From 55e4bce6f31b611d8c610af4ae1604323666b8a6 Mon Sep 17 00:00:00 2001 From: jacobkim9881 Date: Tue, 19 Nov 2024 10:45:57 +0900 Subject: [PATCH 1/2] fix: add navigating back to Calendar on Chrome mWeb --- src/components/DatePicker/CalendarPicker/YearPickerModal.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx b/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx index 6170b81073a2..3c4bb94d1b6d 100644 --- a/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx +++ b/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx @@ -6,6 +6,7 @@ import SelectionList from '@components/SelectionList'; import RadioListItem from '@components/SelectionList/RadioListItem'; import useLocalize from '@hooks/useLocalize'; import useThemeStyles from '@hooks/useThemeStyles'; +import * as Browser from '@libs/Browser'; import CONST from '@src/CONST'; import type CalendarPickerListItem from './types'; @@ -53,6 +54,7 @@ function YearPickerModal({isVisible, years, currentYear = new Date().getFullYear onModalHide={onClose} hideModalContentWhileAnimating useNativeDriver + shouldHandleNavigationBack={Browser.isMobileChrome()} > Date: Wed, 27 Nov 2024 12:10:44 +0900 Subject: [PATCH 2/2] fix: shouldHandleNavigationBack works for YearPickerModal on all platforms --- src/components/DatePicker/CalendarPicker/YearPickerModal.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx b/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx index 3c4bb94d1b6d..7dcec93b1cd3 100644 --- a/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx +++ b/src/components/DatePicker/CalendarPicker/YearPickerModal.tsx @@ -6,7 +6,6 @@ import SelectionList from '@components/SelectionList'; import RadioListItem from '@components/SelectionList/RadioListItem'; import useLocalize from '@hooks/useLocalize'; import useThemeStyles from '@hooks/useThemeStyles'; -import * as Browser from '@libs/Browser'; import CONST from '@src/CONST'; import type CalendarPickerListItem from './types'; @@ -54,7 +53,7 @@ function YearPickerModal({isVisible, years, currentYear = new Date().getFullYear onModalHide={onClose} hideModalContentWhileAnimating useNativeDriver - shouldHandleNavigationBack={Browser.isMobileChrome()} + shouldHandleNavigationBack >