Skip to content

Commit

Permalink
fix names
Browse files Browse the repository at this point in the history
  • Loading branch information
289Adam289 committed Jan 30, 2025
1 parent c67b428 commit 83a66ac
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
10 changes: 5 additions & 5 deletions src/components/Search/SearchPageHeader/SearchPageHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ import ROUTES from '@src/ROUTES';
import type DeepValueOf from '@src/types/utils/DeepValueOf';
import SearchPageHeaderInput from './SearchPageHeaderInput';

type SearchPageHeaderProps = {queryJSON: SearchQueryJSON; searchRouterListVisible?: boolean; onSearchRouterFocus?: () => void};
type SearchPageHeaderProps = {queryJSON: SearchQueryJSON; searchAutocompleteListVisible?: boolean; onSearchRouterFocus?: () => void};

type SearchHeaderOptionValue = DeepValueOf<typeof CONST.SEARCH.BULK_ACTION_TYPES> | undefined;

function SearchPageHeader({queryJSON, searchRouterListVisible, onSearchRouterFocus}: SearchPageHeaderProps) {
function SearchPageHeader({queryJSON, searchAutocompleteListVisible, onSearchRouterFocus}: SearchPageHeaderProps) {
const {translate} = useLocalize();
const theme = useTheme();
const styles = useThemeStyles();
Expand Down Expand Up @@ -334,7 +334,7 @@ function SearchPageHeader({queryJSON, searchRouterListVisible, onSearchRouterFoc
onTooltipPress={onFiltersButtonPress}
>
<Button
innerStyles={[styles.searchRouterInputResults, styles.borderNone, styles.bgTransparent]}
innerStyles={[styles.searchAutocompleteInputResults, styles.borderNone, styles.bgTransparent]}
icon={Expensicons.Filters}
onPress={onFiltersButtonPress}
/>
Expand All @@ -349,7 +349,7 @@ function SearchPageHeader({queryJSON, searchRouterListVisible, onSearchRouterFoc
styles.bgTransparent,
styles.borderNone,
styles.productTrainingTooltipWrapper,
styles.searchRouterInputResults,
styles.searchAutocompleteInputResults,
translate,
]);

Expand Down Expand Up @@ -397,7 +397,7 @@ function SearchPageHeader({queryJSON, searchRouterListVisible, onSearchRouterFoc
return (
<>
<SearchPageHeaderInput
searchRouterListVisible={searchRouterListVisible}
searchAutocompleteListVisible={searchAutocompleteListVisible}
onSearchRouterFocus={onSearchRouterFocus}
queryJSON={queryJSON}
inputRightComponent={InputRightComponent}
Expand Down
24 changes: 12 additions & 12 deletions src/components/Search/SearchPageHeader/SearchPageHeaderInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ const ANIMATION_DURATION = 300;

type SearchPageHeaderInputProps = {
queryJSON: SearchQueryJSON;
searchRouterListVisible?: boolean;
searchAutocompleteListVisible?: boolean;
onSearchRouterFocus?: () => void;
inputRightComponent: React.ReactNode;
};

function SearchPageHeaderInput({queryJSON, searchRouterListVisible, onSearchRouterFocus, inputRightComponent}: SearchPageHeaderInputProps) {
function SearchPageHeaderInput({queryJSON, searchAutocompleteListVisible, onSearchRouterFocus, inputRightComponent}: SearchPageHeaderInputProps) {
const styles = useThemeStyles();
const {shouldUseNarrowLayout: displayNarrowHeader} = useResponsiveLayout();
const personalDetails = usePersonalDetails();
Expand All @@ -61,7 +61,7 @@ function SearchPageHeaderInput({queryJSON, searchRouterListVisible, onSearchRout

// The actual input text that the user sees
const [textInputValue, setTextInputValue] = useState(isDefaultQuery ? '' : queryText);
// The input text that was last used for autocomplete; needed for the SearchRouterList when browsing list via arrow keys
// The input text that was last used for autocomplete; needed for the SearchAutocompleteList when browsing list via arrow keys
const [autocompleteQueryValue, setAutocompleteQueryValue] = useState(isDefaultQuery ? '' : queryText);
const [selection, setSelection] = useState({start: textInputValue.length, end: textInputValue.length});

Expand All @@ -74,13 +74,13 @@ function SearchPageHeaderInput({queryJSON, searchRouterListVisible, onSearchRout

// useEffect for blurring TextInput when we cancel SearchRouter interaction on narrow layout
useEffect(() => {
if (!displayNarrowHeader || !!searchRouterListVisible || !textInputRef.current || !textInputRef.current.isFocused()) {
if (!displayNarrowHeader || !!searchAutocompleteListVisible || !textInputRef.current || !textInputRef.current.isFocused()) {
return;
}
textInputRef.current.blur();
// eslint-disable-next-line react-compiler/react-compiler
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [searchRouterListVisible]);
}, [searchAutocompleteListVisible]);

useEffect(() => {
if (displayNarrowHeader || !isFocused || !textInputRef.current) {
Expand Down Expand Up @@ -203,8 +203,8 @@ function SearchPageHeaderInput({queryJSON, searchRouterListVisible, onSearchRout
: undefined;

const animatedPadding = useDerivedValue(() => {
return withTiming(searchRouterListVisible ? 0 : 52, {duration: ANIMATION_DURATION});
}, [searchRouterListVisible]);
return withTiming(searchAutocompleteListVisible ? 0 : 52, {duration: ANIMATION_DURATION});
}, [searchAutocompleteListVisible]);
const inputWrapperStyleTest = useAnimatedStyle(() => {
return {
marginRight: animatedPadding.value,

Check failure on line 210 in src/components/Search/SearchPageHeader/SearchPageHeaderInput.tsx

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

'value' is deprecated. Use the new `.get()` and `.set(value)` methods instead
Expand Down Expand Up @@ -232,8 +232,8 @@ function SearchPageHeaderInput({queryJSON, searchRouterListVisible, onSearchRout
listRef.current?.updateAndScrollToFocusedIndex(0);
onSearchRouterFocus?.();
}}
wrapperStyle={[styles.searchRouterInputResults, styles.br2]}
wrapperFocusedStyle={styles.searchRouterInputResultsFocused}
wrapperStyle={[styles.searchAutocompleteInputResults, styles.br2]}
wrapperFocusedStyle={styles.searchAutocompleteInputResultsFocused}
rightComponent={inputRightComponent}
autocompleteListRef={listRef}
ref={textInputRef}
Expand All @@ -244,7 +244,7 @@ function SearchPageHeaderInput({queryJSON, searchRouterListVisible, onSearchRout
<SearchTypeMenuPopover queryJSON={queryJSON} />
</View>
</View>
<View style={[styles.flex1, !searchRouterListVisible && styles.dNone]}>
<View style={[styles.flex1, !searchAutocompleteListVisible && styles.dNone]}>
<SearchAutocompleteList
autocompleteQueryValue={autocompleteQueryValue}
searchQueryItem={searchQueryItem}
Expand Down Expand Up @@ -298,8 +298,8 @@ function SearchPageHeaderInput({queryJSON, searchRouterListVisible, onSearchRout
autoFocus={false}
onFocus={showAutocompleteList}
onBlur={hideAutocompleteList}
wrapperStyle={[styles.searchRouterInputResults, styles.br2]}
wrapperFocusedStyle={styles.searchRouterInputResultsFocused}
wrapperStyle={[styles.searchAutocompleteInputResults, styles.br2]}
wrapperFocusedStyle={styles.searchAutocompleteInputResultsFocused}
outerWrapperStyle={[inputWrapperActiveStyle, styles.pb2]}
rightComponent={inputRightComponent}
autocompleteListRef={listRef}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ function SearchTypeMenuPopover({queryJSON}: SearchTypeMenuNarrowProps) {
return (
<>
<Button
innerStyles={[styles.searchRouterInputResults, styles.borderNone]}
innerStyles={[styles.searchAutocompleteInputResults, styles.borderNone]}
icon={Expensicons.Bookmark}
onPress={openMenu}
/>
Expand Down
20 changes: 10 additions & 10 deletions src/pages/Search/SearchPageBottomTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function SearchPageBottomTab() {
const styles = useThemeStyles();
const StyleUtils = useStyleUtils();
const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
const [searchRouterListVisible, setSearchRouterListVisible] = useState(false);
const [searchAutocompleteListVisible, setSearchAutocompleteListVisible] = useState(false);
const {clearSelectedTransactions} = useSearchContext();

const scrollOffset = useSharedValue(0);
Expand Down Expand Up @@ -103,7 +103,7 @@ function SearchPageBottomTab() {
);
}

const shouldDisplayCancelSearch = shouldUseNarrowLayout && (!isCannedSearchQuery(queryJSON) || searchRouterListVisible);
const shouldDisplayCancelSearch = shouldUseNarrowLayout && (!isCannedSearchQuery(queryJSON) || searchAutocompleteListVisible);

if (shouldUseNarrowLayout) {
return (
Expand All @@ -115,33 +115,33 @@ function SearchPageBottomTab() {
headerGapStyles={styles.searchHeaderGap}
>
{!selectionMode?.isEnabled ? (
<View style={[styles.zIndex10, searchRouterListVisible && styles.flex1, styles.mh100]}>
<View style={[styles.zIndex10, searchAutocompleteListVisible && styles.flex1, styles.mh100]}>
<View style={[styles.zIndex10, styles.appBG]}>
<TopBar
activeWorkspaceID={policyID}
breadcrumbLabel={translate('common.reports')}
shouldDisplaySearch={false}
shouldDisplayCancel={shouldDisplayCancelSearch}
cancelSearch={() => {
if (searchRouterListVisible) {
setSearchRouterListVisible(false);
if (searchAutocompleteListVisible) {
setSearchAutocompleteListVisible(false);
return;
}
Navigation.goBack(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: buildCannedSearchQuery()}));
}}
/>
</View>
<View style={[styles.flex1]}>
<Animated.View style={[topBarAnimatedStyle, !searchRouterListVisible && styles.narrowSearchRouterActiveStyle, styles.narrowSearchHeaderStyle]}>
<Animated.View style={[topBarAnimatedStyle, !searchAutocompleteListVisible && styles.narrowSearchRouterActiveStyle, styles.narrowSearchHeaderStyle]}>
<SearchPageHeader
queryJSON={queryJSON}
searchRouterListVisible={searchRouterListVisible}
searchAutocompleteListVisible={searchAutocompleteListVisible}
onSearchRouterFocus={() => {
topBarOffset.set(StyleUtils.searchHeaderDefaultOffset);
setSearchRouterListVisible(true);
setSearchAutocompleteListVisible(true);
}}
/>
{!searchRouterListVisible && (
{!searchAutocompleteListVisible && (
<SearchStatusBar
queryJSON={queryJSON}
onStatusChange={() => {
Expand All @@ -164,7 +164,7 @@ function SearchPageBottomTab() {
<SearchPageHeader queryJSON={queryJSON} />
</>
)}
<View style={[styles.flex1, searchRouterListVisible && styles.dNone]}>
<View style={[styles.flex1, searchAutocompleteListVisible && styles.dNone]}>
<Search
isSearchScreenFocused={isActiveCentralPaneRoute}
queryJSON={queryJSON}
Expand Down
4 changes: 2 additions & 2 deletions src/styles/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3685,13 +3685,13 @@ const styles = (theme: ThemeColors) =>
paddingHorizontal: 8,
},

searchRouterInputResults: {
searchAutocompleteInputResults: {
backgroundColor: theme.sidebarHover,
borderWidth: 1,
borderColor: theme.sidebarHover,
},

searchRouterInputResultsFocused: {
searchAutocompleteInputResultsFocused: {
borderWidth: 1,
borderColor: theme.success,
backgroundColor: theme.appBG,
Expand Down

0 comments on commit 83a66ac

Please sign in to comment.