wip: handle move and unmount for suspense

diff --git a/packages/runtime-core/src/createRenderer.ts b/packages/runtime-core/src/createRenderer.ts
index 1889aa469b22a56855023f7e98cbd4d113202420..fb404feb0e71c6c838a7db9c8caa8e2968006fd2 100644 (file)
--- a/packages/runtime-core/src/createRenderer.ts
+++ b/packages/runtime-core/src/createRenderer.ts
@@ -617,8 +617,8 @@ export function createRenderer<
 
       suspense.onRetry(() => {
         processFragment(
-          suspense.oldContentTree,
-          suspense.contentTree as HostVNode,
+          suspense.oldSubTree,
+          suspense.subTree as HostVNode,
           contentContainer,
           null,
           parentComponent,
@@ -635,10 +635,10 @@ export function createRenderer<
 
       suspense.onResolve(() => {
         // move content from off-dom container to actual container
-        ;(suspense.contentTree as any).children.forEach((vnode: HostVNode) => {
+        ;(suspense.subTree as any).children.forEach((vnode: HostVNode) => {
           move(vnode, container, anchor)
         })
-        suspense.vnode.el = (suspense.contentTree as HostVNode).el
+        suspense.vnode.el = (suspense.subTree as HostVNode).el
         // check if there is a pending parent suspense
         let parent = suspense.parent
         let hasUnresolvedAncestor = false
@@ -667,12 +667,12 @@ export function createRenderer<
 
       // start mounting the subtree off-dom
       // TODO should buffer postQueue jobs on current boundary
-      const contentTree = (suspense.contentTree = suspense.oldContentTree = childrenToFragment(
+      const subTree = (suspense.subTree = suspense.oldSubTree = childrenToFragment(
         n2
       ))
       processFragment(
         null,
-        contentTree as HostVNode,
+        subTree as HostVNode,
         contentContainer,
         null,
         parentComponent,
@@ -692,14 +692,14 @@ export function createRenderer<
         HostElement
       >
       suspense.vnode = n2
-      const oldContentTree = (suspense.oldContentTree = suspense.contentTree)
-      const newContentTree = (suspense.contentTree = childrenToFragment(n2))
+      const oldSubTree = (suspense.oldSubTree = suspense.subTree)
+      const newContentTree = (suspense.subTree = childrenToFragment(n2))
       if (!suspense.isResolved) {
         suspense.retry()
       } else {
         // just normal patch inner content as a fragment
         processFragment(
-          oldContentTree,
+          oldSubTree,
           newContentTree,
           container,
           null,
@@ -1259,6 +1259,10 @@ export function createRenderer<
       move(vnode.component.subTree, container, anchor)
       return
     }
+    if (__FEATURE_SUSPENSE__ && vnode.type === Suspense) {
+      move((vnode.suspense as any).subTree, container, anchor)
+      return
+    }
     if (vnode.type === Fragment) {
       hostInsert(vnode.el as HostNode, container, anchor)
       const children = vnode.children as HostVNode[]
@@ -1281,6 +1285,7 @@ export function createRenderer<
       ref,
       type,
       component,
+      suspense,
       children,
       dynamicChildren,
       shapeFlag,
@@ -1297,6 +1302,11 @@ export function createRenderer<
       return
     }
 
+    if (__FEATURE_SUSPENSE__ && suspense != null) {
+      unmount(suspense.subTree as HostVNode, parentComponent, doRemove)
+      return
+    }
+
     if (props != null && props.vnodeBeforeUnmount != null) {
       invokeDirectiveHook(props.vnodeBeforeUnmount, parentComponent, vnode)
     }

diff --git a/packages/runtime-core/src/suspense.ts b/packages/runtime-core/src/suspense.ts
index b6027bbb69210b47730b4057b8caea9c5e86c96f..bbe5b0928a7c66ccf3f74e4bcdc7da8e10a308b3 100644 (file)
--- a/packages/runtime-core/src/suspense.ts
+++ b/packages/runtime-core/src/suspense.ts
@@ -9,8 +9,8 @@ export interface SuspenseBoundary<
 > {
   vnode: HostVNode
   parent: SuspenseBoundary<HostNode, HostElement> | null
-  contentTree: HostVNode | null
-  oldContentTree: HostVNode | null
+  subTree: HostVNode | null
+  oldSubTree: HostVNode | null
   fallbackTree: HostVNode | null
   oldFallbackTree: HostVNode | null
   deps: number
@@ -32,8 +32,8 @@ export function createSuspenseBoundary<HostNode, HostElement>(
     vnode,
     parent,
     deps: 0,
-    contentTree: null,
-    oldContentTree: null,
+    subTree: null,
+    oldSubTree: null,
     fallbackTree: null,
     oldFallbackTree: null,
     isResolved: false,