From 66c967b782abd262d81d26ffd16b40a0a12555ab Mon Sep 17 00:00:00 2001
From: landluck <landl_ww@163.com>
Date: Thu, 3 Nov 2022 10:18:25 +0800
Subject: [PATCH] fix(button): fix button disabled & loading active ui (#5084)
* fix(button): fix button disabled active ui
* fix(button): fix button loading active ui
Co-authored-by: liuhaihonggia <liuhaihong@youzan.com>
---
packages/button/index.wxml | 2 +-
packages/button/test/__snapshots__/demo.spec.ts.snap | 10 +++++-----
.../submit-bar/test/__snapshots__/demo.spec.ts.snap | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/packages/button/index.wxml b/packages/button/index.wxml
index beb46cd4..b5abebbd 100644
--- a/packages/button/index.wxml
+++ b/packages/button/index.wxml
@@ -5,7 +5,7 @@
id="{{ id }}"
data-detail="{{ dataset }}"
class="custom-class {{ utils.bem('button', [type, size, { block, round, plain, square, loading, disabled, hairline, unclickable: disabled || loading }]) }} {{ hairline ? 'van-hairline--surround' : '' }}"
- hover-class="van-button--active hover-class"
+ hover-class="{{ disabled || loading ? '' : 'van-button--active hover-class'}}"
lang="{{ lang }}"
form-type="{{ formType }}"
style="{{ computed.rootStyle({ plain, color, customStyle }) }}"
diff --git a/packages/button/test/__snapshots__/demo.spec.ts.snap b/packages/button/test/__snapshots__/demo.spec.ts.snap
index b8605d2e..5e4050c9 100644
--- a/packages/button/test/__snapshots__/demo.spec.ts.snap
+++ b/packages/button/test/__snapshots__/demo.spec.ts.snap
@@ -376,7 +376,7 @@ exports[`should render demo and match snapshot 1`] = `
class="custom-class van-button van-button--primary van-button--normal van-button--disabled van-button--unclickable "
data-detail="{{null}}"
formType=""
- hoverClass="van-button--active hover-class"
+ hoverClass=""
id=""
lang=""
openType=""
@@ -410,7 +410,7 @@ exports[`should render demo and match snapshot 1`] = `
class="custom-class van-button van-button--info van-button--normal van-button--disabled van-button--unclickable "
data-detail="{{null}}"
formType=""
- hoverClass="van-button--active hover-class"
+ hoverClass=""
id=""
lang=""
openType=""
@@ -457,7 +457,7 @@ exports[`should render demo and match snapshot 1`] = `
class="custom-class van-button van-button--primary van-button--normal van-button--loading van-button--unclickable "
data-detail="{{null}}"
formType=""
- hoverClass="van-button--active hover-class"
+ hoverClass=""
id=""
lang=""
openType=""
@@ -504,7 +504,7 @@ exports[`should render demo and match snapshot 1`] = `
class="custom-class van-button van-button--primary van-button--normal van-button--loading van-button--unclickable "
data-detail="{{null}}"
formType=""
- hoverClass="van-button--active hover-class"
+ hoverClass=""
id=""
lang=""
openType=""
@@ -586,7 +586,7 @@ exports[`should render demo and match snapshot 1`] = `
class="custom-class van-button van-button--info van-button--normal van-button--loading van-button--unclickable "
data-detail="{{null}}"
formType=""
- hoverClass="van-button--active hover-class"
+ hoverClass=""
id=""
lang=""
openType=""
diff --git a/packages/submit-bar/test/__snapshots__/demo.spec.ts.snap b/packages/submit-bar/test/__snapshots__/demo.spec.ts.snap
index 9c5b0ee8..be62e01f 100644
--- a/packages/submit-bar/test/__snapshots__/demo.spec.ts.snap
+++ b/packages/submit-bar/test/__snapshots__/demo.spec.ts.snap
@@ -178,7 +178,7 @@ exports[`should render demo and match snapshot 1`] = `
class="custom-class van-button van-button--danger van-button--normal van-button--round van-button--disabled van-button--unclickable "
data-detail="{{null}}"
formType=""
- hoverClass="van-button--active hover-class"
+ hoverClass=""
id=""
lang=""
openType=""
@@ -274,7 +274,7 @@ exports[`should render demo and match snapshot 1`] = `
class="custom-class van-button van-button--danger van-button--normal van-button--round van-button--loading van-button--unclickable "
data-detail="{{null}}"
formType=""
- hoverClass="van-button--active hover-class"
+ hoverClass=""
id=""
lang=""
openType=""