test/vue
1
0
Fork 0
mirror of https://gitee.com/vuejs/vue.git synced 2024-12-03 20:47:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

avoid checked state being overwritten before change event trigger (fix #4521)

Browse Source
This commit is contained in:
Evan You 2016-12-21 22:35:21 -05:00
parent 92ad0bd378
commit 36193183e1
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/platforms/web/runtime/modules/dom-props.js
View File

@ -2,9 +2,6 @@
import { extend, toNumber } from 'shared/util'
// check platforms/web/util/attrs.js acceptValue
declare type acceptValueElm = HTMLInputElement | HTMLSelectElement | HTMLOptionElement
function updateDOMProps (oldVnode: VNodeWithData, vnode: VNodeWithData) {
if (!oldVnode.data.domProps && !vnode.data.domProps) {
return
@ -32,13 +29,19 @@ function updateDOMProps (oldVnode: VNodeWithData, vnode: VNodeWithData) {
if (vnode.children) vnode.children.length = 0
if (cur === oldProps[key]) continue
}
// #4521: if a click event triggers update before the change event is
// dispatched on a checkbox/radio input, the input's checked state will
// be reset and fail to trigger another update.
if (key === 'checked' && !isDirty(elm, cur)) {
continue
}
if (key === 'value') {
// store value as _value as well since
// non-string values will be stringified
elm._value = cur
// avoid resetting cursor position when value is the same
const strCur = cur == null ? '' : String(cur)
if (needUpdateValue(elm, vnode, strCur)) {
if (shouldUpdateValue(elm, vnode, strCur)) {
elm.value = strCur
}
} else {
@ -47,12 +50,21 @@ function updateDOMProps (oldVnode: VNodeWithData, vnode: VNodeWithData) {
}
}
function needUpdateValue (elm: acceptValueElm, vnode: VNodeWithData, checkVal: string): boolean {
// inputing
if (elm.composing) return false
if (elm.tagName.toLowerCase() === 'option') return true
if (isDirty(elm, checkVal)) return true
if (isInputChanged(vnode, checkVal)) return true
// check platforms/web/util/attrs.js acceptValue
type acceptValueElm = HTMLInputElement | HTMLSelectElement | HTMLOptionElement
function shouldUpdateValue (
elm: acceptValueElm,
vnode: VNodeWithData,
checkVal: string
): boolean {
if (!elm.composing && (
vnode.tag === 'option' ||
isDirty(elm, checkVal) ||
isInputChanged(vnode, checkVal)
)) {
return true
}
return false
}