diff --git a/src/components/Topbar/Topbar.vue b/src/components/Topbar/Topbar.vue index ecb93b6d..77c844e6 100644 --- a/src/components/Topbar/Topbar.vue +++ b/src/components/Topbar/Topbar.vue @@ -8,6 +8,7 @@ import { settings } from '~/logic' interface Props { showSearchBar: boolean + showTopbarMask: boolean } const props = withDefaults(defineProps(), { @@ -19,7 +20,7 @@ const userInfo = reactive({}) as UnwrapNestedRefs const showChannelsPop = ref(false) const showUserPanelPop = ref(false) -const showTopbarMask = ref(false) +// const showTopbarMask = ref(false) const showNotificationsPop = ref(false) const showMomentsPop = ref(false) const showFavoritesPop = ref(false) @@ -56,11 +57,11 @@ watch( onMounted(() => { initUserPanel() - document.addEventListener('scroll', () => { - if (window.scrollY > 0) - showTopbarMask.value = true - else showTopbarMask.value = false - }) + // document.addEventListener('scroll', () => { + // if (window.scrollY > 0) + // showTopbarMask.value = true + // else showTopbarMask.value = false + // }) }) async function initUserPanel() { diff --git a/src/contentScripts/views/App.vue b/src/contentScripts/views/App.vue index 4fe88930..5b98807f 100644 --- a/src/contentScripts/views/App.vue +++ b/src/contentScripts/views/App.vue @@ -36,6 +36,7 @@ const pages = { Home, Search, Anime, History, WatchLater, Favorites, Video } const isVideoPage = ref(false) const mainAppRef = ref() as Ref const mainAppOpacity = ref(0) +const showTopbarMask = ref(false) const tooltipPlacement = computed(() => { if (settings.value.dockPosition === 'left') @@ -111,6 +112,11 @@ onMounted(() => { >= mainAppRef.value.scrollHeight - 20 ) emitter.emit('reachBottom') + + if (mainAppRef.value.scrollTop === 0) + showTopbarMask.value = false + else + showTopbarMask.value = true }) } @@ -176,6 +182,7 @@ function setAppAppearance() {