@douyinfe/semi-ui 2.30.0-beta.0 → 2.30.1

package/lib/cjs/dropdown/dropdownItem.js

@@ -43,11 +43,12 @@ class DropdownItem extends _baseComponent.default {
     const {
       showTick: contextShowTick
     } = this.context;
+    const realShowTick = contextShowTick !== null && contextShowTick !== void 0 ? contextShowTick : showTick;
     const itemclass = (0, _classnames.default)(className, {
       [`${prefixCls}-item`]: true,
       [`${prefixCls}-item-disabled`]: disabled,
       [`${prefixCls}-item-hover`]: hover,
-      [`${prefixCls}-item-withTick`]: contextShowTick !== null && contextShowTick !== void 0 ? contextShowTick : showTick,
+      [`${prefixCls}-item-withTick`]: realShowTick,
       [`${prefixCls}-item-${type}`]: type,
       [`${prefixCls}-item-active`]: active
     });
@@ -62,11 +63,11 @@ class DropdownItem extends _baseComponent.default {
     let tick = null;
 
     switch (true) {
-      case showTick && active:
+      case realShowTick && active:
         tick = /*#__PURE__*/_react.default.createElement(_semiIcons.IconTick, null);
         break;
 
-      case showTick && !active:
+      case realShowTick && !active:
         tick = /*#__PURE__*/_react.default.createElement(_semiIcons.IconTick, {
           style: {
             color: 'transparent'

package/lib/cjs/modal/confirm.js

@@ -49,7 +49,16 @@ function confirm(props) {
   };
 
   function render(renderProps) {
+    const {
+      afterClose
+    } = renderProps; //@ts-ignore
+
     _reactDom.default.render( /*#__PURE__*/_react.default.createElement(_ConfirmModal.default, Object.assign({}, renderProps, {
+      afterClose: function () {
+        //@ts-ignore
+        afterClose === null || afterClose === void 0 ? void 0 : afterClose(...arguments);
+        destroy();
+      },
       motion: props.motion
     })), div);
   }

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

@@ -87,11 +87,11 @@ export declare type OverrideCommonState = 'keyEntities' | 'treeData' | 'disabled
 export interface TreeSelectState extends Omit<BasicTreeSelectInnerData, OverrideCommonState | 'prevProps'>, Pick<TreeState, OverrideCommonState> {
     inputTriggerFocus: boolean;
     isOpen: boolean;
-    isInput: boolean;
     rePosKey: number;
     dropdownMinWidth: null | number;
     isHovering: boolean;
     prevProps: TreeSelectProps;
+    isFocus: boolean;
 }
 declare class TreeSelect extends BaseComponent<TreeSelectProps, TreeSelectState> {
     static contextType: React.Context<ContextValue>;
@@ -179,6 +179,7 @@ declare class TreeSelect extends BaseComponent<TreeSelectProps, TreeSelectState>
         'aria-label': PropTypes.Requireable<string>;
         showRestTagsPopover: PropTypes.Requireable<boolean>;
         restTagsPopoverProps: PropTypes.Requireable<object>;
+        preventScroll: PropTypes.Requireable<boolean>;
     };
     static defaultProps: Partial<TreeSelectProps>;
     inputRef: React.RefObject<typeof Input>;

package/lib/cjs/treeSelect/index.js

@@ -442,12 +442,11 @@ class TreeSelect extends _baseComponent.default {
         triggerRender
       } = this.props;
       const {
-        isOpen,
-        isInput,
         inputValue,
         selectedKeys,
         checkedKeys,
-        keyEntities
+        keyEntities,
+        isFocus
       } = this.state;
       const filterable = Boolean(filterTreeNode);
       const useCustomTrigger = typeof triggerRender === 'function';
@@ -459,7 +458,7 @@ class TreeSelect extends _baseComponent.default {
       const isEmptyTriggerSearch = isTriggerPositionSearch && (0, _isEmpty2.default)(checkedKeys);
       const isValueTriggerSearch = isTriggerPositionSearch && !(0, _isEmpty2.default)(checkedKeys);
       const classNames = useCustomTrigger ? (0, _classnames.default)(className) : (0, _classnames.default)(prefixcls, {
-        [`${prefixcls}-focus`]: isOpen && !isInput,
+        [`${prefixcls}-focus`]: isFocus,
         [`${prefixcls}-disabled`]: disabled,
         [`${prefixcls}-single`]: !multiple,
         [`${prefixcls}-multiple`]: multiple,
@@ -599,7 +598,8 @@ class TreeSelect extends _baseComponent.default {
         showRestTagsPopover,
         restTagsPopoverProps,
         searchPosition,
-        filterTreeNode
+        filterTreeNode,
+        preventScroll
       } = this.props;
       const {
         keyEntities,
@@ -638,7 +638,8 @@ class TreeSelect extends _baseComponent.default {
         autoFocus: autoFocus,
         renderTagItem: (itemKey, index) => this.renderTagItem(itemKey, index),
         onRemove: itemKey => this.removeTag(itemKey),
-        expandRestTagsOnClick: false
+        expandRestTagsOnClick: false,
+        preventScroll: preventScroll
       });
     }; // render Tree
 
@@ -956,7 +957,8 @@ class TreeSelect extends _baseComponent.default {
     this.state = {
       inputTriggerFocus: false,
       isOpen: false,
-      isInput: false,
+      isFocus: false,
+      // isInput: false,
       rePosKey: key,
       dropdownMinWidth: null,
       inputValue: '',
@@ -1255,7 +1257,12 @@ class TreeSelect extends _baseComponent.default {
       updateInputFocus: bool => {
         if (bool) {
           if (this.inputRef && this.inputRef.current) {
-            this.inputRef.current.focus();
+            const {
+              preventScroll
+            } = this.props;
+            this.inputRef.current.focus({
+              preventScroll
+            });
           }
 
           if (this.tagInputRef && this.tagInputRef.current) {
@@ -1270,8 +1277,12 @@ class TreeSelect extends _baseComponent.default {
             this.tagInputRef.current.blur();
           }
         }
-      } // eslint-disable-line
-
+      },
+      updateIsFocus: bool => {
+        this.setState({
+          isFocus: bool
+        });
+      }
     });
   }
 
@@ -1408,7 +1419,8 @@ TreeSelect.propTypes = {
   checkRelation: _propTypes.default.string,
   'aria-label': _propTypes.default.string,
   showRestTagsPopover: _propTypes.default.bool,
-  restTagsPopoverProps: _propTypes.default.object
+  restTagsPopoverProps: _propTypes.default.object,
+  preventScroll: _propTypes.default.bool
 };
 TreeSelect.defaultProps = {
   searchPosition: _constants.strings.SEARCH_POSITION_DROPDOWN,

package/lib/es/dropdown/dropdownItem.js

@@ -26,11 +26,12 @@ class DropdownItem extends BaseComponent {
     const {
       showTick: contextShowTick
     } = this.context;
+    const realShowTick = contextShowTick !== null && contextShowTick !== void 0 ? contextShowTick : showTick;
     const itemclass = cls(className, {
       [`${prefixCls}-item`]: true,
       [`${prefixCls}-item-disabled`]: disabled,
       [`${prefixCls}-item-hover`]: hover,
-      [`${prefixCls}-item-withTick`]: contextShowTick !== null && contextShowTick !== void 0 ? contextShowTick : showTick,
+      [`${prefixCls}-item-withTick`]: realShowTick,
       [`${prefixCls}-item-${type}`]: type,
       [`${prefixCls}-item-active`]: active
     });
@@ -45,11 +46,11 @@ class DropdownItem extends BaseComponent {
     let tick = null;
 
     switch (true) {
-      case showTick && active:
+      case realShowTick && active:
         tick = /*#__PURE__*/React.createElement(IconTick, null);
         break;
 
-      case showTick && !active:
+      case realShowTick && !active:
         tick = /*#__PURE__*/React.createElement(IconTick, {
           style: {
             color: 'transparent'

package/lib/es/modal/confirm.js

@@ -28,7 +28,16 @@ export default function confirm(props) {
   };
 
   function render(renderProps) {
+    const {
+      afterClose
+    } = renderProps; //@ts-ignore
+
     ReactDOM.render( /*#__PURE__*/React.createElement(ConfirmModal, Object.assign({}, renderProps, {
+      afterClose: function () {
+        //@ts-ignore
+        afterClose === null || afterClose === void 0 ? void 0 : afterClose(...arguments);
+        destroy();
+      },
       motion: props.motion
     })), div);
   }

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

@@ -87,11 +87,11 @@ export declare type OverrideCommonState = 'keyEntities' | 'treeData' | 'disabled
 export interface TreeSelectState extends Omit<BasicTreeSelectInnerData, OverrideCommonState | 'prevProps'>, Pick<TreeState, OverrideCommonState> {
     inputTriggerFocus: boolean;
     isOpen: boolean;
-    isInput: boolean;
     rePosKey: number;
     dropdownMinWidth: null | number;
     isHovering: boolean;
     prevProps: TreeSelectProps;
+    isFocus: boolean;
 }
 declare class TreeSelect extends BaseComponent<TreeSelectProps, TreeSelectState> {
     static contextType: React.Context<ContextValue>;
@@ -179,6 +179,7 @@ declare class TreeSelect extends BaseComponent<TreeSelectProps, TreeSelectState>
         'aria-label': PropTypes.Requireable<string>;
         showRestTagsPopover: PropTypes.Requireable<boolean>;
         restTagsPopoverProps: PropTypes.Requireable<object>;
+        preventScroll: PropTypes.Requireable<boolean>;
     };
     static defaultProps: Partial<TreeSelectProps>;
     inputRef: React.RefObject<typeof Input>;

package/lib/es/treeSelect/index.js

@@ -393,12 +393,11 @@ class TreeSelect extends BaseComponent {
         triggerRender
       } = this.props;
       const {
-        isOpen,
-        isInput,
         inputValue,
         selectedKeys,
         checkedKeys,
-        keyEntities
+        keyEntities,
+        isFocus
       } = this.state;
       const filterable = Boolean(filterTreeNode);
       const useCustomTrigger = typeof triggerRender === 'function';
@@ -412,7 +411,7 @@ class TreeSelect extends BaseComponent {
 
       const isValueTriggerSearch = isTriggerPositionSearch && !_isEmpty(checkedKeys);
       const classNames = useCustomTrigger ? cls(className) : cls(prefixcls, {
-        [`${prefixcls}-focus`]: isOpen && !isInput,
+        [`${prefixcls}-focus`]: isFocus,
         [`${prefixcls}-disabled`]: disabled,
         [`${prefixcls}-single`]: !multiple,
         [`${prefixcls}-multiple`]: multiple,
@@ -552,7 +551,8 @@ class TreeSelect extends BaseComponent {
         showRestTagsPopover,
         restTagsPopoverProps,
         searchPosition,
-        filterTreeNode
+        filterTreeNode,
+        preventScroll
       } = this.props;
       const {
         keyEntities,
@@ -591,7 +591,8 @@ class TreeSelect extends BaseComponent {
         autoFocus: autoFocus,
         renderTagItem: (itemKey, index) => this.renderTagItem(itemKey, index),
         onRemove: itemKey => this.removeTag(itemKey),
-        expandRestTagsOnClick: false
+        expandRestTagsOnClick: false,
+        preventScroll: preventScroll
       });
     }; // render Tree
 
@@ -909,7 +910,8 @@ class TreeSelect extends BaseComponent {
     this.state = {
       inputTriggerFocus: false,
       isOpen: false,
-      isInput: false,
+      isFocus: false,
+      // isInput: false,
       rePosKey: key,
       dropdownMinWidth: null,
       inputValue: '',
@@ -1207,7 +1209,12 @@ class TreeSelect extends BaseComponent {
       updateInputFocus: bool => {
         if (bool) {
           if (this.inputRef && this.inputRef.current) {
-            this.inputRef.current.focus();
+            const {
+              preventScroll
+            } = this.props;
+            this.inputRef.current.focus({
+              preventScroll
+            });
           }
 
           if (this.tagInputRef && this.tagInputRef.current) {
@@ -1222,8 +1229,12 @@ class TreeSelect extends BaseComponent {
             this.tagInputRef.current.blur();
           }
         }
-      } // eslint-disable-line
-
+      },
+      updateIsFocus: bool => {
+        this.setState({
+          isFocus: bool
+        });
+      }
     });
   }
 
@@ -1360,7 +1371,8 @@ TreeSelect.propTypes = {
   checkRelation: PropTypes.string,
   'aria-label': PropTypes.string,
   showRestTagsPopover: PropTypes.bool,
-  restTagsPopoverProps: PropTypes.object
+  restTagsPopoverProps: PropTypes.object,
+  preventScroll: PropTypes.bool
 };
 TreeSelect.defaultProps = {
   searchPosition: strings.SEARCH_POSITION_DROPDOWN,

package/package.json

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