Skip to content

Commit 816b32b

Browse files
authored
Quick filter search fixes (#2603)
* Add tick to afterUpdate * Fix focusing for list filter * Fix null filter
1 parent cbe77a2 commit 816b32b

File tree

4 files changed

+11
-9
lines changed

4 files changed

+11
-9
lines changed

Diff for: src/lib/components/search-attribute-filter/conditional-menu.svelte

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
4747
function handleNullFilter() {
4848
$filter.value = null;
49+
$filter.customDate = false;
4950
handleSubmit();
5051
}
5152
@@ -57,7 +58,7 @@
5758

5859
<MenuContainer>
5960
<MenuButton
60-
class="{noBorderRight ? '!border-r-0' : ''} {noBorderLeft
61+
class="{noBorderRight && !isNullFilter ? '!border-r-0' : ''} {noBorderLeft
6162
? '!border-l-0'
6263
: ''} whitespace-nowrap"
6364
id="conditional-menu-button"

Diff for: src/lib/components/search-attribute-filter/filter-list.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
{attribute}
118118
{#if isNullConditional(conditional)}
119119
{conditional}
120-
{value}
120+
{String(value)}
121121
{:else if isDateTimeFilter(workflowFilter)}
122122
{#if customDate}
123123
{formatDateTimeRange(value, $timeFormat, $relativeTime)}

Diff for: src/lib/components/search-attribute-filter/index.svelte

+6-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { writable, type Writable } from 'svelte/store';
33
import { fly } from 'svelte/transition';
44
5-
import { afterUpdate, setContext } from 'svelte';
5+
import { afterUpdate, setContext, tick } from 'svelte';
66
77
export const FILTER_CONTEXT = 'filter-context';
88
@@ -42,7 +42,7 @@
4242
4343
import BooleanFilter from './boolean-filter.svelte';
4444
import CloseFilter from './close-filter-button.svelte';
45-
import DateTimeFilter from './datetime-filter.svelte';
45+
import DatetimeFilter from './datetime-filter.svelte';
4646
import DurationFilter from './duration-filter.svelte';
4747
import FilterList from './filter-list.svelte';
4848
import ListFilter from './list-filter.svelte';
@@ -125,7 +125,9 @@
125125
}
126126
127127
afterUpdate(() => {
128-
updateFocus();
128+
tick().then(() => {
129+
updateFocus();
130+
});
129131
});
130132
131133
function resetFilter() {
@@ -192,7 +194,7 @@
192194
class="flex w-full items-center"
193195
in:fly={{ x: -100, duration: 150 }}
194196
>
195-
<DateTimeFilter />
197+
<DatetimeFilter />
196198
<CloseFilter />
197199
</div>
198200
{:else if isBooleanFilter($filter)}

Diff for: src/lib/utilities/query/search-attribute-filter.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,11 @@ export function getFocusedElementId(filter: SearchAttributeFilter) {
7777
if (
7878
isTextFilter(filter) ||
7979
isNumberFilter(filter) ||
80-
isDateTimeFilter(filter)
80+
isDateTimeFilter(filter) ||
81+
isListFilter(filter)
8182
)
8283
return 'conditional-menu-button';
8384

84-
if (isListFilter(filter)) return 'list-filter';
85-
8685
if (isBooleanFilter(filter)) return 'boolean-filter';
8786

8887
return '';

0 commit comments

Comments
 (0)