From bd36224b45ee832765afcf4a57c211d362e4e6af Mon Sep 17 00:00:00 2001
From: Kia Ishii <kia.king.08@gmail.com>
Date: Fri, 20 Jan 2023 19:10:35 +0900
Subject: [PATCH] fix(theme): sidebar scrollbar is cropped by nav bar

---
 src/client/theme-default/components/VPNav.vue | 23 +-----
 .../theme-default/components/VPNavBar.vue     | 77 ++++++++++++++-----
 .../theme-default/components/VPSidebar.vue    | 16 ++++
 3 files changed, 75 insertions(+), 41 deletions(-)

diff --git a/src/client/theme-default/components/VPNav.vue b/src/client/theme-default/components/VPNav.vue
index 2f782be2aa97..1f7b554d092a 100644
--- a/src/client/theme-default/components/VPNav.vue
+++ b/src/client/theme-default/components/VPNav.vue
@@ -1,26 +1,16 @@
 <script setup lang="ts">
-import { computed, provide } from 'vue'
-import { useWindowScroll } from '@vueuse/core'
+import { provide } from 'vue'
 import { useNav } from '../composables/nav.js'
-import { useSidebar } from '../composables/sidebar.js'
 import VPNavBar from './VPNavBar.vue'
 import VPNavScreen from './VPNavScreen.vue'
 
-const { y } = useWindowScroll()
-
 const { isScreenOpen, closeScreen, toggleScreen } = useNav()
-const { hasSidebar } = useSidebar()
 
 provide('close-screen', closeScreen)
-
-const classes = computed(() => ({
-  'no-sidebar': !hasSidebar.value,
-  'fill-bg': y.value > 0
-}))
 </script>
 
 <template>
-  <header class="VPNav" :class="classes">
+  <header class="VPNav">
     <VPNavBar :is-screen-open="isScreenOpen" @toggle-screen="toggleScreen">
       <template #nav-bar-title-before><slot name="nav-bar-title-before" /></template>
       <template #nav-bar-title-after><slot name="nav-bar-title-after" /></template>
@@ -42,19 +32,10 @@ const classes = computed(() => ({
   left: 0;
   z-index: var(--vp-z-index-nav);
   width: 100%;
-  background-color: var(--vp-nav-bg-color);
   pointer-events: none;
   transition: background-color 0.5s;
 }
 
-.VPNav.no-sidebar {
-  background-color: transparent;
-}
-
-.VPNav.fill-bg {
-  background-color: var(--vp-nav-bg-color);
-}
-
 @media (min-width: 960px) {
   .VPNav {
     position: fixed;
diff --git a/src/client/theme-default/components/VPNavBar.vue b/src/client/theme-default/components/VPNavBar.vue
index 6189e4df1e6e..7b4d65cbe7ed 100644
--- a/src/client/theme-default/components/VPNavBar.vue
+++ b/src/client/theme-default/components/VPNavBar.vue
@@ -1,4 +1,6 @@
 <script lang="ts" setup>
+import { computed } from 'vue'
+import { useWindowScroll } from '@vueuse/core'
 import { useSidebar } from '../composables/sidebar.js'
 import VPNavBarTitle from './VPNavBarTitle.vue'
 import VPNavBarSearch from './VPNavBarSearch.vue'
@@ -17,11 +19,17 @@ defineEmits<{
   (e: 'toggle-screen'): void
 }>()
 
+const { y } = useWindowScroll()
 const { hasSidebar } = useSidebar()
+
+const classes = computed(() => ({
+  'has-sidebar': hasSidebar.value,
+  fill: y.value > 0
+}))
 </script>
 
 <template>
-  <div class="VPNavBar" :class="{ 'has-sidebar' : hasSidebar }">
+  <div class="VPNavBar" :class="classes">
     <div class="container">
       <div class="title">
         <VPNavBarTitle>
@@ -32,15 +40,17 @@ const { hasSidebar } = useSidebar()
 
       <div class="content">
         <div class="curtain" />
-        <slot name="nav-bar-content-before" />
-        <VPNavBarSearch class="search" />
-        <VPNavBarMenu class="menu" />
-        <VPNavBarTranslations class="translations" />
-        <VPNavBarAppearance class="appearance" />
-        <VPNavBarSocialLinks class="social-links" />
-        <VPNavBarExtra class="extra" />
-        <slot name="nav-bar-content-after" />
-        <VPNavBarHamburger class="hamburger" :active="isScreenOpen" @click="$emit('toggle-screen')" />
+        <div class="content-body">
+          <slot name="nav-bar-content-before" />
+          <VPNavBarSearch class="search" />
+          <VPNavBarMenu class="menu" />
+          <VPNavBarTranslations class="translations" />
+          <VPNavBarAppearance class="appearance" />
+          <VPNavBarSocialLinks class="social-links" />
+          <VPNavBarExtra class="extra" />
+          <slot name="nav-bar-content-after" />
+          <VPNavBarHamburger class="hamburger" :active="isScreenOpen" @click="$emit('toggle-screen')" />
+        </div>
       </div>
     </div>
   </div>
@@ -49,13 +59,18 @@ const { hasSidebar } = useSidebar()
 <style scoped>
 .VPNavBar {
   position: relative;
-  border-bottom: 1px solid var(--vp-c-gutter);
+  border-bottom: 1px solid transparent;
   padding: 0 8px 0 24px;
   height: var(--vp-nav-height);
   transition: border-color 0.5s, background-color 0.5s;
   pointer-events: none;
 }
 
+.VPNavBar.has-sidebar,
+.VPNavBar.fill {
+  border-bottom-color: var(--vp-c-gutter);
+}
+
 @media (min-width: 768px) {
   .VPNavBar {
     padding: 0 32px;
@@ -78,6 +93,10 @@ const { hasSidebar } = useSidebar()
   pointer-events: none;
 }
 
+.container :deep(*) {
+  pointer-events: auto;
+}
+
 @media (min-width: 960px) {
   .VPNavBar.has-sidebar .container {
     max-width: 100%;
@@ -86,6 +105,12 @@ const { hasSidebar } = useSidebar()
 
 .title {
   flex-shrink: 0;
+  height: calc(var(--vp-nav-height) - 1px);
+  transition: background-color 0.5s;
+}
+
+.VPNavBar.fill .title {
+  background-color: var(--vp-nav-bg-color);
 }
 
 @media (min-width: 960px) {
@@ -97,7 +122,7 @@ const { hasSidebar } = useSidebar()
     padding: 0 32px;
     width: var(--vp-sidebar-width);
     height: var(--vp-nav-height);
-    background-color: var(--vp-c-bg-alt);
+    background-color: transparent;
   }
 }
 
@@ -108,14 +133,7 @@ const { hasSidebar } = useSidebar()
   }
 }
 
-.container :deep(*) {
-  pointer-events: auto;
-}
-
 .content {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
   flex-grow: 1;
 }
 
@@ -135,6 +153,25 @@ const { hasSidebar } = useSidebar()
   }
 }
 
+.content-body {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  height: calc(var(--vp-nav-height) - 1px);
+  transition: background-color 0.5s;
+}
+
+.VPNavBar.fill .content-body {
+  background-color: var(--vp-nav-bg-color);
+}
+
+@media (min-width: 960px) {
+  .VPNavBar.has-sidebar .content-body {
+    position: relative;
+    background-color: var(--vp-nav-bg-color);
+  }
+}
+
 .menu + .translations::before,
 .menu + .appearance::before,
 .menu + .social-links::before,
@@ -165,7 +202,7 @@ const { hasSidebar } = useSidebar()
   .VPNavBar.has-sidebar .curtain {
     position: absolute;
     right: 0;
-    bottom: -32px;
+    bottom: -31px;
     width: calc(100% - var(--vp-sidebar-width));
     height: 32px;
   }
diff --git a/src/client/theme-default/components/VPSidebar.vue b/src/client/theme-default/components/VPSidebar.vue
index bad3382948b4..2efd8c3d5184 100644
--- a/src/client/theme-default/components/VPSidebar.vue
+++ b/src/client/theme-default/components/VPSidebar.vue
@@ -39,6 +39,8 @@ watchPostEffect(async () => {
     ref="navEl"
     @click.stop
   >
+    <div class="curtain" />
+
     <nav class="nav" id="VPSidebarNav" aria-labelledby="sidebar-aria-label" tabindex="-1">
       <span class="visually-hidden" id="sidebar-aria-label">
         Sidebar Navigation
@@ -113,6 +115,20 @@ watchPostEffect(async () => {
   }
 }
 
+@media (min-width: 960px) {
+  .curtain {
+    position: sticky;
+    top: -64px;
+    left: 0;
+    z-index: 1;
+    margin-top: calc(var(--vp-nav-height) * -1);
+    margin-right: -32px;
+    margin-left: -32px;
+    height: var(--vp-nav-height);
+    background-color: var(--vp-sidebar-bg-color);
+  }
+}
+
 .nav {
   outline: 0;
 }