Skip to content

fix(WeekPicker):cross year select not selected at panel #751

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

Open
wants to merge 1 commit into
base: 2.7.x
Choose a base branch
from
Open

fix(WeekPicker):cross year select not selected at panel #751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/utils/dateUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,10 @@ export function isSameWeek<DateType>(
if (typeof equal === 'boolean') {
return equal;
}

const weekStartDate1 = generateConfig.locale.getWeekFirstDate(locale, date1!);
const weekStartDate2 = generateConfig.locale.getWeekFirstDate(locale, date2!);
return (
isSameYear(generateConfig, date1!, date2!) &&
isSameYear(generateConfig, weekStartDate1, weekStartDate2) &&
generateConfig.locale.getWeek(locale, date1!) === generateConfig.locale.getWeek(locale, date2!)
);
}
Expand Down
36 changes: 30 additions & 6 deletions tests/util.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import momentGenerateConfig from '../src/generate/moment';
import { getLowerBoundTime, setTime, getLastDay } from '../src/utils/timeUtil';
import { toArray } from '../src/utils/miscUtil';
import { isSameTime, isSameDecade } from '../src/utils/dateUtil';
import { isSameTime, isSameDecade, isSameWeek } from '../src/utils/dateUtil';
import { getMoment } from './util/commonUtil';

describe('Picker.Util', () => {
Expand Down Expand Up @@ -66,11 +66,35 @@ describe('Picker.Util', () => {
});

describe('getLastDay', () => {
expect(getLastDay(momentGenerateConfig, getMoment('2020-10-01'))).toEqual('2020-10-31');
});

it('isSameWeek', () => {
// 2024 CN first date === 2024-01-01 monday
expect(
getLastDay(
momentGenerateConfig,
getMoment('2020-10-01'),
),
).toEqual('2020-10-31');
isSameWeek(momentGenerateConfig, 'zh_CN', getMoment('2023-12-31'), getMoment('2024-01-01')),
).toBeFalsy();
expect(
isSameWeek(momentGenerateConfig, 'zh_CN', getMoment('2023-12-31'), getMoment('2024-12-31')),
).toBeFalsy();
expect(
isSameWeek(momentGenerateConfig, 'zh_CN', getMoment('2024-01-02'), getMoment('2024-01-01')),
).toBeTruthy();
expect(
isSameWeek(momentGenerateConfig, 'zh_CN', getMoment('2024-01-02'), getMoment('2024-03-01')),
).toBeFalsy();
// 2024 US first date === 2023-12-31 sunday
expect(
isSameWeek(momentGenerateConfig, 'en_US', getMoment('2023-12-31'), getMoment('2024-01-01')),
).toBeTruthy();
expect(
isSameWeek(momentGenerateConfig, 'en_US', getMoment('2023-12-31'), getMoment('2024-12-31')),
).toBeFalsy();
expect(
isSameWeek(momentGenerateConfig, 'en_US', getMoment('2024-01-02'), getMoment('2024-01-01')),
).toBeTruthy();
expect(
isSameWeek(momentGenerateConfig, 'en_US', getMoment('2024-01-02'), getMoment('2024-03-01')),
).toBeFalsy();
});
});