Skip to content

Commit

Permalink
fix(runtime-core): should call chained mixins and extends (#3040)
Browse files Browse the repository at this point in the history
fix #3038
  • Loading branch information
HcySunYang authored Mar 25, 2021
1 parent 86ceef4 commit b58bb16
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 0 deletions.
87 changes: 87 additions & 0 deletions packages/runtime-core/__tests__/apiOptions.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,93 @@ describe('api: options', () => {
expect(renderToString(h(Comp))).toBe('from mixin')
})

test('chained mixins in extends', () => {
const calls: string[] = []
const mixinA = {
beforeCreate() {
calls.push('mixinA beforeCreate')
},
created() {
calls.push('mixinA created')
}
}

const extendA = {
mixins: [mixinA],
beforeCreate() {
calls.push('extendA beforeCreate')
},
created() {
calls.push('extendA created')
}
}

const Comp = {
extends: extendA,
render: () => '123',
beforeCreate() {
calls.push('self beforeCreate')
},
created() {
calls.push('self created')
}
}

expect(renderToString(h(Comp))).toBe(`123`)
expect(calls).toEqual([
'mixinA beforeCreate',
'extendA beforeCreate',
'self beforeCreate',
'mixinA created',
'extendA created',
'self created'
])
})

test('chained extends in mixins', () => {
const calls: string[] = []

const extendA = {
beforeCreate() {
calls.push('extendA beforeCreate')
},
created() {
calls.push('extendA created')
}
}

const mixinA = {
extends: extendA,
beforeCreate() {
calls.push('mixinA beforeCreate')
},
created() {
calls.push('mixinA created')
}
}

const Comp = {
mixins: [mixinA],
render: () => '123',
beforeCreate() {
calls.push('self beforeCreate')
},
created() {
calls.push('self created')
}
}

expect(renderToString(h(Comp))).toBe(`123`)
expect(calls).toEqual([
'extendA beforeCreate',
'mixinA beforeCreate',
'self beforeCreate',
'extendA created',
'mixinA created',
'self created'
])
})

test('extends', () => {
const calls: string[] = []
const Base = {
Expand Down
8 changes: 8 additions & 0 deletions packages/runtime-core/src/componentOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,10 @@ function callHookFromExtends(
if (base.extends) {
callHookFromExtends(name, type, base.extends, instance)
}
const chainedMixins = base.mixins
if (chainedMixins) {
callHookFromMixins(name, type, chainedMixins, instance)
}
const baseHook = base[name]
if (baseHook) {
callWithAsyncErrorHandling(baseHook.bind(instance.proxy!), instance, type)
Expand All @@ -853,6 +857,10 @@ function callHookFromMixins(
) {
for (let i = 0; i < mixins.length; i++) {
const chainedMixins = mixins[i].mixins
const chainedExtends = mixins[i].extends
if (chainedExtends) {
callHookFromExtends(name, type, chainedExtends, instance)
}
if (chainedMixins) {
callHookFromMixins(name, type, chainedMixins, instance)
}
Expand Down

0 comments on commit b58bb16

Please sign in to comment.