Skip to content

Commit 83a66ac

Browse files
289Adam289289Adam289
committed
fix names
1 parent c67b428 commit 83a66ac

File tree

5 files changed

+30
-30
lines changed

5 files changed

+30
-30
lines changed

‎src/components/Search/SearchPageHeader/SearchPageHeader.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ import ROUTES from '@src/ROUTES';
3838
import type DeepValueOf from '@src/types/utils/DeepValueOf';
3939
import SearchPageHeaderInput from './SearchPageHeaderInput';
4040

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

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

45-
function SearchPageHeader({queryJSON, searchRouterListVisible, onSearchRouterFocus}: SearchPageHeaderProps) {
45+
function SearchPageHeader({queryJSON, searchAutocompleteListVisible, onSearchRouterFocus}: SearchPageHeaderProps) {
4646
const {translate} = useLocalize();
4747
const theme = useTheme();
4848
const styles = useThemeStyles();
@@ -334,7 +334,7 @@ function SearchPageHeader({queryJSON, searchRouterListVisible, onSearchRouterFoc
334334
onTooltipPress={onFiltersButtonPress}
335335
>
336336
<Button
337-
innerStyles={[styles.searchRouterInputResults, styles.borderNone, styles.bgTransparent]}
337+
innerStyles={[styles.searchAutocompleteInputResults, styles.borderNone, styles.bgTransparent]}
338338
icon={Expensicons.Filters}
339339
onPress={onFiltersButtonPress}
340340
/>
@@ -349,7 +349,7 @@ function SearchPageHeader({queryJSON, searchRouterListVisible, onSearchRouterFoc
349349
styles.bgTransparent,
350350
styles.borderNone,
351351
styles.productTrainingTooltipWrapper,
352-
styles.searchRouterInputResults,
352+
styles.searchAutocompleteInputResults,
353353
translate,
354354
]);
355355

@@ -397,7 +397,7 @@ function SearchPageHeader({queryJSON, searchRouterListVisible, onSearchRouterFoc
397397
return (
398398
<>
399399
<SearchPageHeaderInput
400-
searchRouterListVisible={searchRouterListVisible}
400+
searchAutocompleteListVisible={searchAutocompleteListVisible}
401401
onSearchRouterFocus={onSearchRouterFocus}
402402
queryJSON={queryJSON}
403403
inputRightComponent={InputRightComponent}

‎src/components/Search/SearchPageHeader/SearchPageHeaderInput.tsx

+12-12
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ const ANIMATION_DURATION = 300;
4040

4141
type SearchPageHeaderInputProps = {
4242
queryJSON: SearchQueryJSON;
43-
searchRouterListVisible?: boolean;
43+
searchAutocompleteListVisible?: boolean;
4444
onSearchRouterFocus?: () => void;
4545
inputRightComponent: React.ReactNode;
4646
};
4747

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

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

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

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

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

205205
const animatedPadding = useDerivedValue(() => {
206-
return withTiming(searchRouterListVisible ? 0 : 52, {duration: ANIMATION_DURATION});
207-
}, [searchRouterListVisible]);
206+
return withTiming(searchAutocompleteListVisible ? 0 : 52, {duration: ANIMATION_DURATION});
207+
}, [searchAutocompleteListVisible]);
208208
const inputWrapperStyleTest = useAnimatedStyle(() => {
209209
return {
210210
marginRight: animatedPadding.value,
@@ -232,8 +232,8 @@ function SearchPageHeaderInput({queryJSON, searchRouterListVisible, onSearchRout
232232
listRef.current?.updateAndScrollToFocusedIndex(0);
233233
onSearchRouterFocus?.();
234234
}}
235-
wrapperStyle={[styles.searchRouterInputResults, styles.br2]}
236-
wrapperFocusedStyle={styles.searchRouterInputResultsFocused}
235+
wrapperStyle={[styles.searchAutocompleteInputResults, styles.br2]}
236+
wrapperFocusedStyle={styles.searchAutocompleteInputResultsFocused}
237237
rightComponent={inputRightComponent}
238238
autocompleteListRef={listRef}
239239
ref={textInputRef}
@@ -244,7 +244,7 @@ function SearchPageHeaderInput({queryJSON, searchRouterListVisible, onSearchRout
244244
<SearchTypeMenuPopover queryJSON={queryJSON} />
245245
</View>
246246
</View>
247-
<View style={[styles.flex1, !searchRouterListVisible && styles.dNone]}>
247+
<View style={[styles.flex1, !searchAutocompleteListVisible && styles.dNone]}>
248248
<SearchAutocompleteList
249249
autocompleteQueryValue={autocompleteQueryValue}
250250
searchQueryItem={searchQueryItem}
@@ -298,8 +298,8 @@ function SearchPageHeaderInput({queryJSON, searchRouterListVisible, onSearchRout
298298
autoFocus={false}
299299
onFocus={showAutocompleteList}
300300
onBlur={hideAutocompleteList}
301-
wrapperStyle={[styles.searchRouterInputResults, styles.br2]}
302-
wrapperFocusedStyle={styles.searchRouterInputResultsFocused}
301+
wrapperStyle={[styles.searchAutocompleteInputResults, styles.br2]}
302+
wrapperFocusedStyle={styles.searchAutocompleteInputResultsFocused}
303303
outerWrapperStyle={[inputWrapperActiveStyle, styles.pb2]}
304304
rightComponent={inputRightComponent}
305305
autocompleteListRef={listRef}

‎src/components/Search/SearchPageHeader/SearchTypeMenuPopover.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ function SearchTypeMenuPopover({queryJSON}: SearchTypeMenuNarrowProps) {
177177
return (
178178
<>
179179
<Button
180-
innerStyles={[styles.searchRouterInputResults, styles.borderNone]}
180+
innerStyles={[styles.searchAutocompleteInputResults, styles.borderNone]}
181181
icon={Expensicons.Bookmark}
182182
onPress={openMenu}
183183
/>

‎src/pages/Search/SearchPageBottomTab.tsx

+10-10
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function SearchPageBottomTab() {
3838
const styles = useThemeStyles();
3939
const StyleUtils = useStyleUtils();
4040
const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);
41-
const [searchRouterListVisible, setSearchRouterListVisible] = useState(false);
41+
const [searchAutocompleteListVisible, setSearchAutocompleteListVisible] = useState(false);
4242
const {clearSelectedTransactions} = useSearchContext();
4343

4444
const scrollOffset = useSharedValue(0);
@@ -103,7 +103,7 @@ function SearchPageBottomTab() {
103103
);
104104
}
105105

106-
const shouldDisplayCancelSearch = shouldUseNarrowLayout && (!isCannedSearchQuery(queryJSON) || searchRouterListVisible);
106+
const shouldDisplayCancelSearch = shouldUseNarrowLayout && (!isCannedSearchQuery(queryJSON) || searchAutocompleteListVisible);
107107

108108
if (shouldUseNarrowLayout) {
109109
return (
@@ -115,33 +115,33 @@ function SearchPageBottomTab() {
115115
headerGapStyles={styles.searchHeaderGap}
116116
>
117117
{!selectionMode?.isEnabled ? (
118-
<View style={[styles.zIndex10, searchRouterListVisible && styles.flex1, styles.mh100]}>
118+
<View style={[styles.zIndex10, searchAutocompleteListVisible && styles.flex1, styles.mh100]}>
119119
<View style={[styles.zIndex10, styles.appBG]}>
120120
<TopBar
121121
activeWorkspaceID={policyID}
122122
breadcrumbLabel={translate('common.reports')}
123123
shouldDisplaySearch={false}
124124
shouldDisplayCancel={shouldDisplayCancelSearch}
125125
cancelSearch={() => {
126-
if (searchRouterListVisible) {
127-
setSearchRouterListVisible(false);
126+
if (searchAutocompleteListVisible) {
127+
setSearchAutocompleteListVisible(false);
128128
return;
129129
}
130130
Navigation.goBack(ROUTES.SEARCH_CENTRAL_PANE.getRoute({query: buildCannedSearchQuery()}));
131131
}}
132132
/>
133133
</View>
134134
<View style={[styles.flex1]}>
135-
<Animated.View style={[topBarAnimatedStyle, !searchRouterListVisible && styles.narrowSearchRouterActiveStyle, styles.narrowSearchHeaderStyle]}>
135+
<Animated.View style={[topBarAnimatedStyle, !searchAutocompleteListVisible && styles.narrowSearchRouterActiveStyle, styles.narrowSearchHeaderStyle]}>
136136
<SearchPageHeader
137137
queryJSON={queryJSON}
138-
searchRouterListVisible={searchRouterListVisible}
138+
searchAutocompleteListVisible={searchAutocompleteListVisible}
139139
onSearchRouterFocus={() => {
140140
topBarOffset.set(StyleUtils.searchHeaderDefaultOffset);
141-
setSearchRouterListVisible(true);
141+
setSearchAutocompleteListVisible(true);
142142
}}
143143
/>
144-
{!searchRouterListVisible && (
144+
{!searchAutocompleteListVisible && (
145145
<SearchStatusBar
146146
queryJSON={queryJSON}
147147
onStatusChange={() => {
@@ -164,7 +164,7 @@ function SearchPageBottomTab() {
164164
<SearchPageHeader queryJSON={queryJSON} />
165165
</>
166166
)}
167-
<View style={[styles.flex1, searchRouterListVisible && styles.dNone]}>
167+
<View style={[styles.flex1, searchAutocompleteListVisible && styles.dNone]}>
168168
<Search
169169
isSearchScreenFocused={isActiveCentralPaneRoute}
170170
queryJSON={queryJSON}

‎src/styles/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3685,13 +3685,13 @@ const styles = (theme: ThemeColors) =>
36853685
paddingHorizontal: 8,
36863686
},
36873687

3688-
searchRouterInputResults: {
3688+
searchAutocompleteInputResults: {
36893689
backgroundColor: theme.sidebarHover,
36903690
borderWidth: 1,
36913691
borderColor: theme.sidebarHover,
36923692
},
36933693

3694-
searchRouterInputResultsFocused: {
3694+
searchAutocompleteInputResultsFocused: {
36953695
borderWidth: 1,
36963696
borderColor: theme.success,
36973697
backgroundColor: theme.appBG,

0 commit comments

Comments
 (0)