fix: resolveDynamicComponent should use context instance
This commit is contained in:
parent
01eb3c12e9
commit
08a3d95e52
@ -788,7 +788,8 @@ describe('compiler: element transform', () => {
|
||||
{
|
||||
type: NodeTypes.SIMPLE_EXPRESSION,
|
||||
content: 'foo'
|
||||
}
|
||||
},
|
||||
'$'
|
||||
]
|
||||
}
|
||||
])
|
||||
|
@ -86,7 +86,8 @@ export const transformElement: NodeTransform = (node, context) => {
|
||||
else if (isProp.exp) {
|
||||
dynamicComponent = createCallExpression(
|
||||
context.helper(RESOLVE_DYNAMIC_COMPONENT),
|
||||
[isProp.exp]
|
||||
// _ctx.$ exposes the owner instance of current render function
|
||||
[isProp.exp, context.prefixIdentifiers ? `_ctx.$` : `$`]
|
||||
)
|
||||
}
|
||||
}
|
||||
|
@ -106,6 +106,9 @@ export const PublicInstanceProxyHandlers: ProxyHandler<any> = {
|
||||
}
|
||||
// return the value from propsProxy for ref unwrapping and readonly
|
||||
return propsProxy![key]
|
||||
} else if (key === '$') {
|
||||
// reserved backdoor to access the internal instance
|
||||
return target
|
||||
} else if (key === '$cache') {
|
||||
return target.renderCache || (target.renderCache = [])
|
||||
} else if (key === '$el') {
|
||||
|
@ -1,5 +1,9 @@
|
||||
import { currentRenderingInstance } from '../componentRenderUtils'
|
||||
import { currentInstance, Component } from '../component'
|
||||
import {
|
||||
currentInstance,
|
||||
Component,
|
||||
ComponentInternalInstance
|
||||
} from '../component'
|
||||
import { Directive } from '../directives'
|
||||
import {
|
||||
camelize,
|
||||
@ -15,11 +19,16 @@ export function resolveComponent(name: string): Component | undefined {
|
||||
}
|
||||
|
||||
export function resolveDynamicComponent(
|
||||
component: unknown
|
||||
component: unknown,
|
||||
// Dynamic component resolution has to be called inline due to potential
|
||||
// access to scope variables. When called inside slots it will be inside
|
||||
// a different component's render cycle, so the owner instance must be passed
|
||||
// in explicitly.
|
||||
instance: ComponentInternalInstance
|
||||
): Component | undefined {
|
||||
if (!component) return
|
||||
if (isString(component)) {
|
||||
return resolveAsset('components', component)
|
||||
return resolveAsset('components', component, instance)
|
||||
} else if (isFunction(component) || isObject(component)) {
|
||||
return component
|
||||
}
|
||||
@ -30,12 +39,24 @@ export function resolveDirective(name: string): Directive | undefined {
|
||||
}
|
||||
|
||||
// overload 1: components
|
||||
function resolveAsset(type: 'components', name: string): Component | undefined
|
||||
function resolveAsset(
|
||||
type: 'components',
|
||||
name: string,
|
||||
instance?: ComponentInternalInstance
|
||||
): Component | undefined
|
||||
// overload 2: directives
|
||||
function resolveAsset(type: 'directives', name: string): Directive | undefined
|
||||
function resolveAsset(
|
||||
type: 'directives',
|
||||
name: string,
|
||||
instance?: ComponentInternalInstance
|
||||
): Directive | undefined
|
||||
|
||||
function resolveAsset(type: 'components' | 'directives', name: string) {
|
||||
const instance = currentRenderingInstance || currentInstance
|
||||
function resolveAsset(
|
||||
type: 'components' | 'directives',
|
||||
name: string,
|
||||
instance: ComponentInternalInstance | null = currentRenderingInstance ||
|
||||
currentInstance
|
||||
) {
|
||||
if (instance) {
|
||||
let camelized
|
||||
const registry = instance[type]
|
||||
|
Loading…
x
Reference in New Issue
Block a user