File tree 4 files changed +11
-9
lines changed
components/search-attribute-filter
4 files changed +11
-9
lines changed Original file line number Diff line number Diff line change 46
46
47
47
function handleNullFilter() {
48
48
$filter .value = null ;
49
+ $filter .customDate = false ;
49
50
handleSubmit ();
50
51
}
51
52
57
58
58
59
<MenuContainer >
59
60
<MenuButton
60
- class =" {noBorderRight ? ' !border-r-0' : ' ' } {noBorderLeft
61
+ class =" {noBorderRight && ! isNullFilter ? ' !border-r-0' : ' ' } {noBorderLeft
61
62
? ' !border-l-0'
62
63
: ' ' } whitespace-nowrap"
63
64
id =" conditional-menu-button"
Original file line number Diff line number Diff line change 117
117
{attribute }
118
118
{#if isNullConditional (conditional )}
119
119
{conditional }
120
- {value }
120
+ {String ( value ) }
121
121
{:else if isDateTimeFilter (workflowFilter )}
122
122
{#if customDate }
123
123
{formatDateTimeRange (value , $timeFormat , $relativeTime )}
Original file line number Diff line number Diff line change 2
2
import { writable , type Writable } from ' svelte/store' ;
3
3
import { fly } from ' svelte/transition' ;
4
4
5
- import { afterUpdate , setContext } from ' svelte' ;
5
+ import { afterUpdate , setContext , tick } from ' svelte' ;
6
6
7
7
export const FILTER_CONTEXT = ' filter-context' ;
8
8
42
42
43
43
import BooleanFilter from ' ./boolean-filter.svelte' ;
44
44
import CloseFilter from ' ./close-filter-button.svelte' ;
45
- import DateTimeFilter from ' ./datetime-filter.svelte' ;
45
+ import DatetimeFilter from ' ./datetime-filter.svelte' ;
46
46
import DurationFilter from ' ./duration-filter.svelte' ;
47
47
import FilterList from ' ./filter-list.svelte' ;
48
48
import ListFilter from ' ./list-filter.svelte' ;
125
125
}
126
126
127
127
afterUpdate (() => {
128
- updateFocus ();
128
+ tick ().then (() => {
129
+ updateFocus ();
130
+ });
129
131
});
130
132
131
133
function resetFilter() {
192
194
class =" flex w-full items-center"
193
195
in:fly ={{ x : - 100 , duration : 150 }}
194
196
>
195
- <DateTimeFilter />
197
+ <DatetimeFilter />
196
198
<CloseFilter />
197
199
</div >
198
200
{:else if isBooleanFilter ($filter )}
Original file line number Diff line number Diff line change @@ -77,12 +77,11 @@ export function getFocusedElementId(filter: SearchAttributeFilter) {
77
77
if (
78
78
isTextFilter ( filter ) ||
79
79
isNumberFilter ( filter ) ||
80
- isDateTimeFilter ( filter )
80
+ isDateTimeFilter ( filter ) ||
81
+ isListFilter ( filter )
81
82
)
82
83
return 'conditional-menu-button' ;
83
84
84
- if ( isListFilter ( filter ) ) return 'list-filter' ;
85
-
86
85
if ( isBooleanFilter ( filter ) ) return 'boolean-filter' ;
87
86
88
87
return '' ;
You can’t perform that action at this time.
0 commit comments