@douyinfe/semi-foundation 2.37.1 → 2.37.2

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

@@ -135,7 +135,7 @@ export default class TreeSelectFoundation<P = Record<string, any>, S = Record<st
     focusInput(bool: boolean): void;
     _notifyMultipleChange(key: string[], e: any): void;
     _notifyChange(key: any, e: any): void;
-    _registerClickOutsideHandler: (e: any) => void;
+    _registerClickOutsideHandler: () => void;
     _notifyFocus(e: any): void;
     handleTriggerFocus(e: any): void;
     _notifyBlur(e: any): void;

package/lib/cjs/treeSelect/foundation.js

@@ -21,7 +21,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 class TreeSelectFoundation extends _foundation.default {
   constructor(adapter) {
     super(Object.assign({}, adapter));
-    this._registerClickOutsideHandler = e => {
+    this._registerClickOutsideHandler = () => {
       this._adapter.registerClickOutsideHandler(e => {
         this.handlerTriggerBlur(e);
         this.close(e);
@@ -37,11 +37,13 @@ class TreeSelectFoundation extends _foundation.default {
     const triggerSearch = searchPosition === _constants.strings.SEARCH_POSITION_TRIGGER && filterTreeNode;
     const triggerSearchAutoFocus = searchAutoFocus && triggerSearch;
     this._setDropdownWidth();
-    const isOpen = (this.getProp('defaultOpen') || triggerSearchAutoFocus) && !this._isDisabled();
+    const able = !this._isDisabled();
+    const isOpen = (this.getProp('defaultOpen') || triggerSearchAutoFocus) && able;
     if (isOpen) {
       this.open();
+      this._registerClickOutsideHandler();
     }
-    if (triggerSearchAutoFocus) {
+    if (triggerSearchAutoFocus && able) {
       this.handleTriggerFocus(null);
     }
   }
@@ -272,7 +274,7 @@ class TreeSelectFoundation extends _foundation.default {
   handleTriggerFocus(e) {
     this._adapter.updateIsFocus(true);
     this._notifyFocus(e);
-    this._registerClickOutsideHandler(e);
+    this._registerClickOutsideHandler();
   }
   // Scenes that may trigger blur
   //  1、clickOutSide
@@ -282,6 +284,10 @@ class TreeSelectFoundation extends _foundation.default {
     this._adapter.notifyBlur(e);
   }
   handlerTriggerBlur(e) {
+    const isFocus = this.getState('isFocus');
+    if (!isFocus) {
+      return;
+    }
     this._adapter.updateIsFocus(false);
     this._notifyBlur(e);
     this._adapter.unregisterClickOutsideHandler();

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

@@ -135,7 +135,7 @@ export default class TreeSelectFoundation<P = Record<string, any>, S = Record<st
     focusInput(bool: boolean): void;
     _notifyMultipleChange(key: string[], e: any): void;
     _notifyChange(key: any, e: any): void;
-    _registerClickOutsideHandler: (e: any) => void;
+    _registerClickOutsideHandler: () => void;
     _notifyFocus(e: any): void;
     handleTriggerFocus(e: any): void;
     _notifyBlur(e: any): void;

package/lib/es/treeSelect/foundation.js

@@ -14,7 +14,7 @@ import isEnterPress from '../utils/isEnterPress';
 export default class TreeSelectFoundation extends BaseFoundation {
   constructor(adapter) {
     super(Object.assign({}, adapter));
-    this._registerClickOutsideHandler = e => {
+    this._registerClickOutsideHandler = () => {
       this._adapter.registerClickOutsideHandler(e => {
         this.handlerTriggerBlur(e);
         this.close(e);
@@ -30,11 +30,13 @@ export default class TreeSelectFoundation extends BaseFoundation {
     const triggerSearch = searchPosition === strings.SEARCH_POSITION_TRIGGER && filterTreeNode;
     const triggerSearchAutoFocus = searchAutoFocus && triggerSearch;
     this._setDropdownWidth();
-    const isOpen = (this.getProp('defaultOpen') || triggerSearchAutoFocus) && !this._isDisabled();
+    const able = !this._isDisabled();
+    const isOpen = (this.getProp('defaultOpen') || triggerSearchAutoFocus) && able;
     if (isOpen) {
       this.open();
+      this._registerClickOutsideHandler();
     }
-    if (triggerSearchAutoFocus) {
+    if (triggerSearchAutoFocus && able) {
       this.handleTriggerFocus(null);
     }
   }
@@ -265,7 +267,7 @@ export default class TreeSelectFoundation extends BaseFoundation {
   handleTriggerFocus(e) {
     this._adapter.updateIsFocus(true);
     this._notifyFocus(e);
-    this._registerClickOutsideHandler(e);
+    this._registerClickOutsideHandler();
   }
   // Scenes that may trigger blur
   //  1、clickOutSide
@@ -275,6 +277,10 @@ export default class TreeSelectFoundation extends BaseFoundation {
     this._adapter.notifyBlur(e);
   }
   handlerTriggerBlur(e) {
+    const isFocus = this.getState('isFocus');
+    if (!isFocus) {
+      return;
+    }
     this._adapter.updateIsFocus(false);
     this._notifyBlur(e);
     this._adapter.unregisterClickOutsideHandler();

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.37.1",
+    "version": "2.37.2",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
         "prepublishOnly": "npm run build:lib"
     },
     "dependencies": {
-        "@douyinfe/semi-animation": "2.37.1",
+        "@douyinfe/semi-animation": "2.37.2",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
         "date-fns": "^2.29.3",
@@ -23,7 +23,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "2d2a5d947fcb294ca82bc3aa9b05c061c3640499",
+    "gitHead": "a60ba17cdb9b16ace637706583ea31dbf3a6a255",
     "devDependencies": {
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",

package/treeSelect/foundation.ts

@@ -212,11 +212,13 @@ export default class TreeSelectFoundation<P = Record<string, any>, S = Record<st
         const triggerSearch = searchPosition === strings.SEARCH_POSITION_TRIGGER && filterTreeNode;
         const triggerSearchAutoFocus = searchAutoFocus && triggerSearch;
         this._setDropdownWidth();
-        const isOpen = (this.getProp('defaultOpen') || triggerSearchAutoFocus) && !this._isDisabled();
+        const able = !this._isDisabled();
+        const isOpen = (this.getProp('defaultOpen') || triggerSearchAutoFocus) && able;
         if (isOpen) {
             this.open();
+            this._registerClickOutsideHandler();
         }
-        if (triggerSearchAutoFocus) {
+        if (triggerSearchAutoFocus && able) {
             this.handleTriggerFocus(null);
         }
     }
@@ -433,7 +435,7 @@ export default class TreeSelectFoundation<P = Record<string, any>, S = Record<st
         }
     }
 
-    _registerClickOutsideHandler = (e) => {
+    _registerClickOutsideHandler = () => {
         this._adapter.registerClickOutsideHandler(e => {
             this.handlerTriggerBlur(e);
             this.close(e);
@@ -449,7 +451,7 @@ export default class TreeSelectFoundation<P = Record<string, any>, S = Record<st
     handleTriggerFocus(e: any) {
         this._adapter.updateIsFocus(true);
         this._notifyFocus(e);
-        this._registerClickOutsideHandler(e);
+        this._registerClickOutsideHandler();
     }
 
     // Scenes that may trigger blur
@@ -461,6 +463,10 @@ export default class TreeSelectFoundation<P = Record<string, any>, S = Record<st
     }
 
     handlerTriggerBlur(e) {
+        const isFocus = this.getState('isFocus');
+        if (!isFocus) {
+            return;
+        }
         this._adapter.updateIsFocus(false);
         this._notifyBlur(e);
         this._adapter.unregisterClickOutsideHandler();