@douyinfe/semi-foundation 2.67.2-alpha.0 → 2.67.2-alpha.1

package/lib/cjs/select/foundation.js

@@ -378,16 +378,9 @@ class SelectFoundation extends _foundation.default {
       closeCb,
       notToggleInput
     } = closeConfig || {};
-    const {
-      isFocus
-    } = this.getStates();
     this._adapter.closeMenu();
     this._adapter.notifyDropdownVisibleChange(false);
     this._adapter.setIsFocusInContainer(false);
-    if (isFocus) {
-      // if the isFocus state is true, refocus the trigger case see in https://github.com/DouyinFE/semi-design/issues/2465
-      this._focusTrigger();
-    }
     // this.unBindKeyBoardEvent();
     // this._notifyBlur(e);
     // this._adapter.updateFocusState(false);
@@ -418,6 +411,7 @@ class SelectFoundation extends _foundation.default {
     const isMultiple = this._isMultiple();
     if (!isMultiple) {
       this._handleSingleSelect(option, event);
+      this._focusTrigger();
     } else {
       this._handleMultipleSelect(option, event);
     }

package/lib/cjs/select/select.css

@@ -165,6 +165,7 @@
 }
 .semi-select-disabled:focus {
   border: 1px solid transparent;
+  background-color: var(--semi-color-disabled-fill);
 }
 .semi-select-disabled .semi-select-selection,
 .semi-select-disabled .semi-select-selection-placeholder {

package/lib/cjs/select/select.scss

@@ -37,6 +37,7 @@ $overflowList: #{$prefix}-overflow-list;
     &:focus {
         border: $width-select-border-focus solid $color-select-border-focus;
         background-color: $color-select-bg-focus;
+        // background-color: plum;
         outline: 0;
     }
 
@@ -125,7 +126,8 @@ $overflowList: #{$prefix}-overflow-list;
 
         &:focus {
             // when select is disabled, the border should not have active color
-            border: $width-select-border-focus solid transparent;
+            border: $width-select-border-focus solid $color-select_input_disabled-border-focus;
+            background-color: $color-select_input_disabled-bg-focus;
         }
 
         .#{$module}-selection,

package/lib/cjs/select/variables.scss

@@ -37,8 +37,11 @@ $color-select_clearBtn-text-hover: var(--semi-color-primary); // 选择器输入
 $color-select_input-bg-default: transparent; // 选择器输入框清空按钮颜色 - 悬停态
 $color-select_input_disabled-bg: var(--semi-color-disabled-fill); // 禁用选择器输入框背景色
 $color-select_input_disabled-border: var(--semi-color-border); // 禁用选择器输入框描边颜色
+$color-select_input_disabled-border-focus: transparent; // 禁用选择器输入框描边颜色 - 聚焦态
 $color-select_input_disabled-text: var(--semi-color-disabled-text); // 禁用选择器输入框回填内容文字颜色
 $color-select_input_disabled-bg-hover: var(--semi-color-disabled-fill); // 选择器输入框回填内容文字颜色 - 悬停态
+$color-select_input_disabled-bg-focus: var(--semi-color-disabled-fill); // 选择器输入框回填内容文字颜色 - 聚焦态
+
 $color-select_input_placeholder-text: var(--semi-color-text-2); // 选择器输入框占位文本文字颜色
 
 $color-select_option_main-text: var(--semi-color-text-0); // 选择器菜单选项文本颜色

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

@@ -83,6 +83,6 @@ export declare function getValueOrKey(data: any, keyMaps?: KeyMapProps): any;
 export declare function normalizeValue(value: any, withObject: boolean, keyMaps?: KeyMapProps): any;
 export declare function updateKeys(keySet: Set<string> | string[], keyEntities: KeyEntities): string[];
 export declare function calcDisabledKeys(keyEntities: KeyEntities, keyMaps?: KeyMapProps): 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/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/select/foundation.js

@@ -369,16 +369,9 @@ export default class SelectFoundation extends BaseFoundation {
       closeCb,
       notToggleInput
     } = closeConfig || {};
-    const {
-      isFocus
-    } = this.getStates();
     this._adapter.closeMenu();
     this._adapter.notifyDropdownVisibleChange(false);
     this._adapter.setIsFocusInContainer(false);
-    if (isFocus) {
-      // if the isFocus state is true, refocus the trigger case see in https://github.com/DouyinFE/semi-design/issues/2465
-      this._focusTrigger();
-    }
     // this.unBindKeyBoardEvent();
     // this._notifyBlur(e);
     // this._adapter.updateFocusState(false);
@@ -409,6 +402,7 @@ export default class SelectFoundation extends BaseFoundation {
     const isMultiple = this._isMultiple();
     if (!isMultiple) {
       this._handleSingleSelect(option, event);
+      this._focusTrigger();
     } else {
       this._handleMultipleSelect(option, event);
     }

package/lib/es/select/select.css

@@ -165,6 +165,7 @@
 }
 .semi-select-disabled:focus {
   border: 1px solid transparent;
+  background-color: var(--semi-color-disabled-fill);
 }
 .semi-select-disabled .semi-select-selection,
 .semi-select-disabled .semi-select-selection-placeholder {

package/lib/es/select/select.scss

@@ -37,6 +37,7 @@ $overflowList: #{$prefix}-overflow-list;
     &:focus {
         border: $width-select-border-focus solid $color-select-border-focus;
         background-color: $color-select-bg-focus;
+        // background-color: plum;
         outline: 0;
     }
 
@@ -125,7 +126,8 @@ $overflowList: #{$prefix}-overflow-list;
 
         &:focus {
             // when select is disabled, the border should not have active color
-            border: $width-select-border-focus solid transparent;
+            border: $width-select-border-focus solid $color-select_input_disabled-border-focus;
+            background-color: $color-select_input_disabled-bg-focus;
         }
 
         .#{$module}-selection,

package/lib/es/select/variables.scss

@@ -37,8 +37,11 @@ $color-select_clearBtn-text-hover: var(--semi-color-primary); // 选择器输入
 $color-select_input-bg-default: transparent; // 选择器输入框清空按钮颜色 - 悬停态
 $color-select_input_disabled-bg: var(--semi-color-disabled-fill); // 禁用选择器输入框背景色
 $color-select_input_disabled-border: var(--semi-color-border); // 禁用选择器输入框描边颜色
+$color-select_input_disabled-border-focus: transparent; // 禁用选择器输入框描边颜色 - 聚焦态
 $color-select_input_disabled-text: var(--semi-color-disabled-text); // 禁用选择器输入框回填内容文字颜色
 $color-select_input_disabled-bg-hover: var(--semi-color-disabled-fill); // 选择器输入框回填内容文字颜色 - 悬停态
+$color-select_input_disabled-bg-focus: var(--semi-color-disabled-fill); // 选择器输入框回填内容文字颜色 - 聚焦态
+
 $color-select_input_placeholder-text: var(--semi-color-text-2); // 选择器输入框占位文本文字颜色
 
 $color-select_option_main-text: var(--semi-color-text-0); // 选择器菜单选项文本颜色

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

@@ -83,6 +83,6 @@ export declare function getValueOrKey(data: any, keyMaps?: KeyMapProps): any;
 export declare function normalizeValue(value: any, withObject: boolean, keyMaps?: KeyMapProps): any;
 export declare function updateKeys(keySet: Set<string> | string[], keyEntities: KeyEntities): string[];
 export declare function calcDisabledKeys(keyEntities: KeyEntities, keyMaps?: KeyMapProps): 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/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.67.2-alpha.0",
+    "version": "2.67.2-alpha.1",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
         "prepublishOnly": "npm run build:lib"
     },
     "dependencies": {
-        "@douyinfe/semi-animation": "2.67.2-alpha.0",
+        "@douyinfe/semi-animation": "2.67.0",
         "@mdx-js/mdx": "^3.0.1",
         "async-validator": "^3.5.0",
         "classnames": "^2.2.6",
@@ -28,7 +28,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "9ad910e9b057e33d05d7194786dfeb76519f89cb",
+    "gitHead": "3f08368852c402daca35bf5ff4a192e841ea4dd3",
     "devDependencies": {
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/preset-env": "^7.15.8",

package/select/foundation.ts

@@ -400,14 +400,9 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
     close(closeConfig?: { event?: any; closeCb?: () => void; notToggleInput?: boolean }) {
         // to support A11y, closing the panel trigger does not necessarily lose focus
         const { event, closeCb, notToggleInput } = closeConfig || {};
-        const { isFocus } = this.getStates();
         this._adapter.closeMenu();
         this._adapter.notifyDropdownVisibleChange(false);
         this._adapter.setIsFocusInContainer(false);
-        if (isFocus) {
-            // if the isFocus state is true, refocus the trigger case see in https://github.com/DouyinFE/semi-design/issues/2465
-            this._focusTrigger();
-        }
         // this.unBindKeyBoardEvent();
         // this._notifyBlur(e);
         // this._adapter.updateFocusState(false);
@@ -443,6 +438,7 @@ export default class SelectFoundation extends BaseFoundation<SelectAdapter> {
         const isMultiple = this._isMultiple();
         if (!isMultiple) {
             this._handleSingleSelect(option, event);
+            this._focusTrigger();
         } else {
             this._handleMultipleSelect(option, event);
         }

package/select/select.scss

@@ -37,6 +37,7 @@ $overflowList: #{$prefix}-overflow-list;
     &:focus {
         border: $width-select-border-focus solid $color-select-border-focus;
         background-color: $color-select-bg-focus;
+        // background-color: plum;
         outline: 0;
     }
 
@@ -125,7 +126,8 @@ $overflowList: #{$prefix}-overflow-list;
 
         &:focus {
             // when select is disabled, the border should not have active color
-            border: $width-select-border-focus solid transparent;
+            border: $width-select-border-focus solid $color-select_input_disabled-border-focus;
+            background-color: $color-select_input_disabled-bg-focus;
         }
 
         .#{$module}-selection,

package/select/variables.scss

@@ -37,8 +37,11 @@ $color-select_clearBtn-text-hover: var(--semi-color-primary); // 选择器输入
 $color-select_input-bg-default: transparent; // 选择器输入框清空按钮颜色 - 悬停态
 $color-select_input_disabled-bg: var(--semi-color-disabled-fill); // 禁用选择器输入框背景色
 $color-select_input_disabled-border: var(--semi-color-border); // 禁用选择器输入框描边颜色
+$color-select_input_disabled-border-focus: transparent; // 禁用选择器输入框描边颜色 - 聚焦态
 $color-select_input_disabled-text: var(--semi-color-disabled-text); // 禁用选择器输入框回填内容文字颜色
 $color-select_input_disabled-bg-hover: var(--semi-color-disabled-fill); // 选择器输入框回填内容文字颜色 - 悬停态
+$color-select_input_disabled-bg-focus: var(--semi-color-disabled-fill); // 选择器输入框回填内容文字颜色 - 聚焦态
+
 $color-select_input_placeholder-text: var(--semi-color-text-2); // 选择器输入框占位文本文字颜色
 
 $color-select_option_main-text: var(--semi-color-text-0); // 选择器菜单选项文本颜色