@douyinfe/semi-ui 2.25.0 → 2.25.2

package/lib/es/overflowList/index.js

@@ -1,6 +1,5 @@
-import _isUndefined from "lodash/isUndefined";
-import _isNull from "lodash/isNull";
-import _omit from "lodash/omit";
+import _get from "lodash/get";
+import _isFunction from "lodash/isFunction";
 import _isEqual from "lodash/isEqual";
 
 /* eslint-disable arrow-body-style */
@@ -8,7 +7,7 @@ import React from 'react';
 import cls from 'classnames';
 import BaseComponent from '../_base/baseComponent';
 import PropTypes from 'prop-types';
-import { cssClasses, strings } from '@douyinfe/semi-foundation/lib/es/overflowList/constants';
+import { cssClasses, strings, numbers } from '@douyinfe/semi-foundation/lib/es/overflowList/constants';
 import ResizeObserver from '../resizeObserver';
 import IntersectionObserver from './intersectionObserver';
 import OverflowListFoundation from '@douyinfe/semi-foundation/lib/es/overflowList/foundation';
@@ -36,26 +35,15 @@ class OverflowList extends BaseComponent {
 
     this.resize = function () {
       let entries = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-      // if any parent is growing, assume we have more room than before
-      const growing = entries.some(entry => {
-        const previousWidth = _this.previousWidths.get(entry.target) || 0;
-        return entry.contentRect.width > previousWidth;
-      });
-
-      _this.repartition(growing);
-
-      entries.forEach(entry => _this.previousWidths.set(entry.target, entry.contentRect.width));
-    };
 
-    this.repartition = growing => {
-      // if not mounted or scroll mode, we do not
-      if (_isNull(this.spacer) || _isUndefined(this.spacer) || this.isScrollMode()) {
-        return;
-      } // spacer has flex-shrink and width 1px so if it's much smaller then we know to shrink
+      var _a;
 
+      const containerWidth = (_a = entries[0]) === null || _a === void 0 ? void 0 : _a.target.clientWidth;
 
-      const state = growing ? OverflowDirection.GROW : this.spacer.getBoundingClientRect().width < 0.9 ? OverflowDirection.SHRINK : OverflowDirection.NONE;
-      this.foundation.handlePartition(state);
+      _this.setState({
+        containerWidth,
+        overflowStatus: 'calculating'
+      });
     };
 
     this.reintersect = entries => {
@@ -77,6 +65,18 @@ class OverflowList extends BaseComponent {
       return this.props.overflowRenderer(overflow);
     };
 
+    this.getItemKey = (item, defalutKey) => {
+      const {
+        itemKey
+      } = this.props;
+
+      if (_isFunction(itemKey)) {
+        return itemKey(item);
+      }
+
+      return _get(item, itemKey || 'key', defalutKey);
+    };
+
     this.renderItemList = () => {
       const {
         className,
@@ -88,9 +88,32 @@ class OverflowList extends BaseComponent {
         collapseFrom
       } = this.props;
       const {
-        visible
+        visible,
+        overflowStatus
       } = this.state;
-      const overflow = this.renderOverflow();
+      let overflow = this.renderOverflow();
+
+      if (!this.isScrollMode()) {
+        if (Array.isArray(overflow)) {
+          overflow = /*#__PURE__*/React.createElement(React.Fragment, null, overflow);
+        }
+
+        if ( /*#__PURE__*/React.isValidElement(overflow)) {
+          const child = /*#__PURE__*/React.cloneElement(overflow);
+          overflow = /*#__PURE__*/React.createElement(ResizeObserver, {
+            onResize: _ref => {
+              let [entry] = _ref;
+              this.setState({
+                overflowWidth: entry.target.clientWidth,
+                overflowStatus: 'calculating'
+              });
+            }
+          }, /*#__PURE__*/React.createElement("div", {
+            className: "".concat(prefixCls, "-overflow")
+          }, child));
+        }
+      }
+
       const inner = renderMode === RenderMode.SCROLL ? [overflow[0], /*#__PURE__*/React.createElement("div", {
         className: cls(wrapperClassName, "".concat(prefixCls, "-scroll-wrapper")),
         ref: ref => {
@@ -98,7 +121,7 @@ class OverflowList extends BaseComponent {
         },
         style: Object.assign({}, wrapperStyle),
         key: "".concat(prefixCls, "-scroll-wrapper")
-      }, visible.map(visibleItemRenderer).map((item, ind) => {
+      }, visible.map(visibleItemRenderer).map(item => {
         const {
           forwardRef,
           key
@@ -108,24 +131,71 @@ class OverflowList extends BaseComponent {
           'data-scrollkey': "".concat(key),
           key
         });
-      })), overflow[1]] : [collapseFrom === Boundary.START ? overflow : null, visible.map(visibleItemRenderer), collapseFrom === Boundary.END ? overflow : null, /*#__PURE__*/React.createElement("div", {
-        className: "".concat(prefixCls, "-spacer"),
-        ref: ref => this.spacer = ref,
-        key: "".concat(prefixCls, "-spacer")
-      })];
+      })), overflow[1]] : [collapseFrom === Boundary.START ? overflow : null, visible.map((item, idx) => {
+        const {
+          key
+        } = item;
+        const element = visibleItemRenderer(item, idx);
+        const child = /*#__PURE__*/React.cloneElement(element);
+        return /*#__PURE__*/React.createElement(ResizeObserver, {
+          key: key,
+          onResize: _ref2 => {
+            let [entry] = _ref2;
+            return this.onItemResize(entry, item, idx);
+          }
+        }, /*#__PURE__*/React.createElement("div", {
+          key: key,
+          className: "".concat(prefixCls, "-item")
+        }, child));
+      }), collapseFrom === Boundary.END ? overflow : null];
       const list = /*#__PURE__*/React.createElement('div', {
         className: cls("".concat(prefixCls), className),
-        style
+        style: Object.assign(Object.assign({}, style), renderMode === RenderMode.COLLAPSE ? {
+          maxWidth: '100%',
+          visibility: overflowStatus === "calculating" ? "hidden" : "visible"
+        } : null)
       }, ...inner);
       return list;
     };
 
+    this.onItemResize = (entry, item, idx) => {
+      const key = this.getItemKey(item, idx);
+      const width = this.itemSizeMap.get(key);
+
+      if (!width) {
+        this.itemSizeMap.set(key, entry.target.clientWidth);
+      } else if (width !== entry.target.clientWidth) {
+        // 某个item发生resize后，重新计算
+        this.itemSizeMap.set(key, entry.target.clientWidth);
+        this.setState({
+          overflowStatus: 'calculating'
+        });
+      }
+
+      const {
+        maxCount
+      } = this.state; // 已经按照最大值maxCount渲染完毕，触发真正的渲染。(-1 是overflow部分会占1)
+      // Already rendered maxCount items, trigger the real rendering. (-1 for the overflow part)
+
+      if (this.itemSizeMap.size === maxCount - 1) {
+        this.setState({
+          overflowStatus: 'calculating'
+        });
+      }
+    };
+
     this.state = {
       direction: OverflowDirection.GROW,
       lastOverflowCount: 0,
       overflow: [],
-      visible: props.items,
-      visibleState: new Map()
+      visible: [],
+      containerWidth: 0,
+      visibleState: new Map(),
+      itemSizeMap: new Map(),
+      overflowStatus: "calculating",
+      pivot: 0,
+      overflowWidth: 0,
+      maxCount: 0
     };
     this.foundation = new OverflowListFoundation(this.adapter);
     this.previousWidths = new Map();
@@ -148,8 +218,18 @@ class OverflowList extends BaseComponent {
       // reset visible state if the above props change.
       newState.direction = OverflowDirection.GROW;
       newState.lastOverflowCount = 0;
-      newState.overflow = [];
-      newState.visible = props.items;
+
+      if (props.renderMode === RenderMode.SCROLL) {
+        newState.visible = props.items;
+        newState.overflow = [];
+      } else {
+        newState.visible = [];
+        newState.overflow = [];
+      }
+
+      newState.pivot = 0;
+      newState.maxCount = 0;
+      newState.overflowStatus = "calculating";
     }
 
     return newState;
@@ -167,45 +247,45 @@ class OverflowList extends BaseComponent {
       },
       notifyIntersect: res => {
         this.props.onIntersect && this.props.onIntersect(res);
-      }
+      },
+      getItemSizeMap: () => this.itemSizeMap
     });
   }
 
-  componentDidMount() {
-    this.repartition(false);
-  }
-
-  shouldComponentUpdate(_nextProps, nextState) {
-    // We want this component to always re-render, even when props haven't changed, so that
-    // changes in the renderers' behavior can be reflected.
-    // The following statement prevents re-rendering only in the case where the state changes
-    // identity (i.e. setState was called), but the state is still the same when
-    // shallow-compared to the previous state.
-    const currState = _omit(this.state, 'prevProps');
-
-    const comingState = _omit(nextState, 'prevProps');
-
-    return !(currState !== comingState && _isEqual(currState, comingState));
-  }
-
   componentDidUpdate(prevProps, prevState) {
     if (!_isEqual(prevProps.items, this.props.items)) {
       this.itemRefs = {};
     }
 
-    if (!_isEqual(_omit(prevState, 'prevProps'), _omit(this.state, 'prevProps'))) {
-      this.repartition(false);
-    }
-
     const {
-      direction,
       overflow,
-      lastOverflowCount
+      containerWidth,
+      visible,
+      overflowStatus
     } = this.state;
 
-    if ( // if a resize operation has just completed (transition to NONE)
-    direction === OverflowDirection.NONE && direction !== prevState.direction && overflow.length !== lastOverflowCount) {
-      this.props.onOverflow && this.props.onOverflow(overflow);
+    if (this.isScrollMode() || overflowStatus !== "calculating") {
+      return;
+    }
+
+    if (visible.length === 0 && overflow.length === 0 && this.props.items.length !== 0) {
+      // 推测container最多能渲染的数量
+      // Figure out the maximum number of items in this container
+      const maxCount = Math.min(this.props.items.length, Math.floor(containerWidth / numbers.MINIMUM_HTML_ELEMENT_WIDTH)); // 如果collapseFrom是start, 第一次用来计算容量时，倒转列表顺序渲染
+      // If collapseFrom === start, render item from end to start. Figuring out how many items in the end could fit in container.
+
+      const isCollapseFromStart = this.props.collapseFrom === Boundary.START;
+      const visible = isCollapseFromStart ? this.foundation.getReversedItems().slice(0, maxCount) : this.props.items.slice(0, maxCount);
+      const overflow = isCollapseFromStart ? this.foundation.getReversedItems().slice(maxCount) : this.props.items.slice(maxCount);
+      this.setState({
+        overflowStatus: 'calculating',
+        visible,
+        overflow,
+        maxCount: maxCount
+      });
+      this.itemSizeMap.clear();
+    } else {
+      this.foundation.handleCollapseOverflow();
     }
   }
 
@@ -237,7 +317,8 @@ OverflowList.defaultProps = {
   overflowRenderer: () => null,
   renderMode: 'collapse',
   threshold: 0.75,
-  visibleItemRenderer: () => null
+  visibleItemRenderer: () => null,
+  onOverflow: () => null
 };
 OverflowList.propTypes = {
   // if render in scroll mode, key is required in items

package/lib/es/select/index.js

@@ -667,7 +667,8 @@ class Select extends BaseComponent {
       innerBottomSlot,
       loading,
       virtualize,
-      multiple
+      multiple,
+      emptyContent
     } = this.props; // Do a filter first, instead of directly judging in forEach, so that the focusIndex can correspond to
 
     const visibleOptions = options.filter(item => item._show);
@@ -690,7 +691,11 @@ class Select extends BaseComponent {
       // eslint-disable-next-line jsx-a11y/no-static-element-interactions
       React.createElement("div", {
         id: "".concat(prefixcls, "-").concat(this.selectOptionListID),
-        className: cls("".concat(prefixcls, "-option-list-wrapper"), dropdownClassName),
+        className: cls({
+          // When emptyContent is null and the option is empty, there is no need for the drop-down option for the user,
+          // so there is no need to set padding through this className
+          ["".concat(prefixcls, "-option-list-wrapper")]: !(isEmpty && emptyContent === null)
+        }, dropdownClassName),
         style: style,
         ref: this.setOptionContainerEl,
         onKeyDown: e => this.foundation.handleContainerKeyDown(e)

package/lib/es/tag/index.js

@@ -170,9 +170,9 @@ export default class Tag extends Component {
     })) : null;
     return /*#__PURE__*/React.createElement("div", Object.assign({
       "aria-label": this.props['aria-label'] || _isString(children) ? "".concat(closable ? 'Closable ' : '', "Tag: ").concat(children) : ''
-    }, wrapProps), /*#__PURE__*/React.createElement("div", {
+    }, wrapProps), avatarSrc ? this.renderAvatar() : null, /*#__PURE__*/React.createElement("div", {
       className: "".concat(prefixCls, "-content")
-    }, avatarSrc ? this.renderAvatar() : null, children), closeIcon);
+    }, children), closeIcon);
   }
 
 }

package/lib/es/tagInput/index.js

@@ -18,16 +18,14 @@ import Popover from '../popover';
 import Paragraph from '../typography/paragraph';
 import { IconClear, IconHandle } from '@douyinfe/semi-icons';
 import { SortableContainer, SortableElement, SortableHandle } from 'react-sortable-hoc';
+const prefixCls = cssClasses.PREFIX;
 const SortableItem = SortableElement(props => props.item);
 const SortableList = SortableContainer(_ref => {
   let {
     items
   } = _ref;
   return /*#__PURE__*/React.createElement("div", {
-    style: {
-      display: 'flex',
-      flexFlow: 'row wrap'
-    }
+    className: "".concat(prefixCls, "-sortable-list")
   }, items.map((item, index) =>
   /*#__PURE__*/
   // @ts-ignore skip SortableItem type check
@@ -37,7 +35,6 @@ const SortableList = SortableContainer(_ref => {
     item: item.item
   })));
 });
-const prefixCls = cssClasses.PREFIX;
 
 class TagInput extends BaseComponent {
   constructor(props) {
@@ -143,13 +140,15 @@ class TagInput extends BaseComponent {
             key: elementKey,
             visible: true,
             "aria-label": "".concat(!disabled ? 'Closable ' : '', "Tag: ").concat(value)
+          }, /*#__PURE__*/React.createElement("div", {
+            className: "".concat(prefixCls, "-tag-content-wrapper")
           }, showIconHandler && /*#__PURE__*/React.createElement(DragHandle, null), /*#__PURE__*/React.createElement(Paragraph, {
             className: typoCls,
             ellipsis: {
               showTooltip: showContentTooltip,
               rows: 1
             }
-          }, value));
+          }, value)));
         }
       });
     };

package/package.json

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