fix: race condition

artsy · Dec 12, 2024 · b972158 · b972158
1 parent 79bb158
commit b972158
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/app/Components/GlobalSearchInput/GlobalSearchInput.tsx b/src/app/Components/GlobalSearchInput/GlobalSearchInput.tsx
@@ -3,6 +3,7 @@ import { Flex, RoundSearchInput, Touchable } from "@artsy/palette-mobile"
 import { GlobalSearchInputOverlay } from "app/Components/GlobalSearchInput/GlobalSearchInputOverlay"
 import { useDismissSearchOverlayOnTabBarPress } from "app/Components/GlobalSearchInput/utils/useDismissSearchOverlayOnTabBarPress"
 import { ICON_HIT_SLOP } from "app/Components/constants"
+import { useDebouncedValue } from "app/utils/hooks/useDebouncedValue"
 import { forwardRef, Fragment, useImperativeHandle, useState } from "react"
 import { useTracking } from "react-tracking"
 
@@ -16,13 +17,14 @@ export type GlobalSearchInput = {
 export const GlobalSearchInput = forwardRef<GlobalSearchInput, GlobalSearchInputProps>(
   ({ ownerType }, ref) => {
     const [isVisible, setIsVisible] = useState(false)
+    const debouncedIsVisible = useDebouncedValue({ value: isVisible })
     const tracking = useTracking()
 
     useDismissSearchOverlayOnTabBarPress({ isVisible, ownerType, setIsVisible })
 
     useImperativeHandle(ref, () => ({
       focus: () => {
-        if (!isVisible) {
+        if (!debouncedIsVisible.debouncedValue) {
           setIsVisible(true)
         }
       },

diff --git a/src/app/Scenes/Search/Search.tsx b/src/app/Scenes/Search/Search.tsx
@@ -64,12 +64,11 @@ export const Search: React.FC = () => {
 
   useRefetchWhenQueryChanged({ query: searchQuery, refetch })
 
-  // Focus input and open keyboard on bottom nav Search tab double-tab
   const scrollableRef = useBottomTabsScrollToTop(() => {
     if (enableNewSearchModal) {
+      // Focus input and open keyboard on bottom nav Search tab double-tab
       searchInputRef.current?.focus()
     } else {
-      // Focus input and open keyboard on bottom nav Search tab double-tab
       searchProviderValues.inputRef.current?.focus()
     }
   })