test: Update test coverage

Author: zombieJ

src/generate/index.ts

@@ -16,7 +16,6 @@ export interface GenerateConfig<DateType> {
   setYear: (value: DateType, year: number) => DateType;
   setMonth: (value: DateType, month: number) => DateType;
   setDate: (value: DateType, date: number) => DateType;
-  setWeekDay: (value: DateType, day: number) => DateType;
   setHour: (value: DateType, hour: number) => DateType;
   setMinute: (value: DateType, minute: number) => DateType;
   setSecond: (value: DateType, second: number) => DateType;

src/generate/moment.ts

@@ -39,12 +39,6 @@ const generateConfig: GenerateConfig<Moment> = {
     clone.month(month);
     return clone;
   },
-  setWeekDay: (date, day) => {
-    const clone = date.clone();
-    clone.locale('en_US');
-    clone.weekday(day);
-    return clone;
-  },
   setDate: (date, num) => {
     const clone = date.clone();
     clone.date(num);

src/hooks/useWeekDisabled.ts

@@ -14,11 +14,6 @@ export default function useWeekDisabled<DateType>({
   const disabledCache = React.useMemo(() => new Map<string, boolean>(), [
     disabledDate,
   ]);
-  const firstDay = React.useMemo(
-    () => generateConfig.locale.getWeekFirstDay(locale.locale),
-    [locale.locale],
-  );
-
   function disabledWeekDate(date: DateType): boolean {
     const weekStr = generateConfig.locale.format(
       locale.locale,
@@ -27,28 +22,28 @@ export default function useWeekDisabled<DateType>({
     );
 
     if (!disabledCache.has(weekStr)) {
-      const weekDay = generateConfig.getWeekDay(date);
-      let weekStartDate: DateType;
-
-      // Set start week date
-      if (weekDay < firstDay) {
-        weekStartDate = generateConfig.setWeekDay(
-          generateConfig.addDate(date, -7),
-          firstDay,
-        );
-      } else {
-        weekStartDate = generateConfig.setWeekDay(date, firstDay);
-      }
-
-      // Loop to find disabled status
       let disabled = false;
-      for (let i = 0; i < 7; i += 1) {
-        const currentDate = generateConfig.setWeekDay(weekStartDate, i);
-        if (disabledDate(currentDate)) {
-          disabled = true;
-          break;
+      const checkDisabled = (offset: 1 | -1) => {
+        for (let i = 0; i < 7; i += 1) {
+          const currentDate = generateConfig.addDate(date, i * offset);
+          const currentWeekStr = generateConfig.locale.format(
+            locale.locale,
+            currentDate,
+            'YYYY-WW',
+          );
+
+          if (currentWeekStr !== weekStr) {
+            break;
+          }
+
+          if (disabledDate(currentDate)) {
+            disabled = true;
+            break;
+          }
         }
-      }
+      };
+      checkDisabled(1);
+      checkDisabled(-1);
 
       disabledCache.set(weekStr, disabled);
     }

src/utils/dateUtil.ts

@@ -1,6 +1,6 @@
 import { noteOnce } from 'rc-util/lib/warning';
 import { GenerateConfig } from '../generate';
-import { NullableDateType, PickerMode, Locale } from '../interface';
+import { NullableDateType, PickerMode } from '../interface';
 
 export const WEEK_DAY_COUNT = 7;
 
@@ -109,23 +109,6 @@ export function isSameWeek<DateType>(
   );
 }
 
-export function isSameWeekDay<DateType>(
-  generateConfig: GenerateConfig<DateType>,
-  week1: NullableDateType<DateType>,
-  week2: NullableDateType<DateType>,
-  locale: Locale,
-) {
-  const equal = isNullEqual(week1, week2);
-  if (typeof equal === 'boolean') {
-    return equal;
-  }
-
-  return (
-    generateConfig.locale.format(locale.locale, week1!, 'YYYY-WW') ===
-    generateConfig.locale.format(locale.locale, week2!, 'YYYY-WW')
-  );
-}
-
 export function isEqual<DateType>(
   generateConfig: GenerateConfig<DateType>,
   value1: NullableDateType<DateType>,

tests/range.spec.tsx

@@ -11,6 +11,7 @@ import {
   MomentRangePicker,
   Wrapper,
 } from './util/commonUtil';
+import zhCN from '../src/locale/zh_CN';
 
 describe('Picker.Range', () => {
   function matchValues(wrapper: Wrapper, value1: string, value2: string) {
@@ -166,6 +167,19 @@ describe('Picker.Range', () => {
     expect(onChange).not.toHaveBeenCalled();
   });
 
+  it('week picker can not click before start week', () => {
+    const wrapper = mount(<MomentRangePicker picker="week" locale={zhCN} />);
+    wrapper.openPicker();
+    wrapper.selectCell(11);
+
+    expect(
+      wrapper.findCell(4).hasClass('rc-picker-cell-disabled'),
+    ).toBeTruthy();
+    expect(
+      wrapper.findCell(11).hasClass('rc-picker-cell-disabled'),
+    ).toBeFalsy();
+  });
+
   it('Reset when startDate is after endDate', () => {
     const onChange = jest.fn();
     const wrapper = mount(<MomentRangePicker onChange={onChange} />);