theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(runtime-core): failed component resolution should fallback to native element

Browse Source
This commit is contained in:
Evan You 2020-03-25 15:08:15 -04:00
parent c5beb9fb4c
commit cb31eb4d0a
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/runtime-core/src/helpers/resolveAssets.ts
View File

@ -1,10 +1,5 @@
import { currentRenderingInstance } from '../componentRenderUtils' import { currentRenderingInstance } from '../componentRenderUtils'
import { import { currentInstance, Component, FunctionalComponent } from '../component'
currentInstance,
Component,
ComponentInternalInstance,
FunctionalComponent
} from '../component'
import { Directive } from '../directives' import { Directive } from '../directives'
import { import {
camelize, camelize,
@ -18,8 +13,8 @@ import { warn } from '../warning'
const COMPONENTS = 'components' const COMPONENTS = 'components'
const DIRECTIVES = 'directives' const DIRECTIVES = 'directives'
export function resolveComponent(name: string): Component | undefined { export function resolveComponent(name: string): Component | string | undefined {
return resolveAsset(COMPONENTS, name) return resolveAsset(COMPONENTS, name) || name
} }
export function resolveDynamicComponent( export function resolveDynamicComponent(
@ -27,11 +22,7 @@ export function resolveDynamicComponent(
): Component | string | undefined { ): Component | string | undefined {
if (!component) return if (!component) return
if (isString(component)) { if (isString(component)) {
return ( return resolveAsset(COMPONENTS, component, false) || component
resolveAsset(COMPONENTS, component, currentRenderingInstance, false) ||
// fallback to plain element
component
)
} else if (isFunction(component) || isObject(component)) { } else if (isFunction(component) || isObject(component)) {
return component return component
} }
@ -45,23 +36,20 @@ export function resolveDirective(name: string): Directive | undefined {
function resolveAsset( function resolveAsset(
type: typeof COMPONENTS, type: typeof COMPONENTS,
name: string, name: string,
instance?: ComponentInternalInstance | null,
warnMissing?: boolean warnMissing?: boolean
): Component | undefined ): Component | undefined
// overload 2: directives // overload 2: directives
function resolveAsset( function resolveAsset(
type: typeof DIRECTIVES, type: typeof DIRECTIVES,
name: string, name: string
instance?: ComponentInternalInstance | null
): Directive | undefined ): Directive | undefined
function resolveAsset( function resolveAsset(
type: typeof COMPONENTS | typeof DIRECTIVES, type: typeof COMPONENTS | typeof DIRECTIVES,
name: string, name: string,
instance: ComponentInternalInstance | null = currentRenderingInstance ||
currentInstance,
warnMissing = true warnMissing = true
) { ) {
const instance = currentRenderingInstance || currentInstance
if (instance) { if (instance) {
let camelized, capitalized let camelized, capitalized
const registry = instance[type] const registry = instance[type]