From 3985ade64337ee2901f4f608ebe6cdc3d5f0c0bb Mon Sep 17 00:00:00 2001
From: starknt <1431880400@qq.com>
Date: Fri, 12 Jan 2024 23:57:27 +0800
Subject: [PATCH 01/23] fix: `global Speed` conflict

---
 src/contentScripts/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/contentScripts/index.ts b/src/contentScripts/index.ts
index 0c2f9440..ca65c46f 100644
--- a/src/contentScripts/index.ts
+++ b/src/contentScripts/index.ts
@@ -138,7 +138,9 @@ function injectApp() {
     container.id = 'bewly'
     const root = document.createElement('div')
     const styleEl = document.createElement('link')
-    const shadowDOM = container.attachShadow?.({ mode: __DEV__ ? 'open' : 'closed' }) || container
+    // Fix #69 https://github.com/hakadao/BewlyBewly/issues/69
+    // https://medium.com/@emilio_martinez/shadow-dom-open-vs-closed-1a8cf286088a - open shadow dom
+    const shadowDOM = container.attachShadow?.({ mode: 'open' }) || container
     styleEl.setAttribute('rel', 'stylesheet')
     styleEl.setAttribute('href', browser.runtime.getURL('dist/contentScripts/style.css'))
     shadowDOM.appendChild(styleEl)

From c77b8223c8a3ea3da7ebc24cbd1d6ecb43d2f0f8 Mon Sep 17 00:00:00 2001
From: starknt <1431880400@qq.com>
Date: Fri, 12 Jan 2024 23:57:34 +0800
Subject: [PATCH 02/23] refactor: improve search bar component

---
 src/_locales/cmn-CN.yml                |  1 +
 src/_locales/cmn-TW.yml                |  1 +
 src/_locales/en.yml                    |  1 +
 src/_locales/jyut.yml                  |  1 +
 src/components/SearchBar/SearchBar.vue | 92 +++++++++++++-------------
 5 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/src/_locales/cmn-CN.yml b/src/_locales/cmn-CN.yml
index 21fc6fef..cb33c692 100644
--- a/src/_locales/cmn-CN.yml
+++ b/src/_locales/cmn-CN.yml
@@ -293,3 +293,4 @@ watch_later:
 search_bar:
   history_title: 搜索历史
   clear_history: 清空搜索历史
+  placeholder: 输入关键字搜索
diff --git a/src/_locales/cmn-TW.yml b/src/_locales/cmn-TW.yml
index e77cc172..90588c47 100644
--- a/src/_locales/cmn-TW.yml
+++ b/src/_locales/cmn-TW.yml
@@ -296,3 +296,4 @@ watch_later:
 search_bar:
   history_title: 搜尋記錄
   clear_history: 清除所有搜尋記錄
+  placeholder: 輸入關鍵字搜尋
diff --git a/src/_locales/en.yml b/src/_locales/en.yml
index be456657..f04452a5 100644
--- a/src/_locales/en.yml
+++ b/src/_locales/en.yml
@@ -292,3 +292,4 @@ watch_later:
 search_bar:
   history_title: Search History
   clear_history: Clear search history
+  placeholder: Enter keywords to search
diff --git a/src/_locales/jyut.yml b/src/_locales/jyut.yml
index f1d91580..10287ae9 100644
--- a/src/_locales/jyut.yml
+++ b/src/_locales/jyut.yml
@@ -296,3 +296,4 @@ watch_later:
 search_bar:
   history_title: 搜尋記錄
   clear_history: 剷晒你啲搜尋記錄
+  placeholder: 键入关键字搜尋
diff --git a/src/components/SearchBar/SearchBar.vue b/src/components/SearchBar/SearchBar.vue
index cc7e63c5..182fa7de 100644
--- a/src/components/SearchBar/SearchBar.vue
+++ b/src/components/SearchBar/SearchBar.vue
@@ -1,5 +1,6 @@
 <!-- TODO: refactor all that shit -->
 <script setup lang="ts">
+import { onClickOutside, useFocus, useWindowFocus, watchThrottled } from '@vueuse/core'
 import type { HistoryItem, SuggestionItem, SuggestionResponse } from './searchHistoryProvider'
 import {
   addSearchHistory,
@@ -14,7 +15,9 @@ defineProps<{
   focusedCharacter?: string
 }>()
 
-const isFocus = ref<boolean>(false)
+const inputRef = ref<HTMLInputElement | null>(null)
+const { focused: isFocus } = useFocus(inputRef)
+const isWindowFocus = useWindowFocus()
 const keyword = ref<string>('')
 const suggestions = reactive<SuggestionItem[]>([])
 const selectedIndex = ref<number>(-1)
@@ -22,30 +25,35 @@ const searchHistory = shallowRef<HistoryItem[]>([])
 const historyItemRef = ref<HTMLElement[]>([])
 const suggestionItemRef = ref<HTMLElement[]>([])
 
-watch(isFocus, async (focus) => {
+watch([isFocus, isWindowFocus], async ([focus, windowFocus]) => {
   // 延后加载搜索历史
-  if (focus)
+  if (focus && windowFocus)
     searchHistory.value = await getSearchHistory()
-})
+  if (!windowFocus) {
+    selectedIndex.value = -1
+    inputRef.value?.blur()
+  }
+}, { flush: 'sync' })
 
-function handleInput() {
+watchThrottled(keyword, (keyword) => {
   selectedIndex.value = -1
-  if (keyword.value.length > 0) {
-    browser.runtime
-      .sendMessage({
-        contentScriptQuery: 'getSearchSuggestion',
-        term: keyword.value,
-      })
-      .then((res: SuggestionResponse) => {
-        if (!res || (res && res.code !== 0))
-          return
-        Object.assign(suggestions, res.result.tag)
-      })
-  }
-  else {
+
+  if (keyword.length <= 0) {
     suggestions.length = 0
+    return
   }
-}
+
+  browser.runtime
+    .sendMessage({
+      contentScriptQuery: 'getSearchSuggestion',
+      term: keyword,
+    })
+    .then((res: SuggestionResponse) => {
+      if (!res || (res && res.code !== 0))
+        return
+      Object.assign(suggestions, res.result.tag)
+    })
+}, { throttle: 100 })
 
 async function navigateToSearchResultPage(keyword: string) {
   if (keyword) {
@@ -78,13 +86,15 @@ function handleKeyUp() {
   suggestionItemRef.value.forEach((item, index) => {
     if (index === selectedIndex.value)
       item.classList.add('active')
-    else item.classList.remove('active')
+    else
+      item.classList.remove('active')
   })
 
   historyItemRef.value.forEach((item, index) => {
     if (index === selectedIndex.value)
       item.classList.add('active')
-    else item.classList.remove('active')
+    else
+      item.classList.remove('active')
   })
 }
 
@@ -142,12 +152,10 @@ async function handleClearSearchHistory() {
       w="full"
       h="full"
       content="~"
-      @click="isFocus = false"
     />
     <Transition name="mask">
       <div
         v-if="darkenOnFocus && isFocus" pos="fixed top-0 left-0" w-full h-full bg="black opacity-60"
-        @click="isFocus = false"
       />
     </Transition>
 
@@ -162,8 +170,8 @@ async function handleClearSearchHistory() {
       <Transition name="focus-character">
         <img v-show="focusedCharacter && isFocus" :src="focusedCharacter" width="100" object-contain pos="absolute right-0 bottom-40px">
       </Transition>
-
       <input
+        ref="inputRef"
         v-model.trim="keyword"
         rounded="60px focus:$bew-radius"
         p="l-6 r-16 y-3"
@@ -173,12 +181,11 @@ async function handleClearSearchHistory() {
         ring="1 $bew-border-color"
         transition="all duration-300"
         type="text"
-        @focus="isFocus = true"
-        @input="handleInput"
-        @keyup.enter.stop.passive="navigateToSearchResultPage(keyword)"
-        @keyup.up.stop.passive="handleKeyUp"
-        @keyup.down.stop.passive="handleKeyDown"
-        @keydown.stop="() => {}"
+        autocomplete="off"
+        :placeholder="$t('search_bar.placeholder')"
+        @keyup.up="handleKeyUp"
+        @keyup.down="handleKeyDown"
+        @keyup.enter="navigateToSearchResultPage(keyword)"
       >
       <button
         p-2
@@ -199,14 +206,13 @@ async function handleClearSearchHistory() {
 
     <Transition name="result-list">
       <div
-        v-if="
-          isFocus
-            && searchHistory.length !== 0
-            && keyword.length === 0
-        "
-        id="search-history"
+        v-if="isFocus"
+        class="search-suggestion search-history min-h-60px"
       >
-        <div class="history-list flex flex-col gap-y-2">
+        <div
+          v-show="keyword.length === 0 && searchHistory.length !== 0"
+          class="history-list flex flex-col gap-y-2"
+        >
           <div class="title p-2 pb-0 flex justify-between">
             <span>{{ $t('search_bar.history_title') }}</span>
             <button class="rounded-2 duration-300 pointer-events-auto cursor-pointer" hover="text-$bew-theme-color" text="base $bew-text-2" @click="handleClearSearchHistory">
@@ -233,16 +239,10 @@ async function handleClearSearchHistory() {
             </div>
           </div>
         </div>
-      </div>
-    </Transition>
 
-    <Transition name="result-list">
-      <div
-        v-if="isFocus && suggestions.length !== 0 && keyword.length > 0"
-        id="search-suggestion"
-      >
         <div
           v-for="(item, index) in suggestions"
+          v-show="keyword.length > 0"
           :key="index"
           ref="suggestionItemRef"
           class="suggestion-item"
@@ -339,7 +339,7 @@ async function handleClearSearchHistory() {
       hover:bg-$bew-fill-2;
   }
 
-  #search-history {
+  .search-history {
     @include search-content;
     --at-apply: bg-$bew-elevated-1;
 
@@ -357,7 +357,7 @@ async function handleClearSearchHistory() {
     }
   }
 
-  #search-suggestion {
+  .search-suggestion {
     @include search-content;
     --at-apply: bg-$bew-elevated-1;
 

From b29154c0a4e149f8750faad277c4b6e1496710cb Mon Sep 17 00:00:00 2001
From: starknt <1431880400@qq.com>
Date: Sat, 13 Jan 2024 22:35:44 +0800
Subject: [PATCH 03/23] fix: when del search bar history, and the result list
 hide

---
 src/components/SearchBar/SearchBar.vue | 42 +++++++++++++++++---------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/components/SearchBar/SearchBar.vue b/src/components/SearchBar/SearchBar.vue
index 182fa7de..e02d2174 100644
--- a/src/components/SearchBar/SearchBar.vue
+++ b/src/components/SearchBar/SearchBar.vue
@@ -1,6 +1,6 @@
 <!-- TODO: refactor all that shit -->
 <script setup lang="ts">
-import { onClickOutside, useFocus, useWindowFocus, watchThrottled } from '@vueuse/core'
+import { useWindowFocus, watchThrottled } from '@vueuse/core'
 import type { HistoryItem, SuggestionItem, SuggestionResponse } from './searchHistoryProvider'
 import {
   addSearchHistory,
@@ -16,7 +16,7 @@ defineProps<{
 }>()
 
 const inputRef = ref<HTMLInputElement | null>(null)
-const { focused: isFocus } = useFocus(inputRef)
+const isFocus = ref(false)
 const isWindowFocus = useWindowFocus()
 const keyword = ref<string>('')
 const suggestions = reactive<SuggestionItem[]>([])
@@ -25,15 +25,16 @@ const searchHistory = shallowRef<HistoryItem[]>([])
 const historyItemRef = ref<HTMLElement[]>([])
 const suggestionItemRef = ref<HTMLElement[]>([])
 
-watch([isFocus, isWindowFocus], async ([focus, windowFocus]) => {
+watch(isFocus, async (focus) => {
   // 延后加载搜索历史
-  if (focus && windowFocus)
+  if (focus && searchHistory.value.length === 0)
     searchHistory.value = await getSearchHistory()
-  if (!windowFocus) {
-    selectedIndex.value = -1
-    inputRef.value?.blur()
-  }
-}, { flush: 'sync' })
+})
+
+watch(isWindowFocus, (windowFocus) => {
+  if (!windowFocus)
+    isFocus.value = false
+}, { flush: 'post' })
 
 watchThrottled(keyword, (keyword) => {
   selectedIndex.value = -1
@@ -145,17 +146,23 @@ async function handleClearSearchHistory() {
 </script>
 
 <template>
-  <div id="search-wrap" w="full" max-w="550px" m="x-8" pos="relative">
+  <div
+    id="search-wrap" w="full" max-w="550px" m="x-8"
+    pos="relative"
+  >
     <div
       v-if="!darkenOnFocus && isFocus"
       pos="fixed top-0 left-0"
       w="full"
       h="full"
       content="~"
+      z="2"
+      @click="isFocus = false"
     />
     <Transition name="mask">
       <div
-        v-if="darkenOnFocus && isFocus" pos="fixed top-0 left-0" w-full h-full bg="black opacity-60"
+        v-if="darkenOnFocus && isFocus"
+        pos="fixed top-0 left-0" w-full h-full bg="black opacity-60"
       />
     </Transition>
 
@@ -166,7 +173,11 @@ async function handleClearSearchHistory() {
       :style="{ backdropFilter: isFocus ? 'blur(15px)' : 'blur(0)' }"
     />
 
-    <div class="search-bar group" :class="isFocus ? 'focus' : ''" flex="~" items-center pos="relative">
+    <div
+      class="search-bar group" :class="isFocus ? 'focus' : ''" flex="~" items-center
+      pos="relative"
+      z="3"
+    >
       <Transition name="focus-character">
         <img v-show="focusedCharacter && isFocus" :src="focusedCharacter" width="100" object-contain pos="absolute right-0 bottom-40px">
       </Transition>
@@ -183,6 +194,7 @@ async function handleClearSearchHistory() {
         type="text"
         autocomplete="off"
         :placeholder="$t('search_bar.placeholder')"
+        @focus="isFocus = true"
         @keyup.up="handleKeyUp"
         @keyup.down="handleKeyDown"
         @keyup.enter="navigateToSearchResultPage(keyword)"
@@ -206,11 +218,11 @@ async function handleClearSearchHistory() {
 
     <Transition name="result-list">
       <div
-        v-if="isFocus"
-        class="search-suggestion search-history min-h-60px"
+        v-if="isFocus && (suggestions.length !== 0 || searchHistory.length !== 0)"
+        class="search-suggestion search-history min-h-60px z-3"
       >
         <div
-          v-show="keyword.length === 0 && searchHistory.length !== 0"
+          v-show="keyword.length === 0"
           class="history-list flex flex-col gap-y-2"
         >
           <div class="title p-2 pb-0 flex justify-between">

From e2f44275e3d77faedf5b00df8b8443fb06f48c9e Mon Sep 17 00:00:00 2001
From: MengNianxiaoyao <2589141604@qq.com>
Date: Mon, 15 Jan 2024 11:43:39 +0800
Subject: [PATCH 04/23] =?UTF-8?q?fix:=20=E4=B8=93=E6=A0=8F=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BE=A7=E8=BE=B9=E6=A0=8F=E7=9B=AE=E5=BD=95=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=9E=82=E7=9B=B4=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/adaptedStyles/articlesPage.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/styles/adaptedStyles/articlesPage.scss b/src/styles/adaptedStyles/articlesPage.scss
index 279bf851..e86c18bb 100644
--- a/src/styles/adaptedStyles/articlesPage.scss
+++ b/src/styles/adaptedStyles/articlesPage.scss
@@ -3,6 +3,10 @@
     line-height: unset;
   }
 
+  .right-side-bar .catalog{
+    justify-content: center;
+  }
+
   body {
     background-color: unset;
   }

From 272ed0233abc1f0f5fb3f9be812f95fd9c371a06 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Tue, 16 Jan 2024 23:24:19 +0800
Subject: [PATCH 05/23] revert: revert search bar code to previous version to
 undo recent changes

---
 src/_locales/cmn-CN.yml                |   1 -
 src/_locales/cmn-TW.yml                |   1 -
 src/_locales/en.yml                    |   1 -
 src/_locales/jyut.yml                  |   1 -
 src/components/SearchBar/SearchBar.vue | 104 +++++++++++--------------
 5 files changed, 46 insertions(+), 62 deletions(-)

diff --git a/src/_locales/cmn-CN.yml b/src/_locales/cmn-CN.yml
index cb33c692..21fc6fef 100644
--- a/src/_locales/cmn-CN.yml
+++ b/src/_locales/cmn-CN.yml
@@ -293,4 +293,3 @@ watch_later:
 search_bar:
   history_title: 搜索历史
   clear_history: 清空搜索历史
-  placeholder: 输入关键字搜索
diff --git a/src/_locales/cmn-TW.yml b/src/_locales/cmn-TW.yml
index 90588c47..e77cc172 100644
--- a/src/_locales/cmn-TW.yml
+++ b/src/_locales/cmn-TW.yml
@@ -296,4 +296,3 @@ watch_later:
 search_bar:
   history_title: 搜尋記錄
   clear_history: 清除所有搜尋記錄
-  placeholder: 輸入關鍵字搜尋
diff --git a/src/_locales/en.yml b/src/_locales/en.yml
index f04452a5..be456657 100644
--- a/src/_locales/en.yml
+++ b/src/_locales/en.yml
@@ -292,4 +292,3 @@ watch_later:
 search_bar:
   history_title: Search History
   clear_history: Clear search history
-  placeholder: Enter keywords to search
diff --git a/src/_locales/jyut.yml b/src/_locales/jyut.yml
index 10287ae9..f1d91580 100644
--- a/src/_locales/jyut.yml
+++ b/src/_locales/jyut.yml
@@ -296,4 +296,3 @@ watch_later:
 search_bar:
   history_title: 搜尋記錄
   clear_history: 剷晒你啲搜尋記錄
-  placeholder: 键入关键字搜尋
diff --git a/src/components/SearchBar/SearchBar.vue b/src/components/SearchBar/SearchBar.vue
index d3bc8c21..e1766e71 100644
--- a/src/components/SearchBar/SearchBar.vue
+++ b/src/components/SearchBar/SearchBar.vue
@@ -1,6 +1,5 @@
 <!-- TODO: refactor all that code -->
 <script setup lang="ts">
-import { useWindowFocus, watchThrottled } from '@vueuse/core'
 import type { HistoryItem, SuggestionItem, SuggestionResponse } from './searchHistoryProvider'
 import {
   addSearchHistory,
@@ -15,9 +14,7 @@ defineProps<{
   focusedCharacter?: string
 }>()
 
-const inputRef = ref<HTMLInputElement | null>(null)
-const isFocus = ref(false)
-const isWindowFocus = useWindowFocus()
+const isFocus = ref<boolean>(false)
 const keyword = ref<string>('')
 const suggestions = reactive<SuggestionItem[]>([])
 const selectedIndex = ref<number>(-1)
@@ -27,34 +24,28 @@ const suggestionItemRef = ref<HTMLElement[]>([])
 
 watch(isFocus, async (focus) => {
   // 延后加载搜索历史
-  if (focus && searchHistory.value.length === 0)
+  if (focus)
     searchHistory.value = await getSearchHistory()
 })
 
-watch(isWindowFocus, (windowFocus) => {
-  if (!windowFocus)
-    isFocus.value = false
-}, { flush: 'post' })
-
-watchThrottled(keyword, (keyword) => {
+function handleInput() {
   selectedIndex.value = -1
-
-  if (keyword.length <= 0) {
-    suggestions.length = 0
-    return
+  if (keyword.value.length > 0) {
+    browser.runtime
+      .sendMessage({
+        contentScriptQuery: 'getSearchSuggestion',
+        term: keyword.value,
+      })
+      .then((res: SuggestionResponse) => {
+        if (!res || (res && res.code !== 0))
+          return
+        Object.assign(suggestions, res.result.tag)
+      })
   }
-
-  browser.runtime
-    .sendMessage({
-      contentScriptQuery: 'getSearchSuggestion',
-      term: keyword,
-    })
-    .then((res: SuggestionResponse) => {
-      if (!res || (res && res.code !== 0))
-        return
-      Object.assign(suggestions, res.result.tag)
-    })
-}, { throttle: 100 })
+  else {
+    suggestions.length = 0
+  }
+}
 
 async function navigateToSearchResultPage(keyword: string) {
   if (keyword) {
@@ -87,15 +78,13 @@ function handleKeyUp() {
   suggestionItemRef.value.forEach((item, index) => {
     if (index === selectedIndex.value)
       item.classList.add('active')
-    else
-      item.classList.remove('active')
+    else item.classList.remove('active')
   })
 
   historyItemRef.value.forEach((item, index) => {
     if (index === selectedIndex.value)
       item.classList.add('active')
-    else
-      item.classList.remove('active')
+    else item.classList.remove('active')
   })
 }
 
@@ -146,23 +135,19 @@ async function handleClearSearchHistory() {
 </script>
 
 <template>
-  <div
-    id="search-wrap" w="full" max-w="550px" m="x-8"
-    pos="relative"
-  >
+  <div id="search-wrap" w="full" max-w="550px" m="x-8" pos="relative">
     <div
       v-if="!darkenOnFocus && isFocus"
       pos="fixed top-0 left-0"
       w="full"
       h="full"
       content="~"
-      z="2"
       @click="isFocus = false"
     />
     <Transition name="mask">
       <div
-        v-if="darkenOnFocus && isFocus"
-        pos="fixed top-0 left-0" w-full h-full bg="black opacity-60"
+        v-if="darkenOnFocus && isFocus" pos="fixed top-0 left-0" w-full h-full bg="black opacity-60"
+        @click="isFocus = false"
       />
     </Transition>
 
@@ -173,16 +158,12 @@ async function handleClearSearchHistory() {
       :style="{ backdropFilter: isFocus ? 'blur(15px)' : 'blur(0)' }"
     />
 
-    <div
-      class="search-bar group" :class="isFocus ? 'focus' : ''" flex="~" items-center
-      pos="relative"
-      z="3"
-    >
+    <div class="search-bar group" :class="isFocus ? 'focus' : ''" flex="~" items-center pos="relative">
       <Transition name="focus-character">
         <img v-show="focusedCharacter && isFocus" :src="focusedCharacter" width="100" object-contain pos="absolute right-0 bottom-40px">
       </Transition>
+
       <input
-        ref="inputRef"
         v-model.trim="keyword"
         rounded="60px focus:$bew-radius"
         p="l-6 r-16 y-3"
@@ -192,12 +173,12 @@ async function handleClearSearchHistory() {
         ring="1 $bew-border-color"
         transition="all duration-300"
         type="text"
-        autocomplete="off"
-        :placeholder="$t('search_bar.placeholder')"
         @focus="isFocus = true"
-        @keyup.up="handleKeyUp"
-        @keyup.down="handleKeyDown"
-        @keyup.enter="navigateToSearchResultPage(keyword)"
+        @input="handleInput"
+        @keyup.enter.stop.passive="navigateToSearchResultPage(keyword)"
+        @keyup.up.stop.passive="handleKeyUp"
+        @keyup.down.stop.passive="handleKeyDown"
+        @keydown.stop="() => {}"
       >
       <button
         p-2
@@ -218,13 +199,14 @@ async function handleClearSearchHistory() {
 
     <Transition name="result-list">
       <div
-        v-if="isFocus && (suggestions.length !== 0 || searchHistory.length !== 0)"
-        class="search-suggestion search-history min-h-60px z-3"
+        v-if="
+          isFocus
+            && searchHistory.length !== 0
+            && keyword.length === 0
+        "
+        id="search-history"
       >
-        <div
-          v-show="keyword.length === 0"
-          class="history-list flex flex-col gap-y-2"
-        >
+        <div class="history-list flex flex-col gap-y-2">
           <div class="title p-2 pb-0 flex justify-between">
             <span>{{ $t('search_bar.history_title') }}</span>
             <button class="rounded-2 duration-300 pointer-events-auto cursor-pointer" hover="text-$bew-theme-color" text="base $bew-text-2" @click="handleClearSearchHistory">
@@ -251,10 +233,16 @@ async function handleClearSearchHistory() {
             </div>
           </div>
         </div>
+      </div>
+    </Transition>
 
+    <Transition name="result-list">
+      <div
+        v-if="isFocus && suggestions.length !== 0 && keyword.length > 0"
+        id="search-suggestion"
+      >
         <div
           v-for="(item, index) in suggestions"
-          v-show="keyword.length > 0"
           :key="index"
           ref="suggestionItemRef"
           class="suggestion-item"
@@ -351,7 +339,7 @@ async function handleClearSearchHistory() {
       hover:bg-$bew-fill-2;
   }
 
-  .search-history {
+  #search-history {
     @include search-content;
     --at-apply: bg-$bew-elevated-1;
 
@@ -369,7 +357,7 @@ async function handleClearSearchHistory() {
     }
   }
 
-  .search-suggestion {
+  #search-suggestion {
     @include search-content;
     --at-apply: bg-$bew-elevated-1;
 

From 1edf3822770c172a371ea7183e9d8582ffc9ffc2 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Tue, 16 Jan 2024 23:26:41 +0800
Subject: [PATCH 06/23] =?UTF-8?q?fix:=20=E4=BB=8E=E7=A8=8D=E5=90=8E?=
 =?UTF-8?q?=E5=86=8D=E7=9C=8B=E6=89=93=E5=BC=80=E8=A7=86=E9=A2=91=E6=97=B6?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=B7=B3=E8=BD=AC=20#180?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/contentScripts/views/App.vue | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/contentScripts/views/App.vue b/src/contentScripts/views/App.vue
index ada9b72a..cd1fa532 100644
--- a/src/contentScripts/views/App.vue
+++ b/src/contentScripts/views/App.vue
@@ -91,7 +91,7 @@ watch(() => settings.value.adaptToOtherPageStyles, () => {
 })
 
 onMounted(() => {
-  openVideoPageIfBvidExists()
+  // openVideoPageIfBvidExists()
 
   if (isHomePage()) {
     // Force overwrite Bilibili Evolved body tag & html tag background color
@@ -239,19 +239,19 @@ function handleOsScroll() {
     topBarRef.value?.handleScroll()
 }
 
-// fix #166 https://github.com/hakadao/BewlyBewly/issues/166
-function openVideoPageIfBvidExists() {
-  // Assume the URL is https://www.bilibili.com/?bvid=BV1be41127ft&spm_id_from=333.788.seo.out
+// // fix #166 https://github.com/hakadao/BewlyBewly/issues/166
+// function openVideoPageIfBvidExists() {
+//   // Assume the URL is https://www.bilibili.com/?bvid=BV1be41127ft&spm_id_from=333.788.seo.out
 
-  // Get the current URL's query string
-  const queryString = window.location.search
-  // Create a URLSearchParams instance
-  const urlParams = new URLSearchParams(queryString)
-  const bvid = urlParams.get('bvid')
+//   // Get the current URL's query string
+//   const queryString = window.location.search
+//   // Create a URLSearchParams instance
+//   const urlParams = new URLSearchParams(queryString)
+//   const bvid = urlParams.get('bvid')
 
-  if (bvid)
-    window.open(`https://www.bilibili.com/video/${bvid}`, '_self')
-}
+//   if (bvid)
+//     window.open(`https://www.bilibili.com/video/${bvid}`, '_self')
+// }
 
 provide('handleBackToTop', handleBackToTop)
 provide('handleRefresh', handleRefresh)

From 3bcecb1b7c3bead9513c81c42f8d3d90f5627585 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Tue, 16 Jan 2024 23:56:38 +0800
Subject: [PATCH 07/23] style: adapt to  unadapted areas

---
 src/styles/adaptedStyles/channelPage.scss | 72 +++++++++++++++++------
 1 file changed, 53 insertions(+), 19 deletions(-)

diff --git a/src/styles/adaptedStyles/channelPage.scss b/src/styles/adaptedStyles/channelPage.scss
index 28ea9d7a..ad581795 100644
--- a/src/styles/adaptedStyles/channelPage.scss
+++ b/src/styles/adaptedStyles/channelPage.scss
@@ -1,41 +1,66 @@
 .bewly-design {
-  .channel-swiper .channel-carousel-tool .channel-nav-click li.active {
-    background-color: var(--bew-theme-color);
-  }
-
-  .inner-c .play-icon.button,
-  .hover-c .play-icon.button {
-    background-color: var(--bew-theme-color-80);
-  }
-
   .banner-wrapper {
     background-color: black;
     margin-bottom: 0 !important;
     padding-bottom: 20px !important;
   }
 
-  .promotion-c {
+  .index-module {
+    padding-bottom: 20px;
+    background: linear-gradient(0deg,#111319 40px,rgba(17,19,25,.8) 60.12%,rgba(20,20,20,.0001))
+  }
+
+  .promotion-c,
+  .link-c .link,
+  .section-title .subTitle {
     background-color: var(--bew-fill-1);
   }
 
   .hover-c .title,
-  :not(.index-module) > .inner-c .title {
+  :not(.index-module) > .inner-c .title,
+  .link-c .link,
+  .section-title .subTitle {
     color: var(--bew-text-1);
   }
 
-  .banner-wrapper .side-list .side-item .title {
+  .banner-wrapper .side-list .side-item .title,
+  .section-title .subTitle.highlight {
     color: white;
   }
 
-  .index-module .all-a:hover .all,
-  .index-module .all-a:hover .arrow-all,
-  .index-module .sub-m:hover,
-  .hot-module .hot-item:hover .title,
-  .promotion-c:hover .title,
-  .hover-c:hover .title {
-    color: var(--bew-theme-color);
+  .link-c .link {
+    border-color: var(--bew-border-color);
   }
 
+  // #region theme color adaption part
+  // Increase the priority of the style inside by writing a non-existent selector in :not()
+  :not(fjdslfds) {
+    .channel-swiper .channel-carousel-tool .channel-nav-click li.active,
+    .hot-module .left .goto,
+    .switch-c.checked,
+    .section-title .subTitle.highlight {
+      background-color: var(--bew-theme-color);
+    }
+
+    .inner-c .play-icon.button,
+    .hover-c .play-icon.button,
+    .hot-module .left .goto:hover {
+      background-color: var(--bew-theme-color-80);
+    }
+
+    .index-module .all-a:hover .all,
+    .index-module .all-a:hover .arrow-all,
+    .index-module .sub-m:hover,
+    .hot-module .hot-item:hover .title,
+    .promotion-c:hover .title,
+    .hover-c:hover .title,
+    .switch-c .round {
+      color: var(--bew-theme-color);
+    }
+  }
+  // #endregion
+
+  // #region dark mode adaption part
   &.dark {
     .channel-swiper .channel-carousel-tool .channel-nav-click li {
       background-color: var(--bew-fill-1);
@@ -44,5 +69,14 @@
     .channel-container .el-input__inner {
       box-shadow: 0 0 0 1px var(--bew-border-color) inset;
     }
+
+    .b-img {
+      background-color: var(--bew-fill-4);
+    }
+
+    .season-cover {
+      background-color: transparent;
+    }
   }
+  // #endregion
 }

From e42a61e0e4528cd202dead17d5b0a32cbb684c53 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Wed, 17 Jan 2024 00:29:16 +0800
Subject: [PATCH 08/23] style: adjust areas not yet compatible with dark mode

---
 src/styles/adaptedStyles/channelPage.scss |  4 ----
 src/styles/adaptedStyles/comments.scss    | 22 +++++++++++++++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/styles/adaptedStyles/channelPage.scss b/src/styles/adaptedStyles/channelPage.scss
index ad581795..90c9bb33 100644
--- a/src/styles/adaptedStyles/channelPage.scss
+++ b/src/styles/adaptedStyles/channelPage.scss
@@ -70,10 +70,6 @@
       box-shadow: 0 0 0 1px var(--bew-border-color) inset;
     }
 
-    .b-img {
-      background-color: var(--bew-fill-4);
-    }
-
     .season-cover {
       background-color: transparent;
     }
diff --git a/src/styles/adaptedStyles/comments.scss b/src/styles/adaptedStyles/comments.scss
index f46b5703..4eeec120 100644
--- a/src/styles/adaptedStyles/comments.scss
+++ b/src/styles/adaptedStyles/comments.scss
@@ -53,14 +53,25 @@
 
   &.dark {
     // Comment input box
-    .reply-box .box-normal .reply-box-warp .reply-box-textarea {
-      background-color: var(--bew-fill-1);
-      border-color: var(--bew-border-color);
-    }
+    // .reply-box .box-normal .reply-box-warp .reply-box-textarea {
+    //   background-color: var(--bew-fill-1);
+    //   border-color: var(--bew-border-color);
+    // }
 
     .bili-comment.browser-pc {
       // background-color: var(--bew-content-solid-1);
     }
+
+    .reply-box .box-normal .reply-box-warp,
+    .reply-box .box-expand .reply-box-emoji .emoji-btn,
+    .reply-box .box-expand .at-btn,
+    .reply-box .box-expand .image-btn {
+      border-color: var(--bew-border-color);
+    }
+
+    .reply-box .box-expand .svg-icon svg path {
+      filter: invert(1) hue-rotate(180deg);
+    }
   }
   // #endregion
 
@@ -283,7 +294,8 @@
       color: var(--bew-text-2) !important;
     }
 
-    .bb-comment .reply-notice .notice-item, .comment-bilibili-fold .reply-notice .notice-item{
+    .bb-comment .reply-notice .notice-item,
+    .comment-bilibili-fold .reply-notice .notice-item {
       background-color: var(--Ye1);
       border-color: var(--Ye1);
       color: var(--Or7);

From 781b2c07d781dddb02662b875e46c58eb8984f20 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Wed, 17 Jan 2024 00:29:34 +0800
Subject: [PATCH 09/23] chore: adjust regex

---
 src/styles/adaptedStyles/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/styles/adaptedStyles/index.ts b/src/styles/adaptedStyles/index.ts
index e139cf0e..7084de32 100644
--- a/src/styles/adaptedStyles/index.ts
+++ b/src/styles/adaptedStyles/index.ts
@@ -59,7 +59,7 @@ async function setupStyles() {
 
   // anime page & chinese anime page
   else if (
-    /https?:\/\/www.bilibili.com\/(anime|guochuang).*/.test(currentUrl))
+    /https?:\/\/(www.)?bilibili.com\/(anime|guochuang).*/.test(currentUrl))
     await import('./animePage.scss')
 
   // channel page e.g. tv shows, movie, variety shows, mooc page

From d459603a5b27874883263a19b0b654fc872dd206 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Wed, 17 Jan 2024 00:30:51 +0800
Subject: [PATCH 10/23] chore: update version number

---
 .github/workflows/changelog.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index b61776d4..9e51c045 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.0
+          release-as: 0.14.1
           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":"ci","section":"CI","hidden":false},{"type":"chore","section":"Miscellaneous","hidden":false},{"type":"contributor","section":"New Contributors","hidden":false},{"type":"notice","section":"Notices","hidden":false}]'

From 61710d0cd0805a842caa7eeb536ef614ec74eba0 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Wed, 17 Jan 2024 00:33:12 +0800
Subject: [PATCH 11/23] chore(main): release 0.14.1

Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 CHANGELOG.md | 19 +++++++++++++++++++
 package.json |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06bcd1ef..a735ba96 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## [0.14.1](https://github.com/hakadao/BewlyBewly/compare/v0.14.0...v0.14.1) (2024-01-16)
+
+
+### Reverts
+
+* revert search bar code to previous version to undo recent changes ([272ed02](https://github.com/hakadao/BewlyBewly/commit/272ed0233abc1f0f5fb3f9be812f95fd9c371a06))
+
+
+### Bug Fixes
+
+* 专栏页面侧边栏目录按钮垂直居中 ([e2f4427](https://github.com/hakadao/BewlyBewly/commit/e2f44275e3d77faedf5b00df8b8443fb06f48c9e))
+* 从稍后再看打开视频时自动跳转 [#180](https://github.com/hakadao/BewlyBewly/issues/180) ([1edf382](https://github.com/hakadao/BewlyBewly/commit/1edf3822770c172a371ea7183e9d8582ffc9ffc2))
+
+
+### Miscellaneous
+
+* adjust regex ([781b2c0](https://github.com/hakadao/BewlyBewly/commit/781b2c07d781dddb02662b875e46c58eb8984f20))
+* update version number ([d459603](https://github.com/hakadao/BewlyBewly/commit/d459603a5b27874883263a19b0b654fc872dd206))
+
 ## [0.14.0](https://github.com/hakadao/BewlyBewly/compare/v0.13.3...v0.14.0) (2024-01-14)
 
 
diff --git a/package.json b/package.json
index efea5d59..3aa722e9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bewly-bewly",
   "displayName": "BewlyBewly",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "private": true,
   "packageManager": "pnpm@8.14.1",
   "description": "Just make a few small changes to your Bilibili homepage.",

From 0d980646018d01ae89a1e9c6ce36d9eeeabac59f Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Wed, 17 Jan 2024 10:28:56 +0800
Subject: [PATCH 12/23] chore: changelog work add style changes type

---
 .github/workflows/changelog.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index 9e51c045..007377bb 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -21,4 +21,4 @@ jobs:
           package-name: release-please-action
           release-as: 0.14.1
           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":"ci","section":"CI","hidden":false},{"type":"chore","section":"Miscellaneous","hidden":false},{"type":"contributor","section":"New Contributors","hidden":false},{"type":"notice","section":"Notices","hidden":false}]'
+          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}]'

From 7c73889c8875ffd95cc42ff70217176bd2486270 Mon Sep 17 00:00:00 2001
From: MengNianxiaoyao <2589141604@qq.com>
Date: Wed, 17 Jan 2024 22:37:12 +0800
Subject: [PATCH 13/23] chore: upgrade build deps version

---
 .github/workflows/ci.yml      | 12 ++++++------
 .github/workflows/release.yml | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b3863ab5..20b4b951 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,9 +12,9 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2.4.0
+      - uses: actions/setup-node@v4
         with:
           node-version: 16.x
           cache: pnpm
@@ -28,9 +28,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2.4.0
+      - uses: actions/setup-node@v4
         with:
           node-version: 18.x
           cache: pnpm
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a1e9b61f..fa5fed69 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,9 +9,9 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2.4.0
+      - uses: actions/setup-node@v4
         with:
           node-version: 16.x
           cache: pnpm
@@ -25,11 +25,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: pnpm/action-setup@v2.4.0
+      - uses: actions/setup-node@v4
         with:
-          node-version: 18.17.0
+          node-version: 18.x
           cache: pnpm
 
       - name: Install

From 67112911460d5dbf7d87d3cf64c00288c1462c3f Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Fri, 19 Jan 2024 01:08:52 +0800
Subject: [PATCH 14/23] =?UTF-8?q?fix:=20=E9=A1=B6=E6=A0=8F=E7=9A=84?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=EF=BC=8C=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=97=B6=E4=BB=85up=E4=B8=BB=E5=88=B6?=
 =?UTF-8?q?=E4=BD=9C=E8=A7=86=E9=A2=91=E5=8F=AF=E4=BB=A5=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=EF=BC=8C=E5=85=B6=E4=BD=99=E7=9A=86=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E4=B8=BB=E9=A1=B5=20#193?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TopBar/components/HistoryPop.vue | 4 +++-
 src/components/TopBar/types.ts                  | 1 +
 src/contentScripts/views/History/History.vue    | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/TopBar/components/HistoryPop.vue b/src/components/TopBar/components/HistoryPop.vue
index 805ae686..f196a27a 100644
--- a/src/components/TopBar/components/HistoryPop.vue
+++ b/src/components/TopBar/components/HistoryPop.vue
@@ -113,7 +113,9 @@ function onClickTab(tabId: number) {
 function getHistoryUrl(item: HistoryItem) {
   // Video
   if (activatedTab.value === 0) {
-    return `https://www.bilibili.com/video/${item.history.bvid}`
+    if (item.history.business === HistoryType.PGC)
+      return item.uri
+    return `//www.bilibili.com/video/${item.history.bvid}`
   }
   // Live
   else if (activatedTab.value === 1) {
diff --git a/src/components/TopBar/types.ts b/src/components/TopBar/types.ts
index e495770c..07617036 100644
--- a/src/components/TopBar/types.ts
+++ b/src/components/TopBar/types.ts
@@ -104,6 +104,7 @@ export interface HistoryItem {
   duration: number
   kid: number
   live_status: 0 | 1 // 0：未开播 1：已开播
+  uri: string
 }
 
 export interface FavoriteCategory {
diff --git a/src/contentScripts/views/History/History.vue b/src/contentScripts/views/History/History.vue
index e9c85777..fadd1747 100644
--- a/src/contentScripts/views/History/History.vue
+++ b/src/contentScripts/views/History/History.vue
@@ -353,7 +353,7 @@ function jumpToLoginPage() {
                 <template
                   v-else-if="historyItem.history.business === HistoryBusiness.PGC"
                 >
-                  Anime
+                  PGC
                 </template>
               </span>
 

From 8cd6112d2e1d618e0f69a25c88179aae990ea8a8 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Fri, 19 Jan 2024 01:10:03 +0800
Subject: [PATCH 15/23] chore: update version number

---
 .github/workflows/changelog.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index 007377bb..e5ee3658 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.1
+          release-as: 0.14.2
           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}]'

From 0e057c7ad64777e20780c9685372ba486f6d2327 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Fri, 19 Jan 2024 01:11:55 +0800
Subject: [PATCH 16/23] chore(main): release 0.14.2

Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 CHANGELOG.md | 13 +++++++++++++
 package.json |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a735ba96..14b6cb1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.14.2](https://github.com/hakadao/BewlyBewly/compare/v0.14.1...v0.14.2) (2024-01-18)
+
+
+### Bug Fixes
+
+* 顶栏的历史记录，跳转视频时仅up主制作视频可以跳转成功，其余皆跳转主页 [#193](https://github.com/hakadao/BewlyBewly/issues/193) ([6711291](https://github.com/hakadao/BewlyBewly/commit/67112911460d5dbf7d87d3cf64c00288c1462c3f))
+
+
+### Miscellaneous
+
+* changelog work add style changes type ([0d98064](https://github.com/hakadao/BewlyBewly/commit/0d980646018d01ae89a1e9c6ce36d9eeeabac59f))
+* update version number ([8cd6112](https://github.com/hakadao/BewlyBewly/commit/8cd6112d2e1d618e0f69a25c88179aae990ea8a8))
+
 ## [0.14.1](https://github.com/hakadao/BewlyBewly/compare/v0.14.0...v0.14.1) (2024-01-16)
 
 
diff --git a/package.json b/package.json
index 3aa722e9..3e5ec26f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bewly-bewly",
   "displayName": "BewlyBewly",
-  "version": "0.14.1",
+  "version": "0.14.2",
   "private": true,
   "packageManager": "pnpm@8.14.1",
   "description": "Just make a few small changes to your Bilibili homepage.",

From 93a41fae8e370f9108c76c1e76f94b1e1c080ccc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 20 Jan 2024 07:56:10 +0000
Subject: [PATCH 17/23] chore(deps-dev): bump vite from 3.2.7 to 3.2.8

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 3.2.7 to 3.2.8.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v3.2.8/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v3.2.8/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json   |  2 +-
 pnpm-lock.yaml | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 3e5ec26f..7c07201f 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "unplugin-auto-import": "^0.11.5",
     "unplugin-icons": "^0.14.15",
     "unplugin-vue-components": "^0.22.12",
-    "vite": "^3.2.7",
+    "vite": "^3.2.8",
     "vitest": "^0.24.5",
     "vue": "^3.3.8",
     "vue-demi": "^0.13.11",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cfc0e31d..d645930f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -81,7 +81,7 @@ devDependencies:
     version: 0.54.3
   '@vitejs/plugin-vue':
     specifier: ^3.2.0
-    version: 3.2.0(vite@3.2.7)(vue@3.4.13)
+    version: 3.2.0(vite@3.2.8)(vue@3.4.13)
   '@vue/compiler-sfc':
     specifier: ^3.3.8
     version: 3.4.13
@@ -141,7 +141,7 @@ devDependencies:
     version: 4.9.5
   unocss:
     specifier: ^0.54.3
-    version: 0.54.3(postcss@8.4.33)(vite@3.2.7)
+    version: 0.54.3(postcss@8.4.33)(vite@3.2.8)
   unplugin-auto-import:
     specifier: ^0.11.5
     version: 0.11.5(@vueuse/core@10.7.2)
@@ -152,8 +152,8 @@ devDependencies:
     specifier: ^0.22.12
     version: 0.22.12(vue@3.4.13)
   vite:
-    specifier: ^3.2.7
-    version: 3.2.7(@types/node@18.19.6)(sass@1.69.7)(terser@5.26.0)
+    specifier: ^3.2.8
+    version: 3.2.8(@types/node@18.19.6)(sass@1.69.7)(terser@5.26.0)
   vitest:
     specifier: ^0.24.5
     version: 0.24.5(jsdom@20.0.3)(sass@1.69.7)(terser@5.26.0)
@@ -1572,12 +1572,12 @@ packages:
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
     dev: true
 
-  /@unocss/astro@0.54.3(vite@3.2.7):
+  /@unocss/astro@0.54.3(vite@3.2.8):
     resolution: {integrity: sha512-/gmnSIIsYtAVPbcIGXuuaoCM71x8s8I0VtsEQZicNB51ux7BhSyXIQ5CE/W384NqTaqJt7gHVfbjn+io4ZSJXw==}
     dependencies:
       '@unocss/core': 0.54.3
       '@unocss/reset': 0.54.3
-      '@unocss/vite': 0.54.3(vite@3.2.7)
+      '@unocss/vite': 0.54.3(vite@3.2.8)
     transitivePeerDependencies:
       - rollup
       - vite
@@ -1741,7 +1741,7 @@ packages:
       '@unocss/core': 0.54.3
     dev: true
 
-  /@unocss/vite@0.54.3(vite@3.2.7):
+  /@unocss/vite@0.54.3(vite@3.2.8):
     resolution: {integrity: sha512-UxVo7WQpTAr5uHyjLKW1xs5kcecctUXsPApUChFxQwHRUeMT1gnBftd0r7dtSwdsdELClbIUgRVCrpFAPy2Y3g==}
     peerDependencies:
       vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0
@@ -1756,19 +1756,19 @@ packages:
       chokidar: 3.5.3
       fast-glob: 3.3.2
       magic-string: 0.30.5
-      vite: 3.2.7(@types/node@18.19.6)(sass@1.69.7)(terser@5.26.0)
+      vite: 3.2.8(@types/node@18.19.6)(sass@1.69.7)(terser@5.26.0)
     transitivePeerDependencies:
       - rollup
     dev: true
 
-  /@vitejs/plugin-vue@3.2.0(vite@3.2.7)(vue@3.4.13):
+  /@vitejs/plugin-vue@3.2.0(vite@3.2.8)(vue@3.4.13):
     resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       vite: ^3.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 3.2.7(@types/node@18.19.6)(sass@1.69.7)(terser@5.26.0)
+      vite: 3.2.8(@types/node@18.19.6)(sass@1.69.7)(terser@5.26.0)
       vue: 3.4.13(typescript@4.9.5)
     dev: true
 
@@ -7649,7 +7649,7 @@ packages:
     engines: {node: '>= 10.0.0'}
     dev: true
 
-  /unocss@0.54.3(postcss@8.4.33)(vite@3.2.7):
+  /unocss@0.54.3(postcss@8.4.33)(vite@3.2.8):
     resolution: {integrity: sha512-uaoCKFigRkqceLmBrtWhLqQR6D6NyBAtSFVUnM1m57BSqA0EwAFmBsgoynzAmZRTQQFsPrBzKQjEmaCUTyUd9Q==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -7658,7 +7658,7 @@ packages:
       '@unocss/webpack':
         optional: true
     dependencies:
-      '@unocss/astro': 0.54.3(vite@3.2.7)
+      '@unocss/astro': 0.54.3(vite@3.2.8)
       '@unocss/cli': 0.54.3
       '@unocss/core': 0.54.3
       '@unocss/extractor-arbitrary-variants': 0.54.3
@@ -7677,7 +7677,7 @@ packages:
       '@unocss/transformer-compile-class': 0.54.3
       '@unocss/transformer-directives': 0.54.3
       '@unocss/transformer-variant-group': 0.54.3
-      '@unocss/vite': 0.54.3(vite@3.2.7)
+      '@unocss/vite': 0.54.3(vite@3.2.8)
     transitivePeerDependencies:
       - postcss
       - rollup
@@ -7849,8 +7849,8 @@ packages:
       extsprintf: 1.3.0
     dev: true
 
-  /vite@3.2.7(@types/node@18.19.6)(sass@1.69.7)(terser@5.26.0):
-    resolution: {integrity: sha512-29pdXjk49xAP0QBr0xXqu2s5jiQIXNvE/xwd0vUizYT2Hzqe4BksNNoWllFVXJf4eLZ+UlVQmXfB4lWrc+t18g==}
+  /vite@3.2.8(@types/node@18.19.6)(sass@1.69.7)(terser@5.26.0):
+    resolution: {integrity: sha512-EtQU16PLIJpAZol2cTLttNP1mX6L0SyI0pgQB1VOoWeQnMSvtiwovV3D6NcjN8CZQWWyESD2v5NGnpz5RvgOZA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
     peerDependencies:
@@ -7918,7 +7918,7 @@ packages:
       tinybench: 2.5.1
       tinypool: 0.3.1
       tinyspy: 1.1.1
-      vite: 3.2.7(@types/node@18.19.6)(sass@1.69.7)(terser@5.26.0)
+      vite: 3.2.8(@types/node@18.19.6)(sass@1.69.7)(terser@5.26.0)
     transitivePeerDependencies:
       - less
       - sass

From 778382eb11028fc02fd491b77bca19badce380e1 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Tue, 23 Jan 2024 01:21:10 +0800
Subject: [PATCH 18/23] fix: resolve issue with displaying full favorites video
 list (#207)

---
 src/contentScripts/views/Favorites/Favorites.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/contentScripts/views/Favorites/Favorites.vue b/src/contentScripts/views/Favorites/Favorites.vue
index ef64d152..476c230d 100644
--- a/src/contentScripts/views/Favorites/Favorites.vue
+++ b/src/contentScripts/views/Favorites/Favorites.vue
@@ -115,10 +115,7 @@ async function getFavoriteResources(
       if (Array.isArray(res.data.medias) && res.data.medias.length > 0)
         favoriteResources.push(...res.data.medias)
 
-      if (
-        res.data.medias === null
-        || (res.data.medias.length < 20 && favoriteResources.length > 0)
-      )
+      if (!res.data.medias)
         noMoreContent.value = true
     }
   }
@@ -158,7 +155,7 @@ function handleUnfavorite(favoriteResource: FavoriteResource) {
     csrf: getCSRF(),
   }).then((res) => {
     if (res.code === 0)
-      favoriteResources.splice(favoriteResources.indexOf(favoriteResource), 1)
+      favoriteResources.splice(favoriteResources.indexOf(favoriteResource as FavoriteItem), 1)
   })
 }
 </script>

From ec38fafeab6c80dd45bc0e8f29598eeaed43f202 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Tue, 23 Jan 2024 01:34:32 +0800
Subject: [PATCH 19/23] fix: top bar not showing when reaching the top of the
 moments page (#205)

---
 src/components/TopBar/TopBar.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index 007aa951..70c74f3b 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -143,6 +143,9 @@ function handleScroll() {
     scrollTop.value = document.documentElement.scrollTop
   }
 
+  if (scrollTop.value === 0)
+    toggleTopBarVisible(true)
+
   if (settings.value.autoHideTopBar && !hoveringTopBar.value && scrollTop.value !== 0) {
     if (scrollTop.value > oldScrollTop.value)
       toggleTopBarVisible(false)

From fda3469425c93e7cc9157d017164d308966e474d Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Tue, 23 Jan 2024 01:42:48 +0800
Subject: [PATCH 20/23] fix: exclude the unsupported page (#206)

---
 src/contentScripts/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/contentScripts/index.ts b/src/contentScripts/index.ts
index 70207ab8..9e596714 100644
--- a/src/contentScripts/index.ts
+++ b/src/contentScripts/index.ts
@@ -56,7 +56,7 @@ function isSupportedPages() {
     // notifications page
     || /https?:\/\/message.bilibili.com\.*/.test(currentUrl)
     // bilibili channel page b站分区页面
-    || /https?:\/\/www.bilibili.com\/v\/.*/.test(currentUrl)
+    || /https?:\/\/www.bilibili.com\/v\/(?!popular).*/.test(currentUrl)
     // anime page & chinese anime page
     || /https?:\/\/www.bilibili.com\/(anime|guochuang).*/.test(currentUrl)
     // channel page e.g. tv shows, movie, variety shows, mooc page

From b2c142d5380e98e82640eee3f31abaf519736f45 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Tue, 23 Jan 2024 01:49:29 +0800
Subject: [PATCH 21/23] style: adjust homepage styles

---
 src/styles/adaptedStyles/homePage.scss | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/styles/adaptedStyles/homePage.scss b/src/styles/adaptedStyles/homePage.scss
index 6babbd5a..82a80d9f 100644
--- a/src/styles/adaptedStyles/homePage.scss
+++ b/src/styles/adaptedStyles/homePage.scss
@@ -9,7 +9,7 @@
   //   box-shadow: none;
   //   z-index: 60;
   // }
-  
+
   // .header-channel-fixed {
   //   background-color: var(--bew-elevated-2);
   //   backdrop-filter: var(--bew-filter-glass);
@@ -34,6 +34,11 @@
   //   filter: var(--bew-filter-icon-glow);
   // }
 
+  .bili-live-card .bili-live-card__info--living img,
+  .single-card.floor-card .living > img {
+    filter: var(--bew-filter-icon-glow);
+  }
+
   &.dark {
     .floor-card .floor-title {
       color: var(--bew-text-1);
@@ -43,4 +48,4 @@
       background-color: var(--bew-content-solid-1);
     }
   }
-}
\ No newline at end of file
+}

From 4b4808cbfe6adc3cf8ce38b0dd7208cfd81d80c5 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Tue, 23 Jan 2024 02:00:06 +0800
Subject: [PATCH 22/23] chore: update version number

---
 .github/workflows/changelog.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index e5ee3658..2be5bba6 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.2
+          release-as: 0.14.3
           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}]'

From f25d0837861faffbbdd885e447c4bf555e321696 Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Tue, 23 Jan 2024 02:01:43 +0800
Subject: [PATCH 23/23] chore(main): release 0.14.3

Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
---
 CHANGELOG.md | 20 ++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14b6cb1d..5b4b70ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Changelog
 
+## [0.14.3](https://github.com/hakadao/BewlyBewly/compare/v0.14.2...v0.14.3) (2024-01-22)
+
+
+### Bug Fixes
+
+* exclude the unsupported page ([#206](https://github.com/hakadao/BewlyBewly/issues/206)) ([fda3469](https://github.com/hakadao/BewlyBewly/commit/fda3469425c93e7cc9157d017164d308966e474d))
+* resolve issue with displaying full favorites video list ([#207](https://github.com/hakadao/BewlyBewly/issues/207)) ([778382e](https://github.com/hakadao/BewlyBewly/commit/778382eb11028fc02fd491b77bca19badce380e1))
+* top bar not showing when reaching the top of the moments page ([#205](https://github.com/hakadao/BewlyBewly/issues/205)) ([ec38faf](https://github.com/hakadao/BewlyBewly/commit/ec38fafeab6c80dd45bc0e8f29598eeaed43f202))
+
+
+### Style Changes
+
+* adjust homepage styles ([b2c142d](https://github.com/hakadao/BewlyBewly/commit/b2c142d5380e98e82640eee3f31abaf519736f45))
+
+
+### Miscellaneous
+
+* **deps-dev:** bump vite from 3.2.7 to 3.2.8 ([93a41fa](https://github.com/hakadao/BewlyBewly/commit/93a41fae8e370f9108c76c1e76f94b1e1c080ccc))
+* update version number ([4b4808c](https://github.com/hakadao/BewlyBewly/commit/4b4808cbfe6adc3cf8ce38b0dd7208cfd81d80c5))
+
 ## [0.14.2](https://github.com/hakadao/BewlyBewly/compare/v0.14.1...v0.14.2) (2024-01-18)
 
 
diff --git a/package.json b/package.json
index 7c07201f..e3d3b9fb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bewly-bewly",
   "displayName": "BewlyBewly",
-  "version": "0.14.2",
+  "version": "0.14.3",
   "private": true,
   "packageManager": "pnpm@8.14.1",
   "description": "Just make a few small changes to your Bilibili homepage.",