fix(QImg): prevent SSR hydration error in suspense; restore placehold…

…er image on null addImage or onError #14815, #14858 (#14869) * chore: prevent router error when changing page on SSR on dev * fix(QImg): prevent SSR hydration error in suspense #14815 * fix(QImg): restore placeholder image on null addImage or onError #14858
quasarframework · Nov 14, 2022 · 07e21c7 · 07e21c7
1 parent 4c407da
commit 07e21c7
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 14 deletions.
diff --git a/ui/dev/src/App.vue b/ui/dev/src/App.vue
@@ -2,6 +2,24 @@
   <div>
     <router-view />
 
+    <!--
+    <router-view v-slot="{ Component, route }">
+      <template v-if="Component">
+        <transition name="fade" mode="out-in">
+          <keep-alive>
+            <suspense :timeout="100">
+              <component :is="Component" :key="route.path" />
+
+              <template #fallback>
+                <q-inner-loading showing size="10vmin" />
+              </template>
+            </suspense>
+          </keep-alive>
+        </transition>
+      </template>
+    </router-view>
+    -->
+
     <q-btn to="/" round icon="home" dense size="xs" class="fixed dev-home-btn z-max" color="accent" aria-label="Go Home" />
 
     <q-card

diff --git a/ui/dev/src/boot/ssr-client.js b/ui/dev/src/boot/ssr-client.js
@@ -3,12 +3,14 @@ export default ({ router }) => {
   console.log('[Quasar] On route change we deliberately load page from server -- in order to test hydration errors')
 
   let reload = false
-  router.beforeEach((to, _, next) => {
+  router.beforeEach((to) => {
     if (reload) {
-      window.location.href = to.fullPath
+      setTimeout(() => {
+        window.location.href = to.fullPath
+      }, 0)
       return false
     }
     reload = true
-    next()
+    return true
   })
 }
diff --git a/ui/dev/src/pages/components/img.vue b/ui/dev/src/pages/components/img.vue
@@ -171,6 +171,7 @@
 
       <q-img
         :src="bogusSrc"
+        placeholder-src="https://picsum.photos/500/300/?blur"
         spinner-color="white"
         ratio="1"
         style="min-height: 100px; max-width: 225px"
@@ -204,7 +205,9 @@ export default {
     onClick () {
       console.log('@click')
     }
-  }
+  } // ,
+
+  // async setup () {}
 }
 </script>
 

diff --git a/ui/src/components/img/QImg.js b/ui/src/components/img/QImg.js
@@ -6,7 +6,6 @@ import useRatio, { useRatioProps } from '../../composables/private/use-ratio.js'
 
 import { createComponent } from '../../utils/private/create.js'
 import { hSlot } from '../../utils/private/render.js'
-import { isRuntimeSsrPreHydration } from '../../plugins/Platform.js'
 
 const defaultRatio = 16 / 9
 
@@ -74,7 +73,7 @@ export default createComponent({
 
     const images = [
       ref(null),
-      ref(props.placeholderSrc !== void 0 ? { src: props.placeholderSrc } : null)
+      ref(getPlaceholderSrc())
     ]
 
     const position = ref(0)
@@ -114,18 +113,24 @@ export default createComponent({
         : null
     }
 
+    function getPlaceholderSrc () {
+      return props.placeholderSrc !== void 0
+        ? { src: props.placeholderSrc }
+        : null
+    }
+
     function addImage (imgProps) {
       clearTimeout(loadTimer)
       hasError.value = false
 
       if (imgProps === null) {
         isLoading.value = false
-        images[ 0 ].value = null
-        images[ 1 ].value = null
-        return
+        images[ position.value ^ 1 ].value = getPlaceholderSrc()
+      }
+      else {
+        isLoading.value = true
       }
 
-      isLoading.value = true
       images[ position.value ].value = imgProps
     }
 
@@ -160,7 +165,7 @@ export default createComponent({
       // if component has been already destroyed
       if (loadTimer === null) { return }
 
-      position.value = position.value === 1 ? 0 : 1
+      position.value = position.value ^ 1
       images[ position.value ].value = null
       isLoading.value = false
       hasError.value = false
@@ -171,8 +176,8 @@ export default createComponent({
       clearTimeout(loadTimer)
       isLoading.value = false
       hasError.value = true
-      images[ 0 ].value = null
-      images[ 1 ].value = null
+      images[ position.value ].value = null
+      images[ position.value ^ 1 ].value = getPlaceholderSrc()
       emit('error', err)
     }
 
@@ -242,7 +247,7 @@ export default createComponent({
     }
 
     if (__QUASAR_SSR_SERVER__ !== true) {
-      if (__QUASAR_SSR_CLIENT__ && isRuntimeSsrPreHydration.value === true) {
+      if (__QUASAR_SSR_CLIENT__) {
         onMounted(() => {
           addImage(getCurrentSrc())
         })