Skip to content

Commit 6805909

Browse files
JuneAndGreenJuneAndGreen
committed
update: rm :active
1 parent 578dace commit 6805909

File tree

18 files changed

+58
-22
lines changed

18 files changed

+58
-22
lines changed

‎src/actionsheet/__test__/__snapshots__/actionsheet.test.ts.snap

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ exports[`actionsheet basic actionsheet 1`] = `
3131
data-groupindex="{{0}}"
3232
data-index="{{0}}"
3333
data-value="{{1}}"
34+
hoverClass="weui-active"
3435
bind:tap="buttonTap"
3536
>
3637
@@ -42,6 +43,7 @@ exports[`actionsheet basic actionsheet 1`] = `
4243
data-groupindex="{{0}}"
4344
data-index="{{1}}"
4445
data-value="{{2}}"
46+
hoverClass="weui-active"
4547
bind:tap="buttonTap"
4648
>
4749
@@ -53,6 +55,7 @@ exports[`actionsheet basic actionsheet 1`] = `
5355
data-groupindex="{{0}}"
5456
data-index="{{2}}"
5557
data-value="{{3}}"
58+
hoverClass="weui-active"
5659
bind:tap="buttonTap"
5760
>
5861
@@ -66,6 +69,7 @@ exports[`actionsheet basic actionsheet 1`] = `
6669
<wx-view
6770
class="weui-actionsheet__cell"
6871
data-type="close"
72+
hoverClass="weui-active"
6973
id="iosActionsheetCancel"
7074
bind:tap="closeActionSheet"
7175
>
@@ -108,6 +112,7 @@ exports[`actionsheet no cancel 1`] = `
108112
data-groupindex="{{0}}"
109113
data-index="{{0}}"
110114
data-value="{{1}}"
115+
hoverClass="weui-active"
111116
bind:tap="buttonTap"
112117
>
113118
@@ -119,6 +124,7 @@ exports[`actionsheet no cancel 1`] = `
119124
data-groupindex="{{0}}"
120125
data-index="{{1}}"
121126
data-value="{{2}}"
127+
hoverClass="weui-active"
122128
bind:tap="buttonTap"
123129
>
124130
@@ -130,6 +136,7 @@ exports[`actionsheet no cancel 1`] = `
130136
data-groupindex="{{0}}"
131137
data-index="{{2}}"
132138
data-value="{{3}}"
139+
hoverClass="weui-active"
133140
bind:tap="buttonTap"
134141
>
135142

‎src/actionsheet/actionsheet.wxml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
>
3030
<block wx:if="{{utils.isNotSlot(actionItem)}}">
3131
<view
32-
class="weui-actionsheet__cell {{item.type === 'warn' ? 'weui-actionsheet__cell_warn' : '' }}"
32+
class="weui-actionsheet__cell {{item.type === 'warn' ? 'weui-actionsheet__cell_warn' : '' }}"
33+
hover-class="weui-active"
3334
wx:key="actionIndex"
3435
wx:for="{{actionItem}}"
3536
wx:for-index="actionIndex"
@@ -45,6 +46,6 @@
4546
</view>
4647
<!-- 取消按钮 -->
4748
<view class="weui-actionsheet__action" wx:if="{{showCancel}}">
48-
<view class="weui-actionsheet__cell" data-type="close" id="iosActionsheetCancel" bindtap="closeActionSheet">{{cancelText}}</view>
49+
<view class="weui-actionsheet__cell" hover-class="weui-active" data-type="close" id="iosActionsheetCancel" bindtap="closeActionSheet">{{cancelText}}</view>
4950
</view>
5051
</view>

‎src/cell/cell.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ Component({
7575
hasBody: {
7676
type: Boolean,
7777
value: true
78+
},
79+
extHoverClass: {
80+
// 提供给需要定制 hover-class 的场景，要求 hover 为 false
81+
type: String,
82+
value: ''
7883
}
7984
},
8085
relations: {

‎src/cell/cell.wxml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<block wx:if="{{link}}">
2-
<view bindtap="navigateTo" class="weui-cell weui-cell_access {{extClass}} {{outerClass}}{{inForm ? ' weui-cell-inform' : ''}}{{inline ? '' : ' .weui-cell_label-block'}}" hover-class="{{hover ? 'weui-cell_active' : ''}}">
2+
<view bindtap="navigateTo" class="weui-cell weui-cell_access {{extClass}} {{outerClass}}{{inForm ? ' weui-cell-inform' : ''}}{{inline ? '' : ' .weui-cell_label-block'}}" hover-class="{{hover ? 'weui-cell_active weui-active' : extHoverClass}}">
33
<view wx:if="{{hasHeader}}" class="weui-cell__hd {{iconClass}}">
44
<block wx:if="{{icon}}">
55
<image src="{{icon}}" class="weui-cell__icon" mode="aspectFit"></image>
@@ -35,7 +35,7 @@
3535
</view>
3636
</block>
3737
<block wx:else>
38-
<view bindtap="navigateTo" class="weui-cell {{showError && error ? 'weui-cell_warn' : ''}} {{inForm ? 'weui-cell-inform' : ''}} {{extClass}} {{outerClass}}" hover-class="{{hover ? 'weui-cell_active' : ''}}">
38+
<view bindtap="navigateTo" class="weui-cell {{showError && error ? 'weui-cell_warn' : ''}} {{inForm ? 'weui-cell-inform' : ''}} {{extClass}} {{outerClass}}" hover-class="{{hover ? 'weui-cell_active weui-active' : extHoverClass}}">
3939
<view wx:if="{{hasHeader}}" class="weui-cell__hd {{iconClass}}">
4040
<block wx:if="{{icon}}">
4141
<image src="{{icon}}" class="weui-cell__icon" mode="aspectFit"></image>

‎src/checkbox/__test__/__snapshots__/checkbox.test.js.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ exports[`checkbox-group & checkbox basic checkbox 1`] = `
2121
>
2222
<wx-view
2323
class="weui-cell weui-check__label ^weui-cell_radio "
24-
hoverClass=""
24+
hoverClass="weui-active"
2525
bind:tap="navigateTo"
2626
>
2727
<wx-view
@@ -60,7 +60,7 @@ exports[`checkbox-group & checkbox basic checkbox 1`] = `
6060
>
6161
<wx-view
6262
class="weui-cell weui-check__label weui-cell_wxss ^weui-cell_radio "
63-
hoverClass=""
63+
hoverClass="weui-active"
6464
bind:tap="navigateTo"
6565
>
6666
<wx-view
@@ -113,7 +113,7 @@ exports[`checkbox-group & checkbox basic checkbox 1`] = `
113113
>
114114
<wx-view
115115
class="weui-cell weui-check__label ^weui-cell_checkbox "
116-
hoverClass=""
116+
hoverClass="weui-active"
117117
bind:tap="navigateTo"
118118
>
119119
<wx-view
@@ -152,7 +152,7 @@ exports[`checkbox-group & checkbox basic checkbox 1`] = `
152152
>
153153
<wx-view
154154
class="weui-cell weui-check__label weui-cell_wxss ^weui-cell_checkbox "
155-
hoverClass=""
155+
hoverClass="weui-active"
156156
bind:tap="navigateTo"
157157
>
158158
<wx-view

‎src/checkbox/checkbox.wxml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
has-footer="{{!multi}}"
33
has-header="{{multi}}"
44
bindtap="checkedChange"
5-
ext-class="weui-check__label {{outerClass}} {{extClass}} {{!multi ? '^weui-cell_radio' : '^weui-cell_checkbox'}}">
5+
ext-class="weui-check__label {{outerClass}} {{extClass}} {{!multi ? '^weui-cell_radio' : '^weui-cell_checkbox'}}"
6+
ext-hover-class="weui-active">
67

78
<view slot="icon" wx:if="{{multi}}">
89
<checkbox value="{{value}}" checked="{{checked}}" disabled="{{disabled}}" color="{{color}}" class="weui-check">

‎src/dialog/__test__/__snapshots__/dialog.test.js.snap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,15 @@ exports[`dialog basic dialog 1`] = `
3838
<wx-view
3939
class="weui-dialog__btn weui-dialog__btn_default "
4040
data-index="{{0}}"
41+
hoverClass="weui-active"
4142
bind:tap="buttonTap"
4243
>
4344
取消
4445
</wx-view>
4546
<wx-view
4647
class="weui-dialog__btn weui-dialog__btn_primary "
4748
data-index="{{1}}"
49+
hoverClass="weui-active"
4850
bind:tap="buttonTap"
4951
>
5052
确定

‎src/dialog/dialog.wxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</view>
1212
<view class="weui-dialog__ft">
1313
<block wx:if="{{buttons && buttons.length}}">
14-
<view wx:for="{{buttons}}" wx:key="index" class="weui-dialog__btn {{item.className}} {{item.extClass}}" data-index="{{index}}" bindtap="buttonTap">{{item.text}}</view>
14+
<view wx:for="{{buttons}}" wx:key="index" class="weui-dialog__btn {{item.className}} {{item.extClass}}" hover-class="weui-active" data-index="{{index}}" bindtap="buttonTap">{{item.text}}</view>
1515
</block>
1616
<slot name="footer" wx:else></slot>
1717
</view>

‎src/form/__test__/__snapshots__/form.test.ts.snap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ exports[`form basic 1`] = `
3333
>
3434
<wx-view
3535
class="weui-cell weui-check__label ^weui-cell_radio "
36-
hoverClass=""
36+
hoverClass="weui-active"
3737
bind:tap="navigateTo"
3838
>
3939
<wx-view
@@ -70,7 +70,7 @@ exports[`form basic 1`] = `
7070
>
7171
<wx-view
7272
class="weui-cell weui-check__label weui-cell_wxss ^weui-cell_radio "
73-
hoverClass=""
73+
hoverClass="weui-active"
7474
bind:tap="navigateTo"
7575
>
7676
<wx-view
@@ -131,7 +131,7 @@ exports[`form basic 1`] = `
131131
>
132132
<wx-view
133133
class="weui-cell weui-check__label ^weui-cell_checkbox "
134-
hoverClass=""
134+
hoverClass="weui-active"
135135
bind:tap="navigateTo"
136136
>
137137
<wx-view
@@ -168,7 +168,7 @@ exports[`form basic 1`] = `
168168
>
169169
<wx-view
170170
class="weui-cell weui-check__label weui-cell_wxss ^weui-cell_checkbox "
171-
hoverClass=""
171+
hoverClass="weui-active"
172172
bind:tap="navigateTo"
173173
>
174174
<wx-view

‎src/half-screen-dialog/__test__/__snapshots__/half-screen-dialog.test.ts.snap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ exports[`grids basic 1`] = `
2828
>
2929
<wx-view
3030
class="weui-icon-btn weui-icon-btn_close"
31+
hoverClass="weui-active"
3132
>
3233
关闭
3334
</wx-view>
@@ -50,6 +51,7 @@ exports[`grids basic 1`] = `
5051
>
5152
<wx-view
5253
class="weui-icon-btn weui-icon-btn_more"
54+
hoverClass="weui-active"
5355
>
5456
更多
5557
</wx-view>
@@ -117,6 +119,7 @@ exports[`grids basic 2`] = `
117119
>
118120
<wx-view
119121
class="weui-icon-btn weui-icon-btn_close"
122+
hoverClass="weui-active"
120123
>
121124
关闭
122125
</wx-view>
@@ -139,6 +142,7 @@ exports[`grids basic 2`] = `
139142
>
140143
<wx-view
141144
class="weui-icon-btn weui-icon-btn_more"
145+
hoverClass="weui-active"
142146
>
143147
更多
144148
</wx-view>

0 commit comments

Comments
 (0)