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.

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

fix(runtime-core): patchChildren first in patchElement #4313

Merged
merged 1 commit into from
Aug 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions packages/runtime-core/src/renderer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -840,6 +840,35 @@ function baseCreateRenderer(
dynamicChildren = null
}

const areChildrenSVG = isSVG && n2.type !== 'foreignObject'
if (dynamicChildren) {
patchBlockChildren(
n1.dynamicChildren!,
dynamicChildren,
el,
parentComponent,
parentSuspense,
areChildrenSVG,
slotScopeIds
)
if (__DEV__ && parentComponent && parentComponent.type.__hmrId) {
traverseStaticChildren(n1, n2)
}
} else if (!optimized) {
// full diff
patchChildren(
n1,
n2,
el,
null,
parentComponent,
parentSuspense,
areChildrenSVG,
slotScopeIds,
false
)
}

if (patchFlag > 0) {
// the presence of a patchFlag means this element's render code was
// generated by the compiler and can take the fast path.
Expand Down Expand Up @@ -922,35 +951,6 @@ function baseCreateRenderer(
)
}

const areChildrenSVG = isSVG && n2.type !== 'foreignObject'
if (dynamicChildren) {
patchBlockChildren(
n1.dynamicChildren!,
dynamicChildren,
el,
parentComponent,
parentSuspense,
areChildrenSVG,
slotScopeIds
)
if (__DEV__ && parentComponent && parentComponent.type.__hmrId) {
traverseStaticChildren(n1, n2)
}
} else if (!optimized) {
// full diff
patchChildren(
n1,
n2,
el,
null,
parentComponent,
parentSuspense,
areChildrenSVG,
slotScopeIds,
false
)
}

if ((vnodeHook = newProps.onVnodeUpdated) || dirs) {
queuePostRenderEffect(() => {
vnodeHook && invokeVNodeHook(vnodeHook, parentComponent, n2, n1)
Expand Down
22 changes: 22 additions & 0 deletions packages/runtime-dom/__tests__/patchProps.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -192,4 +192,26 @@ describe('runtime-dom: props patching', () => {
patchProp(el, 'size', 100, null)
expect(el.getAttribute('size')).toBe(null)
})

test('patch value for select', () => {
const root = document.createElement('div')
render(
h('select', { value: 'foo' }, [
h('option', { value: 'foo' }, 'foo'),
h('option', { value: 'bar' }, 'bar')
]),
root
)
const el = root.children[0] as HTMLSelectElement
expect(el.value).toBe('foo')

render(
h('select', { value: 'baz' }, [
h('option', { value: 'foo' }, 'foo'),
h('option', { value: 'baz' }, 'baz')
]),
root
)
expect(el.value).toBe('baz')
})
})
12 changes: 6 additions & 6 deletions packages/runtime-test/__tests__/testRuntime.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,17 @@ describe('test renderer', () => {
expect(updateOps.length).toBe(2)

expect(updateOps[0]).toEqual({
type: NodeOpTypes.PATCH,
type: NodeOpTypes.SET_ELEMENT_TEXT,
targetNode: root.children[0],
propKey: 'id',
propPrevValue: 'test',
propNextValue: 'foo'
text: 'bar'
})

expect(updateOps[1]).toEqual({
type: NodeOpTypes.SET_ELEMENT_TEXT,
type: NodeOpTypes.PATCH,
targetNode: root.children[0],
text: 'bar'
propKey: 'id',
propPrevValue: 'test',
propNextValue: 'foo'
})
})

Expand Down