@douyinfe/semi-ui 2.50.0-alpha.0 → 2.50.0-beta.0

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

@@ -90,6 +90,7 @@ export interface TreeState extends BasicTreeInnerData {
 export interface TreeNodeProps extends BasicTreeNodeProps {
     children?: TreeNodeData[];
     icon?: ReactNode;
+    isEnd?: boolean[];
 }
 export interface TreeNodeState {
     [x: string]: any;
@@ -104,6 +105,7 @@ export interface FlattenNode extends BasicFlattenNode {
     data?: BasicTreeNodeData;
     label?: ReactNode;
     parent?: null | FlattenNode;
+    isEnd?: boolean[];
 }
 export interface NodeListProps {
     [x: string]: any;

package/lib/cjs/tree/treeNode.d.ts

@@ -22,6 +22,8 @@ export default class TreeNode extends PureComponent<TreeNodeProps, TreeNodeState
         treeNodeFilterProp: PropTypes.Requireable<string>;
         selectedKey: PropTypes.Requireable<string>;
         motionKey: PropTypes.Requireable<NonNullable<string | string[]>>;
+        isEnd: PropTypes.Requireable<boolean[]>;
+        showLine: PropTypes.Requireable<boolean>;
     };
     static defaultProps: {
         selectedKey: string;
@@ -56,6 +58,7 @@ export default class TreeNode extends PureComponent<TreeNodeProps, TreeNodeState
     isDisabled: () => boolean;
     renderArrow(): JSX.Element;
     renderCheckbox(): JSX.Element;
+    renderSwitcher: () => JSX.Element;
     renderIcon(): any;
     renderEmptyNode(): JSX.Element;
     renderRealLabel: () => any;

package/lib/cjs/tree/treeNode.js

@@ -19,6 +19,7 @@ var _checkbox = require("../checkbox");
 var _treeContext = _interopRequireDefault(require("./treeContext"));
 var _spin = _interopRequireDefault(require("../spin"));
 var _index = require("../_utils/index");
+var _indent = _interopRequireDefault(require("./indent"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -204,6 +205,18 @@ class TreeNode extends _react.PureComponent {
       }
       return Boolean(treeDisabled || disabled);
     };
+    // Switcher
+    this.renderSwitcher = () => {
+      if (this.isLeaf()) {
+        // if switcherIconDom is null, no render switcher span
+        return /*#__PURE__*/_react.default.createElement("span", {
+          className: (0, _classnames.default)(`${prefixcls}-switcher`)
+        }, /*#__PURE__*/_react.default.createElement("span", {
+          className: `${prefixcls}-switcher-leaf-line`
+        }));
+      }
+      return null;
+    };
     this.renderRealLabel = () => {
       const {
         renderLabel
@@ -243,7 +256,8 @@ class TreeNode extends _react.PureComponent {
     const showIcon = !this.isLeaf();
     const {
       loading,
-      expanded
+      expanded,
+      showLine
     } = this.props;
     if (loading) {
       return /*#__PURE__*/_react.default.createElement(_spin.default, {
@@ -259,6 +273,9 @@ class TreeNode extends _react.PureComponent {
         onClick: this.onExpand
       });
     }
+    if (showLine) {
+      return this.renderSwitcher();
+    }
     return /*#__PURE__*/_react.default.createElement("span", {
       className: `${prefixcls}-empty-icon`
     });
@@ -342,9 +359,11 @@ class TreeNode extends _react.PureComponent {
         filtered,
         treeNodeFilterProp,
         display,
-        style
+        style,
+        isEnd,
+        showLine
       } = _a,
-      rest = __rest(_a, ["eventKey", "expanded", "selected", "checked", "halfChecked", "loading", "active", "level", "empty", "filtered", "treeNodeFilterProp", "display", "style"]);
+      rest = __rest(_a, ["eventKey", "expanded", "selected", "checked", "halfChecked", "loading", "active", "level", "empty", "filtered", "treeNodeFilterProp", "display", "style", "isEnd", "showLine"]);
     if (empty) {
       return this.renderEmptyNode();
     }
@@ -356,6 +375,7 @@ class TreeNode extends _react.PureComponent {
       dropPosition,
       labelEllipsis
     } = this.context;
+    const isEndNode = isEnd[isEnd.length - 1];
     const disabled = this.isDisabled();
     const dragOver = dragOverNodeKey === eventKey && dropPosition === 0;
     const dragOverGapTop = dragOverNodeKey === eventKey && dropPosition === -1;
@@ -373,7 +393,8 @@ class TreeNode extends _react.PureComponent {
       [`${prefixcls}-fullLabel-draggable`]: !disabled && draggable && renderFullLabel,
       // When draggable + renderFullLabel is turned on, the style of dragover
       [`${prefixcls}-fullLabel-drag-over-gap-top`]: !disabled && dragOverGapTop && renderFullLabel,
-      [`${prefixcls}-fullLabel-drag-over-gap-bottom`]: !disabled && dragOverGapBottom && renderFullLabel
+      [`${prefixcls}-fullLabel-drag-over-gap-bottom`]: !disabled && dragOverGapBottom && renderFullLabel,
+      [`${prefixcls}-tree-node-last-leaf`]: isEndNode
     });
     const labelProps = {
       onClick: this.onClick,
@@ -449,7 +470,12 @@ class TreeNode extends _react.PureComponent {
       onDoubleClick: this.onDoubleClick,
       ref: this.setRef,
       style: style
-    }, dragProps), this.renderArrow(), /*#__PURE__*/_react.default.createElement("span", {
+    }, dragProps), /*#__PURE__*/_react.default.createElement(_indent.default, {
+      showLine: showLine,
+      prefixcls: prefixcls,
+      level: level,
+      isEnd: isEnd
+    }), this.renderArrow(), /*#__PURE__*/_react.default.createElement("span", {
       className: labelCls
     }, multiple ? this.renderCheckbox() : null, this.renderIcon(), /*#__PURE__*/_react.default.createElement("span", {
       className: `${prefixcls}-label-text`
@@ -475,7 +501,9 @@ TreeNode.propTypes = {
   keyword: _propTypes.default.string,
   treeNodeFilterProp: _propTypes.default.string,
   selectedKey: _propTypes.default.string,
-  motionKey: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)])
+  motionKey: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.arrayOf(_propTypes.default.string)]),
+  isEnd: _propTypes.default.arrayOf(_propTypes.default.bool),
+  showLine: _propTypes.default.bool
 };
 TreeNode.defaultProps = {
   selectedKey: '',

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

@@ -29,7 +29,7 @@ export type RenderSelectedItemInMultiple = (treeNode: TreeNodeData, otherProps:
     content: React.ReactNode;
 };
 export type RenderSelectedItem = RenderSelectedItemInSingle | RenderSelectedItemInMultiple;
-export type OverrideCommonProps = 'renderFullLabel' | 'renderLabel' | 'defaultValue' | 'emptyContent' | 'filterTreeNode' | 'style' | 'treeData' | 'value' | 'onExpand' | 'keyMaps';
+export type OverrideCommonProps = 'renderFullLabel' | 'renderLabel' | 'defaultValue' | 'emptyContent' | 'filterTreeNode' | 'style' | 'treeData' | 'value' | 'onExpand' | 'keyMaps' | 'showLine';
 /**
 * Type definition description:
 * TreeSelectProps inherits some properties from BasicTreeSelectProps (from foundation) and TreeProps (from semi-ui-react).
@@ -77,7 +77,7 @@ export interface TreeSelectProps extends Omit<BasicTreeSelectProps, OverrideComm
     onSelect?: (selectedKey: string, selected: boolean, selectedNode: TreeNodeData) => void;
     renderSelectedItem?: RenderSelectedItem;
     getPopupContainer?: () => HTMLElement;
-    triggerRender?: (props?: TriggerRenderProps) => React.ReactNode;
+    triggerRender?: (props: TriggerRenderProps) => React.ReactNode;
     onBlur?: (e: React.MouseEvent) => void;
     onChange?: OnChange;
     onFocus?: (e: React.MouseEvent) => void;
@@ -134,6 +134,7 @@ declare class TreeSelect extends BaseComponent<TreeSelectProps, TreeSelectState>
         showSearchClear: PropTypes.Requireable<boolean>;
         autoAdjustOverflow: PropTypes.Requireable<boolean>;
         showFilteredOnly: PropTypes.Requireable<boolean>;
+        showLine: PropTypes.Requireable<boolean>;
         motionExpand: PropTypes.Requireable<boolean>;
         emptyContent: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         keyMaps: PropTypes.Requireable<object>;
@@ -190,7 +191,6 @@ declare class TreeSelect extends BaseComponent<TreeSelectProps, TreeSelectState>
     triggerRef: React.RefObject<HTMLDivElement>;
     optionsRef: React.RefObject<any>;
     clickOutsideHandler: any;
-    _flattenNodes: TreeState['flattenNodes'];
     onNodeClick: any;
     onNodeDoubleClick: any;
     onMotionEnd: any;
@@ -247,6 +247,7 @@ declare class TreeSelect extends BaseComponent<TreeSelectProps, TreeSelectState>
     };
     getTreeNodeKey: (treeNode: TreeNodeData) => string;
     handlePopoverClose: (isVisible: any) => void;
+    afterClose: () => void;
     renderTreeNode: (treeNode: FlattenNode, ind: number, style: React.CSSProperties) => JSX.Element;
     itemKey: (index: number, data: Record<string, any>) => any;
     renderNodeList: () => JSX.Element;

package/lib/cjs/treeSelect/index.js

@@ -689,23 +689,40 @@ class TreeSelect extends _baseComponent.default {
         searchAutoFocus,
         searchPosition
       } = this.props;
-      if (isVisible === false && Boolean(filterTreeNode)) {
-        this.foundation.clearInput();
+      // 将 inputValue 清空，如果有选中值的话，选中项能够快速回显
+      // Clear the inputValue. If there is a selected value, the selected item can be quickly echoed.
+      if (isVisible === false && filterTreeNode) {
+        this.foundation.clearInputValue();
       }
       if (filterTreeNode && searchPosition === _constants.strings.SEARCH_POSITION_DROPDOWN && isVisible && searchAutoFocus) {
         this.foundation.focusInput(true);
       }
     };
+    this.afterClose = () => {
+      // flattenNode 的变化将导致弹出层面板中的选项数目变化
+      // 在弹层完全收起之后，再通过 clearInput 重新计算 state 中的 expandedKey， flattenNode
+      // 防止在弹出层未收起时弹层面板中选项数目变化导致视觉上出现弹层闪动问题
+      // Changes to flattenNode will cause the number of options in the popup panel to change
+      // After the pop-up layer is completely closed, recalculate the expandedKey and flattenNode in the state through clearInput.
+      // Prevent the pop-up layer from flickering visually due to changes in the number of options in the pop-up panel when the pop-up layer is not collapsed.
+      const {
+        filterTreeNode
+      } = this.props;
+      filterTreeNode && this.foundation.clearInput();
+    };
     this.renderTreeNode = (treeNode, ind, style) => {
       const {
         data,
         key
       } = treeNode;
       const treeNodeProps = this.foundation.getTreeNodeProps(key);
+      const {
+        showLine
+      } = this.props;
       if (!treeNodeProps) {
         return null;
       }
-      const props = (0, _pick2.default)(treeNode, ['key', 'label', 'disabled', 'isLeaf', 'icon']);
+      const props = (0, _pick2.default)(treeNode, ['key', 'label', 'disabled', 'isLeaf', 'icon', 'isEnd']);
       const {
         keyMaps
       } = this.props;
@@ -713,7 +730,8 @@ class TreeSelect extends _baseComponent.default {
       !(0, _isUndefined2.default)(children) && (props.children = children);
       return /*#__PURE__*/_react.default.createElement(_treeNode.default, Object.assign({}, treeNodeProps, data, props, {
         data: data,
-        style: style
+        style: style,
+        showLine: showLine
       }));
     };
     this.itemKey = (index, data) => {
@@ -728,6 +746,7 @@ class TreeSelect extends _baseComponent.default {
     this.renderNodeList = () => {
       const {
         flattenNodes,
+        cachedFlattenNodes,
         motionKeys,
         motionType,
         filteredKeys
@@ -743,7 +762,7 @@ class TreeSelect extends _baseComponent.default {
       if (!virtualize || (0, _isEmpty2.default)(virtualize)) {
         return /*#__PURE__*/_react.default.createElement(_nodeList.default, {
           flattenNodes: flattenNodes,
-          flattenList: this._flattenNodes,
+          flattenList: cachedFlattenNodes,
           motionKeys: motionExpand ? motionKeys : new Set([]),
           motionType: motionType,
           // When motionKeys is empty, but filteredKeys is not empty (that is, the search hits), this situation should be distinguished from ordinary motionKeys
@@ -862,6 +881,7 @@ class TreeSelect extends _baseComponent.default {
       keyEntities: {},
       treeData: [],
       flattenNodes: [],
+      cachedFlattenNodes: undefined,
       selectedKeys: [],
       checkedKeys: new Set(),
       halfCheckedKeys: new Set(),
@@ -891,6 +911,7 @@ class TreeSelect extends _baseComponent.default {
     };
   }
   static getDerivedStateFromProps(props, prevState) {
+    var _a;
     const {
       prevProps,
       rePosKey
@@ -908,6 +929,8 @@ class TreeSelect extends _baseComponent.default {
     };
     const needUpdateTreeData = needUpdate('treeData');
     const needUpdateExpandedKeys = needUpdate('expandedKeys');
+    const isExpandControlled = ('expandedKeys' in props);
+    const isSearching = Boolean(props.filterTreeNode && prevState.inputValue && prevState.inputValue.length);
     // TreeNode
     if (needUpdateTreeData) {
       treeData = props.treeData;
@@ -926,31 +949,97 @@ class TreeSelect extends _baseComponent.default {
       }
     }
     const expandAllWhenDataChange = needUpdateTreeData && props.expandAll;
-    // expandedKeys
-    if (needUpdateExpandedKeys || prevProps && needUpdate('autoExpandParent')) {
-      newState.expandedKeys = (0, _treeUtil.calcExpandedKeys)(props.expandedKeys, keyEntities, props.autoExpandParent || !prevProps);
-      // only show animation when treeData does not change
-      if (prevProps && props.motion && !treeData) {
-        const {
-          motionKeys,
-          motionType
-        } = (0, _treeUtil.calcMotionKeys)(prevState.expandedKeys, newState.expandedKeys, keyEntities);
-        newState.motionKeys = new Set(motionKeys);
-        newState.motionType = motionType;
+    if (!isSearching) {
+      // expandedKeys
+      if (needUpdateExpandedKeys || prevProps && needUpdate('autoExpandParent')) {
+        newState.expandedKeys = (0, _treeUtil.calcExpandedKeys)(props.expandedKeys, keyEntities, props.autoExpandParent || !prevProps);
+        // only show animation when treeData does not change
+        if (prevProps && props.motion && !treeData) {
+          const {
+            motionKeys,
+            motionType
+          } = (0, _treeUtil.calcMotionKeys)(prevState.expandedKeys, newState.expandedKeys, keyEntities);
+          newState.motionKeys = new Set(motionKeys);
+          newState.motionType = motionType;
+          if (motionType === 'hide') {
+            // cache flatten nodes: expandedKeys changed may not be triggered by interaction
+            newState.cachedFlattenNodes = (0, _treeUtil2.cloneDeep)(prevState.flattenNodes);
+          }
+        }
+      } else if (!prevProps && (props.defaultExpandAll || props.expandAll) || expandAllWhenDataChange) {
+        newState.expandedKeys = new Set(Object.keys(keyEntities));
+      } else if (!prevProps && props.defaultExpandedKeys) {
+        newState.expandedKeys = (0, _treeUtil.calcExpandedKeys)(props.defaultExpandedKeys, keyEntities);
+      } else if (!prevProps && props.defaultValue) {
+        newState.expandedKeys = (0, _treeUtil.calcExpandedKeysForValues)((0, _treeUtil.normalizeValue)(props.defaultValue, withObject, keyMaps), keyEntities, props.multiple, valueEntities);
+      } else if (!prevProps && props.value) {
+        newState.expandedKeys = (0, _treeUtil.calcExpandedKeysForValues)((0, _treeUtil.normalizeValue)(props.value, withObject, keyMaps), keyEntities, props.multiple, valueEntities);
+      } else if (!isExpandControlled && needUpdateTreeData && props.value) {
+        // 当 treeData 已经设置具体的值，并且设置了 props.loadData ，则认为 treeData 的更新是因为 loadData 导致的
+        // 如果是因为 loadData 导致 treeData改变， 此时在这里重新计算 key 会导致为未选中的展开项目被收起
+        // 所以此时不需要重新计算 expandedKeys，因为在点击展开按钮时候已经把被展开的项添加到 expandedKeys 中
+        // When treeData has a specific value and props.loadData is set, it is considered that the update of treeData is caused by loadData
+        // If the treeData is changed because of loadData, recalculating the key here will cause the unselected expanded items to be collapsed
+        // So there is no need to recalculate expandedKeys at this time, because the expanded item has been added to expandedKeys when the expand button is clicked
+        if (!(prevState.treeData && ((_a = prevState.treeData) === null || _a === void 0 ? void 0 : _a.length) > 0 && props.loadData)) {
+          newState.expandedKeys = (0, _treeUtil.calcExpandedKeysForValues)(props.value, keyEntities, props.multiple, valueEntities);
+        }
+      }
+      if (!newState.expandedKeys) {
+        delete newState.expandedKeys;
+      }
+      if (treeData || newState.expandedKeys) {
+        const flattenNodes = (0, _treeUtil.flattenTreeData)(treeData || prevState.treeData, newState.expandedKeys || prevState.expandedKeys, keyMaps);
+        newState.flattenNodes = flattenNodes;
+      }
+    } else {
+      let filteredState;
+      // treeData changed while searching
+      if (treeData) {
+        // Get filter data
+        filteredState = (0, _treeUtil.filterTreeData)({
+          treeData,
+          inputValue: prevState.inputValue,
+          filterTreeNode: props.filterTreeNode,
+          filterProps: props.treeNodeFilterProp,
+          showFilteredOnly: props.showFilteredOnly,
+          keyEntities: newState.keyEntities,
+          prevExpandedKeys: [...prevState.filteredExpandedKeys],
+          keyMaps: keyMaps
+        });
+        newState.flattenNodes = filteredState.flattenNodes;
+        newState.motionKeys = new Set([]);
+        newState.filteredKeys = filteredState.filteredKeys;
+        newState.filteredShownKeys = filteredState.filteredShownKeys;
+        newState.filteredExpandedKeys = filteredState.filteredExpandedKeys;
+      }
+      // expandedKeys changed while searching
+      if (props.expandedKeys) {
+        newState.filteredExpandedKeys = (0, _treeUtil.calcExpandedKeys)(props.expandedKeys, keyEntities, props.autoExpandParent || !prevProps);
+        if (prevProps && props.motion) {
+          const prevKeys = prevState ? prevState.filteredExpandedKeys : new Set([]);
+          // only show animation when treeData does not change
+          if (!treeData) {
+            const motionResult = (0, _treeUtil.calcMotionKeys)(prevKeys, newState.filteredExpandedKeys, keyEntities);
+            let {
+              motionKeys
+            } = motionResult;
+            const {
+              motionType
+            } = motionResult;
+            if (props.showFilteredOnly) {
+              motionKeys = motionKeys.filter(key => prevState.filteredShownKeys.has(key));
+            }
+            if (motionType === 'hide') {
+              // cache flatten nodes: expandedKeys changed may not be triggered by interaction
+              newState.cachedFlattenNodes = (0, _treeUtil2.cloneDeep)(prevState.flattenNodes);
+            }
+            newState.motionKeys = new Set(motionKeys);
+            newState.motionType = motionType;
+          }
+        }
+        newState.flattenNodes = (0, _treeUtil.flattenTreeData)(treeData || prevState.treeData, newState.filteredExpandedKeys || prevState.filteredExpandedKeys, keyMaps, props.showFilteredOnly && prevState.filteredShownKeys);
       }
-    } else if (!prevProps && (props.defaultExpandAll || props.expandAll) || expandAllWhenDataChange) {
-      newState.expandedKeys = new Set(Object.keys(keyEntities));
-    } else if (!prevProps && props.defaultExpandedKeys) {
-      newState.expandedKeys = (0, _treeUtil.calcExpandedKeys)(props.defaultExpandedKeys, keyEntities);
-    } else if (!prevProps && props.defaultValue) {
-      newState.expandedKeys = (0, _treeUtil.calcExpandedKeysForValues)((0, _treeUtil.normalizeValue)(props.defaultValue, withObject, keyMaps), keyEntities, props.multiple, valueEntities);
-    } else if (!prevProps && props.value) {
-      newState.expandedKeys = (0, _treeUtil.calcExpandedKeysForValues)((0, _treeUtil.normalizeValue)(props.value, withObject, keyMaps), keyEntities, props.multiple, valueEntities);
-    }
-    // flattenNodes
-    if (treeData || needUpdateExpandedKeys) {
-      const flattenNodes = (0, _treeUtil.flattenTreeData)(treeData || prevState.treeData, newState.expandedKeys || prevState.expandedKeys, keyMaps);
-      newState.flattenNodes = flattenNodes;
     }
     // selectedKeys: single mode controlled
     const isMultiple = props.multiple;
@@ -1057,7 +1146,9 @@ class TreeSelect extends _baseComponent.default {
         this.props.onSearch && this.props.onSearch(input, filteredExpandedKeys);
       },
       cacheFlattenNodes: bool => {
-        this._flattenNodes = bool ? (0, _treeUtil2.cloneDeep)(this.state.flattenNodes) : null;
+        this.setState({
+          cachedFlattenNodes: bool ? (0, _treeUtil2.cloneDeep)(this.state.flattenNodes) : undefined
+        });
       },
       notifyLoad: (newLoadedKeys, data) => {
         const {
@@ -1202,7 +1293,8 @@ class TreeSelect extends _baseComponent.default {
       autoAdjustOverflow: autoAdjustOverflow,
       mouseLeaveDelay: mouseLeaveDelay,
       mouseEnterDelay: mouseEnterDelay,
-      onVisibleChange: this.handlePopoverClose
+      onVisibleChange: this.handlePopoverClose,
+      afterClose: this.afterClose
     }, selection);
   }
 }
@@ -1247,6 +1339,7 @@ TreeSelect.propTypes = {
   showSearchClear: _propTypes.default.bool,
   autoAdjustOverflow: _propTypes.default.bool,
   showFilteredOnly: _propTypes.default.bool,
+  showLine: _propTypes.default.bool,
   motionExpand: _propTypes.default.bool,
   emptyContent: _propTypes.default.node,
   keyMaps: _propTypes.default.object,

package/lib/cjs/typography/base.d.ts

@@ -85,7 +85,7 @@ export default class Base extends Component<BaseTypographyProps, BaseTypographyS
         spacing: PropTypes.Requireable<"normal" | "extended">;
         strong: PropTypes.Requireable<boolean>;
         size: PropTypes.Requireable<"small" | "normal">;
-        type: PropTypes.Requireable<"warning" | "success" | "primary" | "secondary" | "tertiary" | "danger" | "quaternary">;
+        type: PropTypes.Requireable<"warning" | "success" | "primary" | "tertiary" | "secondary" | "danger" | "quaternary">;
         style: PropTypes.Requireable<object>;
         className: PropTypes.Requireable<string>;
         icon: PropTypes.Requireable<NonNullable<PropTypes.ReactNodeLike>>;

package/lib/cjs/typography/numeral.d.ts

@@ -38,7 +38,7 @@ export default class Numeral extends PureComponent<NumeralProps> {
         underline: PropTypes.Requireable<boolean>;
         link: PropTypes.Requireable<NonNullable<boolean | object>>;
         strong: PropTypes.Requireable<boolean>;
-        type: PropTypes.Requireable<"warning" | "success" | "primary" | "secondary" | "tertiary" | "danger" | "quaternary">;
+        type: PropTypes.Requireable<"warning" | "success" | "primary" | "tertiary" | "secondary" | "danger" | "quaternary">;
         size: PropTypes.Requireable<"small" | "normal">;
         style: PropTypes.Requireable<object>;
         className: PropTypes.Requireable<string>;

package/lib/cjs/typography/paragraph.d.ts

@@ -50,7 +50,7 @@ export default class Paragraph extends PureComponent<ParagraphProps> {
         link: PropTypes.Requireable<NonNullable<boolean | object>>;
         underline: PropTypes.Requireable<boolean>;
         strong: PropTypes.Requireable<boolean>;
-        type: PropTypes.Requireable<"warning" | "success" | "primary" | "secondary" | "tertiary" | "danger" | "quaternary">;
+        type: PropTypes.Requireable<"warning" | "success" | "primary" | "tertiary" | "secondary" | "danger" | "quaternary">;
         size: PropTypes.Requireable<"small" | "normal">;
         spacing: PropTypes.Requireable<"normal" | "extended">;
         style: PropTypes.Requireable<object>;

package/lib/cjs/typography/text.d.ts

@@ -53,7 +53,7 @@ export default class Text extends PureComponent<TextProps> {
         underline: PropTypes.Requireable<boolean>;
         link: PropTypes.Requireable<NonNullable<boolean | object>>;
         strong: PropTypes.Requireable<boolean>;
-        type: PropTypes.Requireable<"warning" | "success" | "primary" | "secondary" | "tertiary" | "danger" | "quaternary">;
+        type: PropTypes.Requireable<"warning" | "success" | "primary" | "tertiary" | "secondary" | "danger" | "quaternary">;
         size: PropTypes.Requireable<"small" | "normal">;
         style: PropTypes.Requireable<object>;
         className: PropTypes.Requireable<string>;

package/lib/cjs/typography/title.d.ts

@@ -59,7 +59,7 @@ export default class Title extends PureComponent<TitleProps> {
         link: PropTypes.Requireable<NonNullable<boolean | object>>;
         underline: PropTypes.Requireable<boolean>;
         strong: PropTypes.Requireable<boolean>;
-        type: PropTypes.Requireable<"warning" | "success" | "primary" | "secondary" | "tertiary" | "danger" | "quaternary">;
+        type: PropTypes.Requireable<"warning" | "success" | "primary" | "tertiary" | "secondary" | "danger" | "quaternary">;
         heading: PropTypes.Requireable<1 | 2 | 3 | 4 | 5 | 6>;
         style: PropTypes.Requireable<object>;
         className: PropTypes.Requireable<string>;

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

@@ -49,7 +49,7 @@ declare class Anchor extends BaseComponent<AnchorProps, AnchorState> {
         offsetTop: PropTypes.Requireable<number>;
         targetOffset: PropTypes.Requireable<number>;
         showTooltip: PropTypes.Requireable<boolean>;
-        position: PropTypes.Requireable<"left" | "right" | "top" | "topLeft" | "topRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom" | "bottom" | "bottomLeft" | "bottomRight" | "leftTopOver" | "rightTopOver">;
+        position: PropTypes.Requireable<"left" | "right" | "top" | "bottom" | "topLeft" | "topRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom" | "bottomLeft" | "bottomRight" | "leftTopOver" | "rightTopOver">;
         maxWidth: PropTypes.Requireable<NonNullable<string | number>>;
         maxHeight: PropTypes.Requireable<NonNullable<string | number>>;
         getContainer: PropTypes.Requireable<(...args: any[]) => any>;

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

@@ -116,7 +116,7 @@ declare class AutoComplete<T extends AutoCompleteItems> extends BaseComponent<Au
         onFocus: PropTypes.Requireable<(...args: any[]) => any>;
         onChange: PropTypes.Requireable<(...args: any[]) => any>;
         onKeyDown: PropTypes.Requireable<(...args: any[]) => any>;
-        position: PropTypes.Requireable<"left" | "right" | "top" | "topLeft" | "topRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom" | "bottom" | "bottomLeft" | "bottomRight" | "leftTopOver" | "rightTopOver" | "leftBottomOver" | "rightBottomOver">;
+        position: PropTypes.Requireable<"left" | "right" | "top" | "bottom" | "topLeft" | "topRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom" | "bottomLeft" | "bottomRight" | "leftTopOver" | "rightTopOver" | "leftBottomOver" | "rightBottomOver">;
         placeholder: PropTypes.Requireable<string>;
         prefix: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         onChangeWithObject: PropTypes.Requireable<boolean>;

package/lib/es/button/Button.d.ts

@@ -48,7 +48,7 @@ export default class Button extends PureComponent<ButtonProps> {
         prefixCls: PropTypes.Requireable<string>;
         style: PropTypes.Requireable<object>;
         size: PropTypes.Requireable<"default" | "small" | "large">;
-        type: PropTypes.Requireable<"warning" | "primary" | "secondary" | "tertiary" | "danger">;
+        type: PropTypes.Requireable<"warning" | "primary" | "tertiary" | "secondary" | "danger">;
         block: PropTypes.Requireable<boolean>;
         onClick: PropTypes.Requireable<(...args: any[]) => any>;
         onMouseDown: PropTypes.Requireable<(...args: any[]) => any>;

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

@@ -23,7 +23,7 @@ declare class Button extends React.PureComponent<ButtonProps> {
         onMouseLeave: import("prop-types").Requireable<(...args: any[]) => any>;
         disabled: import("prop-types").Requireable<boolean>;
         size: import("prop-types").Requireable<"default" | "small" | "large">;
-        type: import("prop-types").Requireable<"warning" | "primary" | "secondary" | "tertiary" | "danger">;
+        type: import("prop-types").Requireable<"warning" | "primary" | "tertiary" | "secondary" | "danger">;
         block: import("prop-types").Requireable<boolean>;
         onClick: import("prop-types").Requireable<(...args: any[]) => any>;
         onMouseDown: import("prop-types").Requireable<(...args: any[]) => any>;

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

@@ -24,7 +24,7 @@ declare class Carousel extends BaseComponent<CarouselProps, CarouselState> {
         indicatorType: PropTypes.Requireable<"line" | "dot" | "columnar">;
         theme: PropTypes.Requireable<"dark" | "light" | "primary">;
         onChange: PropTypes.Requireable<(...args: any[]) => any>;
-        arrowType: PropTypes.Requireable<"hover" | "always">;
+        arrowType: PropTypes.Requireable<"always" | "hover">;
         showArrow: PropTypes.Requireable<boolean>;
         showIndicator: PropTypes.Requireable<boolean>;
         slideDirection: PropTypes.Requireable<"left" | "right">;

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

@@ -91,7 +91,7 @@ export default class DatePicker extends BaseComponent<DatePickerProps, DatePicke
         insetLabel: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         insetLabelId: PropTypes.Requireable<string>;
         zIndex: PropTypes.Requireable<number>;
-        position: PropTypes.Requireable<"left" | "right" | "top" | "topLeft" | "topRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom" | "bottom" | "bottomLeft" | "bottomRight" | "leftTopOver" | "rightTopOver">;
+        position: PropTypes.Requireable<"left" | "right" | "top" | "bottom" | "topLeft" | "topRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom" | "bottomLeft" | "bottomRight" | "leftTopOver" | "rightTopOver">;
         getPopupContainer: PropTypes.Requireable<(...args: any[]) => any>;
         onCancel: PropTypes.Requireable<(...args: any[]) => any>;
         onConfirm: PropTypes.Requireable<(...args: any[]) => any>;

package/lib/es/datePicker/yearAndMonth.js

@@ -124,11 +124,7 @@ class YearAndMonth extends BaseComponent {
     const right = strings.PANEL_TYPE_RIGHT;
     const needDisabled = year => {
       if (panelType === right && currentYear[left]) {
-        if (currentMonth[left] <= currentMonth[right]) {
-          return currentYear[left] > year;
-        } else {
-          return currentYear[left] >= year;
-        }
+        return currentYear[left] > year;
       }
       return false;
     };

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

@@ -66,7 +66,7 @@ declare class Dropdown extends BaseComponent<DropdownProps, DropdownState> {
         motion: PropTypes.Requireable<NonNullable<boolean | object>>;
         onVisibleChange: PropTypes.Requireable<(...args: any[]) => any>;
         prefixCls: PropTypes.Requireable<string>;
-        position: PropTypes.Requireable<"left" | "right" | "top" | "topLeft" | "topRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom" | "bottom" | "bottomLeft" | "bottomRight" | "leftTopOver" | "rightTopOver" | "leftBottomOver" | "rightBottomOver">;
+        position: PropTypes.Requireable<"left" | "right" | "top" | "bottom" | "topLeft" | "topRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom" | "bottomLeft" | "bottomRight" | "leftTopOver" | "rightTopOver" | "leftBottomOver" | "rightBottomOver">;
         rePosKey: PropTypes.Requireable<NonNullable<string | number>>;
         render: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         spacing: PropTypes.Requireable<NonNullable<number | object>>;

package/lib/es/form/baseForm.d.ts

@@ -85,7 +85,7 @@ declare class Form<Values extends Record<string, any> = any> extends BaseCompone
         expandRestTagsOnClick?: boolean;
         onDropdownVisibleChange?: (visible: boolean) => void;
         zIndex?: number;
-        position?: "left" | "right" | "top" | "topLeft" | "topRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom" | "bottom" | "bottomLeft" | "bottomRight" | "leftTopOver" | "rightTopOver" | "leftBottomOver" | "rightBottomOver";
+        position?: "left" | "right" | "top" | "bottom" | "topLeft" | "topRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom" | "bottomLeft" | "bottomRight" | "leftTopOver" | "rightTopOver" | "leftBottomOver" | "rightBottomOver";
         onSearch?: (value: string, event: React.KeyboardEvent<Element> | React.MouseEvent<Element, MouseEvent>) => void;
         dropdownClassName?: string;
         dropdownStyle?: React.CSSProperties;
@@ -130,7 +130,7 @@ declare class Form<Values extends Record<string, any> = any> extends BaseCompone
         onDeselect?: (value: string | number | any[] | Record<string, any>, option: Record<string, any>) => void;
         onSelect?: (value: string | number | any[] | Record<string, any>, option: Record<string, any>) => void;
         allowCreate?: boolean;
-        triggerRender?: (props?: import("../select").TriggerRenderProps) => React.ReactNode;
+        triggerRender?: (props: import("../select").TriggerRenderProps) => React.ReactNode;
         onClear?: () => void;
         virtualize?: import("../select").virtualListProps;
         onFocus?: (e: React.FocusEvent<Element, Element>) => void;

package/lib/es/form/field.d.ts

@@ -31,7 +31,7 @@ declare const FormSelect: import("react").ComponentType<import("utility-types").
     expandRestTagsOnClick?: boolean;
     onDropdownVisibleChange?: (visible: boolean) => void;
     zIndex?: number;
-    position?: "left" | "right" | "top" | "topLeft" | "topRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom" | "bottom" | "bottomLeft" | "bottomRight" | "leftTopOver" | "rightTopOver" | "leftBottomOver" | "rightBottomOver";
+    position?: "left" | "right" | "top" | "bottom" | "topLeft" | "topRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom" | "bottomLeft" | "bottomRight" | "leftTopOver" | "rightTopOver" | "leftBottomOver" | "rightBottomOver";
     onSearch?: (value: string, event: import("react").KeyboardEvent<Element> | import("react").MouseEvent<Element, MouseEvent>) => void;
     dropdownClassName?: string;
     dropdownStyle?: import("react").CSSProperties;
@@ -76,7 +76,7 @@ declare const FormSelect: import("react").ComponentType<import("utility-types").
     onDeselect?: (value: string | number | any[] | Record<string, any>, option: Record<string, any>) => void;
     onSelect?: (value: string | number | any[] | Record<string, any>, option: Record<string, any>) => void;
     allowCreate?: boolean;
-    triggerRender?: (props?: import("../select/index").TriggerRenderProps) => import("react").ReactNode;
+    triggerRender?: (props: import("../select/index").TriggerRenderProps) => import("react").ReactNode;
     onClear?: () => void;
     virtualize?: import("../select/index").virtualListProps;
     onFocus?: (e: import("react").FocusEvent<Element, Element>) => void;

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

@@ -53,6 +53,8 @@ export interface PreviewProps extends BaseProps {
     zIndex?: number;
     children?: ReactNode;
     crossOrigin?: "anonymous" | "use-credentials";
+    maxZoom?: number;
+    minZoom?: number;
     renderHeader?: (info: any) => ReactNode;
     renderPreviewMenu?: (props: MenuProps) => ReactNode;
     getPopupContainer?: () => HTMLElement;
@@ -138,14 +140,12 @@ export interface FooterProps extends SliderProps {
     onRotate?: (direction: string) => void;
     onDownload?: () => void;
     renderPreviewMenu?: (props: MenuProps) => ReactNode;
+    forwardRef?: React.RefObject<HTMLElement>;
 }
 export interface PreviewImageProps {
     src?: string;
     rotation?: number;
     style?: React.CSSProperties;
-    maxZoom?: number;
-    minZoom?: number;
-    zoomStep?: number;
     zoom?: number;
     ratio?: RatioType;
     disableDownload?: boolean;