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

package/lib/es/cascader/index.js

@@ -272,15 +272,27 @@ class Cascader extends BaseComponent {
     this.renderCustomTrigger = () => {
       const {
         disabled,
-        triggerRender
+        triggerRender,
+        multiple,
+        autoMergeValue
       } = this.props;
       const {
         selectedKeys,
         inputValue,
-        inputPlaceHolder
+        inputPlaceHolder,
+        mergedCheckedKeys,
+        checkedKeys
       } = this.state;
+      let realValue;
+
+      if (multiple) {
+        realValue = autoMergeValue ? mergedCheckedKeys : checkedKeys;
+      } else {
+        realValue = [...selectedKeys][0];
+      }
+
       return /*#__PURE__*/React.createElement(Trigger, {
-        value: [...selectedKeys][0],
+        value: realValue,
         inputValue: inputValue,
         onChange: this.handleInputChange,
         onClear: this.handleClear,

package/lib/es/select/index.js

@@ -22,7 +22,7 @@ import ConfigContext from '../configProvider/context';
 import SelectFoundation from '@douyinfe/semi-foundation/lib/es/select/foundation';
 import { cssClasses, strings, numbers } from '@douyinfe/semi-foundation/lib/es/select/constants';
 import BaseComponent from '../_base/baseComponent';
-import { isEqual, isString, noop } from 'lodash-es';
+import { isEqual, isString, noop, get, isNumber } from 'lodash-es';
 import Tag from '../tag/index';
 import TagGroup from '../tag/group';
 import LocaleCosumer from '../locale/localeConsumer';
@@ -177,9 +177,10 @@ class Select extends BaseComponent {
         } = _this.props;
 
         if (optionList && optionList.length) {
-          options = _mapInstanceProperty(optionList).call(optionList, itemOpt => _Object$assign({
+          options = _mapInstanceProperty(optionList).call(optionList, (itemOpt, index) => _Object$assign({
             _show: true,
-            _selected: false
+            _selected: false,
+            _scrollIndex: index
           }, itemOpt));
           optionGroups[0] = {
             children: options,
@@ -754,15 +755,21 @@ class Select extends BaseComponent {
     }
 
     if (virtualize) {
-      let minKey;
+      let minItemIndex = -1;
 
-      _forEachInstanceProperty(selections).call(selections, (v, k) => {
-        const tempKey = Number(String(k).match(/option-(.*)/)[1]);
-        minKey = typeof minKey === 'number' && minKey < tempKey ? minKey : tempKey;
+      _forEachInstanceProperty(selections).call(selections, item => {
+        const itemIndex = get(item, '_scrollIndex');
+        /* When the itemIndex is legal */
+
+        if (isNumber(itemIndex) && itemIndex >= 0) {
+          minItemIndex = minItemIndex !== -1 && minItemIndex < itemIndex ? minItemIndex : itemIndex;
+        }
       });
 
-      if (minKey) {
-        this.virtualizeListRef.current.scrollToItem(minKey, 'center');
+      if (minItemIndex !== -1) {
+        try {
+          this.virtualizeListRef.current.scrollToItem(minItemIndex, 'center');
+        } catch (error) {}
       }
     } else {
       this.foundation.updateScrollTop();

package/lib/es/select/option.js

@@ -144,14 +144,14 @@ class Option extends PureComponent {
       style: style
     }, showTick ? /*#__PURE__*/React.createElement("div", {
       className: selectedIconClassName
-    }, /*#__PURE__*/React.createElement(IconTick, null)) : null, /*#__PURE__*/React.createElement("div", {
+    }, /*#__PURE__*/React.createElement(IconTick, null)) : null, isString(children) ? /*#__PURE__*/React.createElement("div", {
       className: "".concat(prefixCls, "-text")
     }, this.renderOptionContent({
       children,
       config,
       inputValue,
       prefixCls
-    })));
+    })) : children);
   }
 
 }

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { OptionProps } from './option';
 import { OptionGroupProps } from './optionGroup';
-declare const generateOption: (child: React.ReactElement, parent?: any) => OptionProps;
+declare const generateOption: (child: React.ReactElement, parent: any, index: number) => OptionProps;
 declare const getOptionsFromGroup: (selectChildren: React.ReactNode) => {
     optionGroups: OptionGroupProps[];
     options: OptionProps[];

package/lib/es/select/utils.js

@@ -20,7 +20,7 @@ var __rest = this && this.__rest || function (s, e) {
 import React from 'react';
 import warning from '@douyinfe/semi-foundation/lib/es/utils/warning';
 
-const generateOption = (child, parent) => {
+const generateOption = (child, parent, index) => {
   const childProps = child.props;
 
   if (!child || !childProps) {
@@ -32,7 +32,8 @@ const generateOption = (child, parent) => {
     // Drop-down menu rendering priority label value, children, value in turn downgrade
     label: childProps.label || childProps.children || childProps.value,
     _show: true,
-    _selected: false
+    _selected: false,
+    _scrollIndex: index
   }, childProps), {
     _parentGroup: parent
   });
@@ -55,11 +56,13 @@ const getOptionsFromGroup = selectChildren => {
   const childNodes = _filterInstanceProperty(_context = React.Children.toArray(selectChildren)).call(_context, childNode => childNode && childNode.props);
 
   let type = '';
+  let optionIndex = -1;
 
   _forEachInstanceProperty(childNodes).call(childNodes, child => {
     if (child.type.isSelectOption) {
       type = 'option';
-      const option = generateOption(child);
+      optionIndex++;
+      const option = generateOption(child, undefined, optionIndex);
       emptyGroup.children.push(option);
       options.push(option);
     } else if (child.type.isSelectOptionGroup) {
@@ -74,7 +77,10 @@ const getOptionsFromGroup = selectChildren => {
 
       children = React.Children.toArray(children);
 
-      const childrenOption = _mapInstanceProperty(children).call(children, option => generateOption(option, restGroupProps));
+      const childrenOption = _mapInstanceProperty(children).call(children, option => {
+        optionIndex++;
+        return generateOption(option, restGroupProps, optionIndex);
+      });
 
       const group = _Object$assign(_Object$assign({}, child.props), {
         children: childrenOption,

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

@@ -22,7 +22,7 @@ export interface OnDragProps extends BasicOnDragProps {
 export interface DragEnterProps extends DragProps {
     expandedKeys?: string[];
 }
-export interface ExpanedOtherProps extends BasicExpandedOtherProps {
+export interface ExpandedOtherProps extends BasicExpandedOtherProps {
     node: TreeNodeData;
 }
 export interface RenderFullLabelProps extends BasicRenderFullLabelProps {
@@ -57,7 +57,7 @@ export interface TreeProps extends BasicTreeProps {
     onDragStart?: (dragProps: DragProps) => void;
     onDragEnter?: (dragEnterProps: DragEnterProps) => void;
     onDrop?: (onDragProps: OnDragProps) => void;
-    onExpand?: (expandedKeys: string[], expanedOtherProps: ExpanedOtherProps) => void;
+    onExpand?: (expandedKeys: string[], expandedOtherProps: ExpandedOtherProps) => void;
     onLoad?: (loadedKeys?: Set<string>, treeNode?: TreeNodeData) => void;
     onContextMenu?: (e: MouseEvent, node: TreeNodeData) => void;
     onSelect?: (selectedKeys: string, selected: boolean, selectedNode: TreeNodeData) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-ui",
-    "version": "2.1.0-beta.0",
+    "version": "2.1.0-beta.1",
     "description": "",
     "main": "lib/es/index.js",
     "module": "lib/es/index.js",
@@ -19,11 +19,11 @@
     },
     "dependencies": {
         "@babel/runtime-corejs3": "^7.15.4",
-        "@douyinfe/semi-animation-react": "2.1.0-beta.0",
-        "@douyinfe/semi-foundation": "2.1.0-beta.0",
-        "@douyinfe/semi-icons": "2.1.0-beta.0",
-        "@douyinfe/semi-illustrations": "2.1.0-beta.0",
-        "@douyinfe/semi-theme-default": "2.1.0-beta.0",
+        "@douyinfe/semi-animation-react": "2.1.0-beta.1",
+        "@douyinfe/semi-foundation": "2.1.0-beta.1",
+        "@douyinfe/semi-icons": "2.1.0-beta.1",
+        "@douyinfe/semi-illustrations": "2.1.0-beta.1",
+        "@douyinfe/semi-theme-default": "2.1.0-beta.1",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "copy-text-to-clipboard": "^2.1.1",
@@ -64,13 +64,13 @@
     ],
     "author": "",
     "license": "MIT",
-    "gitHead": "1fa6463d0c9875d62ea2c76f02c253ad40dffa0a",
+    "gitHead": "112ef9a681542c2057f98e2e708648b4fdd5618c",
     "devDependencies": {
         "@babel/plugin-proposal-decorators": "^7.15.8",
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",
         "@babel/preset-react": "^7.14.5",
-        "@douyinfe/semi-scss-compile": "2.1.0-beta.0",
+        "@douyinfe/semi-scss-compile": "2.1.0-beta.1",
         "@storybook/addon-knobs": "^6.3.1",
         "babel-loader": "^8.2.2",
         "case-sensitive-paths-webpack-plugin": "^2.4.0",