chore: auto merge branches (#6083)

chore: feature merge master
ant-design · Apr 3, 2023 · b5f62b8 · b5f62b8
2 parents 4704d25 + 3b02e0f
commit b5f62b8
Show file tree

Hide file tree

Showing 42 changed files with 201 additions and 54 deletions.
diff --git a/src/components/action-sheet/action-sheet.less b/src/components/action-sheet/action-sheet.less
@@ -60,7 +60,7 @@
   }
 
   &-cancel {
-    background-color: var(--adm-color-box);
+    background-color: var(--adm-color-fill-content);
     padding-top: 8px;
   }
 }
diff --git a/src/components/action-sheet/action-sheet.tsx b/src/components/action-sheet/action-sheet.tsx
@@ -96,6 +96,8 @@ export const ActionSheet: FC<ActionSheetProps> = p => {
                       props.onClose?.()
                     }
                   }}
+                  role='option'
+                  aria-disabled={action.disabled}
                 >
                   <div className={`${classPrefix}-button-item-name`}>
                     {action.text}
@@ -111,7 +113,11 @@ export const ActionSheet: FC<ActionSheetProps> = p => {
           </div>
 
           {props.cancelText && (
-            <div className={`${classPrefix}-cancel`}>
+            <div
+              className={`${classPrefix}-cancel`}
+              role='option'
+              aria-label={props.cancelText}
+            >
               <div className={`${classPrefix}-button-item-wrapper`}>
                 <a
                   className={classNames(

diff --git a/src/components/action-sheet/tests/__snapshots__/action-sheet.test.tsx.snap b/src/components/action-sheet/tests/__snapshots__/action-sheet.test.tsx.snap
@@ -50,6 +50,7 @@ exports[`ActionSheet basic usage 1`] = `
           >
             <a
               class="adm-plain-anchor adm-action-sheet-button-item"
+              role="option"
             >
               <div
                 class="adm-action-sheet-button-item-name"
@@ -63,6 +64,7 @@ exports[`ActionSheet basic usage 1`] = `
           >
             <a
               class="adm-plain-anchor adm-action-sheet-button-item"
+              role="option"
             >
               <div
                 class="adm-action-sheet-button-item-name"
@@ -76,6 +78,7 @@ exports[`ActionSheet basic usage 1`] = `
           >
             <a
               class="adm-plain-anchor adm-action-sheet-button-item"
+              role="option"
             >
               <div
                 class="adm-action-sheet-button-item-name"
@@ -86,7 +89,9 @@ exports[`ActionSheet basic usage 1`] = `
           </div>
         </div>
         <div
+          aria-label="取消"
           class="adm-action-sheet-cancel"
+          role="option"
         >
           <div
             class="adm-action-sheet-button-item-wrapper"

diff --git a/src/components/avatar/avatar.tsx b/src/components/avatar/avatar.tsx
@@ -11,7 +11,7 @@ export type AvatarProps = {
   src: string
   fallback?: ReactNode
   fit?: 'contain' | 'cover' | 'fill' | 'none' | 'scale-down'
-} & Pick<ImageProps, 'alt' | 'lazy' | 'onClick' | 'onError'> &
+} & Pick<ImageProps, 'alt' | 'lazy' | 'onClick' | 'onError' | 'onLoad'> &
   NativeProps<'--size' | '--border-radius'>
 
 const defaultProps = {
@@ -33,6 +33,7 @@ export const Avatar: FC<AvatarProps> = p => {
       fit={props.fit}
       onClick={props.onClick}
       onError={props.onError}
+      onLoad={props.onLoad}
     />
   )
 }
diff --git a/src/components/avatar/index.en.md b/src/components/avatar/index.en.md
@@ -20,7 +20,7 @@ It is necessary to show the characteristics of people or things more intuitively
 | fit | The fill mode of the image | `'contain' \| 'cover' \| 'fill' \| 'none' \| 'scale-down'` | `'cover'` |
 | src | The address of avatar. | `string` | - |
 
-In addition, the following props of [Image](/components/image) are also supported: `alt` `lazy` `onClick` `onError`.
+In addition, the following props of [Image](/components/image) are also supported: `alt` `lazy` `onClick` `onError` `onLoad`.
 
 ### CSS Variables
 

diff --git a/src/components/avatar/index.zh.md b/src/components/avatar/index.zh.md
@@ -20,7 +20,7 @@
 | fit | 图片填充模式 | `'contain' \| 'cover' \| 'fill' \| 'none' \| 'scale-down'` | `'cover'` |
 | src | 头像的图片地址 | `string` | - |
 
-此外，还支持 [Image](/zh/components/image) 组件的 `alt` `lazy` `onClick` `onError` 属性。
+此外，还支持 [Image](/zh/components/image) 组件的 `alt` `lazy` `onClick` `onError` `onLoad` 属性。
 
 ### CSS 变量
 

diff --git a/src/components/badge/badge.less b/src/components/badge/badge.less
@@ -16,7 +16,7 @@
   --color: var(--adm-badge-color, #ff411c);
 
   &-content {
-    color: var(--adm-color-white);
+    color: var(--adm-color-text-light-solid);
     box-sizing: border-box;
     min-width: 8px;
     padding: 1px 4px;
@@ -42,6 +42,6 @@
   }
 
   &-bordered {
-    border: solid 1px var(--adm-color-white);
+    border: solid 1px var(--adm-color-text-light-solid);
   }
 }
diff --git a/src/components/button/button.less b/src/components/button/button.less
@@ -1,7 +1,7 @@
 @class-prefix-button: ~'adm-button';
 
 .@{class-prefix-button} {
-  --color: var(--adm-color-white);
+  --color: var(--adm-color-text-light-solid);
 
   --text-color: var(--adm-button-text-color, var(--adm-color-text));
   --background-color: var(
@@ -64,7 +64,7 @@
     }
   }
   &:not(&-default) {
-    --text-color: var(--adm-color-white);
+    --text-color: var(--adm-color-text-light-solid);
     --background-color: var(--color);
     --border-color: var(--color);
     &.@{class-prefix-button}-fill-outline {

diff --git a/src/components/capsule-tabs/capsule-tabs.less b/src/components/capsule-tabs/capsule-tabs.less
@@ -36,10 +36,10 @@
     font-size: var(--adm-font-size-7);
     text-align: center;
     white-space: nowrap;
-    background-color: var(--adm-color-box);
+    background-color: var(--adm-color-fill-content);
   }
   &-tab-active {
-    color: var(--adm-color-white);
+    color: var(--adm-color-text-light-solid);
     background-color: var(--adm-color-primary);
   }
   &-tab-disabled {

diff --git a/src/components/cascader-view/tests/__snapshots__/cascader-view.test.tsx.snap b/src/components/cascader-view/tests/__snapshots__/cascader-view.test.tsx.snap
@@ -21,6 +21,7 @@ exports[`CascaderView basic usage 1`] = `
         />
         <div
           class="adm-tabs-tab-list"
+          role="tablist"
         >
           <div
             class="adm-tabs-tab-line"
@@ -30,7 +31,9 @@ exports[`CascaderView basic usage 1`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="false"
               class="adm-tabs-tab"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -43,7 +46,9 @@ exports[`CascaderView basic usage 1`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="true"
               class="adm-tabs-tab adm-tabs-tab-active"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -280,6 +285,7 @@ exports[`CascaderView basic usage 2`] = `
         />
         <div
           class="adm-tabs-tab-list"
+          role="tablist"
         >
           <div
             class="adm-tabs-tab-line"
@@ -289,7 +295,9 @@ exports[`CascaderView basic usage 2`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="false"
               class="adm-tabs-tab"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -302,7 +310,9 @@ exports[`CascaderView basic usage 2`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="false"
               class="adm-tabs-tab"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -315,7 +325,9 @@ exports[`CascaderView basic usage 2`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="true"
               class="adm-tabs-tab adm-tabs-tab-active"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -671,6 +683,7 @@ exports[`CascaderView basic usage 3`] = `
         />
         <div
           class="adm-tabs-tab-list"
+          role="tablist"
         >
           <div
             class="adm-tabs-tab-line"
@@ -680,7 +693,9 @@ exports[`CascaderView basic usage 3`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="false"
               class="adm-tabs-tab"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -693,7 +708,9 @@ exports[`CascaderView basic usage 3`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="false"
               class="adm-tabs-tab"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -706,7 +723,9 @@ exports[`CascaderView basic usage 3`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="true"
               class="adm-tabs-tab adm-tabs-tab-active"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -1100,6 +1119,7 @@ exports[`CascaderView controlled mode 1`] = `
         />
         <div
           class="adm-tabs-tab-list"
+          role="tablist"
         >
           <div
             class="adm-tabs-tab-line"
@@ -1109,7 +1129,9 @@ exports[`CascaderView controlled mode 1`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="false"
               class="adm-tabs-tab"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -1122,7 +1144,9 @@ exports[`CascaderView controlled mode 1`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="false"
               class="adm-tabs-tab"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -1135,7 +1159,9 @@ exports[`CascaderView controlled mode 1`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="true"
               class="adm-tabs-tab adm-tabs-tab-active"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -1529,6 +1555,7 @@ exports[`CascaderView same value in options 1`] = `
         />
         <div
           class="adm-tabs-tab-list"
+          role="tablist"
         >
           <div
             class="adm-tabs-tab-line"
@@ -1538,7 +1565,9 @@ exports[`CascaderView same value in options 1`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="false"
               class="adm-tabs-tab"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -1551,7 +1580,9 @@ exports[`CascaderView same value in options 1`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="true"
               class="adm-tabs-tab adm-tabs-tab-active"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -1748,6 +1779,7 @@ exports[`CascaderView same value in options 2`] = `
         />
         <div
           class="adm-tabs-tab-list"
+          role="tablist"
         >
           <div
             class="adm-tabs-tab-line"
@@ -1757,7 +1789,9 @@ exports[`CascaderView same value in options 2`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="false"
               class="adm-tabs-tab"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -1770,7 +1804,9 @@ exports[`CascaderView same value in options 2`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="false"
               class="adm-tabs-tab"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -1783,7 +1819,9 @@ exports[`CascaderView same value in options 2`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="true"
               class="adm-tabs-tab adm-tabs-tab-active"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -2079,6 +2117,7 @@ exports[`CascaderView same value in options 3`] = `
         />
         <div
           class="adm-tabs-tab-list"
+          role="tablist"
         >
           <div
             class="adm-tabs-tab-line"
@@ -2088,7 +2127,9 @@ exports[`CascaderView same value in options 3`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="false"
               class="adm-tabs-tab"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -2101,7 +2142,9 @@ exports[`CascaderView same value in options 3`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="false"
               class="adm-tabs-tab"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"
@@ -2114,7 +2157,9 @@ exports[`CascaderView same value in options 3`] = `
             class="adm-tabs-tab-wrapper"
           >
             <div
+              aria-selected="true"
               class="adm-tabs-tab adm-tabs-tab-active"
+              role="tab"
             >
               <div
                 class="adm-cascader-view-header-title"