@douyinfe/semi-foundation 2.2.1 → 2.2.2

package/datePicker/foundation.ts

@@ -745,7 +745,7 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
         let inputValue;
         if (!this._someDateDisabled(changedDates)) {
             inputValue = this._isMultiple() ? this.formatMultipleDates(dates) : this.formatDates(dates);
-            const isRangeTypeAndInputIncomplete = this._isRangeType() && (isNullOrUndefined(dates[0]) || isNullOrUndefined(dates[1]));
+            const isRangeTypeAndInputIncomplete = this._isRangeType() && !this._isRangeValueComplete(dates);
             /**
              * If the input is incomplete when under control, the notifyChange is not triggered because
              * You need to update the value of the input box, otherwise there will be a problem that a date is selected but the input box does not show the date #1357
@@ -1024,11 +1024,9 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
     };
 
     _isRangeValueComplete = (value: Date[] | Date) => {
-        let result = true;
+        let result = false;
         if (Array.isArray(value)) {
             result = !value.some(date => isNullOrUndefined(date));
-        } else {
-            result = false;
         }
         return result;
     };

package/datePicker/monthsGridFoundation.ts

@@ -16,7 +16,7 @@ import {
 import { isBefore, isValidDate, getDefaultFormatToken, getFullDateOffset } from './_utils/index';
 import { formatFullDate, WeekStartNumber } from './_utils/getMonthTable';
 import { compatiableParse } from './_utils/parser';
-import { includes, isSet, isEqual } from 'lodash';
+import { includes, isSet, isEqual, isFunction } from 'lodash';
 import { zonedTimeToUtc } from '../utils/date-fns-extra';
 import { getDefaultFormatTokenByType } from './_utils/getDefaultFormatToken';
 import isNullOrUndefined from '../utils/isNullOrUndefined';
@@ -85,6 +85,7 @@ export interface MonthsGridFoundationProps extends MonthsGridElementProps {
     setRangeInputFocus?: (rangeInputFocus: 'rangeStart' | 'rangeEnd') => void;
     isAnotherPanelHasOpened?: (currentRangeInput: 'rangeStart' | 'rangeEnd') => boolean;
     focusRecordsRef?: any;
+    triggerRender?: (props: Record<string, any>) => any;
 }
 
 export interface MonthInfo {
@@ -636,7 +637,7 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
 
     handleRangeSelected(day: MonthDayInfo) {
         let { rangeStart, rangeEnd } = this.getStates();
-        const { startDateOffset, endDateOffset, type, dateFnsLocale, rangeInputFocus } = this.getProps();
+        const { startDateOffset, endDateOffset, type, dateFnsLocale, rangeInputFocus, triggerRender } = this._adapter.getProps();
         const { fullDate } = day;
         let rangeStartReset = false;
         let rangeEndReset = false;
@@ -712,7 +713,13 @@ export default class MonthsGridFoundation extends BaseFoundation<MonthsGridAdapt
                     date = [start, end];
                 }
             }
-            this._adapter.notifySelectedChange(date, { needCheckFocusRecord: !(type === 'dateRange' && isDateRangeAndHasOffset) });
+            /**
+             * no need to check focus then
+             *  - dateRange and isDateRangeAndHasOffset
+             *  - dateRange and triggerRender
+             */
+            const needCheckFocusRecord = !(type === 'dateRange' && (isDateRangeAndHasOffset || isFunction(triggerRender)));
+            this._adapter.notifySelectedChange(date, { needCheckFocusRecord });
         }
     }
 

package/inputNumber/foundation.ts

@@ -126,6 +126,7 @@ class InputNumberFoundation extends BaseFoundation<InputNumberAdapter> {
         }
         this._adapter.recordCursorPosition();
         this._adapter.setFocusing(true, null);
+        this._adapter.setClickUpOrDown(false);
         this._adapter.notifyFocus(e);
     }
 
@@ -425,11 +426,11 @@ class InputNumberFoundation extends BaseFoundation<InputNumberAdapter> {
 
     /**
      * format number to string
-     * @param {number} value
+     * @param {string|number} value
      * @param {boolean} needAdjustPrec
      * @returns {string}
      */
-    doFormat(value = 0, needAdjustPrec = true): string {
+    doFormat(value: string | number = 0, needAdjustPrec = true): string {
         // if (typeof value === 'string') {
         //     return value;
         // }

package/lib/cjs/datePicker/foundation.js

@@ -96,12 +96,10 @@ class DatePickerFoundation extends _foundation.default {
     };
 
     this._isRangeValueComplete = value => {
-      let result = true;
+      let result = false;
 
       if ((0, _isArray.default)(value)) {
         result = !(0, _some.default)(value).call(value, date => (0, _isNullOrUndefined.default)(date));
-      } else {
-        result = false;
       }
 
       return result;
@@ -755,7 +753,7 @@ class DatePickerFoundation extends _foundation.default {
 
     if (!this._someDateDisabled(changedDates)) {
       inputValue = this._isMultiple() ? this.formatMultipleDates(dates) : this.formatDates(dates);
-      const isRangeTypeAndInputIncomplete = this._isRangeType() && ((0, _isNullOrUndefined.default)(dates[0]) || (0, _isNullOrUndefined.default)(dates[1]));
+      const isRangeTypeAndInputIncomplete = this._isRangeType() && !this._isRangeValueComplete(dates);
       /**
        * If the input is incomplete when under control, the notifyChange is not triggered because
        * You need to update the value of the input box, otherwise there will be a problem that a date is selected but the input box does not show the date #1357

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

@@ -53,6 +53,7 @@ export interface MonthsGridFoundationProps extends MonthsGridElementProps {
     setRangeInputFocus?: (rangeInputFocus: 'rangeStart' | 'rangeEnd') => void;
     isAnotherPanelHasOpened?: (currentRangeInput: 'rangeStart' | 'rangeEnd') => boolean;
     focusRecordsRef?: any;
+    triggerRender?: (props: Record<string, any>) => any;
 }
 export interface MonthInfo {
     pickerDate: Date;

package/lib/cjs/datePicker/monthsGridFoundation.js

@@ -28,6 +28,8 @@ var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-sta
 
 var _trim = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/trim"));
 
+var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
+
 var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
 
 var _isSet2 = _interopRequireDefault(require("lodash/isSet"));
@@ -731,13 +733,16 @@ class MonthsGridFoundation extends _foundation.default {
       rangeStart,
       rangeEnd
     } = this.getStates();
+
     const {
       startDateOffset,
       endDateOffset,
       type,
       dateFnsLocale,
-      rangeInputFocus
-    } = this.getProps();
+      rangeInputFocus,
+      triggerRender
+    } = this._adapter.getProps();
+
     const {
       fullDate
     } = day;
@@ -818,9 +823,17 @@ class MonthsGridFoundation extends _foundation.default {
           date = [start, end];
         }
       }
+      /**
+       * no need to check focus then
+       *  - dateRange and isDateRangeAndHasOffset
+       *  - dateRange and triggerRender
+       */
+
+
+      const needCheckFocusRecord = !(type === 'dateRange' && (isDateRangeAndHasOffset || (0, _isFunction2.default)(triggerRender)));
 
       this._adapter.notifySelectedChange(date, {
-        needCheckFocusRecord: !(type === 'dateRange' && isDateRangeAndHasOffset)
+        needCheckFocusRecord
       });
     }
   }

package/lib/cjs/inputNumber/foundation.d.ts

@@ -63,11 +63,11 @@ declare class InputNumberFoundation extends BaseFoundation<InputNumberAdapter> {
     _adjustPrec(num: string | number): string;
     /**
      * format number to string
-     * @param {number} value
+     * @param {string|number} value
      * @param {boolean} needAdjustPrec
      * @returns {string}
      */
-    doFormat(value?: number, needAdjustPrec?: boolean): string;
+    doFormat(value?: string | number, needAdjustPrec?: boolean): string;
     /**
      *
      * @param {number} current

package/lib/cjs/inputNumber/foundation.js

@@ -140,6 +140,8 @@ class InputNumberFoundation extends _foundation.default {
 
     this._adapter.setFocusing(true, null);
 
+    this._adapter.setClickUpOrDown(false);
+
     this._adapter.notifyFocus(e);
   }
   /**
@@ -476,7 +478,7 @@ class InputNumberFoundation extends _foundation.default {
   }
   /**
    * format number to string
-   * @param {number} value
+   * @param {string|number} value
    * @param {boolean} needAdjustPrec
    * @returns {string}
    */

package/lib/es/datePicker/foundation.js

@@ -58,12 +58,10 @@ export default class DatePickerFoundation extends BaseFoundation {
     };
 
     this._isRangeValueComplete = value => {
-      let result = true;
+      let result = false;
 
       if (_Array$isArray(value)) {
         result = !_someInstanceProperty(value).call(value, date => isNullOrUndefined(date));
-      } else {
-        result = false;
       }
 
       return result;
@@ -721,7 +719,7 @@ export default class DatePickerFoundation extends BaseFoundation {
 
     if (!this._someDateDisabled(changedDates)) {
       inputValue = this._isMultiple() ? this.formatMultipleDates(dates) : this.formatDates(dates);
-      const isRangeTypeAndInputIncomplete = this._isRangeType() && (isNullOrUndefined(dates[0]) || isNullOrUndefined(dates[1]));
+      const isRangeTypeAndInputIncomplete = this._isRangeType() && !this._isRangeValueComplete(dates);
       /**
        * If the input is incomplete when under control, the notifyChange is not triggered because
        * You need to update the value of the input box, otherwise there will be a problem that a date is selected but the input box does not show the date #1357

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

@@ -53,6 +53,7 @@ export interface MonthsGridFoundationProps extends MonthsGridElementProps {
     setRangeInputFocus?: (rangeInputFocus: 'rangeStart' | 'rangeEnd') => void;
     isAnotherPanelHasOpened?: (currentRangeInput: 'rangeStart' | 'rangeEnd') => boolean;
     focusRecordsRef?: any;
+    triggerRender?: (props: Record<string, any>) => any;
 }
 export interface MonthInfo {
     pickerDate: Date;

package/lib/es/datePicker/monthsGridFoundation.js

@@ -1,3 +1,4 @@
+import _isFunction from "lodash/isFunction";
 import _isEqual from "lodash/isEqual";
 import _isSet from "lodash/isSet";
 import _includes from "lodash/includes";
@@ -704,13 +705,16 @@ export default class MonthsGridFoundation extends BaseFoundation {
       rangeStart,
       rangeEnd
     } = this.getStates();
+
     const {
       startDateOffset,
       endDateOffset,
       type,
       dateFnsLocale,
-      rangeInputFocus
-    } = this.getProps();
+      rangeInputFocus,
+      triggerRender
+    } = this._adapter.getProps();
+
     const {
       fullDate
     } = day;
@@ -791,9 +795,17 @@ export default class MonthsGridFoundation extends BaseFoundation {
           date = [start, end];
         }
       }
+      /**
+       * no need to check focus then
+       *  - dateRange and isDateRangeAndHasOffset
+       *  - dateRange and triggerRender
+       */
+
+
+      const needCheckFocusRecord = !(type === 'dateRange' && (isDateRangeAndHasOffset || _isFunction(triggerRender)));
 
       this._adapter.notifySelectedChange(date, {
-        needCheckFocusRecord: !(type === 'dateRange' && isDateRangeAndHasOffset)
+        needCheckFocusRecord
       });
     }
   }

package/lib/es/inputNumber/foundation.d.ts

@@ -63,11 +63,11 @@ declare class InputNumberFoundation extends BaseFoundation<InputNumberAdapter> {
     _adjustPrec(num: string | number): string;
     /**
      * format number to string
-     * @param {number} value
+     * @param {string|number} value
      * @param {boolean} needAdjustPrec
      * @returns {string}
      */
-    doFormat(value?: number, needAdjustPrec?: boolean): string;
+    doFormat(value?: string | number, needAdjustPrec?: boolean): string;
     /**
      *
      * @param {number} current

package/lib/es/inputNumber/foundation.js

@@ -116,6 +116,8 @@ class InputNumberFoundation extends BaseFoundation {
 
     this._adapter.setFocusing(true, null);
 
+    this._adapter.setClickUpOrDown(false);
+
     this._adapter.notifyFocus(e);
   }
   /**
@@ -454,7 +456,7 @@ class InputNumberFoundation extends BaseFoundation {
   }
   /**
    * format number to string
-   * @param {number} value
+   * @param {string|number} value
    * @param {boolean} needAdjustPrec
    * @returns {string}
    */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.2.1",
+    "version": "2.2.2",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
@@ -8,7 +8,7 @@
     },
     "dependencies": {
         "@babel/runtime-corejs3": "^7.15.4",
-        "@douyinfe/semi-animation": "2.2.1",
+        "@douyinfe/semi-animation": "2.2.2",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "date-fns": "^2.9.0",
@@ -24,7 +24,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "6d8bb9dd22bf199225fa2a0dda4f8524a4b97f6f",
+    "gitHead": "de84e4f81bb443c457c075e808c4bd1fcf9441d7",
     "devDependencies": {
         "@babel/plugin-proposal-decorators": "^7.15.8",
         "@babel/plugin-transform-runtime": "^7.15.8",