fix(transition): should call transition hooks inside already resolved suspense (#1698)

fix #1689
2020-07-28 04:47:07 +08:00
parent 6efb2fe3ea
commit 2a633c84ff
2 changed files with 154 additions and 2 deletions
--- a/packages/runtime-core/src/renderer.ts
+++ b/packages/runtime-core/src/renderer.ts
@@ -744,9 +744,12 @@ function baseCreateRenderer(
    }

    hostInsert(el, container, anchor)
-    // #1583 For inside suspense case, enter hook should call when suspense resolved
+    // #1583 For inside suspense + suspense not resolved case, enter hook should call when suspense resolved
+    // #1689 For inside suspense + suspense resolved case, just call it
    const needCallTransitionHooks =
-      !parentSuspense && transition && !transition.persisted
+      (!parentSuspense || (parentSuspense && parentSuspense!.isResolved)) &&
+      transition &&
+      !transition.persisted
    if (
      (vnodeHook = props && props.onVnodeMounted) ||
      needCallTransitionHooks ||