@douyinfe/semi-foundation 2.5.0-beta.0 → 2.5.0

package/datePicker/foundation.ts

@@ -384,6 +384,18 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
         this._adapter.notifyBlur(e);
     }
 
+    /**
+     * clear range input focus when open is controlled
+     * fixed github 1375
+     */
+    clearRangeInputFocus = () => {
+        const { type } = this._adapter.getProps();
+        const { rangeInputFocus } = this._adapter.getStates();
+        if (type === 'dateTimeRange' && rangeInputFocus) {
+            this._adapter.setRangeInputFocus(false);
+        }
+    }
+
     /**
      * Callback when the content of the input box changes
      * Update the date panel if the changed value is a legal date, otherwise only update the input box

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

@@ -221,6 +221,11 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
      * @param {Date[]} dates
      */
     closePanel(e?: any, inputValue?: string, dates?: Date[]): void;
+    /**
+     * clear range input focus when open is controlled
+     * fixed github 1375
+     */
+    clearRangeInputFocus: () => void;
     /**
      * Callback when the content of the input box changes
      * Update the date panel if the changed value is a legal date, otherwise only update the input box

package/lib/cjs/datePicker/foundation.js

@@ -76,6 +76,24 @@ var _constants2 = require("../input/constants");
 class DatePickerFoundation extends _foundation.default {
   constructor(adapter) {
     super((0, _assign.default)({}, adapter));
+    /**
+     * clear range input focus when open is controlled
+     * fixed github 1375
+     */
+
+    this.clearRangeInputFocus = () => {
+      const {
+        type
+      } = this._adapter.getProps();
+
+      const {
+        rangeInputFocus
+      } = this._adapter.getStates();
+
+      if (type === 'dateTimeRange' && rangeInputFocus) {
+        this._adapter.setRangeInputFocus(false);
+      }
+    };
 
     this.getMergedMotion = motion => {
       const mergedMotion = typeof motion === 'undefined' || motion ? (0, _assign.default)((0, _assign.default)({}, motion), {

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

@@ -36,7 +36,7 @@ export interface SelectAdapter<P = Record<string, any>, S = Record<string, any>>
     notifyMouseLeave(event: any): void;
     notifyMouseEnter(event: any): void;
     updateHovering(isHover: boolean): void;
-    updateScrollTop(): void;
+    updateScrollTop(index?: number): void;
 }
 declare type LabelValue = string | number;
 declare type PropValue = LabelValue | Record<string, any>;

package/lib/cjs/select/foundation.js

@@ -944,8 +944,9 @@ class SelectFoundation extends _foundation.default {
     } // console.log('new:' + index);
 
 
-    this._adapter.updateFocusIndex(index); // TODO requires scrollIntoView
+    this._adapter.updateFocusIndex(index);
 
+    this._adapter.updateScrollTop(index);
   }
 
   _handleArrowKeyDown(offset) {

package/lib/cjs/table/utils.js

@@ -384,7 +384,10 @@ function assignColumnKeys(columns) {
     if (column.key == null) {
       var _context4;
 
-      column.key = (0, _concat.default)(_context4 = "".concat(level, "-")).call(_context4, index);
+      // if user give column a dataIndex, use it for backup
+      const _index = column.dataIndex || index;
+
+      column.key = (0, _concat.default)(_context4 = "".concat(level, "-")).call(_context4, _index);
     }
 
     if ((0, _isArray.default)(column[childrenColumnName]) && column[childrenColumnName].length) {

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

@@ -221,6 +221,11 @@ export default class DatePickerFoundation extends BaseFoundation<DatePickerAdapt
      * @param {Date[]} dates
      */
     closePanel(e?: any, inputValue?: string, dates?: Date[]): void;
+    /**
+     * clear range input focus when open is controlled
+     * fixed github 1375
+     */
+    clearRangeInputFocus: () => void;
     /**
      * Callback when the content of the input box changes
      * Update the date panel if the changed value is a legal date, otherwise only update the input box

package/lib/es/datePicker/foundation.js

@@ -38,6 +38,24 @@ import { strings as inputStrings } from '../input/constants';
 export default class DatePickerFoundation extends BaseFoundation {
   constructor(adapter) {
     super(_Object$assign({}, adapter));
+    /**
+     * clear range input focus when open is controlled
+     * fixed github 1375
+     */
+
+    this.clearRangeInputFocus = () => {
+      const {
+        type
+      } = this._adapter.getProps();
+
+      const {
+        rangeInputFocus
+      } = this._adapter.getStates();
+
+      if (type === 'dateTimeRange' && rangeInputFocus) {
+        this._adapter.setRangeInputFocus(false);
+      }
+    };
 
     this.getMergedMotion = motion => {
       const mergedMotion = typeof motion === 'undefined' || motion ? _Object$assign(_Object$assign({}, motion), {

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

@@ -36,7 +36,7 @@ export interface SelectAdapter<P = Record<string, any>, S = Record<string, any>>
     notifyMouseLeave(event: any): void;
     notifyMouseEnter(event: any): void;
     updateHovering(isHover: boolean): void;
-    updateScrollTop(): void;
+    updateScrollTop(index?: number): void;
 }
 declare type LabelValue = string | number;
 declare type PropValue = LabelValue | Record<string, any>;

package/lib/es/select/foundation.js

@@ -916,8 +916,9 @@ export default class SelectFoundation extends BaseFoundation {
     } // console.log('new:' + index);
 
 
-    this._adapter.updateFocusIndex(index); // TODO requires scrollIntoView
+    this._adapter.updateFocusIndex(index);
 
+    this._adapter.updateScrollTop(index);
   }
 
   _handleArrowKeyDown(offset) {

package/lib/es/table/utils.js

@@ -296,7 +296,10 @@ export function assignColumnKeys(columns) {
     if (column.key == null) {
       var _context4;
 
-      column.key = _concatInstanceProperty(_context4 = "".concat(level, "-")).call(_context4, index);
+      // if user give column a dataIndex, use it for backup
+      const _index = column.dataIndex || index;
+
+      column.key = _concatInstanceProperty(_context4 = "".concat(level, "-")).call(_context4, _index);
     }
 
     if (_Array$isArray(column[childrenColumnName]) && column[childrenColumnName].length) {

package/package.json

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

package/select/foundation.ts

@@ -44,7 +44,7 @@ export interface SelectAdapter<P = Record<string, any>, S = Record<string, any>>
     notifyMouseLeave(event: any): void;
     notifyMouseEnter(event: any): void;
     updateHovering(isHover: boolean): void;
-    updateScrollTop(): void;
+    updateScrollTop(index?: number): void;
 }
 
 type LabelValue = string | number;
@@ -704,7 +704,7 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
         }
         // console.log('new:' + index);
         this._adapter.updateFocusIndex(index);
-        // TODO requires scrollIntoView
+        this._adapter.updateScrollTop(index);
     }
 
     _handleArrowKeyDown(offset: number) {
@@ -954,4 +954,5 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
     updateScrollTop() {
         this._adapter.updateScrollTop();
     }
+    
 }

package/table/utils.ts

@@ -281,7 +281,9 @@ export function assignColumnKeys(columns: Record<string, any>[], childrenColumnN
     const sameLevelCols: Record<string, any>[] = [];
     each(columns, (column, index) => {
         if (column.key == null) {
-            column.key = `${level}-${index}`;
+            // if user give column a dataIndex, use it for backup
+            const _index = column.dataIndex || index;
+            column.key = `${level}-${_index}`;
         }
         if (Array.isArray(column[childrenColumnName]) && column[childrenColumnName].length) {
             sameLevelCols.push(...column[childrenColumnName]);