From e63ead93b1f21b2f60335171c8e33f4ad4786d7e Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Sun, 3 Mar 2024 17:23:44 -0300
Subject: [PATCH] fix(Home): resolve home tabs drifting issue(#349) close #349

---
 src/contentScripts/views/Home/Home.vue | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/contentScripts/views/Home/Home.vue b/src/contentScripts/views/Home/Home.vue
index bb834dcb..f12f40da 100644
--- a/src/contentScripts/views/Home/Home.vue
+++ b/src/contentScripts/views/Home/Home.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n'
+import type { Ref } from 'vue'
 import ForYou from './components/ForYou.vue'
 import Following from './components/Following.vue'
 import Trending from './components/Trending.vue'
@@ -13,6 +14,7 @@ import { settings } from '~/logic'
 const { t } = useI18n()
 
 const handleBackToTop = inject('handleBackToTop') as (targetScrollTop: number) => void
+const scrollbarRef = inject('scrollbarRef') as Ref
 
 const recommendContentKey = ref<string>(`recommendContent${Number(new Date())}`)
 const activatedPage = ref<HomeSubPage>(HomeSubPage.ForYou)
@@ -63,11 +65,24 @@ onMounted(() => {
     // This feature is primarily designed to compatible with the Bilibili Evolved's top bar
     // Even when the BewlyBewly top bar is hidden, the Bilibili Evolved top bar still exists, so not moving up
     if (settings.value.autoHideTopBar && settings.value.showTopBar) {
-      if (val)
-        shouldMoveTabsUp.value = false
+      if (!settings.value.useSearchPageModeOnHomePage) {
+        if (val)
+          shouldMoveTabsUp.value = false
 
-      else
-        shouldMoveTabsUp.value = true
+        else
+          shouldMoveTabsUp.value = true
+      }
+      else {
+        // fix #349
+        const osInstance = scrollbarRef.value?.osInstance()
+        const scrollTop = osInstance.elements().viewport.scrollTop as number
+
+        if (val)
+          shouldMoveTabsUp.value = false
+
+        else if (scrollTop > 510 + 40)
+          shouldMoveTabsUp.value = true
+      }
     }
   })
 })