Skip to content

Commit cd07471

Browse files
committed
refactor: move search/filter icons inside input boxes, remove external icons and separator
1 parent eed53b6 commit cd07471

1 file changed

Lines changed: 30 additions & 39 deletions

File tree

‎src/components/database-browser/DataTableView.vue‎

Lines changed: 30 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -841,16 +841,15 @@ watch(
841841

842842
<!-- Data sub-page: Toolbar bar (search + filter + actions) -->
843843
<template v-if="activeSubPage === 'data'">
844-
<div class="px-3 py-1.5 border-b bg-muted/20 flex shrink-0 gap-1.5 items-center">
845-
<span class="i-carbon-search text-muted-foreground flex-shrink-0 h-3.5 w-3.5" />
846-
844+
<div class="px-3 py-1.5 border-b bg-muted/20 flex shrink-0 gap-1 items-center">
847845
<!-- Search input — searches across all columns -->
848846
<div class="flex-1 min-w-0 relative">
847+
<span class="i-carbon-search text-muted-foreground absolute left-2 top-1/2 -translate-y-1/2 h-3.5 w-3.5 pointer-events-none" />
849848
<Input
850849
ref="searchInputRef"
851850
v-model="searchTerm"
852851
:placeholder="t('components.dataTableView.searchPlaceholder')"
853-
class="text-xs pr-7 flex-1 h-7"
852+
class="text-xs pl-7 pr-7 h-7"
854853
@keydown="onSearchKeydown"
855854
@focus="onSearchFocus"
856855
/>
@@ -861,44 +860,36 @@ watch(
861860
>
862861
<span class="i-carbon-loading h-3.5 w-3.5 animate-spin" />
863862
</div>
863+
<!-- Clear search button (inside input, on the right) -->
864+
<button
865+
v-if="searchTerm"
866+
class="text-muted-foreground right-1 top-1/2 absolute -translate-y-1/2 flex items-center justify-center h-5 w-5 rounded hover:bg-accent"
867+
:title="t('components.dataTableView.clearSearch')"
868+
@click.stop="clearSearch"
869+
>
870+
<span class="i-carbon-close h-3 w-3" />
871+
</button>
864872
</div>
865873

866-
<!-- Clear search button -->
867-
<Button
868-
v-if="searchTerm"
869-
variant="ghost"
870-
size="icon"
871-
class="flex-shrink-0 h-7 w-7"
872-
:title="t('components.dataTableView.clearSearch')"
873-
@click.stop="clearSearch"
874-
>
875-
<span class="i-carbon-close h-3.5 w-3.5" />
876-
</Button>
877-
878-
<!-- Visual separator between search and filter sections -->
879-
<div class="mx-0.5 bg-border flex-shrink-0 h-5 w-px" />
880-
881-
<span class="i-carbon-filter text-muted-foreground flex-shrink-0 h-3.5 w-3.5" />
882-
883874
<!-- Filter input -->
884-
<Input
885-
v-model="filterInput"
886-
:placeholder="t('components.dataTableView.filterPlaceholder')"
887-
class="text-xs font-mono flex-1 h-7"
888-
@keydown.enter="applyFilter"
889-
/>
890-
891-
<!-- Clear filter button -->
892-
<Button
893-
v-if="filterInput || appliedFilter"
894-
variant="ghost"
895-
size="icon"
896-
class="flex-shrink-0 h-7 w-7"
897-
:title="t('components.dataTableView.clearFilter')"
898-
@click.stop="clearFilter"
899-
>
900-
<span class="i-carbon-close h-3.5 w-3.5" />
901-
</Button>
875+
<div class="flex-1 min-w-0 relative">
876+
<span class="i-carbon-filter text-muted-foreground absolute left-2 top-1/2 -translate-y-1/2 h-3.5 w-3.5 pointer-events-none" />
877+
<Input
878+
v-model="filterInput"
879+
:placeholder="t('components.dataTableView.filterPlaceholder')"
880+
class="text-xs font-mono pl-7 h-7"
881+
@keydown.enter="applyFilter"
882+
/>
883+
<!-- Clear filter button (inside input, on the right) -->
884+
<button
885+
v-if="filterInput || appliedFilter"
886+
class="text-muted-foreground right-1 top-1/2 absolute -translate-y-1/2 flex items-center justify-center h-5 w-5 rounded hover:bg-accent"
887+
:title="t('components.dataTableView.clearFilter')"
888+
@click.stop="clearFilter"
889+
>
890+
<span class="i-carbon-close h-3 w-3" />
891+
</button>
892+
</div>
902893

903894
<!-- Refresh button -->
904895
<Button

0 commit comments

Comments
 (0)