Skip to content

Commit 27ccc64

Browse files
authored
Merge pull request Expensify#89112 from Expensify/claude-fixNarrowSearchTabHighlight
Fix inconsistent LHN tab highlighting on mobile when filters applied
2 parents 9dac396 + 8b901d9 commit 27ccc64

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

src/hooks/useSearchTypeMenuSections.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,12 @@ const useSearchTypeMenuSections = (queryParams?: UseSearchTypeMenuSectionsParams
168168
return -1;
169169
}, [typeMenuSections, savedSearches, hash, similarSearchHash, sortBy, sortOrder, type]);
170170

171+
const activeKey = activeItemIndex < 0 ? undefined : typeMenuSections.flatMap((section) => section.menuItems).at(activeItemIndex)?.key;
172+
171173
return {
172174
typeMenuSections,
173175
activeItemIndex,
176+
activeKey,
174177
};
175178
};
176179

src/pages/Search/SearchTypeMenuNarrow.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,13 @@ function SearchTypeMenuNarrow({queryJSON, onTabPress}: SearchTypeMenuNarrowProps
7575
const {translate} = useLocalize();
7676
const {isOffline} = useNetwork();
7777
const navigation = useNavigation();
78-
const {typeMenuSections} = useSearchTypeMenuSections();
78+
const {typeMenuSections, activeKey: activeTypeMenuKey} = useSearchTypeMenuSections({
79+
hash: queryJSON?.hash,
80+
similarSearchHash: queryJSON?.similarSearchHash,
81+
sortBy: queryJSON?.sortBy,
82+
sortOrder: queryJSON?.sortOrder,
83+
type: queryJSON?.type,
84+
});
7985
const personalDetails = usePersonalDetails();
8086
const feedKeysWithCards = useFeedKeysWithAssignedCards();
8187
const [restoreFocusType, setRestoreFocusType] = useState<BaseModalProps['restoreFocusType']>();
@@ -188,7 +194,7 @@ function SearchTypeMenuNarrow({queryJSON, onTabPress}: SearchTypeMenuNarrowProps
188194
badgeText,
189195
});
190196
queryMap.set(item.key, {query: item.searchQuery});
191-
if (item.similarSearchHash === queryJSON?.similarSearchHash) {
197+
if (item.key === activeTypeMenuKey) {
192198
activeKey = item.key;
193199
}
194200
}

0 commit comments

Comments
 (0)