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

[improvement] Tab: optimize aria-hidden attr

Browse Source
This commit is contained in:
陈嘉涵 2019-06-03 16:23:00 +08:00
parent cf3b797b20
commit ce3a347723
6 changed files with 56 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/coupon-list/test/__snapshots__/index.spec.js.snap
View File

@ -117,7 +117,7 @@ exports[`render coupon list 1`] = `
</div> </div>
</div> </div>
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>
@ -159,7 +159,7 @@ exports[`render empty coupon list 1`] = `
</div> </div>
</div> </div>
<div class="van-tabs__content"> <div class="van-tabs__content">
<div role="tabpanel" class="van-tab__pane" aria-hidden="true" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<div class="van-coupon-list__list" style="height: 628px;"> <div class="van-coupon-list__list" style="height: 628px;">
<div class="van-coupon-list__empty"><img src="https://img.yzcdn.cn/vant/coupon-empty.png"> <div class="van-coupon-list__empty"><img src="https://img.yzcdn.cn/vant/coupon-empty.png">
<p>暂无优惠券</p> <p>暂无优惠券</p>

2
packages/index-bar/test/__snapshots__/demo.spec.js.snap
View File

@ -380,7 +380,7 @@ exports[`renders demo correctly 1`] = `
</div> </div>
</div> </div>
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>

2
packages/list/test/__snapshots__/demo.spec.js.snap
View File

@ -19,7 +19,7 @@ exports[`renders demo correctly 1`] = `
</div> </div>
</div> </div>
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>

21
packages/tab/index.js
View File

@ -41,20 +41,20 @@ export default sfc({
}, },
render(h) { render(h) {
const { slots } = this; const { slots, selected } = this;
const shouldRender = this.inited || !this.parent.lazyRender; const shouldRender = this.inited || !this.parent.lazyRender;
const Content = [shouldRender ? slots() : h()];
const Content = [ if (slots('title')) {
shouldRender ? slots() : h(), Content.push(<div ref="title">{slots('title')}</div>);
slots('title') && <div ref="title">{slots('title')}</div> }
];
if (this.parent.animated) { if (this.parent.animated) {
return ( return (
<div <div
role="tabpanel" role="tabpanel"
aria-hidden={!this.selected} aria-hidden={!selected}
class={bem('pane-wrapper', { inactive: !this.selected })} class={bem('pane-wrapper', { inactive: !selected })}
> >
<div class={bem('pane')}>{Content}</div> <div class={bem('pane')}>{Content}</div>
</div> </div>
@ -62,12 +62,7 @@ export default sfc({
} }
return ( return (
<div <div vShow={selected} role="tabpanel" class={bem('pane')}>
vShow={this.selected}
role="tabpanel"
class={bem('pane')}
aria-hidden={!this.selected}
>
{Content} {Content}
</div> </div>
); );

44
packages/tab/test/__snapshots__/demo.spec.js.snap
View File

@ -14,16 +14,16 @@ exports[`renders demo correctly 1`] = `
</div> </div>
</div> </div>
<div class="van-tabs__content"> <div class="van-tabs__content">
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" class="van-tab__pane" style=""> <div role="tabpanel" class="van-tab__pane" style="">
内容 3 内容 3
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>
@ -48,25 +48,25 @@ exports[`renders demo correctly 1`] = `
<div role="tabpanel" class="van-tab__pane" style=""> <div role="tabpanel" class="van-tab__pane" style="">
内容 1 内容 1
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>
@ -86,10 +86,10 @@ exports[`renders demo correctly 1`] = `
<div role="tabpanel" class="van-tab__pane" style=""> <div role="tabpanel" class="van-tab__pane" style="">
内容 1 内容 1
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>
@ -108,10 +108,10 @@ exports[`renders demo correctly 1`] = `
<div role="tabpanel" class="van-tab__pane" style=""> <div role="tabpanel" class="van-tab__pane" style="">
内容 1 内容 1
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>
@ -130,7 +130,7 @@ exports[`renders demo correctly 1`] = `
<div role="tabpanel" class="van-tab__pane" style=""> <div role="tabpanel" class="van-tab__pane" style="">
内容 1 内容 1
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>
@ -148,16 +148,16 @@ exports[`renders demo correctly 1`] = `
</div> </div>
</div> </div>
<div class="van-tabs__content"> <div class="van-tabs__content">
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" class="van-tab__pane" style=""> <div role="tabpanel" class="van-tab__pane" style="">
内容 3 内容 3
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>
@ -188,7 +188,7 @@ exports[`renders demo correctly 1`] = `
<div role="tabpanel" class="van-tab__pane" style=""> <div role="tabpanel" class="van-tab__pane" style="">
内容 1 内容 1
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>
@ -243,16 +243,16 @@ exports[`renders demo correctly 1`] = `
</div> </div>
</div> </div>
<div class="van-tabs__content"> <div class="van-tabs__content">
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" class="van-tab__pane" style=""> <div role="tabpanel" class="van-tab__pane" style="">
内容 3 内容 3
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>

44
packages/tab/test/__snapshots__/index.spec.js.snap
View File

@ -25,10 +25,10 @@ exports[`change tabs data 1`] = `
</div> </div>
<div class="van-tabs__content"> <div class="van-tabs__content">
<div role="tabpanel" class="van-tab__pane">Text</div> <div role="tabpanel" class="van-tab__pane">Text</div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>
@ -48,10 +48,10 @@ exports[`change tabs data 2`] = `
</div> </div>
<div class="van-tabs__content"> <div class="van-tabs__content">
<div role="tabpanel" class="van-tab__pane">Text</div> <div role="tabpanel" class="van-tab__pane">Text</div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>
@ -72,10 +72,10 @@ exports[`click to switch tab 1`] = `
</div> </div>
<div class="van-tabs__content"> <div class="van-tabs__content">
<div role="tabpanel" class="van-tab__pane" style="">Text</div> <div role="tabpanel" class="van-tab__pane" style="">Text</div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>
@ -95,11 +95,11 @@ exports[`click to switch tab 2`] = `
</div> </div>
</div> </div>
<div class="van-tabs__content"> <div class="van-tabs__content">
<div role="tabpanel" class="van-tab__pane" style="display: none;" aria-hidden="true">Text</div> <div role="tabpanel" class="van-tab__pane" style="display: none;">Text</div>
<div role="tabpanel" class="van-tab__pane" style=""> <div role="tabpanel" class="van-tab__pane" style="">
Text Text
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>
@ -118,11 +118,11 @@ exports[`lazy render 1`] = `
</div> </div>
<div class="van-tabs__content"> <div class="van-tabs__content">
<div role="tabpanel" class="van-tab__pane">Text</div> <div role="tabpanel" class="van-tab__pane">Text</div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
<div><span>title2</span></div> <div><span>title2</span></div>
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>
@ -143,10 +143,10 @@ exports[`lazy render 2`] = `
</div> </div>
<div class="van-tabs__content"> <div class="van-tabs__content">
<div role="tabpanel" class="van-tab__pane">Text</div> <div role="tabpanel" class="van-tab__pane">Text</div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
Text Text
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;">Text</div> <div role="tabpanel" class="van-tab__pane" style="display: none;">Text</div>
</div> </div>
</div> </div>
`; `;
@ -162,11 +162,11 @@ exports[`render nav-left & nav-right slot 1`] = `
</div> </div>
<div class="van-tabs__content"> <div class="van-tabs__content">
<div role="tabpanel" class="van-tab__pane">Text</div> <div role="tabpanel" class="van-tab__pane">Text</div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
<div><span>title2</span></div> <div><span>title2</span></div>
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>
@ -187,10 +187,10 @@ exports[`swipe to switch tab 1`] = `
</div> </div>
<div class="van-tabs__content"> <div class="van-tabs__content">
<div role="tabpanel" class="van-tab__pane">Text</div> <div role="tabpanel" class="van-tab__pane">Text</div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>
@ -210,11 +210,11 @@ exports[`swipe to switch tab 2`] = `
</div> </div>
</div> </div>
<div class="van-tabs__content"> <div class="van-tabs__content">
<div role="tabpanel" class="van-tab__pane" aria-hidden="true" style="display: none;">Text</div> <div role="tabpanel" class="van-tab__pane" style="display: none;">Text</div>
<div role="tabpanel" class="van-tab__pane" style=""> <div role="tabpanel" class="van-tab__pane" style="">
Text Text
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>
@ -234,11 +234,11 @@ exports[`swipe to switch tab 3`] = `
</div> </div>
</div> </div>
<div class="van-tabs__content"> <div class="van-tabs__content">
<div role="tabpanel" class="van-tab__pane" aria-hidden="true" style="display: none;">Text</div> <div role="tabpanel" class="van-tab__pane" style="display: none;">Text</div>
<div role="tabpanel" class="van-tab__pane" style=""> <div role="tabpanel" class="van-tab__pane" style="">
Text Text
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>
@ -259,10 +259,10 @@ exports[`swipe to switch tab 4`] = `
</div> </div>
<div class="van-tabs__content"> <div class="van-tabs__content">
<div role="tabpanel" class="van-tab__pane" style="">Text</div> <div role="tabpanel" class="van-tab__pane" style="">Text</div>
<div role="tabpanel" class="van-tab__pane" style="display: none;" aria-hidden="true"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
Text Text
</div> </div>
<div role="tabpanel" aria-hidden="true" class="van-tab__pane" style="display: none;"> <div role="tabpanel" class="van-tab__pane" style="display: none;">
<!----> <!---->
</div> </div>
</div> </div>