Open source personal finance application
refactor: move search into menu items instead of custom element
Ilya Komichevc03d56b81030
diff --git a/app/components/layout/MenuBottomModal.vue b/app/components/layout/MenuBottomModal.vueindex 034407e5..940c57dc 100644--- a/app/components/layout/MenuBottomModal.vue+++ b/app/components/layout/MenuBottomModal.vue@@ -1,11 +1,8 @@<script setup lang="ts">import { useDemo } from '~/components/demo/useDemo'-import { useSearch } from '~/components/search/useSearch'import { useUserStore } from '~/components/user/useUserStore'const emit = defineEmits<{ close: [] }>()-const { t } = useI18n()-const { isSearchOpen } = useSearch()const userStore = useUserStore()const { isDemo } = useDemo()</script>@@ -14,6 +11,7 @@ const { isDemo } = useDemo()<Teleport to="body"><LazyBottomSheetisShow+ dragClassesCustom="bottomSheetDragClassesCustom"@closed="emit('close')"><template #handler="{ close }">@@ -30,18 +28,6 @@ const { isDemo } = useDemo()<UserViewLogout /></div>- <div- class="interactive text-muted mx-2 flex min-h-[44px] items-center gap-3 rounded-sm px-2 py-1.5"- @click="isSearchOpen = true; emit('close')"- >- <div class="flex min-w-8 items-center justify-center">- <Icon name="lucide:search" size="22" />- </div>- <div class="text-sm font-medium">- {{ t('search.title') }}- </div>- </div>-<LayoutSidebarMenu class="py-4" /><divdiff --git a/app/components/layout/useMenuData.ts b/app/components/layout/useMenuData.tsindex 1566f3e0..3ae2c570 100644--- a/app/components/layout/useMenuData.ts+++ b/app/components/layout/useMenuData.ts@@ -1,5 +1,6 @@/* eslint-disable perfectionist/sort-objects */import { useCategoriesStore } from '~/components/categories/useCategoriesStore'+import { isSearchOpen } from '~/components/search/useSearch'import { useTrnsFormStore } from '~/components/trnForm/useTrnsFormStore'import { useWalletsStore } from '~/components/wallets/useWalletsStore'@@ -33,6 +34,14 @@ export function useMenuData() {kbds: ['meta', 'G'],},},+ search: {+ icon: 'lucide:search',+ name: t('search.title'),+ tooltip: {+ text: t('search.title'),+ kbds: ['meta', 'K'],+ },+ },dashboard: {icon: 'lucide:chart-no-axes-combined',name: t('stat.title'),@@ -90,6 +99,11 @@ export function useMenuData() {return}+ if (menuId === 'search') {+ isSearchOpen.value = true+ return+ }+if (menuId === 'menu') {isMenuOpen.value = truereturndiff --git a/app/components/search/useSearch.ts b/app/components/search/useSearch.tsindex 0793f1f7..2e8fcb27 100644--- a/app/components/search/useSearch.ts+++ b/app/components/search/useSearch.ts@@ -17,7 +17,7 @@ export type SearchResultItem = CommandPaletteItem & {const RECENT_LIMIT = 10-const isSearchOpen = ref(false)+export const isSearchOpen = ref(false)export function useSearch() {const { t } = useI18n()