@douyinfe/semi-foundation 2.38.3-alpha.2-patch-modal → 2.38.3-alpha.2-patch-select-max

package/lib/cjs/overflowList/constants.d.ts

@@ -2,7 +2,7 @@ declare const cssClasses: {
     PREFIX: string;
 };
 declare const strings: {
-    BOUNDARY_SET: ("start" | "end")[];
+    BOUNDARY_SET: ("end" | "start")[];
     POSITION_SET: string[];
     MODE_SET: string[];
     MODE_MAP: {

package/lib/cjs/select/foundation.js

@@ -439,7 +439,7 @@ class SelectFoundation extends _foundation.default {
         label
       }, rest));
       selections.delete(label);
-    } else if (maxLimit && selections.size === maxLimit) {
+    } else if (maxLimit && selections.size >= maxLimit) {
       this._adapter.notifyMaxLimit(Object.assign({
         value,
         label

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

@@ -75,6 +75,6 @@ export declare function getValueOrKey(data: any): any;
 export declare function normalizeValue(value: any, withObject: boolean): any;
 export declare function updateKeys(keySet: Set<string> | string[], keyEntities: KeyEntities): string[];
 export declare function calcDisabledKeys(keyEntities: KeyEntities): Set<string>;
-export declare function calcDropRelativePosition(event: any, treeNode: any): 0 | 1 | -1;
+export declare function calcDropRelativePosition(event: any, treeNode: any): 1 | -1 | 0;
 export declare function getDragNodesKeys(key: string, keyEntities: KeyEntities): string[];
 export declare function calcDropActualPosition(pos: string, relativeDropPos: any): any;

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/cjs/upload/constants.d.ts

@@ -18,7 +18,7 @@ declare const strings: {
     DRAG_AREA_ILLEGAL: string;
     TRIGGER_AUTO: "auto";
     TRIGGER_CUSTOM: "custom";
-    UPLOAD_TRIGGER: ("custom" | "auto")[];
+    UPLOAD_TRIGGER: ("auto" | "custom")[];
     VALIDATE_STATUS: readonly ["default", "error", "warning", "success"];
     PROMPT_POSITION: readonly ["left", "right", "bottom"];
 };

package/lib/es/overflowList/constants.d.ts

@@ -2,7 +2,7 @@ declare const cssClasses: {
     PREFIX: string;
 };
 declare const strings: {
-    BOUNDARY_SET: ("start" | "end")[];
+    BOUNDARY_SET: ("end" | "start")[];
     POSITION_SET: string[];
     MODE_SET: string[];
     MODE_MAP: {

package/lib/es/select/foundation.js

@@ -430,7 +430,7 @@ export default class SelectFoundation extends BaseFoundation {
         label
       }, rest));
       selections.delete(label);
-    } else if (maxLimit && selections.size === maxLimit) {
+    } else if (maxLimit && selections.size >= maxLimit) {
       this._adapter.notifyMaxLimit(Object.assign({
         value,
         label

package/lib/es/tree/treeUtil.d.ts

@@ -75,6 +75,6 @@ export declare function getValueOrKey(data: any): any;
 export declare function normalizeValue(value: any, withObject: boolean): any;
 export declare function updateKeys(keySet: Set<string> | string[], keyEntities: KeyEntities): string[];
 export declare function calcDisabledKeys(keyEntities: KeyEntities): Set<string>;
-export declare function calcDropRelativePosition(event: any, treeNode: any): 0 | 1 | -1;
+export declare function calcDropRelativePosition(event: any, treeNode: any): 1 | -1 | 0;
 export declare function getDragNodesKeys(key: string, keyEntities: KeyEntities): string[];
 export declare function calcDropActualPosition(pos: string, relativeDropPos: any): any;

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/lib/es/upload/constants.d.ts

@@ -18,7 +18,7 @@ declare const strings: {
     DRAG_AREA_ILLEGAL: string;
     TRIGGER_AUTO: "auto";
     TRIGGER_CUSTOM: "custom";
-    UPLOAD_TRIGGER: ("custom" | "auto")[];
+    UPLOAD_TRIGGER: ("auto" | "custom")[];
     VALIDATE_STATUS: readonly ["default", "error", "warning", "success"];
     PROMPT_POSITION: readonly ["left", "right", "bottom"];
 };

package/package.json

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

package/select/foundation.ts

@@ -455,7 +455,7 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
         if (selections.has(label)) {
             this._notifyDeselect(value, { value, label, ...rest });
             selections.delete(label);
-        } else if (maxLimit && selections.size === maxLimit) {
+        } else if (maxLimit && selections.size >= maxLimit) {
             this._adapter.notifyMaxLimit({ value, label, ...omit(rest, '_scrollIndex') });
             return;
         } else {

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();