diff --git a/src/components/Explore/ExploreV2/screens/UniversalSearch.tsx b/src/components/Explore/ExploreV2/screens/UniversalSearch.tsx index 4ba27c032..8fcbd4ab0 100644 --- a/src/components/Explore/ExploreV2/screens/UniversalSearch.tsx +++ b/src/components/Explore/ExploreV2/screens/UniversalSearch.tsx @@ -17,9 +17,9 @@ import type { UniversalSearchResultItem } from "components/Explore/ExploreV2/hooks/useUniversalSearch"; import useUniversalSearch from "components/Explore/ExploreV2/hooks/useUniversalSearch"; import EmptySearchResults from "components/Explore/SearchScreens/EmptySearchResults"; -import ExploreSearchHeader from "components/Explore/SearchScreens/ExploreSearchHeader"; import ContainedSquareButton from "components/SharedComponents/Buttons/ContainedSquareButton"; import INatIcon from "components/SharedComponents/INatIcon"; +import SearchHeader from "components/SharedComponents/SearchHeader"; import Body3 from "components/SharedComponents/Typography/Body3"; import ViewWrapper from "components/SharedComponents/ViewWrapper"; import { @@ -210,10 +210,10 @@ const UniversalSearch = ( ) => { return ( - diff --git a/src/components/Explore/SearchScreens/ExploreLocationSearch.tsx b/src/components/Explore/SearchScreens/ExploreLocationSearch.tsx index dc556af0f..2027c74b7 100644 --- a/src/components/Explore/SearchScreens/ExploreLocationSearch.tsx +++ b/src/components/Explore/SearchScreens/ExploreLocationSearch.tsx @@ -5,6 +5,7 @@ import { ButtonBar, List2, SearchBar, + SearchHeader, ViewWrapper, } from "components/SharedComponents"; import { Pressable, View } from "components/styledComponents"; @@ -24,7 +25,6 @@ import type { RenderLocationPermissionsGateFunction } from "sharedHooks/useLocat import { getShadow } from "styles/global"; import EmptySearchResults from "./EmptySearchResults"; -import ExploreSearchHeader from "./ExploreSearchHeader"; const DROP_SHADOW = getShadow( { offsetHeight: 4, @@ -152,10 +152,10 @@ const ExploreLocationSearch = ( { return ( - { return ( - - { return ( - { return ( - diff --git a/src/components/Explore/SearchScreens/ExploreSearchHeader.tsx b/src/components/SharedComponents/SearchHeader.tsx similarity index 84% rename from src/components/Explore/SearchScreens/ExploreSearchHeader.tsx rename to src/components/SharedComponents/SearchHeader.tsx index 74f8df5bf..009f7c2b9 100644 --- a/src/components/Explore/SearchScreens/ExploreSearchHeader.tsx +++ b/src/components/SharedComponents/SearchHeader.tsx @@ -9,17 +9,17 @@ import React from "react"; import { useTranslation } from "sharedHooks"; interface Props { - closeModal: ( ) => void; + onClose: ( ) => void; headerText: string; - resetFilters: ( ) => void; + onReset: ( ) => void; resetDisabled?: boolean; testID: string; } -const ExploreSearchHeader = ( { - closeModal, +const SearchHeader = ( { + onClose, headerText, - resetFilters, + onReset, resetDisabled = false, testID, }: Props ) => { @@ -30,7 +30,7 @@ const ExploreSearchHeader = ( { @@ -40,7 +40,7 @@ const ExploreSearchHeader = ( { "w-[50px] items-end", { "opacity-50": resetDisabled }, )} - onPress={resetFilters} + onPress={onReset} disabled={resetDisabled} accessibilityRole="button" accessibilityLabel={t( "Reset-verb" )} @@ -54,4 +54,4 @@ const ExploreSearchHeader = ( { ); }; -export default ExploreSearchHeader; +export default SearchHeader; diff --git a/src/components/SharedComponents/index.ts b/src/components/SharedComponents/index.ts index df43d2a8c..b558c0669 100644 --- a/src/components/SharedComponents/index.ts +++ b/src/components/SharedComponents/index.ts @@ -56,6 +56,7 @@ export { default as RadioButtonRow } from "./RadioButtonRow"; export { default as ScrollableWithStickyHeader } from "./ScrollableWithStickyHeader"; export { default as ScrollViewWrapper } from "./ScrollViewWrapper"; export { default as SearchBar } from "./SearchBar"; +export { default as SearchHeader } from "./SearchHeader"; export { default as BottomSheet } from "./Sheets/BottomSheet"; export { default as BottomSheetStandardBackdrop } from "./Sheets/BottomSheetStandardBackdrop"; export { default as BottomSheetV2 } from "./Sheets/BottomSheetV2";