@douyinfe/semi-ui 2.25.2 → 2.26.0-beta.0

package/lib/cjs/table/Table.js

@@ -1338,6 +1338,8 @@ class Table extends _baseComponent.default {
         if (this.props.defaultExpandAllRows && handledProps.groups && handledProps.groups.size || this.props.expandAllRows || this.props.expandAllGroupRows) {
           this.foundation.initExpandedRowKeys(handledProps);
         }
+
+        states.pagination = handledProps.pagination;
       } // Centrally update paging related state
 
 

package/lib/cjs/treeSelect/index.d.ts

@@ -107,7 +107,7 @@ declare class TreeSelect extends BaseComponent<TreeSelectProps, TreeSelectState>
         arrowIcon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         clearIcon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         defaultOpen: PropTypes.Requireable<boolean>;
-        defaultValue: PropTypes.Requireable<NonNullable<string | any[]>>;
+        defaultValue: PropTypes.Requireable<NonNullable<string | object>>;
         defaultExpandAll: PropTypes.Requireable<boolean>;
         defaultExpandedKeys: PropTypes.Requireable<any[]>;
         expandAll: PropTypes.Requireable<boolean>;
@@ -202,6 +202,7 @@ declare class TreeSelect extends BaseComponent<TreeSelectProps, TreeSelectState>
     renderContent: () => JSX.Element;
     removeTag: (removedKey: TreeNodeData['key']) => void;
     handleClick: (e: React.MouseEvent) => void;
+    getDataForKeyNotInKeyEntities: (key: string) => any;
     handleSelectionEnterPress: (e: React.KeyboardEvent<HTMLDivElement>) => void;
     hasValue: () => boolean;
     showClearBtn: () => boolean;

package/lib/cjs/treeSelect/index.js

@@ -5,6 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _isNull2 = _interopRequireDefault(require("lodash/isNull"));
+
+var _isUndefined2 = _interopRequireDefault(require("lodash/isUndefined"));
+
 var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 
 var _get2 = _interopRequireDefault(require("lodash/get"));
@@ -148,6 +152,10 @@ class TreeSelect extends _baseComponent.default {
     this.handleClick = e => {
       this.foundation.handleClick(e);
     };
+
+    this.getDataForKeyNotInKeyEntities = key => {
+      return this.foundation.getDataForKeyNotInKeyEntities(key);
+    };
     /* istanbul ignore next */
 
 
@@ -218,15 +226,15 @@ class TreeSelect extends _baseComponent.default {
       let renderKeys = [];
 
       if (checkRelation === 'related') {
-        renderKeys = (0, _treeUtil.normalizeKeyList)([...checkedKeys], keyEntities, leafOnly);
+        renderKeys = (0, _treeUtil.normalizeKeyList)([...checkedKeys], keyEntities, leafOnly, true);
       } else if (checkRelation === 'unRelated' && Object.keys(keyEntities).length > 0) {
         renderKeys = [...realCheckedKeys];
       }
 
       const tagList = []; // eslint-disable-next-line @typescript-eslint/no-shadow
 
-      renderKeys.forEach(key => {
-        const item = keyEntities[key].data;
+      renderKeys.forEach((key, index) => {
+        const item = keyEntities[key] && keyEntities[key].data.key === key ? keyEntities[key].data : this.getDataForKeyNotInKeyEntities(key);
 
         const onClose = (tagContent, e) => {
           if (e && typeof e.preventDefault === 'function') {
@@ -240,12 +248,12 @@ class TreeSelect extends _baseComponent.default {
         const {
           content,
           isRenderInTag
-        } = treeNodeLabelProp in item && item ? renderSelectedItem(item, {
-          index: key,
+        } = item && treeNodeLabelProp in item ? renderSelectedItem(item, {
+          index,
           onClose
         }) : null;
 
-        if (!content) {
+        if ((0, _isNull2.default)(content) || (0, _isUndefined2.default)(content)) {
           return;
         }
 
@@ -255,7 +263,7 @@ class TreeSelect extends _baseComponent.default {
           color: 'white',
           visible: true,
           onClose,
-          key,
+          key: "tag-".concat(key, "-").concat(index),
           size: size === 'small' ? 'small' : 'large'
         };
 
@@ -466,7 +474,7 @@ class TreeSelect extends _baseComponent.default {
         ["".concat(prefixcls, "-with-suffix")]: suffix,
         ["".concat(prefixcls, "-with-suffix")]: suffix
       }, className);
-      const triggerRenderKeys = multiple ? (0, _treeUtil.normalizeKeyList)([...checkedKeys], keyEntities, leafOnly) : selectedKeys;
+      const triggerRenderKeys = multiple ? (0, _treeUtil.normalizeKeyList)([...checkedKeys], keyEntities, leafOnly, true) : selectedKeys;
       const inner = useCustomTrigger ? /*#__PURE__*/_react.default.createElement(_trigger.default, {
         inputValue: inputValue,
         // eslint-disable-next-line @typescript-eslint/no-shadow
@@ -530,8 +538,8 @@ class TreeSelect extends _baseComponent.default {
         renderSelectedItem: propRenderSelectedItem,
         treeNodeLabelProp
       } = this.props;
-      const keyList = (0, _treeUtil.normalizeKeyList)([key], keyEntities, leafOnly);
-      const nodes = keyList.map(i => keyEntities[i].data);
+      const keyList = (0, _treeUtil.normalizeKeyList)([key], keyEntities, leafOnly, true);
+      const nodes = keyList.map(i => keyEntities[key] && keyEntities[key].data.key === key ? keyEntities[key].data : this.getDataForKeyNotInKeyEntities(key));
       const value = (0, _treeUtil.getValueOrKey)(nodes);
       const tagCls = (0, _classnames.default)("".concat(prefixcls, "-selection-tag"), {
         ["".concat(prefixcls, "-selection-tag-disabled")]: disabled
@@ -564,7 +572,7 @@ class TreeSelect extends _baseComponent.default {
         const {
           content,
           isRenderInTag
-        } = treeNodeLabelProp in item && item ? renderSelectedItem(item, {
+        } = item && treeNodeLabelProp in item ? renderSelectedItem(item, {
           index: idx,
           onClose
         }) : null;
@@ -602,7 +610,7 @@ class TreeSelect extends _baseComponent.default {
       let keyList = [];
 
       if (checkRelation === 'related') {
-        keyList = (0, _treeUtil.normalizeKeyList)(checkedKeys, keyEntities, leafOnly);
+        keyList = (0, _treeUtil.normalizeKeyList)(checkedKeys, keyEntities, leafOnly, true);
       } else if (checkRelation === 'unRelated') {
         keyList = [...realCheckedKeys];
       } // auto focus search input divide into two parts
@@ -1328,7 +1336,7 @@ TreeSelect.propTypes = {
   arrowIcon: _propTypes.default.node,
   clearIcon: _propTypes.default.node,
   defaultOpen: _propTypes.default.bool,
-  defaultValue: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.array]),
+  defaultValue: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.array, _propTypes.default.object]),
   defaultExpandAll: _propTypes.default.bool,
   defaultExpandedKeys: _propTypes.default.array,
   expandAll: _propTypes.default.bool,

package/lib/cjs/typography/util.js

@@ -44,6 +44,10 @@ const getRenderText = function (originEle, rows) {
   let ellipsisPos // eslint-disable-next-line max-params
   = arguments.length > 6 ? arguments[6] : undefined;
 
+  if (content.length === 0) {
+    return '';
+  }
+
   if (!ellipsisContainer) {
     ellipsisContainer = document.createElement('div');
     ellipsisContainer.setAttribute('aria-hidden', 'true');

package/lib/es/table/Table.js

@@ -1295,6 +1295,8 @@ class Table extends BaseComponent {
         if (this.props.defaultExpandAllRows && handledProps.groups && handledProps.groups.size || this.props.expandAllRows || this.props.expandAllGroupRows) {
           this.foundation.initExpandedRowKeys(handledProps);
         }
+
+        states.pagination = handledProps.pagination;
       } // Centrally update paging related state
 
 

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

@@ -107,7 +107,7 @@ declare class TreeSelect extends BaseComponent<TreeSelectProps, TreeSelectState>
         arrowIcon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         clearIcon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         defaultOpen: PropTypes.Requireable<boolean>;
-        defaultValue: PropTypes.Requireable<NonNullable<string | any[]>>;
+        defaultValue: PropTypes.Requireable<NonNullable<string | object>>;
         defaultExpandAll: PropTypes.Requireable<boolean>;
         defaultExpandedKeys: PropTypes.Requireable<any[]>;
         expandAll: PropTypes.Requireable<boolean>;
@@ -202,6 +202,7 @@ declare class TreeSelect extends BaseComponent<TreeSelectProps, TreeSelectState>
     renderContent: () => JSX.Element;
     removeTag: (removedKey: TreeNodeData['key']) => void;
     handleClick: (e: React.MouseEvent) => void;
+    getDataForKeyNotInKeyEntities: (key: string) => any;
     handleSelectionEnterPress: (e: React.KeyboardEvent<HTMLDivElement>) => void;
     hasValue: () => boolean;
     showClearBtn: () => boolean;

package/lib/es/treeSelect/index.js

@@ -1,3 +1,5 @@
+import _isNull from "lodash/isNull";
+import _isUndefined from "lodash/isUndefined";
 import _isFunction from "lodash/isFunction";
 import _get from "lodash/get";
 import _noop from "lodash/noop";
@@ -101,6 +103,10 @@ class TreeSelect extends BaseComponent {
     this.handleClick = e => {
       this.foundation.handleClick(e);
     };
+
+    this.getDataForKeyNotInKeyEntities = key => {
+      return this.foundation.getDataForKeyNotInKeyEntities(key);
+    };
     /* istanbul ignore next */
 
 
@@ -171,15 +177,15 @@ class TreeSelect extends BaseComponent {
       let renderKeys = [];
 
       if (checkRelation === 'related') {
-        renderKeys = normalizeKeyList([...checkedKeys], keyEntities, leafOnly);
+        renderKeys = normalizeKeyList([...checkedKeys], keyEntities, leafOnly, true);
       } else if (checkRelation === 'unRelated' && Object.keys(keyEntities).length > 0) {
         renderKeys = [...realCheckedKeys];
       }
 
       const tagList = []; // eslint-disable-next-line @typescript-eslint/no-shadow
 
-      renderKeys.forEach(key => {
-        const item = keyEntities[key].data;
+      renderKeys.forEach((key, index) => {
+        const item = keyEntities[key] && keyEntities[key].data.key === key ? keyEntities[key].data : this.getDataForKeyNotInKeyEntities(key);
 
         const onClose = (tagContent, e) => {
           if (e && typeof e.preventDefault === 'function') {
@@ -193,12 +199,12 @@ class TreeSelect extends BaseComponent {
         const {
           content,
           isRenderInTag
-        } = treeNodeLabelProp in item && item ? renderSelectedItem(item, {
-          index: key,
+        } = item && treeNodeLabelProp in item ? renderSelectedItem(item, {
+          index,
           onClose
         }) : null;
 
-        if (!content) {
+        if (_isNull(content) || _isUndefined(content)) {
           return;
         }
 
@@ -208,7 +214,7 @@ class TreeSelect extends BaseComponent {
           color: 'white',
           visible: true,
           onClose,
-          key,
+          key: "tag-".concat(key, "-").concat(index),
           size: size === 'small' ? 'small' : 'large'
         };
 
@@ -421,7 +427,7 @@ class TreeSelect extends BaseComponent {
         ["".concat(prefixcls, "-with-suffix")]: suffix,
         ["".concat(prefixcls, "-with-suffix")]: suffix
       }, className);
-      const triggerRenderKeys = multiple ? normalizeKeyList([...checkedKeys], keyEntities, leafOnly) : selectedKeys;
+      const triggerRenderKeys = multiple ? normalizeKeyList([...checkedKeys], keyEntities, leafOnly, true) : selectedKeys;
       const inner = useCustomTrigger ? /*#__PURE__*/React.createElement(Trigger, {
         inputValue: inputValue,
         // eslint-disable-next-line @typescript-eslint/no-shadow
@@ -485,8 +491,8 @@ class TreeSelect extends BaseComponent {
         renderSelectedItem: propRenderSelectedItem,
         treeNodeLabelProp
       } = this.props;
-      const keyList = normalizeKeyList([key], keyEntities, leafOnly);
-      const nodes = keyList.map(i => keyEntities[i].data);
+      const keyList = normalizeKeyList([key], keyEntities, leafOnly, true);
+      const nodes = keyList.map(i => keyEntities[key] && keyEntities[key].data.key === key ? keyEntities[key].data : this.getDataForKeyNotInKeyEntities(key));
       const value = getValueOrKey(nodes);
       const tagCls = cls("".concat(prefixcls, "-selection-tag"), {
         ["".concat(prefixcls, "-selection-tag-disabled")]: disabled
@@ -519,7 +525,7 @@ class TreeSelect extends BaseComponent {
         const {
           content,
           isRenderInTag
-        } = treeNodeLabelProp in item && item ? renderSelectedItem(item, {
+        } = item && treeNodeLabelProp in item ? renderSelectedItem(item, {
           index: idx,
           onClose
         }) : null;
@@ -557,7 +563,7 @@ class TreeSelect extends BaseComponent {
       let keyList = [];
 
       if (checkRelation === 'related') {
-        keyList = normalizeKeyList(checkedKeys, keyEntities, leafOnly);
+        keyList = normalizeKeyList(checkedKeys, keyEntities, leafOnly, true);
       } else if (checkRelation === 'unRelated') {
         keyList = [...realCheckedKeys];
       } // auto focus search input divide into two parts
@@ -1282,7 +1288,7 @@ TreeSelect.propTypes = {
   arrowIcon: PropTypes.node,
   clearIcon: PropTypes.node,
   defaultOpen: PropTypes.bool,
-  defaultValue: PropTypes.oneOfType([PropTypes.string, PropTypes.array]),
+  defaultValue: PropTypes.oneOfType([PropTypes.string, PropTypes.array, PropTypes.object]),
   defaultExpandAll: PropTypes.bool,
   defaultExpandedKeys: PropTypes.array,
   expandAll: PropTypes.bool,

package/lib/es/typography/util.js

@@ -34,6 +34,10 @@ const getRenderText = function (originEle, rows) {
   let ellipsisPos // eslint-disable-next-line max-params
   = arguments.length > 6 ? arguments[6] : undefined;
 
+  if (content.length === 0) {
+    return '';
+  }
+
   if (!ellipsisContainer) {
     ellipsisContainer = document.createElement('div');
     ellipsisContainer.setAttribute('aria-hidden', 'true');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-ui",
-    "version": "2.25.2",
+    "version": "2.26.0-beta.0",
     "description": "",
     "main": "lib/cjs/index.js",
     "module": "lib/es/index.js",
@@ -17,12 +17,12 @@
         "lib/*"
     ],
     "dependencies": {
-        "@douyinfe/semi-animation": "2.25.2",
-        "@douyinfe/semi-animation-react": "2.25.2",
-        "@douyinfe/semi-foundation": "2.25.2",
-        "@douyinfe/semi-icons": "2.25.2",
-        "@douyinfe/semi-illustrations": "2.25.2",
-        "@douyinfe/semi-theme-default": "2.25.2",
+        "@douyinfe/semi-animation": "2.26.0-beta.0",
+        "@douyinfe/semi-animation-react": "2.26.0-beta.0",
+        "@douyinfe/semi-foundation": "2.26.0-beta.0",
+        "@douyinfe/semi-icons": "2.26.0-beta.0",
+        "@douyinfe/semi-illustrations": "2.26.0-beta.0",
+        "@douyinfe/semi-theme-default": "2.26.0-beta.0",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "copy-text-to-clipboard": "^2.1.1",
@@ -69,7 +69,7 @@
     ],
     "author": "",
     "license": "MIT",
-    "gitHead": "d1cdea565d328c70a4de8636aed30c88f60732dd",
+    "gitHead": "97f744558e96e39201b54219f82ce64da7163b81",
     "devDependencies": {
         "@babel/plugin-proposal-decorators": "^7.15.8",
         "@babel/plugin-transform-runtime": "^7.15.8",