@douyinfe/semi-foundation 2.1.0-beta.0 → 2.1.0-beta.1

package/cascader/foundation.ts

@@ -77,7 +77,7 @@ export interface BasicTriggerRenderProps {
     /** The hierarchical position of the selected node in treeData,
      * as in the following example, when Zhejiang-Hangzhou-Xiaoshan
      * District is selected, the value here is 0-0-1 */
-    value?: string;
+    value?: string | Set<string>;
     /* The input value of the current input box */
     inputValue: string;
     /* Cascader's placeholder */

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

@@ -40,7 +40,7 @@ export interface BasicTriggerRenderProps {
     /** The hierarchical position of the selected node in treeData,
      * as in the following example, when Zhejiang-Hangzhou-Xiaoshan
      * District is selected, the value here is 0-0-1 */
-    value?: string;
+    value?: string | Set<string>;
     inputValue: string;
     placeholder?: string;
     /** The function used to update the value of the input box. You

package/lib/es/select/foundation.js

@@ -29,7 +29,7 @@ var __rest = this && this.__rest || function (s, e) {
 
 import BaseFoundation from '../base/foundation';
 import KeyCode from '../utils/keyCode';
-import { isNumber, isString, isEqual } from 'lodash-es';
+import { isNumber, isString, isEqual, omit } from 'lodash-es';
 import warning from '../utils/warning';
 import isNullOrUndefined from '../utils/isNullOrUndefined';
 export default class SelectFoundation extends BaseFoundation {
@@ -266,12 +266,14 @@ export default class SelectFoundation extends BaseFoundation {
       let optionNotExist = {
         value: propValue,
         label: propValue,
-        _notExist: true
+        _notExist: true,
+        _scrollIndex: -1
       };
 
       if (onChangeWithObject) {
         optionNotExist = _Object$assign(_Object$assign({}, propValue), {
-          _notExist: true
+          _notExist: true,
+          _scrollIndex: -1
         });
       }
 
@@ -330,7 +332,9 @@ export default class SelectFoundation extends BaseFoundation {
             onChangeWithObject ? optionNotExist = _Object$assign(_Object$assign({}, propValue[i]), {
               _notExist: true
             }) : null;
-            selections.set(optionNotExist.label, optionNotExist);
+            selections.set(optionNotExist.label, _Object$assign(_Object$assign({}, optionNotExist), {
+              _scrollIndex: -1
+            }));
           }
         }
       });
@@ -515,7 +519,7 @@ export default class SelectFoundation extends BaseFoundation {
       this._adapter.notifyMaxLimit(_Object$assign({
         value,
         label
-      }, rest));
+      }, omit(rest, '_scrollIndex')));
 
       return;
     } else {
@@ -1016,6 +1020,7 @@ export default class SelectFoundation extends BaseFoundation {
     delete option._parentGroup;
     delete option._show;
     delete option._selected;
+    delete option._scrollIndex;
 
     if ('_keyInOptionList' in option) {
       option.key = option._keyInOptionList;

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

@@ -162,7 +162,7 @@ export interface BasicTreeProps {
     onDragOver?: (dragProps: BasicDragProps) => void;
     onDragStart?: (dragProps: BasicDragProps) => void;
     onDrop?: (onDragProps: BasicOnDragProps) => void;
-    onExpand?: (expandedKeys: string[], expanedOtherProps: BasicExpandedOtherProps) => void;
+    onExpand?: (expandedKeys: string[], expandedOtherProps: BasicExpandedOtherProps) => void;
     onLoad?: (loadedKeys?: Set<string>, treeNode?: BasicTreeNodeData) => void;
     onContextMenu?: (e: any, node: BasicTreeNodeData) => void;
     onSearch?: (sunInput: string) => void;

package/lib/es/tree/treeUtil.js

@@ -9,6 +9,7 @@ import _Set from "@babel/runtime-corejs3/core-js-stable/set";
 import _everyInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/every";
 import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
+import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
 import _someInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/some";
 import _Object$values from "@babel/runtime-corejs3/core-js-stable/object/values";
 
@@ -514,7 +515,9 @@ export function normalizeKeyList(keyList, keyEntities) {
       res.push(key);
     });
   } else {
-    res = _filterInstanceProperty(keyList).call(keyList, key => keyEntities[key] && !isValid(keyEntities[key].children));
+    var _context8;
+
+    res = _filterInstanceProperty(_context8 = _Array$from(keyList)).call(_context8, key => keyEntities[key] && !isValid(keyEntities[key].children));
   }
 
   return res;
@@ -523,9 +526,9 @@ export function getMotionKeys(eventKey, expandedKeys, keyEntities) {
   const res = [];
 
   const getChild = itemKey => {
-    var _context8;
+    var _context9;
 
-    keyEntities[itemKey].children && _forEachInstanceProperty(_context8 = keyEntities[itemKey].children).call(_context8, item => {
+    keyEntities[itemKey].children && _forEachInstanceProperty(_context9 = keyEntities[itemKey].children).call(_context9, item => {
       const {
         key
       } = item;
@@ -641,7 +644,7 @@ export function calcCheckedKeysForUnchecked(key, keyEntities, checkedKeys, halfC
   };
 }
 export function filterTreeData(info) {
-  var _context9, _context10;
+  var _context10, _context11;
 
   const {
     showFilteredOnly,
@@ -653,7 +656,7 @@ export function filterTreeData(info) {
     prevExpandedKeys
   } = info;
   let filteredOptsKeys = [];
-  filteredOptsKeys = _mapInstanceProperty(_context9 = _filterInstanceProperty(_context10 = _Object$values(keyEntities)).call(_context10, item => filter(inputValue, item.data, filterTreeNode, filterProps))).call(_context9, item => item.key);
+  filteredOptsKeys = _mapInstanceProperty(_context10 = _filterInstanceProperty(_context11 = _Object$values(keyEntities)).call(_context11, item => filter(inputValue, item.data, filterTreeNode, filterProps))).call(_context10, item => item.key);
   let expandedOptsKeys = findAncestorKeys(filteredOptsKeys, keyEntities, false);
 
   if (prevExpandedKeys.length) {
@@ -694,9 +697,9 @@ export function updateKeys(keySet, keyEntities) {
   return _filterInstanceProperty(keyArr).call(keyArr, key => key in keyEntities);
 }
 export function calcDisabledKeys(keyEntities) {
-  var _context11;
+  var _context12;
 
-  const disabledKeys = _filterInstanceProperty(_context11 = _Object$keys(keyEntities)).call(_context11, key => keyEntities[key].data.disabled);
+  const disabledKeys = _filterInstanceProperty(_context12 = _Object$keys(keyEntities)).call(_context12, key => keyEntities[key].data.disabled);
 
   const {
     checkedKeys

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

@@ -93,7 +93,7 @@ export interface TreeSelectAdapter<P = Record<string, any>, S = Record<string, a
     setOptionWrapperWidth: (width: null | number) => void;
     notifyChange: BasicOnChangeWithBasic;
     notifyChangeWithObject: BasicOnChangeWithObject;
-    notifyExpand: (expandedKeys: Set<string>, expanedOtherProps: BasicExpandedOtherProps) => void;
+    notifyExpand: (expandedKeys: Set<string>, expandedOtherProps: BasicExpandedOtherProps) => void;
     notifyFocus: (e: any) => void;
     notifyBlur: (e: any) => void;
     toggleHovering: (bool: boolean) => void;

package/package.json

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

package/select/foundation.ts

@@ -2,7 +2,7 @@
 /* eslint-disable max-len */
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
 import KeyCode from '../utils/keyCode';
-import { isNumber, isString, isEqual } from 'lodash-es';
+import { isNumber, isString, isEqual, omit } from 'lodash-es';
 import warning from '../utils/warning';
 import isNullOrUndefined from '../utils/isNullOrUndefined';
 import { BasicOptionProps } from './optionFoundation';
@@ -230,9 +230,9 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
             selections.set(optionExist.label, optionExist);
         } else if (noMatchOptionInList) {
             // If the current value does not have a corresponding item in the optionList, construct an option and update it to the selection. However, it does not need to be inserted into the list
-            let optionNotExist = { value: propValue, label: propValue, _notExist: true };
+            let optionNotExist = { value: propValue, label: propValue, _notExist: true, _scrollIndex: -1 } as BasicOptionProps;
             if (onChangeWithObject) {
-                optionNotExist = { ...propValue as BasicOptionProps, _notExist: true } as any;
+                optionNotExist = { ...propValue as BasicOptionProps, _notExist: true, _scrollIndex: -1 };
             }
             selections.set(optionNotExist.label, optionNotExist);
         }
@@ -277,7 +277,7 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
                         // The current value does not exist in the current optionList or the list before the change. Construct an option and update it to the selection
                         let optionNotExist = { value: selectedValue, label: selectedValue, _notExist: true };
                         onChangeWithObject ? (optionNotExist = { ...propValue[i] as any, _notExist: true }) : null;
-                        selections.set(optionNotExist.label, optionNotExist);
+                        selections.set(optionNotExist.label, { ...optionNotExist, _scrollIndex: -1 });
                     }
                 }
             });
@@ -409,7 +409,7 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
             this._notifyDeselect(value, { value, label, ...rest });
             selections.delete(label);
         } else if (maxLimit && selections.size === maxLimit) {
-            this._adapter.notifyMaxLimit({ value, label, ...rest });
+            this._adapter.notifyMaxLimit({ value, label, ...omit(rest, '_scrollIndex') });
             return;
         } else {
             this._notifySelect(value, { value, label, ...rest });
@@ -787,6 +787,7 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
         delete option._parentGroup;
         delete option._show;
         delete option._selected;
+        delete option._scrollIndex;
         if ('_keyInOptionList' in option) {
             option.key = option._keyInOptionList;
             delete option._keyInOptionList;

package/tree/foundation.ts

@@ -212,7 +212,7 @@ export interface BasicTreeProps {
     onDragOver?: (dragProps: BasicDragProps) => void;
     onDragStart?: (dragProps: BasicDragProps) => void;
     onDrop?: (onDragProps: BasicOnDragProps) => void;
-    onExpand?: (expandedKeys: string[], expanedOtherProps: BasicExpandedOtherProps) => void;
+    onExpand?: (expandedKeys: string[], expandedOtherProps: BasicExpandedOtherProps) => void;
     onLoad?: (loadedKeys?: Set<string>, treeNode?: BasicTreeNodeData) => void;
     onContextMenu?: (e: any, node: BasicTreeNodeData) => void;
     onSearch?: (sunInput: string) => void;

package/tree/treeUtil.ts

@@ -441,7 +441,7 @@ export function normalizeKeyList(keyList: any, keyEntities: KeyEntities, leafOnl
             res.push(key);
         });
     } else {
-        res = keyList.filter((key: string) => keyEntities[key] && !isValid(keyEntities[key].children));
+        res = Array.from(keyList).filter((key: string) => keyEntities[key] && !isValid(keyEntities[key].children)) as string[];
     }
     return res;
 }

package/treeSelect/foundation.ts

@@ -179,7 +179,7 @@ export interface TreeSelectAdapter<P = Record<string, any>, S = Record<string, a
     setOptionWrapperWidth: (width: null | number) => void;
     notifyChange: BasicOnChangeWithBasic;
     notifyChangeWithObject: BasicOnChangeWithObject;
-    notifyExpand: (expandedKeys: Set<string>, expanedOtherProps: BasicExpandedOtherProps) => void;
+    notifyExpand: (expandedKeys: Set<string>, expandedOtherProps: BasicExpandedOtherProps) => void;
     notifyFocus: (e: any) => void;
     notifyBlur: (e: any) => void;
     toggleHovering: (bool: boolean) => void;