Skip to content

Commit b5f62b8

Browse files
github-actions[bot]github-actions[bot]
authored
chore: auto merge branches (#6083)
chore: feature merge master
2 parents 4704d25 + 3b02e0f commit b5f62b8

File tree

42 files changed

+201
-54
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+201
-54
lines changed

‎src/components/action-sheet/action-sheet.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
}
6161

6262
&-cancel {
63-
background-color: var(--adm-color-box);
63+
background-color: var(--adm-color-fill-content);
6464
padding-top: 8px;
6565
}
6666
}

‎src/components/action-sheet/action-sheet.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ export const ActionSheet: FC<ActionSheetProps> = p => {
9696
props.onClose?.()
9797
}
9898
}}
99+
role='option'
100+
aria-disabled={action.disabled}
99101
>
100102
<div className={`${classPrefix}-button-item-name`}>
101103
{action.text}
@@ -111,7 +113,11 @@ export const ActionSheet: FC<ActionSheetProps> = p => {
111113
</div>
112114

113115
{props.cancelText && (
114-
<div className={`${classPrefix}-cancel`}>
116+
<div
117+
className={`${classPrefix}-cancel`}
118+
role='option'
119+
aria-label={props.cancelText}
120+
>
115121
<div className={`${classPrefix}-button-item-wrapper`}>
116122
<a
117123
className={classNames(

‎src/components/action-sheet/tests/__snapshots__/action-sheet.test.tsx.snap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ exports[`ActionSheet basic usage 1`] = `
5050
>
5151
<a
5252
class="adm-plain-anchor adm-action-sheet-button-item"
53+
role="option"
5354
>
5455
<div
5556
class="adm-action-sheet-button-item-name"
@@ -63,6 +64,7 @@ exports[`ActionSheet basic usage 1`] = `
6364
>
6465
<a
6566
class="adm-plain-anchor adm-action-sheet-button-item"
67+
role="option"
6668
>
6769
<div
6870
class="adm-action-sheet-button-item-name"
@@ -76,6 +78,7 @@ exports[`ActionSheet basic usage 1`] = `
7678
>
7779
<a
7880
class="adm-plain-anchor adm-action-sheet-button-item"
81+
role="option"
7982
>
8083
<div
8184
class="adm-action-sheet-button-item-name"
@@ -86,7 +89,9 @@ exports[`ActionSheet basic usage 1`] = `
8689
</div>
8790
</div>
8891
<div
92+
aria-label="取消"
8993
class="adm-action-sheet-cancel"
94+
role="option"
9095
>
9196
<div
9297
class="adm-action-sheet-button-item-wrapper"

‎src/components/avatar/avatar.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export type AvatarProps = {
1111
src: string
1212
fallback?: ReactNode
1313
fit?: 'contain' | 'cover' | 'fill' | 'none' | 'scale-down'
14-
} & Pick<ImageProps, 'alt' | 'lazy' | 'onClick' | 'onError'> &
14+
} & Pick<ImageProps, 'alt' | 'lazy' | 'onClick' | 'onError' | 'onLoad'> &
1515
NativeProps<'--size' | '--border-radius'>
1616

1717
const defaultProps = {
@@ -33,6 +33,7 @@ export const Avatar: FC<AvatarProps> = p => {
3333
fit={props.fit}
3434
onClick={props.onClick}
3535
onError={props.onError}
36+
onLoad={props.onLoad}
3637
/>
3738
)
3839
}

‎src/components/avatar/index.en.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ It is necessary to show the characteristics of people or things more intuitively
2020
| fit | The fill mode of the image | `'contain' \| 'cover' \| 'fill' \| 'none' \| 'scale-down'` | `'cover'` |
2121
| src | The address of avatar. | `string` | - |
2222

23-
In addition, the following props of [Image](/components/image) are also supported: `alt` `lazy` `onClick` `onError`.
23+
In addition, the following props of [Image](/components/image) are also supported: `alt` `lazy` `onClick` `onError` `onLoad`.
2424

2525
### CSS Variables
2626

‎src/components/avatar/index.zh.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
| fit | 图片填充模式 | `'contain' \| 'cover' \| 'fill' \| 'none' \| 'scale-down'` | `'cover'` |
2121
| src | 头像的图片地址 | `string` | - |
2222

23-
此外，还支持 [Image](/zh/components/image) 组件的 `alt` `lazy` `onClick` `onError` 属性。
23+
此外，还支持 [Image](/zh/components/image) 组件的 `alt` `lazy` `onClick` `onError` `onLoad` 属性。
2424

2525
### CSS 变量
2626

‎src/components/badge/badge.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
--color: var(--adm-badge-color, #ff411c);
1717

1818
&-content {
19-
color: var(--adm-color-white);
19+
color: var(--adm-color-text-light-solid);
2020
box-sizing: border-box;
2121
min-width: 8px;
2222
padding: 1px 4px;
@@ -42,6 +42,6 @@
4242
}
4343

4444
&-bordered {
45-
border: solid 1px var(--adm-color-white);
45+
border: solid 1px var(--adm-color-text-light-solid);
4646
}
4747
}

‎src/components/button/button.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@class-prefix-button: ~'adm-button';
22

33
.@{class-prefix-button} {
4-
--color: var(--adm-color-white);
4+
--color: var(--adm-color-text-light-solid);
55

66
--text-color: var(--adm-button-text-color, var(--adm-color-text));
77
--background-color: var(
@@ -64,7 +64,7 @@
6464
}
6565
}
6666
&:not(&-default) {
67-
--text-color: var(--adm-color-white);
67+
--text-color: var(--adm-color-text-light-solid);
6868
--background-color: var(--color);
6969
--border-color: var(--color);
7070
&.@{class-prefix-button}-fill-outline {

‎src/components/capsule-tabs/capsule-tabs.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
font-size: var(--adm-font-size-7);
3737
text-align: center;
3838
white-space: nowrap;
39-
background-color: var(--adm-color-box);
39+
background-color: var(--adm-color-fill-content);
4040
}
4141
&-tab-active {
42-
color: var(--adm-color-white);
42+
color: var(--adm-color-text-light-solid);
4343
background-color: var(--adm-color-primary);
4444
}
4545
&-tab-disabled {

‎src/components/cascader-view/tests/__snapshots__/cascader-view.test.tsx.snap

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ exports[`CascaderView basic usage 1`] = `
2121
/>
2222
<div
2323
class="adm-tabs-tab-list"
24+
role="tablist"
2425
>
2526
<div
2627
class="adm-tabs-tab-line"
@@ -30,7 +31,9 @@ exports[`CascaderView basic usage 1`] = `
3031
class="adm-tabs-tab-wrapper"
3132
>
3233
<div
34+
aria-selected="false"
3335
class="adm-tabs-tab"
36+
role="tab"
3437
>
3538
<div
3639
class="adm-cascader-view-header-title"
@@ -43,7 +46,9 @@ exports[`CascaderView basic usage 1`] = `
4346
class="adm-tabs-tab-wrapper"
4447
>
4548
<div
49+
aria-selected="true"
4650
class="adm-tabs-tab adm-tabs-tab-active"
51+
role="tab"
4752
>
4853
<div
4954
class="adm-cascader-view-header-title"
@@ -280,6 +285,7 @@ exports[`CascaderView basic usage 2`] = `
280285
/>
281286
<div
282287
class="adm-tabs-tab-list"
288+
role="tablist"
283289
>
284290
<div
285291
class="adm-tabs-tab-line"
@@ -289,7 +295,9 @@ exports[`CascaderView basic usage 2`] = `
289295
class="adm-tabs-tab-wrapper"
290296
>
291297
<div
298+
aria-selected="false"
292299
class="adm-tabs-tab"
300+
role="tab"
293301
>
294302
<div
295303
class="adm-cascader-view-header-title"
@@ -302,7 +310,9 @@ exports[`CascaderView basic usage 2`] = `
302310
class="adm-tabs-tab-wrapper"
303311
>
304312
<div
313+
aria-selected="false"
305314
class="adm-tabs-tab"
315+
role="tab"
306316
>
307317
<div
308318
class="adm-cascader-view-header-title"
@@ -315,7 +325,9 @@ exports[`CascaderView basic usage 2`] = `
315325
class="adm-tabs-tab-wrapper"
316326
>
317327
<div
328+
aria-selected="true"
318329
class="adm-tabs-tab adm-tabs-tab-active"
330+
role="tab"
319331
>
320332
<div
321333
class="adm-cascader-view-header-title"
@@ -671,6 +683,7 @@ exports[`CascaderView basic usage 3`] = `
671683
/>
672684
<div
673685
class="adm-tabs-tab-list"
686+
role="tablist"
674687
>
675688
<div
676689
class="adm-tabs-tab-line"
@@ -680,7 +693,9 @@ exports[`CascaderView basic usage 3`] = `
680693
class="adm-tabs-tab-wrapper"
681694
>
682695
<div
696+
aria-selected="false"
683697
class="adm-tabs-tab"
698+
role="tab"
684699
>
685700
<div
686701
class="adm-cascader-view-header-title"
@@ -693,7 +708,9 @@ exports[`CascaderView basic usage 3`] = `
693708
class="adm-tabs-tab-wrapper"
694709
>
695710
<div
711+
aria-selected="false"
696712
class="adm-tabs-tab"
713+
role="tab"
697714
>
698715
<div
699716
class="adm-cascader-view-header-title"
@@ -706,7 +723,9 @@ exports[`CascaderView basic usage 3`] = `
706723
class="adm-tabs-tab-wrapper"
707724
>
708725
<div
726+
aria-selected="true"
709727
class="adm-tabs-tab adm-tabs-tab-active"
728+
role="tab"
710729
>
711730
<div
712731
class="adm-cascader-view-header-title"
@@ -1100,6 +1119,7 @@ exports[`CascaderView controlled mode 1`] = `
11001119
/>
11011120
<div
11021121
class="adm-tabs-tab-list"
1122+
role="tablist"
11031123
>
11041124
<div
11051125
class="adm-tabs-tab-line"
@@ -1109,7 +1129,9 @@ exports[`CascaderView controlled mode 1`] = `
11091129
class="adm-tabs-tab-wrapper"
11101130
>
11111131
<div
1132+
aria-selected="false"
11121133
class="adm-tabs-tab"
1134+
role="tab"
11131135
>
11141136
<div
11151137
class="adm-cascader-view-header-title"
@@ -1122,7 +1144,9 @@ exports[`CascaderView controlled mode 1`] = `
11221144
class="adm-tabs-tab-wrapper"
11231145
>
11241146
<div
1147+
aria-selected="false"
11251148
class="adm-tabs-tab"
1149+
role="tab"
11261150
>
11271151
<div
11281152
class="adm-cascader-view-header-title"
@@ -1135,7 +1159,9 @@ exports[`CascaderView controlled mode 1`] = `
11351159
class="adm-tabs-tab-wrapper"
11361160
>
11371161
<div
1162+
aria-selected="true"
11381163
class="adm-tabs-tab adm-tabs-tab-active"
1164+
role="tab"
11391165
>
11401166
<div
11411167
class="adm-cascader-view-header-title"
@@ -1529,6 +1555,7 @@ exports[`CascaderView same value in options 1`] = `
15291555
/>
15301556
<div
15311557
class="adm-tabs-tab-list"
1558+
role="tablist"
15321559
>
15331560
<div
15341561
class="adm-tabs-tab-line"
@@ -1538,7 +1565,9 @@ exports[`CascaderView same value in options 1`] = `
15381565
class="adm-tabs-tab-wrapper"
15391566
>
15401567
<div
1568+
aria-selected="false"
15411569
class="adm-tabs-tab"
1570+
role="tab"
15421571
>
15431572
<div
15441573
class="adm-cascader-view-header-title"
@@ -1551,7 +1580,9 @@ exports[`CascaderView same value in options 1`] = `
15511580
class="adm-tabs-tab-wrapper"
15521581
>
15531582
<div
1583+
aria-selected="true"
15541584
class="adm-tabs-tab adm-tabs-tab-active"
1585+
role="tab"
15551586
>
15561587
<div
15571588
class="adm-cascader-view-header-title"
@@ -1748,6 +1779,7 @@ exports[`CascaderView same value in options 2`] = `
17481779
/>
17491780
<div
17501781
class="adm-tabs-tab-list"
1782+
role="tablist"
17511783
>
17521784
<div
17531785
class="adm-tabs-tab-line"
@@ -1757,7 +1789,9 @@ exports[`CascaderView same value in options 2`] = `
17571789
class="adm-tabs-tab-wrapper"
17581790
>
17591791
<div
1792+
aria-selected="false"
17601793
class="adm-tabs-tab"
1794+
role="tab"
17611795
>
17621796
<div
17631797
class="adm-cascader-view-header-title"
@@ -1770,7 +1804,9 @@ exports[`CascaderView same value in options 2`] = `
17701804
class="adm-tabs-tab-wrapper"
17711805
>
17721806
<div
1807+
aria-selected="false"
17731808
class="adm-tabs-tab"
1809+
role="tab"
17741810
>
17751811
<div
17761812
class="adm-cascader-view-header-title"
@@ -1783,7 +1819,9 @@ exports[`CascaderView same value in options 2`] = `
17831819
class="adm-tabs-tab-wrapper"
17841820
>
17851821
<div
1822+
aria-selected="true"
17861823
class="adm-tabs-tab adm-tabs-tab-active"
1824+
role="tab"
17871825
>
17881826
<div
17891827
class="adm-cascader-view-header-title"
@@ -2079,6 +2117,7 @@ exports[`CascaderView same value in options 3`] = `
20792117
/>
20802118
<div
20812119
class="adm-tabs-tab-list"
2120+
role="tablist"
20822121
>
20832122
<div
20842123
class="adm-tabs-tab-line"
@@ -2088,7 +2127,9 @@ exports[`CascaderView same value in options 3`] = `
20882127
class="adm-tabs-tab-wrapper"
20892128
>
20902129
<div
2130+
aria-selected="false"
20912131
class="adm-tabs-tab"
2132+
role="tab"
20922133
>
20932134
<div
20942135
class="adm-cascader-view-header-title"
@@ -2101,7 +2142,9 @@ exports[`CascaderView same value in options 3`] = `
21012142
class="adm-tabs-tab-wrapper"
21022143
>
21032144
<div
2145+
aria-selected="false"
21042146
class="adm-tabs-tab"
2147+
role="tab"
21052148
>
21062149
<div
21072150
class="adm-cascader-view-header-title"
@@ -2114,7 +2157,9 @@ exports[`CascaderView same value in options 3`] = `
21142157
class="adm-tabs-tab-wrapper"
21152158
>
21162159
<div
2160+
aria-selected="true"
21172161
class="adm-tabs-tab adm-tabs-tab-active"
2162+
role="tab"
21182163
>
21192164
<div
21202165
class="adm-cascader-view-header-title"

0 commit comments

Comments
 (0)