blackteay/vant-weapp
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant-weapp.git synced 2025-04-06 03:58:05 +08:00
Code Issues Projects Releases Wiki Activity

fix(button): fix button disabled & loading active ui (#5084)

Browse Source 
* fix(button): fix button disabled active ui

* fix(button): fix button loading active ui

Co-authored-by: liuhaihonggia <liuhaihong@youzan.com>
This commit is contained in:
landluck 2022-11-03 10:18:25 +08:00 committed by GitHub
parent 763acff12a
commit 66c967b782
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/button/index.wxml
View File

@ -5,7 +5,7 @@
id="{{ id }}" id="{{ id }}"
data-detail="{{ dataset }}" 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' : '' }}" 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 }}" lang="{{ lang }}"
form-type="{{ formType }}" form-type="{{ formType }}"
style="{{ computed.rootStyle({ plain, color, customStyle }) }}" style="{{ computed.rootStyle({ plain, color, customStyle }) }}"

10
packages/button/test/__snapshots__/demo.spec.ts.snap
View File

@ -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 " class="custom-class van-button van-button--primary van-button--normal van-button--disabled van-button--unclickable "
data-detail="{{null}}" data-detail="{{null}}"
formType="" formType=""
hoverClass="van-button--active hover-class" hoverClass=""
id="" id=""
lang="" lang=""
openType="" 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 " class="custom-class van-button van-button--info van-button--normal van-button--disabled van-button--unclickable "
data-detail="{{null}}" data-detail="{{null}}"
formType="" formType=""
hoverClass="van-button--active hover-class" hoverClass=""
id="" id=""
lang="" lang=""
openType="" 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 " class="custom-class van-button van-button--primary van-button--normal van-button--loading van-button--unclickable "
data-detail="{{null}}" data-detail="{{null}}"
formType="" formType=""
hoverClass="van-button--active hover-class" hoverClass=""
id="" id=""
lang="" lang=""
openType="" 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 " class="custom-class van-button van-button--primary van-button--normal van-button--loading van-button--unclickable "
data-detail="{{null}}" data-detail="{{null}}"
formType="" formType=""
hoverClass="van-button--active hover-class" hoverClass=""
id="" id=""
lang="" lang=""
openType="" 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 " class="custom-class van-button van-button--info van-button--normal van-button--loading van-button--unclickable "
data-detail="{{null}}" data-detail="{{null}}"
formType="" formType=""
hoverClass="van-button--active hover-class" hoverClass=""
id="" id=""
lang="" lang=""
openType="" openType=""

4
packages/submit-bar/test/__snapshots__/demo.spec.ts.snap
View File

@ -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 " class="custom-class van-button van-button--danger van-button--normal van-button--round van-button--disabled van-button--unclickable "
data-detail="{{null}}" data-detail="{{null}}"
formType="" formType=""
hoverClass="van-button--active hover-class" hoverClass=""
id="" id=""
lang="" lang=""
openType="" 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 " class="custom-class van-button van-button--danger van-button--normal van-button--round van-button--loading van-button--unclickable "
data-detail="{{null}}" data-detail="{{null}}"
formType="" formType=""
hoverClass="van-button--active hover-class" hoverClass=""
id="" id=""
lang="" lang=""
openType="" openType=""