fix(v-model): transformModel should check if prop is defined and fall back to attrs if needed (fix #8430) #8442
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…back to attrs if needed (issue vuejs#8430)
posva
reviewed
Jul 2, 2018
src/core/vdom/create-component.js
Outdated
| @@ -247,7 +247,12 @@ function installComponentHooks (data: VNodeData) { | |||
| 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 | |||
| if (options.props && options.props[prop]) { | |||
There was a problem hiding this comment.
could be refactored to
const propOrAtrrKey = options.props && options.props[prop] ? 'props' : 'attrs'
;(data[propOrAttrKey]|| (data[propOrAttrKey] = {}))[prop] = data.model.value
posva
requested changes
Jul 2, 2018
… back to attrs if needed (fix vuejs#8430)
|
It is the first time i did a unit test, is this ok ? |
posva
requested changes
Jul 2, 2018
| describe('Options model', () => { | ||
| it('key should fallback to attrs if prop is not defined in component', () => { | ||
| const ChildComp = { | ||
| model: { |
There was a problem hiding this comment.
You can omit the model option in the component
| template: '<child-comp v-model="value" ref="child-comp" />' | ||
| }).$mount() | ||
|
|
||
| expect(vm.$refs['child-comp'].$attrs.value).toEqual(vm.value) |
There was a problem hiding this comment.
just name it with a one-word name, you can name it test instead of child-component
| import Vue from 'vue' | ||
|
|
||
| describe('Options model', () => { | ||
| it('key should fallback to attrs if prop is not defined in component', () => { |
There was a problem hiding this comment.
A better title: adds value to $attrs if no prop is defined
… back to attrs if needed (fix vuejs#8430)
posva
approved these changes
Jul 3, 2018
|
I think, this has been resolved with #9330, which has the same changes as mine ? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What kind of change does this PR introduce? (check at least one)
Does this PR introduce a breaking change? (check one)
If yes, please describe the impact and migration path for existing applications:
The PR fulfills these requirements:
devbranch for v2.x (or to a previous version branch), not themasterbranchfix #xxx[,#xxx], where "xxx" is the issue number)If adding a new feature, the PR's description includes:
Other information: