Skip to content

Commit b708faa

Browse files
authored
Switch to ionics Search Bar (#435)
1 parent 4fbba65 commit b708faa

File tree

2 files changed

+32
-27
lines changed

2 files changed

+32
-27
lines changed

static/src/components/app-root/app-root.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ ion-footer {
33
color: var(--ion-color-medium-contrast);
44
}
55

6+
ion-searchbar.end {
7+
text-align: initial;
8+
width: unset;
9+
}
10+
611
.copyright {
712
font-size: 0.8em;
813
font-weight: lighter;

static/src/components/app-root/app-root.tsx

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -120,36 +120,36 @@ export class AppRoot {
120120
</ion-buttons>
121121
: ''}
122122
{hasScope(state.jwtToken, AccessLevel.Viewer) ?
123-
<ion-item slot="end" lines="none" class="search ion-hide-sm-down">
124-
<ion-input type="search" placeholder="Search" value={state.searchFilter?.query}
125-
autocorrect="on"
126-
spellcheck
127-
onKeyDown={e => this.onSearchKeyDown(e)}
128-
onIonBlur={e => e.target.value = state.searchFilter?.query ?? ''}>
129-
<ion-icon slot="start" icon="search" color="medium" />
130-
<ion-buttons slot="end" class="always-clickable ion-no-margin">
131-
<ion-button color="medium" onClick={() => this.onSearchClearClicked()}><ion-icon icon="close" slot="icon-only" /></ion-button>
132-
<ion-button color="medium" onClick={() => this.onSearchFilterClicked()}><ion-icon icon="options" slot="icon-only" /></ion-button>
133-
</ion-buttons>
134-
</ion-input>
135-
</ion-item>
123+
<ion-searchbar
124+
slot="end"
125+
class="end ion-hide-md-down"
126+
autocorrect="on"
127+
spellcheck={true}
128+
value={state.searchFilter?.query}
129+
onKeyDown={e => this.onSearchKeyDown(e)}
130+
onIonBlur={e => e.target.value = state.searchFilter?.query ?? ''}
131+
onIonClear={() => this.onSearchClearClicked()}
132+
></ion-searchbar>
133+
: ''}
134+
{hasScope(state.jwtToken, AccessLevel.Viewer) ?
135+
<ion-buttons slot="end" class="ion-hide-md-down">
136+
<ion-button color="light" onClick={() => this.onSearchFilterClicked()}><ion-icon icon="options" slot="icon-only" /></ion-button>
137+
</ion-buttons>
136138
: ''}
137139
</ion-toolbar>
138140
{hasScope(state.jwtToken, AccessLevel.Viewer) ?
139-
<ion-toolbar color="primary" class="ion-hide-sm-up">
140-
<ion-item lines="none" class="search">
141-
<ion-input type="search" placeholder="Search" value={state.searchFilter?.query}
142-
autocorrect="on"
143-
spellcheck
144-
onKeyDown={e => this.onSearchKeyDown(e)}
145-
onIonBlur={e => e.target.value = state.searchFilter?.query ?? ''}>
146-
<ion-icon slot="start" icon="search" color="medium" />
147-
<ion-buttons slot="end" class="always-clickable ion-no-margin">
148-
<ion-button color="medium" onClick={() => this.onSearchClearClicked()}><ion-icon icon="close" slot="icon-only" /></ion-button>
149-
<ion-button color="medium" onClick={() => this.onSearchFilterClicked()}><ion-icon icon="options" slot="icon-only" /></ion-button>
150-
</ion-buttons>
151-
</ion-input>
152-
</ion-item>
141+
<ion-toolbar color="primary" class="ion-hide-md-up">
142+
<ion-searchbar
143+
autocorrect="on"
144+
spellcheck={true}
145+
value={state.searchFilter?.query}
146+
onKeyDown={e => this.onSearchKeyDown(e)}
147+
onIonBlur={e => e.target.value = state.searchFilter?.query ?? ''}
148+
onIonClear={() => this.onSearchClearClicked()}
149+
></ion-searchbar>
150+
<ion-buttons slot="end">
151+
<ion-button color="light" onClick={() => this.onSearchFilterClicked()}><ion-icon icon="options" slot="icon-only" /></ion-button>
152+
</ion-buttons>
153153
</ion-toolbar>
154154
: ''}
155155
{state.loadingCount > 0 ?

0 commit comments

Comments
 (0)