diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index e53603c8..d1be12d7 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -19,6 +19,6 @@ jobs: token: ${{ secrets.RELEASE_TOKEN }} release-type: node package-name: release-please-action - release-as: 0.14.8 + release-as: 0.14.9 signoff: 'github-actions <41898282+github-actions[bot]@users.noreply.github.com>' changelog-types: '[{"type":"types","section":"Types","hidden":false},{"type":"revert","section":"Reverts","hidden":false},{"type":"feat","section":"Features","hidden":false},{"type":"fix","section":"Bug Fixes","hidden":false},{"type":"improvement","section":"Feature Improvements","hidden":false},{"type":"docs","section":"Docs","hidden":false},{"type":"i18n","section":"I18n","hidden":false},{"type":"style","section":"Style Changes","hidden":false},{"type":"ci","section":"CI","hidden":false},{"type":"chore","section":"Miscellaneous","hidden":false},{"type":"contributor","section":"New Contributors","hidden":false},{"type":"notice","section":"Notices","hidden":false}]' diff --git a/src/contentScripts/views/Favorites/Favorites.vue b/src/contentScripts/views/Favorites/Favorites.vue index b753bbd9..e1b4850f 100644 --- a/src/contentScripts/views/Favorites/Favorites.vue +++ b/src/contentScripts/views/Favorites/Favorites.vue @@ -134,8 +134,8 @@ async function getFavoriteResources( async function changeCategory(categoryItem: FavoriteCategory) { currentPageNum.value = 1 selectedCategory.value = categoryItem - noMoreContent.value = false favoriteResources.length = 0 + noMoreContent.value = false getFavoriteResources(categoryItem.id, 1) } diff --git a/src/contentScripts/views/Home/Home.vue b/src/contentScripts/views/Home/Home.vue index e04ac614..5b4f890a 100644 --- a/src/contentScripts/views/Home/Home.vue +++ b/src/contentScripts/views/Home/Home.vue @@ -9,7 +9,7 @@ import { delay } from '~/utils/main' const { t } = useI18n() -const { handleBackToTop } = useBewlyApp() +const { handleBackToTop, scrollbarRef } = useBewlyApp() const activatedPage = ref(HomeSubPage.ForYou) const pages = { @@ -84,11 +84,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 + } } }) diff --git a/src/contentScripts/views/WatchLater/WatchLater.vue b/src/contentScripts/views/WatchLater/WatchLater.vue index aec3ac5d..f6211e7e 100644 --- a/src/contentScripts/views/WatchLater/WatchLater.vue +++ b/src/contentScripts/views/WatchLater/WatchLater.vue @@ -116,7 +116,7 @@ function jumpToLoginPage() {