From c73aeab2ab387a06a7d0a259cb0b7c4aee222d1f Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Mon, 16 Oct 2023 12:21:42 +0800
Subject: [PATCH] refactor: globally import OverlayScrollbarsComponent

---
 src/contentScripts/index.ts      |  5 +++++
 src/contentScripts/views/App.vue | 10 +++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/contentScripts/index.ts b/src/contentScripts/index.ts
index 34d5e7cf..f02d3241 100644
--- a/src/contentScripts/index.ts
+++ b/src/contentScripts/index.ts
@@ -1,5 +1,9 @@
 // import { onMessage } from 'webext-bridge'
 import { createApp } from 'vue'
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-vue'
+import 'overlayscrollbars/overlayscrollbars.css'
+import 'uno.css'
+import '~/styles/index.ts'
 import App from './views/App.vue'
 import { setupApp } from '~/logic/common-setup'
 import { i18n } from '~/utils/i18n'
@@ -147,6 +151,7 @@ function injectApp() {
 
     document.body.appendChild(container)
     app = createApp(App)
+    app.component('OverlayScrollbarsComponent', OverlayScrollbarsComponent)
     setupApp(app)
     app.use(i18n).mount(root)
   }
diff --git a/src/contentScripts/views/App.vue b/src/contentScripts/views/App.vue
index 78010b74..bf6f059e 100644
--- a/src/contentScripts/views/App.vue
+++ b/src/contentScripts/views/App.vue
@@ -1,12 +1,9 @@
 <script setup lang="ts">
 import { useToggle } from '@vueuse/core'
-import 'uno.css'
-import 'overlayscrollbars/overlayscrollbars.css'
 import { useI18n } from 'vue-i18n'
 import browser from 'webextension-polyfill'
 import type { Ref } from '@vue/runtime-dom'
-import type { OverlayScrollbars } from 'overlayscrollbars-vue'
-import { OverlayScrollbarsComponent } from 'overlayscrollbars-vue'
+
 import Home from './Home/Home.vue'
 import Search from './Search/Search.vue'
 import Anime from './Anime/Anime.vue'
@@ -14,7 +11,6 @@ import History from './History/History.vue'
 import WatchLater from './WatchLater/WatchLater.vue'
 import Favorites from './Favorites/Favorites.vue'
 import { accessKey, settings } from '~/logic'
-import '~/styles/index.ts'
 import { AppPage, LanguageType } from '~/enums/appEnums'
 import { getUserID, hexToRGBA, smoothScrollToTop } from '~/utils/main'
 import emitter from '~/utils/mitt'
@@ -24,7 +20,7 @@ const { locale } = useI18n()
 const [showSettings, toggleSettings] = useToggle(false)
 const pages = { Home, Search, Anime, History, WatchLater, Favorites }
 const mainAppRef = ref<HTMLElement>() as Ref<HTMLElement>
-const scrollbarRef = ref<OverlayScrollbars | null>()
+const scrollbarRef = ref()
 const mainAppOpacity = ref<number>(0)
 const showTopbarMask = ref<boolean>(false)
 const dynamicComponentKey = ref<string>(`dynamicComponent${Number(new Date())}`)
@@ -73,7 +69,7 @@ watch(
   () => activatedPage.value,
   () => {
     setTimeout(() => {
-      const osInstance = scrollbarRef.value?.osInstance()
+      const osInstance = scrollbarRef.value.osInstance()
       osInstance.elements().viewport.scrollTop = 0
     }, 500)
   },