Revert "fix: On selecting a category/ tags by multiple tapping, user …

…directed to conversation page."
Expensify · Jan 29, 2025 · bd7fc43 · bd7fc43
1 parent 242b4c9
commit bd7fc43
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
@@ -361,9 +361,6 @@ function BaseSelectionList<TItem extends ListItem>(
      */
     const selectRow = useCallback(
         (item: TItem, indexToFocus?: number) => {
-            if (!isFocused) {
-                return;
-            }
             // In single-selection lists we don't care about updating the focused index, because the list is closed after selecting an item
             if (canSelectMultiple) {
                 if (sections.length > 1) {
@@ -404,7 +401,6 @@ function BaseSelectionList<TItem extends ListItem>(
             setFocusedIndex,
             onSelectRow,
             shouldPreventDefaultFocusOnSelectRow,
-            isFocused,
         ],
     );
 

diff --git a/src/pages/WorkspaceSwitcherPage/index.tsx b/src/pages/WorkspaceSwitcherPage/index.tsx
@@ -1,3 +1,4 @@
+import {useIsFocused} from '@react-navigation/native';
 import React, {useCallback, useMemo} from 'react';
 import {useOnyx} from 'react-native-onyx';
 import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
@@ -38,6 +39,7 @@ function WorkspaceSwitcherPage() {
     const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
     const {translate} = useLocalize();
     const {activeWorkspaceID, setActiveWorkspaceID} = useActiveWorkspace();
+    const isFocused = useIsFocused();
 
     const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
     const [reportActions] = useOnyx(ONYXKEYS.COLLECTION.REPORT_ACTIONS);
@@ -81,14 +83,17 @@ function WorkspaceSwitcherPage() {
 
     const selectPolicy = useCallback(
         (policyID?: string) => {
+            if (!isFocused) {
+                return;
+            }
             const newPolicyID = policyID === activeWorkspaceID ? undefined : policyID;
 
             Navigation.goBack();
             // On native platforms, we will see a blank screen if we navigate to a new HomeScreen route while navigating back at the same time.
             // Therefore we delay switching the workspace until after back navigation, using the InteractionManager.
             switchPolicyAfterInteractions(newPolicyID, () => setActiveWorkspaceID(newPolicyID));
         },
-        [activeWorkspaceID, setActiveWorkspaceID],
+        [activeWorkspaceID, setActiveWorkspaceID, isFocused],
     );
 
     const usersWorkspaces = useMemo<WorkspaceListItem[]>(() => {

diff --git a/tests/unit/BaseSelectionListTest.tsx b/tests/unit/BaseSelectionListTest.tsx
@@ -1,4 +1,3 @@
-import * as NativeNavigation from '@react-navigation/native';
 import {fireEvent, render, screen} from '@testing-library/react-native';
 import BaseSelectionList from '@components/SelectionList/BaseSelectionList';
 import RadioListItem from '@components/SelectionList/RadioListItem';
@@ -42,15 +41,7 @@ describe('BaseSelectionList', () => {
         );
     }
 
-    it('should not trigger item press if screen is not focused', () => {
-        (NativeNavigation.useIsFocused as jest.Mock).mockReturnValue(false);
-        render(<BaseListItemRenderer sections={mockSections} />);
-        fireEvent.press(screen.getByTestId(`${CONST.BASE_LIST_ITEM_TEST_ID}1`));
-        expect(onSelectRowMock).toHaveBeenCalledTimes(0);
-    });
-
     it('should handle item press correctly', () => {
-        (NativeNavigation.useIsFocused as jest.Mock).mockReturnValue(true);
         render(<BaseListItemRenderer sections={mockSections} />);
         fireEvent.press(screen.getByTestId(`${CONST.BASE_LIST_ITEM_TEST_ID}1`));
         expect(onSelectRowMock).toHaveBeenCalledWith({
@@ -64,7 +55,6 @@ describe('BaseSelectionList', () => {
             ...section,
             isSelected: section.keyForList === '2',
         }));
-        (NativeNavigation.useIsFocused as jest.Mock).mockReturnValue(true);
         const {rerender} = render(<BaseListItemRenderer sections={mockSections} />);
         expect(screen.getByTestId(`${CONST.BASE_LIST_ITEM_TEST_ID}1`)).toBeSelected();
         rerender(<BaseListItemRenderer sections={updatedMockSections} />);