wip: suspense buffer effects

diff --git a/packages/runtime-core/src/createRenderer.ts b/packages/runtime-core/src/createRenderer.ts
index 8d77f587bd1da80da7ac60c9964cce9fc8560bd3..62d38d71f6ef6c4d4b1d77f6c429ad145ed9a40c 100644 (file)
--- a/packages/runtime-core/src/createRenderer.ts
+++ b/packages/runtime-core/src/createRenderer.ts
@@ -24,7 +24,8 @@ import {
   EMPTY_OBJ,
   EMPTY_ARR,
   isReservedProp,
-  isFunction
+  isFunction,
+  isArray
 } from '@vue/shared'
 import { queueJob, queuePostFlushCb, flushPostFlushCbs } from './scheduler'
 import {
@@ -77,6 +78,19 @@ function invokeHooks(hooks: Function[], arg?: any) {
   }
 }
 
+function queuePostEffect(
+  fn: Function | Function[],
+  suspense: SuspenseBoundary<any, any> | null
+) {
+  if (suspense === null) {
+    queuePostFlushCb(fn)
+  } else if (isArray(fn)) {
+    suspense.effects.push(...fn)
+  } else {
+    suspense.effects.push(fn)
+  }
+}
+
 export interface RendererOptions<HostNode = any, HostElement = any> {
   patchProp(
     el: HostElement,
@@ -341,9 +355,9 @@ export function createRenderer<
     }
     hostInsert(el, container, anchor)
     if (props != null && props.vnodeMounted != null) {
-      queuePostFlushCb(() => {
+      queuePostEffect(() => {
         invokeDirectiveHook(props.vnodeMounted, parentComponent, vnode)
-      })
+      }, parentSuspense)
     }
   }
 
@@ -492,9 +506,9 @@ export function createRenderer<
     }
 
     if (newProps.vnodeUpdated != null) {
-      queuePostFlushCb(() => {
+      queuePostEffect(() => {
         invokeDirectiveHook(newProps.vnodeUpdated, parentComponent, n2, n1)
-      })
+      }, parentSuspense)
     }
   }
 
@@ -682,7 +696,7 @@ export function createRenderer<
       ))
 
       function resolveSuspense() {
-        const { subTree, fallbackTree, bufferedJobs, vnode } = suspense
+        const { subTree, fallbackTree, effects, vnode } = suspense
         // unmount fallback tree
         unmount(fallbackTree as HostVNode, parentComponent, suspense, true)
         // move content from off-dom container to actual container
@@ -700,14 +714,14 @@ export function createRenderer<
           if (!parent.isResolved) {
             // found a pending parent suspense, merge buffered post jobs
             // into that parent
-            parent.bufferedJobs.push(...bufferedJobs)
+            parent.effects.push(...effects)
             hasUnresolvedAncestor = true
             break
           }
         }
         // no pending parent suspense, flush all jobs
         if (!hasUnresolvedAncestor) {
-          queuePostFlushCb(bufferedJobs)
+          queuePostFlushCb(effects)
         }
         suspense.isResolved = true
         // invoke @resolve event
@@ -949,7 +963,7 @@ export function createRenderer<
         initialVNode.el = subTree.el
         // mounted hook
         if (instance.m !== null) {
-          queuePostFlushCb(instance.m)
+          queuePostEffect(instance.m, parentSuspense)
         }
         mounted = true
       } else {
@@ -1002,7 +1016,7 @@ export function createRenderer<
         }
         // upated hook
         if (instance.u !== null) {
-          queuePostFlushCb(instance.u)
+          queuePostEffect(instance.u, parentSuspense)
         }
 
         if (__DEV__) {
@@ -1484,9 +1498,9 @@ export function createRenderer<
     }
 
     if (props != null && props.vnodeUnmounted != null) {
-      queuePostFlushCb(() => {
+      queuePostEffect(() => {
         invokeDirectiveHook(props.vnodeUnmounted, parentComponent, vnode)
-      })
+      }, parentSuspense)
     }
   }
 
@@ -1509,7 +1523,7 @@ export function createRenderer<
     unmount(subTree, instance, parentSuspense, doRemove)
     // unmounted hook
     if (um !== null) {
-      queuePostFlushCb(um)
+      queuePostEffect(um, parentSuspense)
     }
   }
 

diff --git a/packages/runtime-core/src/suspense.ts b/packages/runtime-core/src/suspense.ts
index e3f04c511b42c271fd455daae6e9955749f49fdf..e1d6065f32f522d2d7ada3355a5b6864e5b255cf 100644 (file)
--- a/packages/runtime-core/src/suspense.ts
+++ b/packages/runtime-core/src/suspense.ts
@@ -18,7 +18,7 @@ export interface SuspenseBoundary<
   oldFallbackTree: HostVNode | null
   deps: number
   isResolved: boolean
-  bufferedJobs: Function[]
+  effects: Function[]
   resolve(): void
 }
 
@@ -38,7 +38,7 @@ export function createSuspenseBoundary<HostNode, HostElement>(
     fallbackTree: null,
     oldFallbackTree: null,
     isResolved: false,
-    bufferedJobs: [],
+    effects: [],
     resolve
   }
 }