Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Exchange the order of setScopeId and props initiate #6948

Merged
merged 3 commits into from Nov 14, 2022
Merged

Exchange the order of setScopeId and props initiate #6948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82a5848
Exchange the order of `setScopeId` and `props initiate`, and update t…
zollero Oct 25, 2022
1d25db4
update the test case
zollero Oct 25, 2022
27cc079
update the test case again!
zollero Oct 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/runtime-core/__tests__/scopeId.spec.ts
View file
Open in desktop
Expand Up @@ -126,7 +126,7 @@ describe('scopeId runtime support', () => {
const root = nodeOps.createElement('div')
render(h(Root), root)
expect(serializeInner(root)).toBe(
`<div class="wrapper" wrapper slotted root>` +
`<div wrapper slotted root class="wrapper">` +
`<div root slotted-s>hoisted</div>` +
`<div root slotted-s>dynamic</div>` +
`</div>`
Expand All @@ -152,8 +152,8 @@ describe('scopeId runtime support', () => {
const root2 = nodeOps.createElement('div')
render(h(Root2), root2)
expect(serializeInner(root2)).toBe(
`<div class="wrapper" wrapper slotted root>` +
`<div class="wrapper" wrapper root slotted-s>` +
`<div wrapper slotted root class="wrapper">` +
`<div wrapper root slotted-s class="wrapper">` +
`<div root>hoisted</div>` +
`<div root>dynamic</div>` +
`</div>` +
Expand Down
4 changes: 2 additions & 2 deletions packages/runtime-core/src/renderer.ts
View file
Open in desktop
Expand Up @@ -646,6 +646,8 @@ function baseCreateRenderer(
if (dirs) {
invokeDirectiveHook(vnode, null, parentComponent, 'created')
}
// scopeId
setScopeId(el, vnode, vnode.scopeId, slotScopeIds, parentComponent)
// props
if (props) {
for (const key in props) {
Expand Down Expand Up @@ -679,8 +681,6 @@ function baseCreateRenderer(
invokeVNodeHook(vnodeHook, parentComponent, vnode)
}
}
// scopeId
setScopeId(el, vnode, vnode.scopeId, slotScopeIds, parentComponent)

if (__DEV__ || __FEATURE_PROD_DEVTOOLS__) {
Object.defineProperty(el, '__vnode', {
Expand Down