jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix layout of clear icon

Browse Source 
Summary:
Flipper clear icon was hidden, this fixes it

Also fixed a null pointer exception that would occur when clearing search with the keyboard, and no filters were active

Reviewed By: passy

Differential Revision: D19445833

fbshipit-source-id: 213c28dc8c1e295018e6318f86604d96d2a9b75c
This commit is contained in:
Michel Weststrate
2020-01-17 06:28:38 -08:00
committed by Facebook Github Bot
parent ef0cf87448
commit c8ebb7caaf
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ui/components/searchable/Searchable.tsx
View File

@@ -291,6 +291,7 @@ const Searchable = (
this.state.focusedToken === -1 && this.state.focusedToken === -1 &&
this.state.searchTerm === '' && this.state.searchTerm === '' &&
this._inputRef && this._inputRef &&
lastFilter &&
(lastFilter.type !== 'enum' || !lastFilter.persistent) (lastFilter.type !== 'enum' || !lastFilter.persistent)
) { ) {
this._inputRef.blur(); this._inputRef.blur();
@@ -483,6 +484,9 @@ const Searchable = (
} }
regex={Boolean(this.state.regexEnabled && this.state.searchTerm)} regex={Boolean(this.state.regexEnabled && this.state.searchTerm)}
/> />
{(this.state.searchTerm || this.state.filters.length > 0) && (
<Clear onClick={this.clear}>&times;</Clear>
)}
</SearchBox> </SearchBox>
{this.props.allowRegexSearch ? ( {this.props.allowRegexSearch ? (
<ToggleButton <ToggleButton
@@ -501,9 +505,6 @@ const Searchable = (
} }
/> />
) : null} ) : null}
{(this.state.searchTerm || this.state.filters.length > 0) && (
<Clear onClick={this.clear}>&times;</Clear>
)}
{actions != null && <Actions>{actions}</Actions>} {actions != null && <Actions>{actions}</Actions>}
</SearchBar>, </SearchBar>,
<Component <Component