Merge branch 'master' into develop

Author: Tidyzq

CHANGELOG.md

@@ -1,5 +1,10 @@
 # 更新日志
 
+## 1.0.5
+
+- updata: 升级 weui-wxss
+- update：使用 `hover-class` 代替 `:active`
+
 ## 1.0.4
 
 - fix: 修复 rangelength 校验

package.json

@@ -1,6 +1,6 @@
 {
   "name": "weui-miniprogram",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "小程序 WeUI 组件库",
   "main": "miniprogram_dist/index.js",
   "files": [

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

@@ -31,6 +31,7 @@ exports[`actionsheet basic actionsheet 1`] = `
           data-groupindex="{{0}}"
           data-index="{{0}}"
           data-value="{{1}}"
+          hoverClass="weui-active"
           bind:tap="buttonTap"
         >
           
@@ -42,6 +43,7 @@ exports[`actionsheet basic actionsheet 1`] = `
           data-groupindex="{{0}}"
           data-index="{{1}}"
           data-value="{{2}}"
+          hoverClass="weui-active"
           bind:tap="buttonTap"
         >
           
@@ -53,6 +55,7 @@ exports[`actionsheet basic actionsheet 1`] = `
           data-groupindex="{{0}}"
           data-index="{{2}}"
           data-value="{{3}}"
+          hoverClass="weui-active"
           bind:tap="buttonTap"
         >
           
@@ -66,6 +69,7 @@ exports[`actionsheet basic actionsheet 1`] = `
         <wx-view
           class="weui-actionsheet__cell"
           data-type="close"
+          hoverClass="weui-active"
           id="iosActionsheetCancel"
           bind:tap="closeActionSheet"
         >
@@ -108,6 +112,7 @@ exports[`actionsheet no cancel 1`] = `
           data-groupindex="{{0}}"
           data-index="{{0}}"
           data-value="{{1}}"
+          hoverClass="weui-active"
           bind:tap="buttonTap"
         >
           
@@ -119,6 +124,7 @@ exports[`actionsheet no cancel 1`] = `
           data-groupindex="{{0}}"
           data-index="{{1}}"
           data-value="{{2}}"
+          hoverClass="weui-active"
           bind:tap="buttonTap"
         >
           
@@ -130,6 +136,7 @@ exports[`actionsheet no cancel 1`] = `
           data-groupindex="{{0}}"
           data-index="{{2}}"
           data-value="{{3}}"
+          hoverClass="weui-active"
           bind:tap="buttonTap"
         >
           

src/actionsheet/actionsheet.wxml

@@ -29,7 +29,8 @@
     >
         <block wx:if="{{utils.isNotSlot(actionItem)}}">
             <view
-                class="weui-actionsheet__cell {{item.type === 'warn' ? 'weui-actionsheet__cell_warn' : '' }}" 
+                class="weui-actionsheet__cell {{item.type === 'warn' ? 'weui-actionsheet__cell_warn' : '' }}"
+                hover-class="weui-active"
                 wx:key="actionIndex" 
                 wx:for="{{actionItem}}"
                 wx:for-index="actionIndex"
@@ -45,6 +46,6 @@
     </view>
     <!-- 取消按钮 -->
     <view class="weui-actionsheet__action" wx:if="{{showCancel}}">
-        <view class="weui-actionsheet__cell" data-type="close" id="iosActionsheetCancel" bindtap="closeActionSheet">{{cancelText}}</view>
+        <view class="weui-actionsheet__cell" hover-class="weui-active" data-type="close" id="iosActionsheetCancel" bindtap="closeActionSheet">{{cancelText}}</view>
     </view>
 </view>

src/cell/cell.ts

@@ -75,6 +75,11 @@ Component({
         hasBody: {
             type: Boolean,
             value: true
+        },
+        extHoverClass: {
+            // 提供给需要定制 hover-class 的场景，要求 hover 为 false
+            type: String,
+            value: ''
         }
     },
     relations: {

src/cell/cell.wxml

@@ -1,5 +1,5 @@
 <block wx:if="{{link}}">
-    <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' : ''}}">
+    <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}}">
         <view wx:if="{{hasHeader}}" class="weui-cell__hd {{iconClass}}">
             <block wx:if="{{icon}}">
                 <image src="{{icon}}" class="weui-cell__icon" mode="aspectFit"></image>
@@ -35,7 +35,7 @@
     </view>
 </block>
 <block wx:else>
-    <view bindtap="navigateTo" class="weui-cell {{showError && error ? 'weui-cell_warn' : ''}} {{inForm ? 'weui-cell-inform' : ''}} {{extClass}} {{outerClass}}" hover-class="{{hover ? 'weui-cell_active' : ''}}">
+    <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}}">
         <view wx:if="{{hasHeader}}" class="weui-cell__hd {{iconClass}}">
             <block wx:if="{{icon}}">
                 <image src="{{icon}}" class="weui-cell__icon" mode="aspectFit"></image>

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

@@ -21,7 +21,7 @@ exports[`checkbox-group & checkbox basic checkbox 1`] = `
           >
             <wx-view
               class="weui-cell   weui-check__label   ^weui-cell_radio "
-              hoverClass=""
+              hoverClass="weui-active"
               bind:tap="navigateTo"
             >
               <wx-view
@@ -60,7 +60,7 @@ exports[`checkbox-group & checkbox basic checkbox 1`] = `
           >
             <wx-view
               class="weui-cell   weui-check__label weui-cell_wxss  ^weui-cell_radio "
-              hoverClass=""
+              hoverClass="weui-active"
               bind:tap="navigateTo"
             >
               <wx-view
@@ -113,7 +113,7 @@ exports[`checkbox-group & checkbox basic checkbox 1`] = `
           >
             <wx-view
               class="weui-cell   weui-check__label   ^weui-cell_checkbox "
-              hoverClass=""
+              hoverClass="weui-active"
               bind:tap="navigateTo"
             >
               <wx-view
@@ -152,7 +152,7 @@ exports[`checkbox-group & checkbox basic checkbox 1`] = `
           >
             <wx-view
               class="weui-cell   weui-check__label weui-cell_wxss  ^weui-cell_checkbox "
-              hoverClass=""
+              hoverClass="weui-active"
               bind:tap="navigateTo"
             >
               <wx-view

src/checkbox/checkbox.wxml

@@ -2,7 +2,8 @@
   has-footer="{{!multi}}"
   has-header="{{multi}}"
   bindtap="checkedChange"
-  ext-class="weui-check__label {{outerClass}} {{extClass}} {{!multi ? '^weui-cell_radio' : '^weui-cell_checkbox'}}">
+  ext-class="weui-check__label {{outerClass}} {{extClass}} {{!multi ? '^weui-cell_radio' : '^weui-cell_checkbox'}}"
+  ext-hover-class="weui-active">
 
   <view slot="icon" wx:if="{{multi}}">
     <checkbox value="{{value}}" checked="{{checked}}" disabled="{{disabled}}" color="{{color}}" class="weui-check">

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

@@ -38,13 +38,15 @@ exports[`dialog basic dialog 1`] = `
           <wx-view
             class="weui-dialog__btn weui-dialog__btn_default "
             data-index="{{0}}"
+            hoverClass="weui-active"
             bind:tap="buttonTap"
           >
             取消
           </wx-view>
           <wx-view
             class="weui-dialog__btn weui-dialog__btn_primary "
             data-index="{{1}}"
+            hoverClass="weui-active"
             bind:tap="buttonTap"
           >
             确定

src/dialog/dialog.wxml

@@ -11,7 +11,7 @@
       </view>
       <view class="weui-dialog__ft">
         <block wx:if="{{buttons && buttons.length}}">
-          <view wx:for="{{buttons}}" wx:key="index" class="weui-dialog__btn {{item.className}} {{item.extClass}}" data-index="{{index}}" bindtap="buttonTap">{{item.text}}</view>
+          <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>
         </block>
         <slot name="footer" wx:else></slot>
       </view>