Skip to content

Commit

Permalink
feat(runtime-core): add special property to get class component optio…
Browse files Browse the repository at this point in the history
…ns (#821)
  • Loading branch information
ktsn authored Mar 12, 2020
1 parent 1e9d131 commit dd17fa1
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 5 deletions.
9 changes: 9 additions & 0 deletions packages/runtime-core/__tests__/vnode.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,15 @@ describe('vnode', () => {
}
})

test('create with class component', () => {
class Component {
$props: any
static __vccOpts = { template: '<div />' }
}
const vnode = createVNode(Component)
expect(vnode.type).toEqual(Component.__vccOpts)
})

describe('class normalization', () => {
test('string', () => {
const vnode = createVNode('p', { class: 'foo baz' })
Expand Down
7 changes: 6 additions & 1 deletion packages/runtime-core/src/component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,18 @@ export interface FunctionalComponent<P = {}> extends SFCInternalOptions {
displayName?: string
}

export interface ClassComponent {
new (...args: any[]): ComponentPublicInstance<any, any, any, any, any>
__vccOpts: ComponentOptions
}

export type Component = ComponentOptions | FunctionalComponent

// A type used in public APIs where a component type is expected.
// The constructor type is an artificial type returned by defineComponent().
export type PublicAPIComponent =
| Component
| { new (): ComponentPublicInstance<any, any, any, any, any> }
| { new (...args: any[]): ComponentPublicInstance<any, any, any, any, any> }

export { ComponentOptions }

Expand Down
2 changes: 1 addition & 1 deletion packages/runtime-core/src/h.ts
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ export function h<O>(
children?: RawChildren | RawSlots
): VNode

// fake constructor type returned by `defineComponent`
// fake constructor type returned by `defineComponent` or class component
export function h(type: Constructor, children?: RawChildren): VNode
export function h<P>(
type: Constructor<P>,
Expand Down
12 changes: 9 additions & 3 deletions packages/runtime-core/src/vnode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ import {
ComponentInternalInstance,
Data,
SetupProxySymbol,
Component
Component,
ClassComponent
} from './component'
import { RawSlots } from './componentSlots'
import { isReactive, Ref } from '@vue/reactivity'
Expand Down Expand Up @@ -162,7 +163,7 @@ export function setBlockTracking(value: number) {
// A block root keeps track of dynamic nodes within the block in the
// `dynamicChildren` array.
export function createBlock(
type: VNodeTypes,
type: VNodeTypes | ClassComponent,
props?: { [key: string]: any } | null,
children?: any,
patchFlag?: number,
Expand Down Expand Up @@ -203,7 +204,7 @@ export function isSameVNodeType(n1: VNode, n2: VNode): boolean {
}

export function createVNode(
type: VNodeTypes,
type: VNodeTypes | ClassComponent,
props: (Data & VNodeProps) | null = null,
children: unknown = null,
patchFlag: number = 0,
Expand All @@ -216,6 +217,11 @@ export function createVNode(
type = Comment
}

// class component normalization.
if (isFunction(type) && '__vccOpts' in type) {
type = type.__vccOpts
}

// class & style normalization.
if (props !== null) {
// for reactive or proxy objects, we need to clone it to enable mutation.
Expand Down

0 comments on commit dd17fa1

Please sign in to comment.