feat: optional search clear text

TheWidlarzGroup · Mar 20, 2024 · 41236d3 · 41236d3
1 parent 31aa092
commit 41236d3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/components/SearchBar.tsx b/src/components/SearchBar.tsx
@@ -7,6 +7,7 @@ export const SearchBar = () => {
   const {
     searchPhrase,
     setSearchPhrase,
+    hideSearchBarClearIcon,
     translation,
     setActiveCategoryIndex,
     renderList,
@@ -19,11 +20,11 @@ export const SearchBar = () => {
   } = React.useContext(KeyboardContext)
   const inputRef = React.useRef<TextInput>(null)
 
-  const handleSearch = async (text: string) => {
+  const handleSearch = (text: string) => {
     setSearchPhrase(text)
 
     if (text === '') {
-      await setActiveCategoryIndex(0)
+      setActiveCategoryIndex(0)
       setShouldAnimateScroll(enableCategoryChangeAnimation)
 
       return
@@ -38,8 +39,10 @@ export const SearchBar = () => {
   const clearPhrase = () => {
     setSearchPhrase('')
     clearEmojiTonesData()
-    inputRef.current?.blur()
     setActiveCategoryIndex(0)
+    setTimeout(() => {
+      inputRef.current?.blur()
+    }, 0)
   }
 
   return (
@@ -59,7 +62,7 @@ export const SearchBar = () => {
         onTouchEndCapture={clearEmojiTonesData}
         placeholderTextColor={theme.search.placeholder}
       />
-      {!!searchPhrase && (
+      {!hideSearchBarClearIcon && !!searchPhrase && (
         <TouchableOpacity onPress={clearPhrase} style={styles.button}>
           <Icon
             iconName={'Close'}

diff --git a/src/contexts/KeyboardContext.ts b/src/contexts/KeyboardContext.ts
@@ -76,6 +76,7 @@ export type KeyboardProps = {
   enableRecentlyUsed?: boolean
   categoryPosition?: CategoryPosition
   enableSearchBar?: boolean
+  hideSearchBarClearIcon?: boolean
   categoryOrder?: CategoryTypes[]
   onRequestClose?: () => void
   disableSafeArea?: boolean
@@ -163,6 +164,7 @@ export const defaultKeyboardContext: Required<KeyboardProps> & {
   enableRecentlyUsed: false,
   categoryPosition: 'floating',
   enableSearchBar: false,
+  hideSearchBarClearIcon: false,
   categoryOrder: [...CATEGORIES],
   onRequestClose: () => {},
   disableSafeArea: false,