fix: home page tag sticky overflow to the footer if no footer link

virtualansh · Aug 22, 2023 · 6cb0a86 · 6cb0a86
1 parent b1ff151
commit 6cb0a86
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/components/Sidebar/src/TagBox.vue b/src/components/Sidebar/src/TagBox.vue
@@ -1,7 +1,7 @@
 <template>
   <Sticky
     :stickyTop="32 + 81"
-    endingElId="footer-link"
+    :endingElId="endEleId"
     dynamicElClass="#sticky-tag-box"
   >
     <div id="sticky-tag-box" class="sidebar-box">
@@ -53,11 +53,13 @@ import { TagList, TagItem } from '@/components/Tag'
 import { useI18n } from 'vue-i18n'
 import SvgIcon from '@/components/SvgIcon/index.vue'
 import Sticky from '@/components/Sticky.vue'
+import { useAppStore } from '@/stores/app'
 
 export default defineComponent({
   name: 'ObTag',
   components: { SubTitle, TagList, TagItem, SvgIcon, Sticky },
   setup() {
+    const appStore = useAppStore()
     const tagStore = useTagStore()
     const { t } = useI18n()
     const expand = ref<boolean>(false)
@@ -73,6 +75,11 @@ export default defineComponent({
     onMounted(fetchData)
 
     return {
+      endEleId: computed(() =>
+        appStore.themeConfig.footerLinks.data.length > 0
+          ? 'footer-link'
+          : 'footer'
+      ),
       tags: computed(() => {
         if (tagStore.isLoaded && tagStore.tags.length === 0) return null
         return tagStore.tags

diff --git a/src/components/Sticky.vue b/src/components/Sticky.vue
@@ -216,6 +216,7 @@ export default defineComponent({
       if (this.isSticky) {
         this.width = this.$el.getBoundingClientRect().width + 'px'
       }
+      this.updateScroll()
     }
   }
 })
-Original file line number
+Diff line change
@@ Expand Up / @@ -216,6 +216,7 @@ export default defineComponent({ @@
           if (this.isSticky) {
             this.width = this.$el.getBoundingClientRect().width + 'px'
           }
+          this.updateScroll()
         }
       }
     })
@@ Expand Down @@