From 8de0372ab446652718daa38d28dc2536a8b4426c Mon Sep 17 00:00:00 2001
From: Eduardo San Martin Morote <posva13@gmail.com>
Date: Tue, 22 Jun 2021 18:31:36 +0200
Subject: [PATCH] fix(suspense): display current branch if no fallback is
 provided

Fix #3986
---
 .../__tests__/components/Suspense.spec.ts     | 88 ++++++++++++++++++-
 .../runtime-core/src/components/Suspense.ts   |  4 +-
 2 files changed, 90 insertions(+), 2 deletions(-)

diff --git a/packages/runtime-core/__tests__/components/Suspense.spec.ts b/packages/runtime-core/__tests__/components/Suspense.spec.ts
index 421bc0a8e9..c6d7be849f 100644
--- a/packages/runtime-core/__tests__/components/Suspense.spec.ts
+++ b/packages/runtime-core/__tests__/components/Suspense.spec.ts
@@ -69,6 +69,32 @@ describe('Suspense', () => {
     expect(serializeInner(root)).toBe(`<div>async</div>`)
   })
 
+  test('fallback content', async () => {
+    const Async = defineAsyncComponent({
+      render() {
+        return h('div', 'async')
+      }
+    })
+
+    const Comp = {
+      setup() {
+        return () =>
+          h(Suspense, null, {
+            default: h(Async),
+            fallback: h('div', 'fallback')
+          })
+      }
+    }
+
+    const root = nodeOps.createElement('div')
+    render(h(Comp), root)
+    expect(serializeInner(root)).toBe(`<div>fallback</div>`)
+
+    await Promise.all(deps)
+    await nextTick()
+    expect(serializeInner(root)).toBe(`<div>async</div>`)
+  })
+
   test('emits events', async () => {
     const Async = defineAsyncComponent({
       render() {
@@ -709,7 +735,7 @@ describe('Suspense', () => {
       <div v-if="errorMessage">{{ errorMessage }}</div>
       <Suspense v-else>
         <div>
-          <Async />     
+          <Async />
         </div>
         <template #fallback>
           <div>fallback</div>
@@ -983,6 +1009,66 @@ describe('Suspense', () => {
     expect(serializeInner(root)).toBe(`<div>foo<div>foo nested</div></div>`)
   })
 
+  test('display previous branch when timeout + no fallback slot is provided', async () => {
+    const toggle = ref(false)
+    let resolve = () => {}
+    let promise: Promise<void>
+    function createPromise() {
+      promise = new Promise<void>(r => {
+        resolve = r
+      })
+
+      return promise
+    }
+
+    const Foo = {
+      async setup() {
+        await createPromise()
+        return () => h('div', ['foo'])
+      }
+    }
+
+    const onPending = jest.fn()
+    const onFallback = jest.fn()
+    const onResolve = jest.fn()
+
+    const Comp = {
+      setup() {
+        return () =>
+          h(
+            Suspense,
+            { timeout: 0, onPending, onFallback, onResolve },
+            {
+              default: toggle.value ? h(Foo) : 'other'
+            }
+          )
+      }
+    }
+
+    const root = nodeOps.createElement('div')
+    render(h(Comp), root)
+    expect(serializeInner(root)).toBe(`other`)
+    expect(onPending).toHaveBeenCalledTimes(0)
+    expect(onFallback).toHaveBeenCalledTimes(0)
+    expect(onResolve).toHaveBeenCalledTimes(1)
+
+    toggle.value = true
+    await nextTick()
+    expect(serializeInner(root)).toBe(`other`)
+    expect(onPending).toHaveBeenCalledTimes(1)
+    expect(onFallback).toHaveBeenCalledTimes(0)
+    expect(onResolve).toHaveBeenCalledTimes(1)
+
+    resolve()
+    await promise!
+    await nextTick()
+    await nextTick()
+    expect(serializeInner(root)).toBe(`<div>foo</div>`)
+    expect(onPending).toHaveBeenCalledTimes(1)
+    expect(onFallback).toHaveBeenCalledTimes(0)
+    expect(onResolve).toHaveBeenCalledTimes(2)
+  })
+
   test('branch switch to 3rd branch before resolve', async () => {
     const calls: string[] = []
 
diff --git a/packages/runtime-core/src/components/Suspense.ts b/packages/runtime-core/src/components/Suspense.ts
index 85a2d1755b..b004a6ace5 100644
--- a/packages/runtime-core/src/components/Suspense.ts
+++ b/packages/runtime-core/src/components/Suspense.ts
@@ -4,6 +4,7 @@ import {
   VNodeProps,
   isSameVNodeType,
   openBlock,
+  Comment,
   closeBlock,
   currentBlock,
   createVNode
@@ -516,7 +517,8 @@ function createSuspenseBoundary(
     },
 
     fallback(fallbackVNode) {
-      if (!suspense.pendingBranch) {
+      // avoid displaying the fallback/emitting node if there isn't any
+      if (!suspense.pendingBranch || fallbackVNode.type === Comment) {
         return
       }
 
-- 
2.47.2