Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 2 additions & 11 deletions src/components/DatePicker/CalendarPicker/MonthPickerModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,20 @@ type MonthPickerModalProps = {
/** 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) {
function MonthPickerModal({isVisible, currentMonth = new Date().getMonth(), 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 allMonths = useMemo(() => DateUtils.getFilteredMonthItems(monthNames, currentMonth), [monthNames, currentMonth]);

const {data, headerMessage} = useMemo(() => {
const filteredMonths = searchText === '' ? allMonths : allMonths.filter((month) => month.text.toLowerCase().includes(searchText.toLowerCase()));
Expand Down
72 changes: 28 additions & 44 deletions src/components/DatePicker/CalendarPicker/index.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,4 @@
import {
addMonths,
addYears,
endOfDay,
endOfMonth,
endOfYear,
format,
getYear,
isSameDay,
parseISO,
setDate,
setMonth,
setYear,
startOfDay,
startOfMonth,
startOfYear,
subMonths,
subYears,
} from 'date-fns';
import {addMonths, addYears, format, isSameDay, parseISO, setDate, setMonth, setYear, startOfDay, 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';
Expand Down Expand Up @@ -99,8 +81,8 @@ function CalendarPicker({
const initialHeight = (calendarDaysMatrix?.length || CONST.MAX_CALENDAR_PICKER_ROWS) * CONST.CALENDAR_PICKER_DAY_HEIGHT;
const heightValue = useSharedValue(initialHeight);

const minYear = getYear(new Date(minDate));
const maxYear = getYear(new Date(maxDate));
const minYear = CONST.CALENDAR_PICKER.MIN_YEAR;
const maxYear = CONST.CALENDAR_PICKER.MAX_YEAR;

const [years, setYears] = useState<CalendarPickerListItem[]>(() =>
Array.from({length: maxYear - minYear + 1}, (v, i) => i + minYear).map((year) => ({
Expand Down Expand Up @@ -140,12 +122,20 @@ function CalendarPicker({
onSelected?.(format(newCurrentDateView, CONST.DATE.FNS_FORMAT_STRING));
};

const isAtMinBoundary = currentYearView <= CONST.CALENDAR_PICKER.MIN_YEAR && currentMonthView === 0;
const isAtMaxBoundary = currentYearView >= CONST.CALENDAR_PICKER.MAX_YEAR && currentMonthView === 11;
const isAtMinYear = currentYearView <= CONST.CALENDAR_PICKER.MIN_YEAR;
const isAtMaxYear = currentYearView >= CONST.CALENDAR_PICKER.MAX_YEAR;

/**
* Handles the user pressing the previous month arrow of the calendar picker.
*/
const moveToPrevMonth = () => {
setCurrentDateView((prev) => {
const prevMonth = subMonths(new Date(prev), 1);
if (prevMonth.getFullYear() < CONST.CALENDAR_PICKER.MIN_YEAR) {
return prev;
}
// if year is subtracted, we need to update the years list
if (prevMonth.getFullYear() < prev.getFullYear()) {
setYears((prevYears) =>
Expand All @@ -165,6 +155,9 @@ function CalendarPicker({
const moveToNextMonth = () => {
setCurrentDateView((prev) => {
const nextMonth = addMonths(new Date(prev), 1);
if (nextMonth.getFullYear() > CONST.CALENDAR_PICKER.MAX_YEAR) {
return prev;
}
// if year is added, we need to update the years list
if (nextMonth.getFullYear() > prev.getFullYear()) {
setYears((prevYears) =>
Expand All @@ -181,9 +174,9 @@ function CalendarPicker({

const moveToPrevYear = () => {
setCurrentDateView((prev) => {
let prevYear = subYears(new Date(prev), 1);
if (prevYear < new Date(minDate)) {
prevYear = new Date(minDate);
const prevYear = subYears(new Date(prev), 1);
if (prevYear.getFullYear() < CONST.CALENDAR_PICKER.MIN_YEAR) {
return prev;
}
setYears((prevYears) => prevYears.map((item) => ({...item, isSelected: item.value === prevYear.getFullYear()})));
return prevYear;
Expand All @@ -192,9 +185,9 @@ function CalendarPicker({

const moveToNextYear = () => {
setCurrentDateView((prev) => {
let nextYear = addYears(new Date(prev), 1);
if (nextYear > new Date(maxDate)) {
nextYear = new Date(maxDate);
const nextYear = addYears(new Date(prev), 1);
if (nextYear.getFullYear() > CONST.CALENDAR_PICKER.MAX_YEAR) {
return prev;
}
setYears((prevYears) => prevYears.map((item) => ({...item, isSelected: item.value === nextYear.getFullYear()})));
return nextYear;
Expand All @@ -203,11 +196,6 @@ function CalendarPicker({

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) {
isFirstRender.current = false;
Expand Down Expand Up @@ -247,15 +235,15 @@ function CalendarPicker({
<PressableWithFeedback
shouldUseAutoHitSlop={false}
testID="prev-month-arrow"
disabled={!hasAvailableDatesPrevMonth}
disabled={isAtMinBoundary}
onPress={moveToPrevMonth}
hoverDimmingValue={1}
accessibilityLabel={translate('common.previousMonth')}
role={CONST.ROLE.BUTTON}
sentryLabel={CONST.SENTRY_LABEL.CALENDAR_PICKER.PREV_MONTH}
>
<ArrowIcon
disabled={!hasAvailableDatesPrevMonth}
disabled={isAtMinBoundary}
direction={CONST.DIRECTION.LEFT}
/>
</PressableWithFeedback>
Expand Down Expand Up @@ -286,29 +274,29 @@ function CalendarPicker({
<PressableWithFeedback
shouldUseAutoHitSlop={false}
testID="next-month-arrow"
disabled={!hasAvailableDatesNextMonth}
disabled={isAtMaxBoundary}
onPress={moveToNextMonth}
hoverDimmingValue={1}
accessibilityLabel={translate('common.nextMonth')}
role={CONST.ROLE.BUTTON}
sentryLabel={CONST.SENTRY_LABEL.CALENDAR_PICKER.NEXT_MONTH}
>
<ArrowIcon disabled={!hasAvailableDatesNextMonth} />
<ArrowIcon disabled={isAtMaxBoundary} />
</PressableWithFeedback>
</View>
<View style={[themeStyles.alignItemsCenter, themeStyles.flexRow, {flex: 2}]}>
<PressableWithFeedback
shouldUseAutoHitSlop={false}
testID="prev-year-arrow"
disabled={!hasAvailableDatesPrevYear}
Comment thread
mukhrr marked this conversation as resolved.
Resolved
disabled={isAtMinYear}
onPress={moveToPrevYear}
hoverDimmingValue={1}
accessibilityLabel={translate('common.previousYear')}
role={CONST.ROLE.BUTTON}
sentryLabel={CONST.SENTRY_LABEL.CALENDAR_PICKER.PREV_YEAR}
>
<ArrowIcon
disabled={!hasAvailableDatesPrevYear}
disabled={isAtMinYear}
direction={CONST.DIRECTION.LEFT}
/>
</PressableWithFeedback>
Expand All @@ -322,7 +310,6 @@ function CalendarPicker({
style={[themeStyles.alignItemsCenter]}
wrapperStyle={[themeStyles.alignItemsCenter]}
hoverDimmingValue={1}
disabled={years.length <= 1}
testID="currentYearButton"
accessibilityLabel={`${currentYearView}, ${translate('common.currentYear')}`}
role={CONST.ROLE.BUTTON}
Expand All @@ -339,14 +326,14 @@ function CalendarPicker({
<PressableWithFeedback
shouldUseAutoHitSlop={false}
testID="next-year-arrow"
disabled={!hasAvailableDatesNextYear}
disabled={isAtMaxYear}
onPress={moveToNextYear}
hoverDimmingValue={1}
accessibilityLabel={translate('common.nextYear')}
role={CONST.ROLE.BUTTON}
sentryLabel={CONST.SENTRY_LABEL.CALENDAR_PICKER.NEXT_YEAR}
>
<ArrowIcon disabled={!hasAvailableDatesNextYear} />
<ArrowIcon disabled={isAtMaxYear} />
</PressableWithFeedback>
</View>
</View>
Expand Down Expand Up @@ -432,9 +419,6 @@ function CalendarPicker({
<MonthPickerModal
isVisible={isMonthPickerVisible}
currentMonth={currentMonthView}
currentYear={currentYearView}
minDate={minDate}
maxDate={maxDate}
onMonthChange={onMonthSelected}
onClose={() => setIsMonthPickerVisible(false)}
/>
Expand Down
31 changes: 8 additions & 23 deletions src/libs/DateUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import {
parse,
set,
startOfDay,
startOfMonth,
startOfWeek,
subDays,
subMilliseconds,
Expand Down Expand Up @@ -306,29 +305,15 @@ function getMonthNames(): string[] {
}

/**
* Filters month names by min/max date boundaries and returns list items for SelectionList.
* Returns month list items for SelectionList.
*/
function getFilteredMonthItems(monthNames: string[], currentYear: number, currentMonth: number, minDate?: Date, maxDate?: Date) {
const minMonthStart = minDate ? startOfMonth(new Date(minDate)) : undefined;
const maxMonthEnd = maxDate ? endOfMonth(new Date(maxDate)) : undefined;

return monthNames
.map((month, index) => {
const monthStart = startOfMonth(new Date(currentYear, index));
const monthEnd = endOfMonth(new Date(currentYear, index));
const isBeforeMin = minMonthStart ? monthEnd < minMonthStart : false;
const isAfterMax = maxMonthEnd ? monthStart > maxMonthEnd : false;
if (isBeforeMin || isAfterMax) {
return null;
}
return {
text: month.charAt(0).toUpperCase() + month.slice(1),
value: index,
keyForList: index.toString(),
isSelected: index === currentMonth,
};
})
.filter((item): item is NonNullable<typeof item> => item !== null);
function getFilteredMonthItems(monthNames: string[], currentMonth: number) {
return monthNames.map((month, index) => ({
text: month.charAt(0).toUpperCase() + month.slice(1),
value: index,
keyForList: index.toString(),
isSelected: index === currentMonth,
}));
}

/**
Expand Down
Loading
Loading