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

Jump to bottom

Fix #9641: v-bind object should be overridable by single bindings #9653

Merged
merged 1 commit into from Mar 8, 2019
+7 −6
Merged

Fix #9641: v-bind object should be overridable by single bindings #9653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/core/instance/render-helpers/bind-object-props.js
View file
Open in desktop
Expand Up @@ -7,7 +7,8 @@ import {
isObject,
toObject,
isReservedAttribute,
camelize
camelize,
hyphenate
} from 'core/util/index'

/**
Expand Down Expand Up @@ -45,12 +46,13 @@ export function bindObjectProps (
: data.attrs || (data.attrs = {})
}
const camelizedKey = camelize(key)
if (!(key in hash) && !(camelizedKey in hash)) {
const hyphenatedKey = hyphenate(key)
if (!(camelizedKey in hash) && !(hyphenatedKey in hash)) {
Copy link
Member Author

Choose a reason for hiding this comment

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

We need to ensure both camelCased and kebab-cased keys are checked here.

hash[key] = value[key]

if (isSync) {
const on = data.on || (data.on = {})
on[`update:${camelizedKey}`] = function ($event) {
on[`update:${key}`] = function ($event) {
value[key] = $event
}
}
Expand Down
5 changes: 2 additions & 3 deletions test/unit/features/directives/bind.spec.js
View file
Open in desktop
Expand Up @@ -234,7 +234,7 @@ describe('Directive v-bind', () => {
template: `<test v-bind="test" data-foo="foo" dataBar="bar"/>`,
components: {
test: {
template: '<div :data-foo="dataFoo" :data-bar="dataBar"></div>',
template: '<div>{{ dataFoo }} {{ dataBar }}</div>',
Copy link
Member Author

Choose a reason for hiding this comment

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

The old spec passed because data-foo fell through as an attribute and coincidentally appeared in the final output. Using plain text instead to ensure we got the correct value.

props: ['dataFoo', 'dataBar']
}
},
Expand All @@ -245,8 +245,7 @@ describe('Directive v-bind', () => {
}
}
}).$mount()
expect(vm.$el.getAttribute('data-foo')).toBe('foo')
expect(vm.$el.getAttribute('data-bar')).toBe('bar')
expect(vm.$el.textContent).toBe('foo bar')
})

it('.sync modifier with bind object', done => {
Expand Down