@douyinfe/semi-foundation 2.15.2-alpha.0 → 2.16.1

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

@@ -26,7 +26,7 @@ export interface SliderProps {
     'aria-label'?: string;
     'aria-labelledby'?: string;
     'aria-valuetext'?: string;
-    getAriaValueText?: (value: number) => string;
+    getAriaValueText?: (value: number, index?: number) => string;
 }
 export interface SliderState {
     currentValue: number | number[];
@@ -40,6 +40,8 @@ export interface SliderState {
     clickValue: 0;
     showBoundary: boolean;
     isInRenderTree: boolean;
+    firstDotFocusVisible: boolean;
+    secondDotFocusVisible: boolean;
 }
 export interface SliderLengths {
     sliderX: number;
@@ -53,7 +55,6 @@ export interface ScrollParentVal {
 }
 export interface OverallVars {
     dragging: boolean[];
-    chooseMovePos: 'min' | 'max';
 }
 export interface SliderAdapter extends DefaultAdapter<SliderProps, SliderState> {
     getSliderLengths: () => SliderLengths;
@@ -189,7 +190,13 @@ export default class SliderFoundation extends BaseFoundation<SliderAdapter> {
     onHandleEnter: (pos: SliderState['focusPos']) => void;
     onHandleLeave: () => void;
     onHandleUp: (e: any) => boolean;
+    _handleValueDecreaseWithKeyBoard: (step: number, handler: 'min' | 'max') => number | any[];
+    _handleValueIncreaseWithKeyBoard: (step: number, handler: 'min' | 'max') => any;
+    _handleHomeKey: (handler: 'min' | 'max') => any;
+    _handleEndKey: (handler: 'min' | 'max') => any;
+    handleKeyDown: (event: any, handler: 'min' | 'max') => void;
     onFocus: (e: any, handler: 'min' | 'max') => void;
+    onBlur: (e: any, handler: 'min' | 'max') => void;
     handleWrapClick: (e: any) => void;
     /**
      * Move the slider to the current click position

package/lib/es/slider/foundation.js

@@ -1,5 +1,6 @@
 import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
 import _Array$isArray from "@babel/runtime-corejs3/core-js-stable/array/is-array";
+import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 
 /* eslint-disable no-param-reassign */
 
@@ -8,6 +9,8 @@ import _Array$isArray from "@babel/runtime-corejs3/core-js-stable/array/is-array
 /* eslint-disable no-nested-ternary */
 import BaseFoundation from '../base/foundation';
 import touchEventPolyfill from '../utils/touchPolyfill';
+import warning from '../utils/warning';
+import { handlePrevent } from '../utils/a11y';
 export default class SliderFoundation extends BaseFoundation {
   constructor(adapter) {
     var _this;
@@ -532,8 +535,7 @@ export default class SliderFoundation extends BaseFoundation {
       const handleMaxDom = this._adapter.getMaxHandleEl().current;
 
       if (e.target === handleMinDom || e.target === handleMaxDom) {
-        e.preventDefault();
-        e.stopPropagation();
+        handlePrevent(e);
         const touch = touchEventPolyfill(e.touches[0], e);
         this.onHandleDown(touch, handler);
       }
@@ -597,18 +599,203 @@ export default class SliderFoundation extends BaseFoundation {
         this._adapter.setDragging([dragging[0], false]);
       }
 
-      this._adapter.setStateVal('isDrag', false); // this._adapter.setStateVal('chooseMovePos', '');
-
+      this._adapter.setStateVal('isDrag', false);
 
       this._adapter.onHandleLeave();
 
       this._adapter.onHandleUpAfter();
 
       return true;
+    };
+
+    this._handleValueDecreaseWithKeyBoard = (step, handler) => {
+      const {
+        min,
+        currentValue
+      } = this.getStates();
+      const {
+        range
+      } = this.getProps();
+
+      if (handler === 'min') {
+        if (range) {
+          let newMinValue = currentValue[0] - step;
+          newMinValue = newMinValue < min ? min : newMinValue;
+          return [newMinValue, currentValue[1]];
+        } else {
+          let newMinValue = currentValue - step;
+          newMinValue = newMinValue < min ? min : newMinValue;
+          return newMinValue;
+        }
+      } else {
+        let newMaxValue = currentValue[1] - step;
+        newMaxValue = newMaxValue < currentValue[0] ? currentValue[0] : newMaxValue;
+        return [currentValue[0], newMaxValue];
+      }
+    };
+
+    this._handleValueIncreaseWithKeyBoard = (step, handler) => {
+      const {
+        max,
+        currentValue
+      } = this.getStates();
+      const {
+        range
+      } = this.getProps();
+
+      if (handler === 'min') {
+        if (range) {
+          let newMinValue = currentValue[0] + step;
+          newMinValue = newMinValue > currentValue[1] ? currentValue[1] : newMinValue;
+          return [newMinValue, currentValue[1]];
+        } else {
+          let newMinValue = currentValue + step;
+          newMinValue = newMinValue > max ? max : newMinValue;
+          return newMinValue;
+        }
+      } else {
+        let newMaxValue = currentValue[1] + step;
+        newMaxValue = newMaxValue > max ? max : newMaxValue;
+        return [currentValue[0], newMaxValue];
+      }
+    };
+
+    this._handleHomeKey = handler => {
+      const {
+        min,
+        currentValue
+      } = this.getStates();
+      const {
+        range
+      } = this.getProps();
+
+      if (handler === 'min') {
+        if (range) {
+          return [min, currentValue[1]];
+        } else {
+          return min;
+        }
+      } else {
+        return [currentValue[0], currentValue[0]];
+      }
+    };
+
+    this._handleEndKey = handler => {
+      const {
+        max,
+        currentValue
+      } = this.getStates();
+      const {
+        range
+      } = this.getProps();
+
+      if (handler === 'min') {
+        if (range) {
+          return [currentValue[1], currentValue[1]];
+        } else {
+          return max;
+        }
+      } else {
+        return [currentValue[0], max];
+      }
+    };
+
+    this.handleKeyDown = (event, handler) => {
+      var _context;
+
+      const {
+        min,
+        max,
+        currentValue
+      } = this.getStates();
+      const {
+        step,
+        range
+      } = this.getProps();
+      let outputValue;
+
+      switch (event.key) {
+        case "ArrowLeft":
+        case "ArrowDown":
+          outputValue = this._handleValueDecreaseWithKeyBoard(step, handler);
+          break;
+
+        case "ArrowRight":
+        case "ArrowUp":
+          outputValue = this._handleValueIncreaseWithKeyBoard(step, handler);
+          break;
+
+        case "PageUp":
+          outputValue = this._handleValueIncreaseWithKeyBoard(10 * step, handler);
+          break;
+
+        case "PageDown":
+          outputValue = this._handleValueDecreaseWithKeyBoard(10 * step, handler);
+          break;
+
+        case "Home":
+          outputValue = this._handleHomeKey(handler);
+          break;
+
+        case "End":
+          outputValue = this._handleEndKey(handler);
+          break;
+
+        case 'default':
+          break;
+      }
+
+      if (_includesInstanceProperty(_context = ["ArrowLeft", "ArrowDown", "ArrowRight", "ArrowUp", "PageUp", "PageDown", "Home", "End"]).call(_context, event.key)) {
+        let update = true;
+
+        if (_Array$isArray(currentValue)) {
+          update = !(currentValue[0] === outputValue[0] && currentValue[1] === outputValue[1]);
+        } else {
+          update = currentValue !== outputValue;
+        }
+
+        if (update) {
+          this._adapter.updateCurrentValue(outputValue);
+
+          this._adapter.notifyChange(outputValue);
+        }
+
+        handlePrevent(event);
+      }
     }; // eslint-disable-next-line @typescript-eslint/no-empty-function
 
 
-    this.onFocus = (e, handler) => {};
+    this.onFocus = (e, handler) => {
+      handlePrevent(e);
+      const {
+        target
+      } = e;
+
+      try {
+        if (target.matches(':focus-visible')) {
+          if (handler === 'min') {
+            this._adapter.setStateVal('firstDotFocusVisible', true);
+          } else {
+            this._adapter.setStateVal('secondDotFocusVisible', true);
+          }
+        }
+      } catch (error) {
+        warning(true, 'Warning: [Semi Slider] The current browser does not support the focus-visible');
+      }
+    };
+
+    this.onBlur = (e, handler) => {
+      const {
+        firstDotFocusVisible,
+        secondDotFocusVisible
+      } = this.getStates();
+
+      if (handler === 'min') {
+        firstDotFocusVisible && this._adapter.setStateVal('firstDotFocusVisible', false);
+      } else {
+        secondDotFocusVisible && this._adapter.setStateVal('secondDotFocusVisible', false);
+      }
+    };
 
     this.handleWrapClick = e => {
       const {

package/lib/es/slider/slider.css

@@ -46,6 +46,9 @@
   cursor: pointer;
   transition: #fff 0.3s;
 }
+.semi-slider-handle:focus-visible {
+  outline: 2px solid var(--semi-color-primary-light-active);
+}
 .semi-slider-handle:hover {
   background-color: var(--semi-color-white);
 }

package/lib/es/slider/slider.scss

@@ -1,5 +1,5 @@
 //@import '../theme/variables.scss';
-@import "./variables.scss";
+@import './variables.scss';
 
 $module: #{$prefix}-slider;
 
@@ -29,7 +29,7 @@ $module: #{$prefix}-slider;
         font-variant: tabular-nums;
         line-height: $font-slider_rail-lineHeight;
         list-style: none;
-        font-feature-settings: "tnum";
+        font-feature-settings: 'tnum';
         position: absolute;
         height: $height-slider_rail;
         cursor: pointer;
@@ -54,7 +54,11 @@ $module: #{$prefix}-slider;
         border: none;
         border-radius: 50%;
         cursor: pointer;
-        transition: #fff .3s;
+        transition: #fff 0.3s;
+
+        &:focus-visible {
+            outline: $width-slider_handle-focus solid $color-slider_handle-focus;
+        }
     }
 
     &-handle:hover {
@@ -133,10 +137,8 @@ $module: #{$prefix}-slider;
         text-align: center;
         cursor: pointer;
         transform: translate(-50%, 0) rotate(-180deg);
-
     }
 
-
     &-boundary {
         position: relative;
         font-size: $font-size-small;

package/lib/es/slider/variables.scss

@@ -11,9 +11,10 @@ $color-slider_handle_disabled-border-hover: var(--semi-color-white); // 禁用
 $color-slider_handle_disabled-border: var(--semi-color-border); // 禁用滑动条圆形描边颜色 - 默认态
 $color-slider_mark-text-default: var(--semi-color-text-2); // 滑动条刻度文字颜色
 $color-slider_rail-bg-default: var(--semi-color-fill-0); // 滑动条轨道颜色 - 未填充
-$color-slider_rail: rgba(0, 0, 0, .65);
+$color-slider_rail: rgba(0, 0, 0, 0.65);
 $color-slider_track-bg-default: var(--semi-color-primary); // 滑动条轨道颜色 - 已填充
 $color-slider_track_disabled-bg: var(--semi-color-primary-disabled); // 禁用滑动条轨道颜色 - 已填充
+$color-slider_handle-focus: var(--semi-color-primary-light-active); // 圆形按钮轮廓 - 聚焦
 
 // Spacing
 $spacing-slider-paddingX: 13px; // 滑动条整体水平内边距
@@ -33,7 +34,7 @@ $spacing-slider_boundary_min-left: 0;
 $spacing-slider_boundary_max-right: 0;
 $spacing-slider_vertical_marks-marginTop: -30px; // 垂直滑动条刻度标签顶部外边距
 $spacing-slider_vertical_marks-marginLeft: 29px; // 垂直滑动条刻度标签左侧外边距
-$spacing-slider_vertical_marks-reverse-marginLeft: -26px;// 垂直滑动条刻度标签左侧外边距（标签在左侧时）
+$spacing-slider_vertical_marks-reverse-marginLeft: -26px; // 垂直滑动条刻度标签左侧外边距（标签在左侧时）
 $spacing-slider_vertical_rail-top: 0; // 垂直滑动条轨道顶部距离
 $spacing-slider_vertical_handle-marginTop: 0; // 垂直滑动条原型按钮顶部外边距
 $spacing-slider_vertical_handle-marginLeft: -10px; // 垂直滑动条原型按钮左侧外边距
@@ -42,7 +43,6 @@ $spacing-slider_vertical_handle-marginLeft: -10px; // 垂直滑动条原型按
 $radius-slider_rail: var(--semi-border-radius-small); // 滚动条未填充轨道圆角
 $radius-slider_track: var(--semi-border-radius-small); // 滚动条已填充轨道圆角
 
-
 // Width/Height
 $height-slider_wrapper: 32px; // 滚动条容器整体高度
 $height-slider_vertical_wrapper: 4px; // 垂直滚动条整体宽度
@@ -52,7 +52,7 @@ $width-slider_handle_clicked: 1px; // 滚动条圆形按钮按下后描边宽度
 $height-slider_track: 4px; // 滚动条已填充轨道高度
 $width-slider_dot: 4px; // 滚动条圆形刻度点宽度
 $width-slider_handle_border_disabled: 1px; // 禁用滚动条圆形按钮按下后描边宽度
-
+$width-slider_handle-focus: 2px; // 圆形按钮轮廓 - 聚焦
 
 // Font
 $font-slider_rail-fontSize: 14px; // 滚动条轨道文本字号

package/lib/es/switch/switch.css

@@ -91,8 +91,8 @@
   left: 0;
 }
 .semi-switch-native-control[type=checkbox] {
-  width: 100%;
-  height: 100%;
+  width: inherit;
+  height: inherit;
 }
 .semi-switch-checked-text, .semi-switch-unchecked-text {
   position: absolute;

package/lib/es/switch/switch.scss

@@ -103,8 +103,8 @@ $module: #{$prefix}-switch;
     &-native-control {
 
         &[type="checkbox"] {
-            width: 100%;
-            height: 100%;
+            width: inherit;
+            height: inherit;
         }
         width: 100%;
         height: 100%;

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

@@ -38,7 +38,7 @@ declare class TimePickerFoundation<P = Record<string, any>, S = Record<string, a
     setPanel(open: boolean): void;
     destroy(): void;
     handlePanelOpen(): void;
-    hanldePanelClose(clickedOutside: boolean, e: any): void;
+    handlePanelClose(clickedOutside: boolean, e: any): void;
     handleVisibleChange(visible: boolean): void;
     handleInputChange(input: string): void;
     doValidate(args: string | Array<Date>): boolean;

package/lib/es/timePicker/foundation.js

@@ -238,7 +238,7 @@ class TimePickerFoundation extends BaseFoundation {
     this._adapter.notifyOpenChange(true);
   }
 
-  hanldePanelClose(clickedOutside, e) {
+  handlePanelClose(clickedOutside, e) {
     if (!this._isControlledComponent('open')) {
       this._adapter.unregisterClickOutSide();
 

package/lib/es/tooltip/variables.scss

@@ -19,7 +19,7 @@ $spacing-tooltip_content-paddingBottom: $spacing-tight; // 工具提示内容底
 
 $font-tooltip-fontSize: $font-size-regular; // 工具提示文本字号
 $width-tooltip: 240px; // 工具提示宽度 - 默认
-$width-tooltip_arrow: 24px; // 工具提示小三角箭头宽度 - 水平
+$width-tooltip_arrow: 24px; // 工具提示小三角箭头宽度 - 水平 ignore-semi-css-trans
 $height-tooltip_arrow: 7px; // 工具提示小三角箭头高度 - 水平
 
 $height-tooltip_arrow_vertical: 24px; // 工具提示小三角箭头高度 - 垂直

package/lib/es/treeSelect/treeSelect.css

@@ -188,6 +188,7 @@
 .semi-tree-select-arrow {
   display: inline-flex;
   align-items: center;
+  flex-shrink: 0;
   height: 100%;
   justify-content: center;
   width: 32px;
@@ -212,6 +213,7 @@
   display: inline-flex;
   align-items: center;
   height: 100%;
+  flex-shrink: 0;
   justify-content: center;
   width: 32px;
   color: var(--semi-color-text-2);

package/lib/es/treeSelect/treeSelect.scss

@@ -239,6 +239,7 @@ $module: #{$prefix}-tree-select;
         // right: 0;
         display: inline-flex;
         align-items: center;
+        flex-shrink: 0;
         height: 100%;
         justify-content: center;
         width: $width-treeSelect_arrow;
@@ -265,6 +266,7 @@ $module: #{$prefix}-tree-select;
         display: inline-flex;
         align-items: center;
         height: 100%;
+        flex-shrink: 0;
         justify-content: center;
         width: $width-treeSelect_arrow;
         color: $color-treeSelect_default-icon-default;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@douyinfe/semi-foundation",
-    "version": "2.15.2-alpha.0",
+    "version": "2.16.1",
     "description": "",
     "scripts": {
         "build:lib": "node ./scripts/compileLib.js",
@@ -24,7 +24,7 @@
         "*.scss",
         "*.css"
     ],
-    "gitHead": "2a0f381a9b559286fe9891093222198792fe5313",
+    "gitHead": "3de98e4072b5614d5e41e2ad65f687507563dc7c",
     "devDependencies": {
         "@babel/plugin-proposal-decorators": "^7.15.8",
         "@babel/plugin-transform-runtime": "^7.15.8",

package/radio/radio.scss

@@ -6,8 +6,9 @@ $inner-width: $width-icon-medium;
 .#{$module} {
     @include box-sizing;
     @include font-size-regular;
+    position: relative;
     display: inline-flex;
-    column-gap: $spacing-radio_addon-paddingLeft;
+    flex-wrap: wrap;
 
     &.#{$module}-vertical {
         display: block;
@@ -77,8 +78,6 @@ $inner-width: $width-icon-medium;
     }
 
     &-buttonRadioGroup {
-        // Button needs to be positioned relative to parent
-        position: relative;
         padding: $spacing-radio_buttonRadioGroup_middle-padding;
         border-radius: $radius-radio_buttonRadio;
         line-height: $font-radio_buttonRadioGroup_middle-lineHeight;
@@ -107,6 +106,7 @@ $inner-width: $width-icon-medium;
         border: $width-radio_cardRadioGroup_checked-border solid transparent;
 
         .#{$module}-inner {
+            position: relative;
             &-display {
                 background: $color-radio_card-bg-default;
             }
@@ -205,19 +205,19 @@ $inner-width: $width-icon-medium;
     }
 
     &-inner {
-        display: inline-flex;
-        margin-top: 2px;
-        // WARN: The absolute positioning used by the input does not occupy space, and relative cannot be removed here.
-        position: relative;
+        position: absolute;
+        display: inline-block;
+        top: 2px;
+        left: 0;
         width: $width-radio_inner;
         height: $width-radio_inner;
         vertical-align: sub;
         user-select: none; // prevent text under it will be selected when double click
 
         &-display {
-            display: inline-flex;
-            align-items: center;
-            justify-content: center;
+            position: absolute;
+            left: 0;
+            top: 0;
             @include box-sizing;
             width: $width-radio_inner;
             height: $width-radio_inner;
@@ -226,6 +226,7 @@ $inner-width: $width-icon-medium;
             background: $color-radio_default-bg-default;
 
             .#{$prefix}-icon {
+                position: absolute;
                 width: 100%;
                 height: 100%;
                 font-size: 14px;
@@ -233,11 +234,6 @@ $inner-width: $width-icon-medium;
         }
     }
 
-    &-content {
-        display: flex;
-        flex-direction: column;
-    }
-
     &:hover {
         .#{$module}-inner-display {
             background: $color-radio_default-bg-hover;
@@ -252,6 +248,8 @@ $inner-width: $width-icon-medium;
 
     &-addon {
         user-select: none;
+        padding-left: $spacing-radio_addon-paddingLeft;
+        margin-left: $spacing-radio_addon-marginLeft;
         color: $color-radio_default-text-default;
         display: inline-flex;
         align-items: center;
@@ -374,7 +372,11 @@ $inner-width: $width-icon-medium;
     }
 
     &-extra {
+        flex-grow: 1;
+        flex-basis: 100%;
+        flex-shrink: 0;
         color: $color-radio_extra-text-default;
+        padding-left: $spacing-radio_extra-paddingLeft;
         box-sizing: border-box;
     }
 
@@ -391,25 +393,37 @@ $inner-width: $width-icon-medium;
     @include font-size-regular;
 
     &-vertical {
-        display: flex;
-        flex-direction: column;
-        row-gap: $spacing-radio_group_vertical-marginBottom;
-
+        .#{$module} {
+            &:last-of-type {
+                margin-bottom: 0;
+            }
+        }
         &-default {
             .#{$module} {
-                display: flex;
+                display: block;
+                margin-bottom: $spacing-radio_group_vertical-marginBottom;
+
             }
         }
         &-card {
             .#{$module} {
                 display: flex;
+                margin-bottom: $spacing-radio_card_group_vertical-marginBottom;
             }
         }
     }
 
     &-horizontal {
-        display: inline-flex;
-        column-gap: $spacing-radio_group_horizontal-marginRight;
+        .#{$module} {
+            margin-right: $spacing-radio_group_horizontal-marginRight;
+
+            &:last-of-type {
+                margin-right: 0;
+            }
+        }
+        &-default {
+            display: inline-block;
+        }
     }
 
     &-buttonRadio {

package/radio/rtl.scss

@@ -18,14 +18,61 @@ $inner-width: $width-icon-medium;
             }
         }
 
+        &-inner {
+            left: auto;
+            right: 0;
+
+            &-display {
+                left: auto;
+                right: 0;
+            }
+        }
+
         &-addon {
+            padding-left: 0;
+            margin-left: 0;
+            padding-right: $spacing-radio_addon-paddingLeft;
+            margin-right: $spacing-radio_addon-marginLeft;
+            
             &-buttonRadio {
                 margin-right: $spacing-none;
             }
         }
+
+        &-extra {
+            padding-left: 0;
+            padding-right: $spacing-radio_extra-paddingLeft;
+        }
+    }
+
+    &-isCardRadioGroup {
+        .#{$module}-inner {
+            margin-right: 0;
+            margin-left: $spacing-radio_cardRadioGroup_inner-marginRight;
+        }
+
+        .#{$module}-addon {
+            margin-right: 0;
+            padding-right: 0;
+        }
+
+        .#{$module}-extra {
+            padding-right: 0;
+        }
     }
 
     .#{$module}Group {
         direction: rtl;
+
+        &-horizontal {
+            .#{$module} {
+                margin-right: 0;
+                margin-left: $spacing-radio_group_horizontal-marginRight;
+
+                &:last-of-type {
+                    margin-left: 0;
+                }
+            }
+        }
     }
 }