Skip to content

Commit 95e93bd

Browse files
authored
fix(Switch): fixed multiple color value errors (#3802)
1 parent d901ba4 commit 95e93bd

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

src/common/style/theme/_components.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
page,
44
.page {
55
--td-picker-transparent-color: rgba(255, 255, 255, 0);
6+
7+
--td-switch-dot-disabled-color: var(--td-font-white-1);
8+
--td-switch-loading-color: var(--td-brand-color);
69
}
710
}
811

@@ -20,5 +23,6 @@
2023
--td-picker-transparent-color: transparent;
2124

2225
--td-switch-dot-disabled-color: var(--td-font-white-2);
26+
--td-switch-loading-color: var(--td-font-white-1);
2327
}
2428
}

src/switch/switch.less

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
@switch-icon-large-size: var(--td-switch-icon-large-size, 48rpx);
4747
@switch-icon-small-size: var(--td-switch-icon-small-size, 32rpx);
4848

49+
@switch-loading-color: var(--td-switch-loading-color, @brand-color);
50+
4951
.@{prefix}-switch {
5052
display: flex;
5153
align-items: center;
@@ -103,7 +105,7 @@
103105
}
104106

105107
&__loading {
106-
color: @switch-label-checked-color;
108+
--td-loading-color: @switch-loading-color;
107109
}
108110

109111
&__body {

src/switch/switch.wxml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
class="{{_.cls(classPrefix + '__body', [['checked', checked], ['disabled', disabled || loading], size])}} {{prefix}}-class-body"
1313
>
1414
<view
15-
class="{{_.cls(classPrefix + '__dot', [['checked', checked], ['disabled', disabled], ['plain', label.length != 2 && icon.length != 2 && !loading], size])}} {{prefix}}-class-dot"
15+
class="{{_.cls(classPrefix + '__dot', [['checked', checked], ['disabled', disabled || loading], ['plain', label.length != 2 && icon.length != 2 && !loading], size])}} {{prefix}}-class-dot"
1616
aria-hidden="{{true}}"
1717
>
1818
<view
1919
wx:if="{{label}}"
2020
class="{{_.cls(classPrefix + '__label', [['checked', checked], ['disabled', disabled], size])}} {{prefix}}-class-label"
2121
>
22-
<t-loading wx:if="{{loading}}" inherit-color size="32rpx" />
22+
<t-loading wx:if="{{loading}}" class="{{classPrefix}}__loading" size="32rpx" />
2323
<text wx:elif="{{label.length == 2}}">{{checked ? label[0] : label[1]}}</text>
2424
<t-icon
2525
wx:elif="{{icon.length == 2}}"

0 commit comments

Comments
 (0)