Skip to content

Commit

Permalink
fix(provide): provide should default to parentVal during merging (#6473)
Browse files Browse the repository at this point in the history
fix #6436
  • Loading branch information
jkzing authored and yyx990803 committed Sep 5, 2017
1 parent a67b795 commit 3c21675
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/core/util/options.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export function mergeDataOrFn (
: childVal
const defaultData = typeof parentVal === 'function'
? parentVal.call(vm)
: undefined
: parentVal
if (instanceData) {
return mergeData(instanceData, defaultData)
} else {
Expand Down
20 changes: 20 additions & 0 deletions test/unit/features/options/inject.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -545,4 +545,24 @@ describe('Options provide/inject', () => {

expect(vm.$el.textContent).toBe(`foo: foo injected, bar: bar injected`)
})

it('merge provide with object syntax when using Vue.extend', () => {
const child = {
inject: ['foo'],
template: `<span/>`,
created () {
injected = this.foo
}
}
const Ctor = Vue.extend({
provide: { foo: 'foo' },
render (h) {
return h(child)
}
})

new Ctor().$mount()

expect(injected).toEqual('foo')
})
})

0 comments on commit 3c21675

Please sign in to comment.