From: Cédric Exbrayat Date: Wed, 11 Mar 2020 15:17:10 +0000 (+0100) Subject: refactor(Suspense): remove unnecessary casts (#819) X-Git-Tag: v3.0.0-alpha.9~38 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f59779706bfff674112b6f166e6259c022872265;p=thirdparty%2Fvuejs%2Fcore.git refactor(Suspense): remove unnecessary casts (#819) --- diff --git a/packages/runtime-core/src/componentRenderUtils.ts b/packages/runtime-core/src/componentRenderUtils.ts index d892cf83c3..1130c9b7ad 100644 --- a/packages/runtime-core/src/componentRenderUtils.ts +++ b/packages/runtime-core/src/componentRenderUtils.ts @@ -260,7 +260,7 @@ function hasPropsChanged(prevProps: Data, nextProps: Data): boolean { export function updateHOCHostEl( { vnode, parent }: ComponentInternalInstance, - el: object // HostNode + el: typeof vnode.el // HostNode ) { while (parent && parent.subTree === vnode) { ;(vnode = parent.vnode).el = el diff --git a/packages/runtime-core/src/components/Suspense.ts b/packages/runtime-core/src/components/Suspense.ts index a783502fc7..34066daefb 100644 --- a/packages/runtime-core/src/components/Suspense.ts +++ b/packages/runtime-core/src/components/Suspense.ts @@ -255,8 +255,8 @@ function createSuspenseBoundary( hiddenContainer, anchor, deps: 0, - subTree: null as any, // will be set immediately after creation - fallbackTree: null as any, // will be set immediately after creation + subTree: (null as unknown) as VNode, // will be set immediately after creation + fallbackTree: (null as unknown) as VNode, // will be set immediately after creation isResolved: false, isUnmounted: false, effects: [], @@ -290,11 +290,11 @@ function createSuspenseBoundary( // if the fallback tree was mounted, it may have been moved // as part of a parent suspense. get the latest anchor for insertion anchor = next(fallbackTree) - unmount(fallbackTree as VNode, parentComponent, suspense, true) + unmount(fallbackTree, parentComponent, suspense, true) } // move content from off-dom container to actual container - move(subTree as VNode, container, anchor, MoveType.ENTER) - const el = (vnode.el = (subTree as VNode).el!) + move(subTree, container, anchor, MoveType.ENTER) + const el = (vnode.el = subTree.el!) // suspense as the root node of a component... if (parentComponent && parentComponent.subTree === vnode) { parentComponent.vnode.el = el @@ -340,7 +340,7 @@ function createSuspenseBoundary( // move content tree back to the off-dom container const anchor = next(subTree) - move(subTree as VNode, hiddenContainer, null, MoveType.LEAVE) + move(subTree, hiddenContainer, null, MoveType.LEAVE) // remount the fallback tree patch( null, @@ -352,7 +352,7 @@ function createSuspenseBoundary( isSVG, optimized ) - const el = (vnode.el = (fallbackTree as VNode).el!) + const el = (vnode.el = fallbackTree.el!) // suspense as the root node of a component... if (parentComponent && parentComponent.subTree === vnode) { parentComponent.vnode.el = el