Skip to content

Commit

Permalink
fix(runtime-core): should catch dom prop set TypeErrors
Browse files Browse the repository at this point in the history
based on #1051
  • Loading branch information
yyx990803 committed May 1, 2020
1 parent c5e7d8b commit 98bee59
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 1 deletion.
15 changes: 15 additions & 0 deletions packages/runtime-dom/__tests__/patchProps.spec.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { patchProp } from '../src/patchProp'
import { render, h } from '../src'
import { mockWarn } from '@vue/shared'

describe('runtime-dom: props patching', () => {
mockWarn()

test('basic', () => {
const el = document.createElement('div')
patchProp(el, 'id', null, 'foo')
Expand Down Expand Up @@ -92,4 +95,16 @@ describe('runtime-dom: props patching', () => {
patchProp(el, 'srcObject', null, null)
expect(el.srcObject).toBe(intiialValue)
})

test('catch and warn prop set TypeError', () => {
const el = document.createElement('div')
Object.defineProperty(el, 'someProp', {
set() {
throw new TypeError('Invalid type')
}
})
patchProp(el, 'someProp', null, 'foo')

expect(`Failed setting prop "someProp" on <div>`).toHaveBeenWarnedLast()
})
})
16 changes: 15 additions & 1 deletion packages/runtime-dom/src/modules/props.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// __UNSAFE__
// Reason: potentially setting innerHTML.
// This can come from explicit usage of v-html or innerHTML as a prop in render

import { warn } from '@vue/runtime-core'

// functions. The user is reponsible for using them with only trusted content.
export function patchDOMProp(
el: any,
Expand Down Expand Up @@ -35,6 +38,17 @@ export function patchDOMProp(
// e.g. <div :id="null">
el[key] = ''
} else {
el[key] = value
// some properties perform value validation and throw
try {
el[key] = value
} catch (e) {
if (__DEV__) {
warn(
`Failed setting prop "${key}" on <${el.tagName.toLowerCase()}>: ` +
`value ${value} is invalid.`,
e
)
}
}
}
}

0 comments on commit 98bee59

Please sign in to comment.