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(v-model): transformModel should check if prop is defined and fall back to attrs if needed (fix #8430) #8442

Closed
wants to merge 5 commits into from
Closed

fix(v-model): transformModel should check if prop is defined and fall back to attrs if needed (fix #8430) #8442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4df1f1d
fix(v-model): transformModel should check if prop is defined and fall…
dattn Jul 2, 2018
5b36846
fix(v-model): transformModel should check if prop is defined and fall…
dattn Jul 2, 2018
ed9f3a7
fix(v-model): transformModel should check if prop is defined and fall…
dattn Jul 3, 2018
9ef1bc8
chore: refactor
posva Jul 3, 2018
c8f4196
Merge branch 'dev' into model-fix
posva Dec 10, 2018
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
4 changes: 3 additions & 1 deletion src/core/vdom/create-component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,9 @@ function mergeHook (f1: any, f2: any): Function {
function transformModel (options, data: any) {
const prop = (options.model && options.model.prop) || 'value'
const event = (options.model && options.model.event) || 'input'
;(data.props || (data.props = {}))[prop] = data.model.value
// check if prop is defined, if not, attrs will be used
const propOrAttrKey = options.props && options.props[prop] ? 'props' : 'attrs'
;(data[propOrAttrKey] || (data[propOrAttrKey] = {}))[prop] = data.model.value
const on = data.on || (data.on = {})
const existing = on[event]
const callback = data.model.callback
Expand Down
21 changes: 21 additions & 0 deletions test/unit/features/directives/model-component.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,27 @@ describe('Directive v-model component', () => {
expect(vm.text).toBe('foo o')
})


it('adds value to $attrs if no prop is defined', () => {
const Test = {
render: () => {}
}

const vm = new Vue({
components: {
Test
},
data () {
return {
value: 'value'
}
},
template: '<test v-model="value" ref="test" />'
}).$mount()

expect(vm.$refs.test.$attrs.value).toEqual(vm.value)
})

// #8436
it('should not double transform mode props', () => {
const BaseInput = {
Expand Down