[HOTFIX] Sidebar scroll (#349)

Sidebar scroll and computed height were broken whenever the site was opened on a branch or root page.
kuzzleio · Jun 17, 2019 · e254f97 · e254f97
1 parent 102511d
commit e254f97
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/.vuepress/theme/Layout.vue b/src/.vuepress/theme/Layout.vue
@@ -85,7 +85,7 @@ export default {
         path: this.$route.path
       });
     },
-    onWindowResize() {
+    computeContentHeight() {
       this.setContainerPadding();
       setTimeout(() => {
         this.computeSidebarHeight();
@@ -143,10 +143,10 @@ export default {
     }
   },
   mounted() {
-    if (this.$page.frontmatter.type !== 'page') {
-      this.$router.replace(getFirstValidChild(this.$page, this.$site.pages));
-      return;
-    }
+    this.$router.afterEach(this.computeContentHeight);
+    window.addEventListener('resize', this.computeContentHeight.bind(this));
+    window.addEventListener('scroll', this.computeSidebarHeight.bind(this));
+
     // TODO condition isSupported()
     const copy = new Clipboard('.md-clipboard', {
       target: trigger => {
@@ -156,9 +156,11 @@ export default {
 
     copy.on('success', this.onCodeCopied);
 
-    window.addEventListener('resize', this.onWindowResize);
-    window.addEventListener('scroll', this.computeSidebarHeight);
-    this.onWindowResize();
+    if (this.$page.frontmatter.type !== 'page') {
+      this.$router.replace(getFirstValidChild(this.$page, this.$site.pages));
+    }
+
+    this.computeContentHeight();
   }
 };
 </script>