Merge branch 'dev' into next

This commit is contained in:
chenjiahan 2020-09-24 16:39:06 +08:00
commit 3c577a8acd
3 changed files with 33 additions and 0 deletions

View File

@ -62,6 +62,10 @@ export default createComponent({
);
return () => {
if (!slots.default) {
return;
}
const { animated, scrollspy, lazyRender } = parent.props;
const active = isActive();
const show = scrollspy || active;

View File

@ -202,6 +202,22 @@ exports[`name prop 1`] = `
</div>
`;
exports[`render empty tab 1`] = `
<div class="van-tabs van-tabs--line">
<div class="van-tabs__wrap">
<div role="tablist" class="van-tabs__nav van-tabs__nav--line">
<div role="tab" aria-selected="true" class="van-tab van-tab--active"><span class="van-tab__text van-tab__text--ellipsis">title1</span></div>
<div role="tab" class="van-tab"><span class="van-tab__text van-tab__text--ellipsis">title2</span></div>
<div class="van-tabs__line"></div>
</div>
</div>
<div class="van-tabs__content">
<!---->
<!---->
</div>
</div>
`;
exports[`render nav-left & nav-right slot 1`] = `
<div class="van-tabs van-tabs--line">
<div>

View File

@ -410,3 +410,16 @@ test('before-change prop', async () => {
expect(onChange).toHaveBeenCalledTimes(2);
expect(onChange).toHaveBeenLastCalledWith(4, 'title5');
});
test('render empty tab', async () => {
const wrapper = mount({
template: `
<van-tabs>
<van-tab title="title1" />
<van-tab title="title2" />
</van-tabs>
`,
});
expect(wrapper).toMatchSnapshot();
});