Skip to content

Commit 85866a4

Browse files
committed
getItemIndex - improve comparison by not using isSameMonth tool
1 parent f3880c8 commit 85866a4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/incubator/Calendar/helpers/CalendarProcessor.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

22
export function generateMonthItems(date: number, pastRange: number, futureRange: number) {
3-
const currentDate = new Date(date);
4-
const currentYear = currentDate.getFullYear();
3+
const currentYear = new Date(date).getFullYear();
54
const monthItems = [];
65
for (let year = currentYear - pastRange; year <= currentYear + futureRange; year++) {
76
for (let month = 0; month < 12; month++) {

src/incubator/Calendar/index.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {FlashListPackage} from 'optionalDeps';
44
import {Constants} from '../../commons/new';
55
import {generateMonthItems} from './helpers/CalendarProcessor';
66
import {addHeaders} from './helpers/DataProcessor';
7-
import {isSameMonth, getTimestamp, addYears} from './helpers/DateUtils';
7+
import {isSameMonth, getTimestamp, addYears, getDateObject} from './helpers/DateUtils';
88
import {CalendarContextProps, CalendarProps, FirstDayOfWeek, UpdateSource, DateObjectWithOptionalDay} from './types';
99
import CalendarContext from './CalendarContext';
1010
import CalendarItem from './CalendarItem';
@@ -36,8 +36,9 @@ function Calendar(props: PropsWithChildren<CalendarProps>) {
3636

3737
const getItemIndex = useCallback((date: number) => {
3838
'worklet';
39+
const dateObject = getDateObject(date);
3940
for (let i = 0; i < items.length; i++) {
40-
if (isSameMonth(items[i], date)) {
41+
if (items[i].month === dateObject.month) {
4142
return i;
4243
}
4344
}

0 commit comments

Comments
 (0)