Merge pull request Expensify#85107 from mukhrr/fix/83389

Author: cead22

src/CONST/index.ts

@@ -9045,8 +9045,11 @@ const CONST = {
         },
         CALENDAR_PICKER: {
             YEAR_PICKER: 'CalendarPicker-YearPicker',
+            MONTH_PICKER: 'CalendarPicker-MonthPicker',
             PREV_MONTH: 'CalendarPicker-PrevMonth',
             NEXT_MONTH: 'CalendarPicker-NextMonth',
+            PREV_YEAR: 'CalendarPicker-PrevYear',
+            NEXT_YEAR: 'CalendarPicker-NextYear',
             DAY: 'CalendarPicker-Day',
         },
         PREV_NEXT_BUTTONS: {

src/components/DatePicker/CalendarPicker/MonthPickerModal.tsx

@@ -0,0 +1,109 @@
+import React, {useEffect, useMemo, useState} from 'react';
+import {Keyboard} from 'react-native';
+import HeaderWithBackButton from '@components/HeaderWithBackButton';
+import Modal from '@components/Modal';
+import ScreenWrapper from '@components/ScreenWrapper';
+import SelectionList from '@components/SelectionList';
+import RadioListItem from '@components/SelectionList/ListItem/RadioListItem';
+import useLocalize from '@hooks/useLocalize';
+import useThemeStyles from '@hooks/useThemeStyles';
+import DateUtils from '@libs/DateUtils';
+import CONST from '@src/CONST';
+
+type MonthPickerModalProps = {
+    /** Whether the modal is visible */
+    isVisible: boolean;
+
+    /** Currently selected month (0-indexed) */
+    currentMonth?: number;
+
+    /** The year currently being viewed */
+    currentYear?: number;
+
+    /** A minimum date (earliest) allowed to select */
+    minDate?: Date;
+
+    /** A maximum date (latest) allowed to select */
+    maxDate?: Date;
+
+    /** Function to call when the user selects a month */
+    onMonthChange?: (month: number) => void;
+
+    /** Function to call when the user closes the month picker */
+    onClose?: () => void;
+};
+
+function MonthPickerModal({isVisible, currentMonth = new Date().getMonth(), currentYear = new Date().getFullYear(), minDate, maxDate, onMonthChange, onClose}: MonthPickerModalProps) {
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const [searchText, setSearchText] = useState('');
+    const monthNames = DateUtils.getMonthNames();
+
+    const allMonths = useMemo(() => DateUtils.getFilteredMonthItems(monthNames, currentYear, currentMonth, minDate, maxDate), [monthNames, currentMonth, currentYear, minDate, maxDate]);
+
+    const {data, headerMessage} = useMemo(() => {
+        const filteredMonths = searchText === '' ? allMonths : allMonths.filter((month) => month.text.toLowerCase().includes(searchText.toLowerCase()));
+        return {
+            headerMessage: !filteredMonths.length ? translate('common.noResultsFound') : '',
+            data: filteredMonths,
+        };
+    }, [allMonths, searchText, translate]);
+
+    useEffect(() => {
+        if (isVisible) {
+            return;
+        }
+        setSearchText('');
+    }, [isVisible]);
+
+    const textInputOptions = useMemo(
+        () => ({
+            label: translate('monthPickerPage.selectMonth'),
+            value: searchText,
+            onChangeText: setSearchText,
+            headerMessage,
+        }),
+        [headerMessage, searchText, translate],
+    );
+
+    return (
+        <Modal
+            type={CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED}
+            isVisible={isVisible}
+            onClose={() => onClose?.()}
+            onModalHide={onClose}
+            shouldHandleNavigationBack
+            shouldUseCustomBackdrop
+            onBackdropPress={onClose}
+            enableEdgeToEdgeBottomSafeAreaPadding
+        >
+            <ScreenWrapper
+                style={[styles.pb0]}
+                includePaddingTop={false}
+                enableEdgeToEdgeBottomSafeAreaPadding
+                testID="MonthPickerModal"
+            >
+                <HeaderWithBackButton
+                    title={translate('monthPickerPage.month')}
+                    onBackButtonPress={onClose}
+                />
+                <SelectionList
+                    data={data}
+                    ListItem={RadioListItem}
+                    onSelectRow={(option) => {
+                        Keyboard.dismiss();
+                        onMonthChange?.(option.value);
+                    }}
+                    textInputOptions={textInputOptions}
+                    initiallyFocusedItemKey={currentMonth.toString()}
+                    disableMaintainingScrollPosition
+                    addBottomSafeAreaPadding
+                    shouldStopPropagation
+                    showScrollIndicator
+                />
+            </ScreenWrapper>
+        </Modal>
+    );
+}
+
+export default MonthPickerModal;

src/components/DatePicker/CalendarPicker/index.tsx

@@ -1,4 +1,22 @@
-import {addMonths, endOfDay, endOfMonth, format, getYear, isSameDay, parseISO, setDate, setYear, startOfDay, startOfMonth, subMonths} from 'date-fns';
+import {
+    addMonths,
+    addYears,
+    endOfDay,
+    endOfMonth,
+    endOfYear,
+    format,
+    getYear,
+    isSameDay,
+    parseISO,
+    setDate,
+    setMonth,
+    setYear,
+    startOfDay,
+    startOfMonth,
+    startOfYear,
+    subMonths,
+    subYears,
+} from 'date-fns';
 import {Str} from 'expensify-common';
 import React, {useCallback, useEffect, useRef, useState} from 'react';
 import type {StyleProp, ViewStyle} from 'react-native';
@@ -15,6 +33,7 @@ import CONST from '@src/CONST';
 import ArrowIcon from './ArrowIcon';
 import Day from './Day';
 import generateMonthMatrix from './generateMonthMatrix';
+import MonthPickerModal from './MonthPickerModal';
 import type CalendarPickerListItem from './types';
 import YearPickerModal from './YearPickerModal';
 
@@ -68,8 +87,10 @@ function CalendarPicker({
     const themeStyles = useThemeStyles();
     const {translate} = useLocalize();
     const pressableRef = useRef<View>(null);
+    const monthPressableRef = useRef<View>(null);
     const [currentDateView, setCurrentDateView] = useState(() => getInitialCurrentDateView(value, minDate, maxDate));
     const [isYearPickerVisible, setIsYearPickerVisible] = useState(false);
+    const [isMonthPickerVisible, setIsMonthPickerVisible] = useState(false);
     const isFirstRender = useRef(true);
 
     const currentMonthView = currentDateView.getMonth();
@@ -104,6 +125,11 @@ function CalendarPicker({
         requestAnimationFrame(() => setIsYearPickerVisible(false));
     };
 
+    const onMonthSelected = (month: number) => {
+        setCurrentDateView((prev) => setMonth(new Date(prev), month));
+        requestAnimationFrame(() => setIsMonthPickerVisible(false));
+    };
+
     /**
      * Calls the onSelected function with the selected date.
      * @param day - The day of the month that was selected.
@@ -153,10 +179,34 @@ function CalendarPicker({
         });
     };
 
+    const moveToPrevYear = () => {
+        setCurrentDateView((prev) => {
+            let prevYear = subYears(new Date(prev), 1);
+            if (prevYear < new Date(minDate)) {
+                prevYear = new Date(minDate);
+            }
+            setYears((prevYears) => prevYears.map((item) => ({...item, isSelected: item.value === prevYear.getFullYear()})));
+            return prevYear;
+        });
+    };
+
+    const moveToNextYear = () => {
+        setCurrentDateView((prev) => {
+            let nextYear = addYears(new Date(prev), 1);
+            if (nextYear > new Date(maxDate)) {
+                nextYear = new Date(maxDate);
+            }
+            setYears((prevYears) => prevYears.map((item) => ({...item, isSelected: item.value === nextYear.getFullYear()})));
+            return nextYear;
+        });
+    };
+
     const monthNames = DateUtils.getMonthNames().map((month) => Str.UCFirst(month));
     const daysOfWeek = DateUtils.getDaysOfWeek().map((day) => day.toUpperCase());
     const hasAvailableDatesNextMonth = startOfDay(new Date(maxDate)) > endOfMonth(new Date(currentDateView));
     const hasAvailableDatesPrevMonth = endOfDay(new Date(minDate)) < startOfMonth(new Date(currentDateView));
+    const hasAvailableDatesNextYear = startOfDay(new Date(maxDate)) > endOfYear(new Date(currentDateView));
+    const hasAvailableDatesPrevYear = endOfDay(new Date(minDate)) < startOfYear(new Date(currentDateView));
 
     useEffect(() => {
         if (isSmallScreenWidth || isFirstRender.current) {
@@ -178,7 +228,7 @@ function CalendarPicker({
 
     const webOnlyMarginStyle = isSmallScreenWidth ? {} : styles.mh1;
     const calendarContainerStyle = isSmallScreenWidth ? [webOnlyMarginStyle, themeStyles.calendarBodyContainer] : [webOnlyMarginStyle, animatedStyle];
-    const headerPaddingStyle = headerContainerStyle ?? themeStyles.ph5;
+    const headerPaddingStyle = headerContainerStyle ?? themeStyles.ph3;
     // On mobile (isSmallScreenWidth is always true on native), the height animation is skipped
     // so using Animated.View is unnecessary. Using a plain View with collapsable={false} avoids
     // activating Reanimated's Fabric commit hook, which on Android can interfere with React's
@@ -188,49 +238,19 @@ function CalendarPicker({
     const getAccessibilityState = useCallback((isSelected: boolean) => ({selected: isSelected}), []);
 
     return (
-        <View style={[themeStyles.pb4]}>
+        <View style={[themeStyles.pb4, themeStyles.pt1]}>
             <View
-                style={[themeStyles.calendarHeader, themeStyles.flexRow, themeStyles.justifyContentBetween, themeStyles.alignItemsCenter, headerPaddingStyle]}
+                style={[themeStyles.calendarHeader, themeStyles.flexRow, themeStyles.justifyContentBetween, themeStyles.alignItemsCenter, themeStyles.gap3, headerPaddingStyle]}
                 dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
             >
-                <PressableWithFeedback
-                    onPress={() => {
-                        pressableRef?.current?.blur();
-                        setIsYearPickerVisible(true);
-                    }}
-                    ref={pressableRef}
-                    style={[themeStyles.alignItemsCenter, themeStyles.flexRow, themeStyles.flex1, themeStyles.justifyContentStart]}
-                    wrapperStyle={[themeStyles.alignItemsCenter]}
-                    hoverDimmingValue={1}
-                    disabled={years.length <= 1}
-                    testID="currentYearButton"
-                    accessibilityLabel={`${currentYearView}, ${translate('common.currentYear')}`}
-                    role={CONST.ROLE.BUTTON}
-                    sentryLabel={CONST.SENTRY_LABEL.CALENDAR_PICKER.YEAR_PICKER}
-                >
-                    <Text
-                        style={themeStyles.sidebarLinkTextBold}
-                        testID="currentYearText"
-                    >
-                        {currentYearView}
-                    </Text>
-                    <ArrowIcon disabled={years.length <= 1} />
-                </PressableWithFeedback>
-                <View style={[themeStyles.alignItemsCenter, themeStyles.flexRow, themeStyles.flex1, themeStyles.justifyContentEnd, themeStyles.mrn2]}>
-                    <Text
-                        style={themeStyles.sidebarLinkTextBold}
-                        testID="currentMonthText"
-                        accessibilityLabel={`${monthNames.at(currentMonthView)}, ${translate('common.currentMonth')}`}
-                    >
-                        {monthNames.at(currentMonthView)}
-                    </Text>
+                <View style={[themeStyles.alignItemsCenter, themeStyles.flexRow, {flex: 3}]}>
                     <PressableWithFeedback
                         shouldUseAutoHitSlop={false}
                         testID="prev-month-arrow"
                         disabled={!hasAvailableDatesPrevMonth}
                         onPress={moveToPrevMonth}
                         hoverDimmingValue={1}
-                        accessibilityLabel={translate('common.previous')}
+                        accessibilityLabel={translate('common.previousMonth')}
                         role={CONST.ROLE.BUTTON}
                         sentryLabel={CONST.SENTRY_LABEL.CALENDAR_PICKER.PREV_MONTH}
                     >
@@ -239,19 +259,96 @@ function CalendarPicker({
                             direction={CONST.DIRECTION.LEFT}
                         />
                     </PressableWithFeedback>
+                    <View style={[themeStyles.flex1, themeStyles.alignItemsCenter]}>
+                        <PressableWithFeedback
+                            onPress={() => {
+                                monthPressableRef?.current?.blur();
+                                setIsMonthPickerVisible(true);
+                            }}
+                            ref={monthPressableRef}
+                            style={[themeStyles.alignItemsCenter]}
+                            wrapperStyle={[themeStyles.alignItemsCenter]}
+                            hoverDimmingValue={1}
+                            testID="currentMonthButton"
+                            accessibilityLabel={`${monthNames.at(currentMonthView)}, ${translate('common.currentMonth')}`}
+                            role={CONST.ROLE.BUTTON}
+                            sentryLabel={CONST.SENTRY_LABEL.CALENDAR_PICKER.MONTH_PICKER}
+                        >
+                            <Text
+                                style={themeStyles.sidebarLinkTextBold}
+                                testID="currentMonthText"
+                                numberOfLines={1}
+                            >
+                                {monthNames.at(currentMonthView)}
+                            </Text>
+                        </PressableWithFeedback>
+                    </View>
                     <PressableWithFeedback
                         shouldUseAutoHitSlop={false}
                         testID="next-month-arrow"
                         disabled={!hasAvailableDatesNextMonth}
                         onPress={moveToNextMonth}
                         hoverDimmingValue={1}
-                        accessibilityLabel={translate('common.next')}
+                        accessibilityLabel={translate('common.nextMonth')}
                         role={CONST.ROLE.BUTTON}
                         sentryLabel={CONST.SENTRY_LABEL.CALENDAR_PICKER.NEXT_MONTH}
                     >
                         <ArrowIcon disabled={!hasAvailableDatesNextMonth} />
                     </PressableWithFeedback>
                 </View>
+                <View style={[themeStyles.alignItemsCenter, themeStyles.flexRow, {flex: 2}]}>
+                    <PressableWithFeedback
+                        shouldUseAutoHitSlop={false}
+                        testID="prev-year-arrow"
+                        disabled={!hasAvailableDatesPrevYear}
+                        onPress={moveToPrevYear}
+                        hoverDimmingValue={1}
+                        accessibilityLabel={translate('common.previousYear')}
+                        role={CONST.ROLE.BUTTON}
+                        sentryLabel={CONST.SENTRY_LABEL.CALENDAR_PICKER.PREV_YEAR}
+                    >
+                        <ArrowIcon
+                            disabled={!hasAvailableDatesPrevYear}
+                            direction={CONST.DIRECTION.LEFT}
+                        />
+                    </PressableWithFeedback>
+                    <View style={[themeStyles.flex1, themeStyles.alignItemsCenter]}>
+                        <PressableWithFeedback
+                            onPress={() => {
+                                pressableRef?.current?.blur();
+                                setIsYearPickerVisible(true);
+                            }}
+                            ref={pressableRef}
+                            style={[themeStyles.alignItemsCenter]}
+                            wrapperStyle={[themeStyles.alignItemsCenter]}
+                            hoverDimmingValue={1}
+                            disabled={years.length <= 1}
+                            testID="currentYearButton"
+                            accessibilityLabel={`${currentYearView}, ${translate('common.currentYear')}`}
+                            role={CONST.ROLE.BUTTON}
+                            sentryLabel={CONST.SENTRY_LABEL.CALENDAR_PICKER.YEAR_PICKER}
+                        >
+                            <Text
+                                style={themeStyles.sidebarLinkTextBold}
+                                testID="currentYearText"
+                            >
+                                {currentYearView}
+                            </Text>
+                        </PressableWithFeedback>
+                    </View>
+                    <PressableWithFeedback
+                        shouldUseAutoHitSlop={false}
+                        testID="next-year-arrow"
+                        disabled={!hasAvailableDatesNextYear}
+                        onPress={moveToNextYear}
+                        hoverDimmingValue={1}
+                        accessibilityLabel={translate('common.nextYear')}
+                        role={CONST.ROLE.BUTTON}
+                        sentryLabel={CONST.SENTRY_LABEL.CALENDAR_PICKER.NEXT_YEAR}
+                    >
+                        <ArrowIcon disabled={!hasAvailableDatesNextYear} />
+                    </PressableWithFeedback>
+                </View>
             </View>
             <View style={[themeStyles.flexRow, webOnlyMarginStyle]}>
                 {daysOfWeek.map((dayOfWeek) => (
@@ -332,6 +429,15 @@ function CalendarPicker({
                 onYearChange={onYearSelected}
                 onClose={() => setIsYearPickerVisible(false)}
             />
+            <MonthPickerModal
+                isVisible={isMonthPickerVisible}
+                currentMonth={currentMonthView}
+                currentYear={currentYearView}
+                minDate={minDate}
+                maxDate={maxDate}
+                onMonthChange={onMonthSelected}
+                onClose={() => setIsMonthPickerVisible(false)}
+            />
         </View>
     );
 }