@douyinfe/semi-foundation 2.24.0 → 2.24.1

package/datePicker/yearAndMonthFoundation.ts

@@ -1,3 +1,4 @@
+import { setMonth, setYear } from 'date-fns';
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
 import { PresetPosition } from './foundation';
 
@@ -26,7 +27,7 @@ export interface YearAndMonthFoundationState {
     currentMonth: number
 }
 export interface YearAndMonthAdapter extends DefaultAdapter<YearAndMonthFoundationProps, YearAndMonthFoundationState> {
-    setCurrentYear: (currentYear: number) => void;
+    setCurrentYear: (currentYear: number, cb?: () => void) => void;
     setCurrentMonth: (currentMonth: number) => void;
     notifySelectYear: (year: number) => void;
     notifySelectMonth: (month: number) => void;
@@ -61,7 +62,7 @@ export default class YearAndMonthFoundation extends BaseFoundation<YearAndMonthA
 
     selectYear(item: YearScrollItem) {
         const year = item.value;
-        this._adapter.setCurrentYear(year);
+        this._adapter.setCurrentYear(year, () => this.autoSelectMonth(item));
         this._adapter.notifySelectYear(year);
     }
 
@@ -71,6 +72,29 @@ export default class YearAndMonthFoundation extends BaseFoundation<YearAndMonthA
         this._adapter.notifySelectMonth(month);
     }
 
+    /**
+     * After selecting a year, if the currentMonth is disabled, automatically select a non-disabled month
+     */
+    autoSelectMonth(item: YearScrollItem) {
+        const { disabledDate, locale } = this._adapter.getProps();
+        const { months, currentMonth } = this._adapter.getStates();
+
+        const currentDate = setYear(Date.now(), item.year);
+        const isCurrentMonthDisabled = disabledDate(setMonth(currentDate, currentMonth - 1));
+        if (isCurrentMonthDisabled) {
+            const currentIndex = months.findIndex(({ month }) => month === currentMonth);
+            let validMonth: typeof months[number];
+            // First look in the back, if you can't find it in the back, then look in the front
+            validMonth = months.slice(currentIndex).find(({ month }) => !disabledDate(setMonth(currentDate, month - 1)));
+            if (!validMonth) {
+                validMonth = months.slice(0, currentIndex).find(({ month }) => !disabledDate(setMonth(currentDate, month - 1)));
+            }
+            if (validMonth) {
+                this.selectMonth({ month: validMonth.month, value: locale.fullMonths[validMonth.month], disabled: false });
+            }
+        }
+    }
+
     backToMain() {
         this._adapter.notifyBackToMain();
     }

package/lib/cjs/datePicker/yearAndMonthFoundation.d.ts

@@ -33,7 +33,7 @@ export interface YearAndMonthFoundationState {
     currentMonth: number;
 }
 export interface YearAndMonthAdapter extends DefaultAdapter<YearAndMonthFoundationProps, YearAndMonthFoundationState> {
-    setCurrentYear: (currentYear: number) => void;
+    setCurrentYear: (currentYear: number, cb?: () => void) => void;
     setCurrentMonth: (currentMonth: number) => void;
     notifySelectYear: (year: number) => void;
     notifySelectMonth: (month: number) => void;
@@ -57,5 +57,9 @@ export default class YearAndMonthFoundation extends BaseFoundation<YearAndMonthA
     destroy(): void;
     selectYear(item: YearScrollItem): void;
     selectMonth(item: MonthScrollItem): void;
+    /**
+     * After selecting a year, if the currentMonth is disabled, automatically select a non-disabled month
+     */
+    autoSelectMonth(item: YearScrollItem): void;
     backToMain(): void;
 }

package/lib/cjs/datePicker/yearAndMonthFoundation.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _dateFns = require("date-fns");
+
 var _foundation = _interopRequireDefault(require("../base/foundation"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -23,7 +25,7 @@ class YearAndMonthFoundation extends _foundation.default {
   selectYear(item) {
     const year = item.value;
 
-    this._adapter.setCurrentYear(year);
+    this._adapter.setCurrentYear(year, () => this.autoSelectMonth(item));
 
     this._adapter.notifySelectYear(year);
   }
@@ -37,6 +39,59 @@ class YearAndMonthFoundation extends _foundation.default {
 
     this._adapter.notifySelectMonth(month);
   }
+  /**
+   * After selecting a year, if the currentMonth is disabled, automatically select a non-disabled month
+   */
+
+
+  autoSelectMonth(item) {
+    const {
+      disabledDate,
+      locale
+    } = this._adapter.getProps();
+
+    const {
+      months,
+      currentMonth
+    } = this._adapter.getStates();
+
+    const currentDate = (0, _dateFns.setYear)(Date.now(), item.year);
+    const isCurrentMonthDisabled = disabledDate((0, _dateFns.setMonth)(currentDate, currentMonth - 1));
+
+    if (isCurrentMonthDisabled) {
+      const currentIndex = months.findIndex(_ref => {
+        let {
+          month
+        } = _ref;
+        return month === currentMonth;
+      });
+      let validMonth; // First look in the back, if you can't find it in the back, then look in the front
+
+      validMonth = months.slice(currentIndex).find(_ref2 => {
+        let {
+          month
+        } = _ref2;
+        return !disabledDate((0, _dateFns.setMonth)(currentDate, month - 1));
+      });
+
+      if (!validMonth) {
+        validMonth = months.slice(0, currentIndex).find(_ref3 => {
+          let {
+            month
+          } = _ref3;
+          return !disabledDate((0, _dateFns.setMonth)(currentDate, month - 1));
+        });
+      }
+
+      if (validMonth) {
+        this.selectMonth({
+          month: validMonth.month,
+          value: locale.fullMonths[validMonth.month],
+          disabled: false
+        });
+      }
+    }
+  }
 
   backToMain() {
     this._adapter.notifyBackToMain();

package/lib/es/datePicker/yearAndMonthFoundation.d.ts

@@ -33,7 +33,7 @@ export interface YearAndMonthFoundationState {
     currentMonth: number;
 }
 export interface YearAndMonthAdapter extends DefaultAdapter<YearAndMonthFoundationProps, YearAndMonthFoundationState> {
-    setCurrentYear: (currentYear: number) => void;
+    setCurrentYear: (currentYear: number, cb?: () => void) => void;
     setCurrentMonth: (currentMonth: number) => void;
     notifySelectYear: (year: number) => void;
     notifySelectMonth: (month: number) => void;
@@ -57,5 +57,9 @@ export default class YearAndMonthFoundation extends BaseFoundation<YearAndMonthA
     destroy(): void;
     selectYear(item: YearScrollItem): void;
     selectMonth(item: MonthScrollItem): void;
+    /**
+     * After selecting a year, if the currentMonth is disabled, automatically select a non-disabled month
+     */
+    autoSelectMonth(item: YearScrollItem): void;
     backToMain(): void;
 }

package/lib/es/datePicker/yearAndMonthFoundation.js

@@ -1,3 +1,4 @@
+import { setMonth, setYear } from 'date-fns';
 import BaseFoundation from '../base/foundation';
 export default class YearAndMonthFoundation extends BaseFoundation {
   constructor(adapter) {
@@ -13,7 +14,7 @@ export default class YearAndMonthFoundation extends BaseFoundation {
   selectYear(item) {
     const year = item.value;
 
-    this._adapter.setCurrentYear(year);
+    this._adapter.setCurrentYear(year, () => this.autoSelectMonth(item));
 
     this._adapter.notifySelectYear(year);
   }
@@ -27,6 +28,59 @@ export default class YearAndMonthFoundation extends BaseFoundation {
 
     this._adapter.notifySelectMonth(month);
   }
+  /**
+   * After selecting a year, if the currentMonth is disabled, automatically select a non-disabled month
+   */
+
+
+  autoSelectMonth(item) {
+    const {
+      disabledDate,
+      locale
+    } = this._adapter.getProps();
+
+    const {
+      months,
+      currentMonth
+    } = this._adapter.getStates();
+
+    const currentDate = setYear(Date.now(), item.year);
+    const isCurrentMonthDisabled = disabledDate(setMonth(currentDate, currentMonth - 1));
+
+    if (isCurrentMonthDisabled) {
+      const currentIndex = months.findIndex(_ref => {
+        let {
+          month
+        } = _ref;
+        return month === currentMonth;
+      });
+      let validMonth; // First look in the back, if you can't find it in the back, then look in the front
+
+      validMonth = months.slice(currentIndex).find(_ref2 => {
+        let {
+          month
+        } = _ref2;
+        return !disabledDate(setMonth(currentDate, month - 1));
+      });
+
+      if (!validMonth) {
+        validMonth = months.slice(0, currentIndex).find(_ref3 => {
+          let {
+            month
+          } = _ref3;
+          return !disabledDate(setMonth(currentDate, month - 1));
+        });
+      }
+
+      if (validMonth) {
+        this.selectMonth({
+          month: validMonth.month,
+          value: locale.fullMonths[validMonth.month],
+          disabled: false
+        });
+      }
+    }
+  }
 
   backToMain() {
     this._adapter.notifyBackToMain();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.24.0",
+    "version": "2.24.1",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
@@ -23,7 +23,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "3cf6c8a6fa76511fd3797c7168f9ecd4bc0ef662",
+    "gitHead": "cdd012ac90665b020133f4b01c4c07c8399e4296",
     "devDependencies": {
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",