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

fix(runtime-dom): should patch svg innerHtml #956

Merged
merged 3 commits into from
Apr 13, 2020
Merged

fix(runtime-dom): should patch svg innerHtml #956

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
050042c
fix(runtime-dom): should patch svg innerHtml
underfin Apr 13, 2020
3d6b1f2
Update patchProp.ts
yyx990803 Apr 13, 2020
d53660c
Update patchProp.ts
yyx990803 Apr 13, 2020
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
16 changes: 16 additions & 0 deletions packages/runtime-dom/__tests__/patchProps.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,22 @@ describe('runtime-dom: props patching', () => {
expect(fn).toHaveBeenCalled()
})

// #954
test('(svg) innerHTML unmount prev children', () => {
const fn = jest.fn()
const comp = {
render: () => 'foo',
unmounted: fn
}
const root = document.createElement('div')
render(h('div', null, [h(comp)]), root)
expect(root.innerHTML).toBe(`<div>foo</div>`)

render(h('svg', { innerHTML: '<g></g>' }), root)
expect(root.innerHTML).toBe(`<svg><g></g></svg>`)
expect(fn).toHaveBeenCalled()
})

test('textContent unmount prev children', () => {
const fn = jest.fn()
const comp = {
Expand Down
9 changes: 5 additions & 4 deletions packages/runtime-dom/src/patchProp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ export const patchProp: RendererOptions<Node, Element>['patchProp'] = (
patchEvent(el, key, prevValue, nextValue, parentComponent)
}
} else if (
!isSVG &&
key in el &&
// onclick="foo" needs to be set as an attribute to work
!(nativeOnRE.test(key) && isString(nextValue))
(!isSVG &&
Copy link
Member

@yyx990803 yyx990803 Apr 13, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's better to do

isSVG ? (key in el &&!(nativeOnRE.test(key) && isString(nextValue)) : key === 'innerHTML'

key in el &&
// onclick="foo" needs to be set as an attribute to work
!(nativeOnRE.test(key) && isString(nextValue))) ||
(isSVG && key === 'innerHTML')
) {
patchDOMProp(
el,
Expand Down