fix: moment set firstDayOfWeek issue (#45)

* adjust weekday logic

* add test case

* fix test

* update start date logic

* un-comment

Author: zombieJ

examples/basic.tsx

@@ -37,6 +37,7 @@ export default () => {
         <div style={{ margin: '0 8px' }}>
           <h3>Basic</h3>
           <Picker<Moment> {...sharedProps} locale={zhCN} />
+          <Picker<Moment> {...sharedProps} locale={enUS} />
         </div>
         <div style={{ margin: '0 8px' }}>
           <h3>Uncontrolled</h3>

src/generate/moment.ts

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

src/utils/dateUtil.ts

@@ -1,4 +1,3 @@
-import { noteOnce } from 'rc-util/lib/warning';
 import { GenerateConfig } from '../generate';
 import { NullableDateType, PickerMode } from '../interface';
 
@@ -163,23 +162,9 @@ export function getWeekStartDate<DateType>(
 ) {
   const weekFirstDay = generateConfig.locale.getWeekFirstDay(locale);
   const monthStartDate = generateConfig.setDate(value, 1);
+  const startDateWeekDay = generateConfig.getWeekDay(monthStartDate);
 
-  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;
-  }
+  return generateConfig.addDate(monthStartDate, weekFirstDay - startDateWeekDay);
 }
 
 export function getClosingViewDate<DateType>(

tests/panel.spec.tsx

@@ -437,5 +437,34 @@ describe('Picker.Panel', () => {
         });
       },
     );
+
+    it('update firstDayOfWeek', () => {
+      const defaultFirstDay = moment(enUS.locale)
+        .localeData()
+        .firstDayOfWeek();
+      moment.updateLocale(enUS.locale, {
+        week: {
+          dow: 5,
+        } as any,
+      });
+      expect(defaultFirstDay).toEqual(0);
+
+      const wrapper = mount(
+        <MomentPickerPanel defaultValue={getMoment('2020-04-02')} locale={enUS} />,
+      );
+
+      expect(
+        wrapper
+          .find('td')
+          .first()
+          .text(),
+      ).toEqual('27');
+
+      moment.updateLocale(enUS.locale, {
+        week: {
+          dow: defaultFirstDay,
+        } as any,
+      });
+    });
   });
 });