Skip to content

Commit dd66366

Browse files
committed
fix(navbar): change wording & switch to auto-complete
1 parent ce7b8bf commit dd66366

File tree

5 files changed

+22
-29
lines changed

5 files changed

+22
-29
lines changed

src/components/views/calendar/CalendarNavbar.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const open = ref(false);
6969
<NInput
7070
v-model:value="debouncedSearch"
7171
class="search-input"
72-
:placeholder="i18n('search', 'navbar')"
72+
:placeholder="i18n('filter', 'navbar')"
7373
autosize
7474
clearable
7575
>

src/components/views/history/HistoryNavbar.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ const open = ref(false);
6464
<NInput
6565
v-model:value="debouncedSearch"
6666
class="search-input"
67-
:placeholder="i18n('search')"
67+
:placeholder="i18n('filter')"
6868
autosize
6969
clearable
7070
>

src/components/views/search/SearchNavbar.vue

+15-26
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<script setup lang="ts">
22
import {
3+
NAutoComplete,
34
NFlex,
45
NIcon,
5-
NInput,
6-
NPopselect,
76
NSelect,
87
NSwitch,
98
NTooltip,
@@ -58,11 +57,6 @@ const historyOptions = computed(() =>
5857
filteredHistory.value.map(value => ({ value, label: value })),
5958
);
6059
61-
const showHistory = computed(() => {
62-
if (!inputFocus.value) return false;
63-
return !!filteredHistory.value.length;
64-
});
65-
6660
defineProps({
6761
parentElement: {
6862
type: HTMLElement,
@@ -201,29 +195,24 @@ onActivated(() => {
201195
</NFlex>
202196
</NFlex>
203197
<template #trigger>
204-
<NPopselect
198+
<NAutoComplete
199+
ref="inputRef"
205200
v-model:value="debouncedSearch"
201+
class="search-input"
202+
:loading="loading"
203+
:disabled="loading"
204+
:placeholder="i18n('search', 'navbar')"
205+
autosize
206+
clearable
207+
:on-input-focus="() => toggleFocus(true)"
208+
:on-input-blur="() => toggleFocus(false)"
206209
:options="historyOptions"
207210
:to="parentElement"
208-
:show="showHistory"
209211
>
210-
<NInput
211-
ref="inputRef"
212-
v-model:value="debouncedSearch"
213-
class="search-input"
214-
:loading="loading"
215-
:disabled="loading"
216-
:placeholder="i18n('search', 'navbar')"
217-
autosize
218-
clearable
219-
:on-input-focus="() => toggleFocus(true)"
220-
:on-input-blur="() => toggleFocus(false)"
221-
>
222-
<template #prefix>
223-
<NIcon :component="IconLoop" />
224-
</template>
225-
</NInput>
226-
</NPopselect>
212+
<template #prefix>
213+
<NIcon :component="IconLoop" />
214+
</template>
215+
</NAutoComplete>
227216
</template>
228217
</NTooltip>
229218

src/components/views/watchlist/WatchlistNavbar.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ const renderTag = ({ option }: { option: SelectOption }) => option.label?.toStri
100100
<NInput
101101
v-model:value="debouncedSearch"
102102
class="search-input"
103-
:placeholder="i18n('search', 'navbar')"
103+
:placeholder="i18n('filter', 'navbar')"
104104
autosize
105105
clearable
106106
>

src/i18n/en/navbar/navbar.json

+4
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,9 @@
66
"navbar__search": {
77
"message": "Search",
88
"description": "Search placeholder."
9+
},
10+
"navbar__filter": {
11+
"message": "Filter",
12+
"description": "Search placeholder."
913
}
1014
}

0 commit comments

Comments
 (0)