From feccffbf97605afeb00549ba62d841a6e9ad5d4d Mon Sep 17 00:00:00 2001
From: ULIVZ <472590061@qq.com>
Date: Tue, 6 Nov 2018 03:46:02 +0800
Subject: [PATCH] refactor: better content transition strategy

---
 packages/@vuepress/core/lib/app/components/Content.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/@vuepress/core/lib/app/components/Content.vue b/packages/@vuepress/core/lib/app/components/Content.vue
index 1691b669..6ab1682f 100644
--- a/packages/@vuepress/core/lib/app/components/Content.vue
+++ b/packages/@vuepress/core/lib/app/components/Content.vue
@@ -1,5 +1,5 @@
 <template>
-  <transition :name="layout === 'ContentLoading' || !layout ? null : 'fade'">
+  <transition :name="disableTransition ? null : 'fade'">
     <component
       v-if="layout"
       :is="layout"
@@ -24,13 +24,17 @@ export default {
 
   data () {
     return {
-      layout: 'ContentLoading'
+      layout: 'ContentLoading',
+      noTransition: true
     }
   },
 
   computed: {
     $key () {
       return this.pageKey || this.$page.key
+    },
+    disableTransition () {
+      return !this.layout || this.layout === 'ContentLoading' || this.noTransition
     }
   },
 
@@ -62,10 +66,12 @@ export default {
     reloadContent (pageKey) {
       if (Vue.component(pageKey)) {
         this.layout = pageKey
+        this.noTransition = true
         return
       }
       this.layout = 'ContentLoading'
       if (components[pageKey]) {
+        this.noTransition = false
         if (!this.$ssrContext) {
           Promise.all([
             components[pageKey](),
-- 
GitLab