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

refactor: tweak arguments

Browse Source
This commit is contained in:
Evan You 2018-10-15 12:41:18 -04:00
parent 24ff686848
commit b0f3a67e29
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/core/src/componentUtils.ts
View File

@ -23,12 +23,11 @@ import { handleError, ErrorTypes } from './errorHandling'
import { warn } from './warning' import { warn } from './warning'
let currentVNode: VNode | null = null let currentVNode: VNode | null = null
let currentContextVNode: MountedVNode | null = null let currentContextVNode: VNode | null = null
export function createComponentInstance( export function createComponentInstance(
vnode: VNode, vnode: VNode,
Component: ComponentClass, Component: ComponentClass
contextVNode: MountedVNode | null
): ComponentInstance { ): ComponentInstance {
// component instance creation is done in two steps. // component instance creation is done in two steps.
// first, `initializeComponentInstance` is called inside base component // first, `initializeComponentInstance` is called inside base component
@ -38,7 +37,7 @@ export function createComponentInstance(
// we are storing the vnodes in variables here so that there's no need to // we are storing the vnodes in variables here so that there's no need to
// always pass args in super() // always pass args in super()
currentVNode = vnode currentVNode = vnode
currentContextVNode = contextVNode currentContextVNode = vnode.contextVNode
const instance = (vnode.children = new Component() as ComponentInstance) const instance = (vnode.children = new Component() as ComponentInstance)
// then we finish the initialization by collecting properties set on the // then we finish the initialization by collecting properties set on the
// instance // instance

10
packages/core/src/createRenderer.ts
View File

@ -210,9 +210,9 @@ export function createRenderer(options: RendererOptions) {
} }
const { flags } = vnode const { flags } = vnode
if (flags & VNodeFlags.COMPONENT_STATEFUL) { if (flags & VNodeFlags.COMPONENT_STATEFUL) {
mountStatefulComponent(vnode, container, contextVNode, isSVG, endNode) mountStatefulComponent(vnode, container, isSVG, endNode)
} else { } else {
mountFunctionalComponent(vnode, container, contextVNode, isSVG, endNode) mountFunctionalComponent(vnode, container, isSVG, endNode)
} }
if (__DEV__) { if (__DEV__) {
popContext() popContext()
@ -222,7 +222,6 @@ export function createRenderer(options: RendererOptions) {
function mountStatefulComponent( function mountStatefulComponent(
vnode: VNode, vnode: VNode,
container: RenderNode | null, container: RenderNode | null,
contextVNode: MountedVNode | null,
isSVG: boolean, isSVG: boolean,
endNode: RenderNode | null endNode: RenderNode | null
) { ) {
@ -234,7 +233,6 @@ export function createRenderer(options: RendererOptions) {
vnode, vnode,
vnode.tag as ComponentClass, vnode.tag as ComponentClass,
container, container,
contextVNode,
isSVG, isSVG,
endNode endNode
) )
@ -244,7 +242,6 @@ export function createRenderer(options: RendererOptions) {
function mountFunctionalComponent( function mountFunctionalComponent(
vnode: VNode, vnode: VNode,
container: RenderNode | null, container: RenderNode | null,
contextVNode: MountedVNode | null,
isSVG: boolean, isSVG: boolean,
endNode: RenderNode | null endNode: RenderNode | null
) { ) {
@ -1156,7 +1153,6 @@ export function createRenderer(options: RendererOptions) {
vnode: VNode, vnode: VNode,
Component: ComponentClass, Component: ComponentClass,
container: RenderNode | null, container: RenderNode | null,
contextVNode: MountedVNode | null,
isSVG: boolean, isSVG: boolean,
endNode: RenderNode | null endNode: RenderNode | null
): RenderNode { ): RenderNode {
@ -1164,7 +1160,7 @@ export function createRenderer(options: RendererOptions) {
// new Vue() // new Vue()
const instance = const instance =
(__COMPAT__ && (vnode.children as ComponentInstance)) || (__COMPAT__ && (vnode.children as ComponentInstance)) ||
createComponentInstance(vnode, Component, contextVNode) createComponentInstance(vnode, Component)
// inject platform-specific unmount to keep-alive container // inject platform-specific unmount to keep-alive container
if ((Component as any)[KeepAliveSymbol] === true) { if ((Component as any)[KeepAliveSymbol] === true) {