Revert "fix ant-design/ant-design#21906 (#38)" (#44)

This reverts commit 9a8c8ce.

Author: zombieJ

src/generate/moment.ts

@@ -5,7 +5,7 @@ import { GenerateConfig } from '.';
 const generateConfig: GenerateConfig<Moment> = {
   // get
   getNow: () => moment(),
-  getWeekDay: date => date.weekday(),
+  getWeekDay: date => date.clone().locale('en_US').weekday(),
   getYear: date => date.year(),
   getMonth: date => date.month(),
   getDate: date => date.date(),

src/utils/dateUtil.ts

@@ -1,3 +1,4 @@
+import { noteOnce } from 'rc-util/lib/warning';
 import { GenerateConfig } from '../generate';
 import { NullableDateType, PickerMode } from '../interface';
 
@@ -160,10 +161,25 @@ export function getWeekStartDate<DateType>(
   generateConfig: GenerateConfig<DateType>,
   value: DateType,
 ) {
+  const weekFirstDay = generateConfig.locale.getWeekFirstDay(locale);
   const monthStartDate = generateConfig.setDate(value, 1);
-  const wd = generateConfig.getWeekDay(monthStartDate);
 
-  return generateConfig.addDate(monthStartDate, -wd);
+  for (let i = 0; i < 7; i += 1) {
+    const current = generateConfig.addDate(monthStartDate, -i);
+    if (generateConfig.getWeekDay(current) === weekFirstDay) {
+      return current;
+    }
+  }
+
+  /* istanbul ignore next */
+  /* eslint-disable no-lone-blocks */
+  {
+    noteOnce(
+      false,
+      'Not find week start date. Please check your `generateConfig`. If using default `generateConfig`, please help to fire a issue.',
+    );
+    return value;
+  }
 }
 
 export function getClosingViewDate<DateType>(

tests/util.spec.tsx

@@ -1,7 +1,6 @@
-import moment from 'moment';
 import momentGenerateConfig from '../src/generate/moment';
 import { toArray } from '../src/utils/miscUtil';
-import { isSameTime, isSameDecade, getWeekStartDate } from '../src/utils/dateUtil';
+import { isSameTime, isSameDecade } from '../src/utils/dateUtil';
 import { getMoment } from './util/commonUtil';
 
 describe('Picker.Util', () => {
@@ -15,57 +14,31 @@ describe('Picker.Util', () => {
   // Time is only for time
   it('isSameTime', () => {
     expect(
-      isSameTime(momentGenerateConfig, getMoment('2000-01-01'), getMoment('1989-11-28')),
+      isSameTime(
+        momentGenerateConfig,
+        getMoment('2000-01-01'),
+        getMoment('1989-11-28'),
+      ),
     ).toBeTruthy();
 
-    expect(isSameTime(momentGenerateConfig, null, getMoment('1989-11-28'))).toBeFalsy();
+    expect(
+      isSameTime(momentGenerateConfig, null, getMoment('1989-11-28')),
+    ).toBeFalsy();
 
     expect(isSameTime(momentGenerateConfig, null, null)).toBeTruthy();
   });
 
   it('isSameDecade', () => {
     expect(isSameDecade(momentGenerateConfig, null, null)).toBeTruthy();
-    expect(isSameDecade(momentGenerateConfig, getMoment('2000-01-02'), null)).toBeFalsy();
-    expect(
-      isSameDecade(momentGenerateConfig, getMoment('1995-01-01'), getMoment('1999-01-01')),
-    ).toBeTruthy();
-  });
-
-  it('getWeekStartDate: en', () => {
     expect(
-      getWeekStartDate('en', momentGenerateConfig, getMoment('2020-03-17').locale('en')).format(
-        'YYYY-MM-DD',
-      ),
-    ).toBe('2020-03-01');
-  });
-
-  it('getWeekStartDate: zh-cn', () => {
+      isSameDecade(momentGenerateConfig, getMoment('2000-01-02'), null),
+    ).toBeFalsy();
     expect(
-      getWeekStartDate(
-        'zh-cn',
+      isSameDecade(
         momentGenerateConfig,
-        getMoment('2020-03-17').locale('zh-cn'),
-      ).format('YYYY-MM-DD'),
-    ).toBe('2020-02-24');
-  });
-
-  describe('week starts from monday', () => {
-    const defaultWeekStartDate = moment.localeData().firstDayOfWeek();
-    const locale = moment.locale();
-
-    beforeAll(() => {
-      moment.updateLocale(locale, { week: { dow: 1 } });
-    });
-    afterAll(() => {
-      moment.updateLocale(locale, { week: { dow: defaultWeekStartDate } });
-    });
-
-    it('getWeekStartDate', () => {
-      expect(
-        getWeekStartDate(locale, momentGenerateConfig, getMoment('2020-03-17')).format(
-          'YYYY-MM-DD',
-        ),
-      ).toBe('2020-02-24');
-    });
+        getMoment('1995-01-01'),
+        getMoment('1999-01-01'),
+      ),
+    ).toBeTruthy();
   });
 });