Merge branch 'dev' of https://github.com/MengNianxiaoyao/BewlyBewly i…

…nto dev
MengNianxiaoyao · May 7, 2024 · 16609e9 · 16609e9
2 parents 1900387 + fef5d0e
commit 16609e9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 21 deletions.
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -18,7 +18,7 @@ jobs:
           token: ${{ secrets.RELEASE_TOKEN }}
           release-type: node
           package-name: release-please-action
-          release-as: 0.18.2
+          release-as: 0.18.4
           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":true},{"type":"style","section":"Style Changes","hidden":false},{"type":"ci","section":"CI","hidden":false},{"type":"chore","section":"Miscellaneous","hidden":true},{"type":"contributor","section":"New Contributors","hidden":false},{"type":"notice","section":"Notices","hidden":false}]'
           default-branch: main
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -76,7 +76,7 @@ jobs:
           pnpm wxt submit --chrome-zip ./extension.zip
           pnpm build-firefox
           pnpm pack:zip-firefox
-          pnpm wxt submit --firefox-zip ./extension-firefox.zip
+          pnpm wxt submit --firefox-zip ./extension-firefox.zip --firefox-sources-zip ./extension-firefox-sources.zip
         env:
           CHROME_EXTENSION_ID: ${{ secrets.CHROME_EXTENSION_ID }}
           CHROME_CLIENT_ID: ${{ secrets.CHROME_CLIENT_ID }}

diff --git a/src/components/Radio.vue b/src/components/Radio.vue
@@ -1,26 +1,16 @@
 <script lang="ts" setup>
-const props = defineProps<{
+defineProps<{
   modelValue: boolean
   label?: string
 }>()
 
-const emit = defineEmits(['update:modelValue'])
-
-const modelValue = ref<boolean>()
-
-watch(() => modelValue.value, (newValue) => {
-  emit('update:modelValue', newValue)
-})
-
-onMounted(() => {
-  modelValue.value = props.modelValue
-})
+const model = defineModel()
 </script>
 
 <template>
   <label cursor="pointer" pointer="auto" flex items-center gap-3>
     <span>{{ label }}</span>
-    <input v-model="modelValue" type="checkbox" hidden>
+    <input v-model="model" type="checkbox" hidden>
     <span
       inline-block w="$b-button-width" h="$b-button-height" bg="$bew-fill-1" rounded="[calc(var(--b-button-height)/2)]"
       relative border="size-$b-border-width color-$bew-border-color"

diff --git a/src/components/SearchBar/SearchBar.vue b/src/components/SearchBar/SearchBar.vue
@@ -1,4 +1,3 @@
-<!-- TODO: refactor all that code -->
 <script setup lang="ts">
 import { onKeyStroke } from '@vueuse/core'
 import type { HistoryItem, SuggestionItem, SuggestionResponse } from './searchHistoryProvider'
@@ -57,7 +56,7 @@ onKeyStroke('Escape', (e: KeyboardEvent) => {
 
 function handleInput() {
   selectedIndex.value = -1
-  if (keyword.value.length > 0) {
+  if (keyword.value.trim().length > 0) {
     api.search.getSearchSuggestion({
       term: keyword.value,
     })
@@ -200,7 +199,7 @@ async function handleClearSearchHistory() {
 
       <input
         ref="keywordRef"
-        v-model.trim="keyword"
+        v-model="keyword"
         rounded="60px focus:$bew-radius"
         p="l-6 r-18 y-3"
         h-50px

diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
@@ -387,9 +387,13 @@ defineExpose({
           pos="absolute top-0 left-0" w-full h-80px
           pointer-events-none opacity-70
           :style="{
-            background: `linear-gradient(to bottom, ${(settings.wallpaper
-              || settings.useSearchPageModeOnHomePage && settings.searchPageWallpaper && settings.individuallySetSearchPageWallpaper) && isHomePage()
-              ? 'rgba(0,0,0,.6)' : 'var(--bew-bg)'}, transparent)`,
+            background: `linear-gradient(to bottom, ${(
+              settings.wallpaper
+              || settings.useSearchPageModeOnHomePage
+              && settings.searchPageWallpaper
+              && settings.individuallySetSearchPageWallpaper)
+              && isHomePage()
+              ? 'rgba(0,0,0,.6)' : `${isHomePage() ? 'var(--bew-homepage-bg)' : 'var(--bew-bg)'}`}, transparent)`,
           }"
         />
       </Transition>