Skip to content

Fix - iOS Reports - Selection mode persists in Reports after entering selection mode in Categories #57636

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
puneetlath merged 2 commits into from
Mar 3, 2025
Merged

Fix - iOS Reports - Selection mode persists in Reports after entering selection mode in Categories #57636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
598013c
removed shouldAutoTurnOff
FitseTLT Feb 28, 2025
f97b9bb
Merge branch 'main' into fix-resetting-selection-mode-on-page-render-…
FitseTLT Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/components/Search/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ function Search({queryJSON, onSearchListScroll, isSearchScreenFocused, contentCo
lastSearchType,
setLastSearchType,
} = useSearchContext();
const {selectionMode} = useMobileSelectionMode(false);
const {selectionMode} = useMobileSelectionMode();
const [offset, setOffset] = useState(0);

const {type, status, sortBy, sortOrder, hash} = queryJSON;
Expand Down Expand Up @@ -509,7 +509,6 @@ function Search({queryJSON, onSearchListScroll, isSearchScreenFocused, contentCo
? item.transactions.some((transaction) => selectedTransactions[transaction.keyForList]?.isSelected)
: !!item.isSelected
}
shouldAutoTurnOff={false}
onScroll={onSearchListScroll}
onContentSizeChange={onContentSizeChange}
canSelectMultiple={type !== CONST.SEARCH.DATA_TYPES.CHAT && canSelectMultiple}
Expand Down
5 changes: 2 additions & 3 deletions src/components/SelectionListWithModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@ import CONST from '@src/CONST';
type SelectionListWithModalProps<TItem extends ListItem> = BaseSelectionListProps<TItem> & {
turnOnSelectionModeOnLongPress?: boolean;
onTurnOnSelectionMode?: (item: TItem | null) => void;
shouldAutoTurnOff?: boolean;
isSelected?: (item: TItem) => boolean;
isScreenFocused?: boolean;
};

function SelectionListWithModal<TItem extends ListItem>(
{turnOnSelectionModeOnLongPress, onTurnOnSelectionMode, onLongPressRow, isScreenFocused = false, sections, shouldAutoTurnOff, isSelected, ...rest}: SelectionListWithModalProps<TItem>,
{turnOnSelectionModeOnLongPress, onTurnOnSelectionMode, onLongPressRow, isScreenFocused = false, sections, isSelected, ...rest}: SelectionListWithModalProps<TItem>,
ref: ForwardedRef<SelectionListHandle>,
) {
const [isModalVisible, setIsModalVisible] = useState(false);
Expand All @@ -33,7 +32,7 @@ function SelectionListWithModal<TItem extends ListItem>(
const {isSmallScreenWidth} = useResponsiveLayout();
const isFocused = useIsFocused();

const {selectionMode} = useMobileSelectionMode(shouldAutoTurnOff);
const {selectionMode} = useMobileSelectionMode();
// Check if selection should be on when the modal is opened
const wasSelectionOnRef = useRef(false);
// Keep track of the number of selected items to determine if we should turn off selection mode
Expand Down
7 changes: 2 additions & 5 deletions src/hooks/useMobileSelectionMode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,12 @@ import {useOnyx} from 'react-native-onyx';
import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode';
import ONYXKEYS from '@src/ONYXKEYS';

export default function useMobileSelectionMode(shouldAutoTurnOff = true) {
export default function useMobileSelectionMode() {
const [selectionMode] = useOnyx(ONYXKEYS.MOBILE_SELECTION_MODE);

useEffect(() => {
if (!shouldAutoTurnOff) {
return;
}
turnOffMobileSelectionMode();
}, [shouldAutoTurnOff]);
}, []);

return {selectionMode};
}
Loading