Skip to content

Commit

Permalink
refactor(Suspense): remove unnecessary casts (#819)
Browse files Browse the repository at this point in the history
  • Loading branch information
cexbrayat authored Mar 11, 2020
1 parent 16a737d commit f597797
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion packages/runtime-core/src/componentRenderUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions packages/runtime-core/src/components/Suspense.ts
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ function createSuspenseBoundary<HostNode, HostElement>(
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: [],
Expand Down Expand Up @@ -290,11 +290,11 @@ function createSuspenseBoundary<HostNode, HostElement>(
// 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
Expand Down Expand Up @@ -340,7 +340,7 @@ function createSuspenseBoundary<HostNode, HostElement>(

// 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,
Expand All @@ -352,7 +352,7 @@ function createSuspenseBoundary<HostNode, HostElement>(
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
Expand Down

0 comments on commit f597797

Please sign in to comment.