-
title1
-
title2
+
title1
+
title2
title3
-
+
diff --git a/src/tab/test/index.legacy.js b/src/tab/test/index.legacy.js
index 1ca16f2a1..df69e2d2e 100644
--- a/src/tab/test/index.legacy.js
+++ b/src/tab/test/index.legacy.js
@@ -61,12 +61,17 @@ test('swipe to switch tab', async () => {
const onChange = jest.fn();
const wrapper = mount({
template: `
-
+
Text
Text
Text
`,
+ data() {
+ return {
+ active: 0,
+ };
+ },
methods: {
onChange,
},
@@ -174,7 +179,7 @@ test('name prop', async () => {
const wrapper = mount({
template: `
-
+
Text
Text
Text
@@ -185,6 +190,11 @@ test('name prop', async () => {
onChange,
onDisabled,
},
+ data() {
+ return {
+ active: 0,
+ };
+ },
});
await later();
diff --git a/src/tab/test/insert.legacy.js b/src/tab/test/insert.legacy.js
index 3c28b4053..3bf617316 100644
--- a/src/tab/test/insert.legacy.js
+++ b/src/tab/test/insert.legacy.js
@@ -27,9 +27,10 @@ test('insert tab dynamically', async () => {
});
test('insert tab with name dynamically', async () => {
+ const onChange = jest.fn();
const wrapper = mount({
template: `
-
+
2
1
@@ -37,14 +38,18 @@ test('insert tab with name dynamically', async () => {
data() {
return {
insert: false,
- active: [{ name: 'foo', title: 'foo' }],
+ active: 'foo',
};
},
+ methods: {
+ onChange,
+ },
});
await later();
wrapper.setData({ insert: true });
expect(wrapper).toMatchSnapshot();
+ expect(onChange).toHaveBeenCalledTimes(0);
});
// this case will throw wierd error in index.spec.js
diff --git a/src/tabs/index.js b/src/tabs/index.js
index e6aeca15f..e9aa33450 100644
--- a/src/tabs/index.js
+++ b/src/tabs/index.js
@@ -218,15 +218,23 @@ export default createComponent({
};
const setCurrentIndex = (currentIndex) => {
- currentIndex = findAvailableTab(currentIndex);
+ const newIndex = findAvailableTab(currentIndex);
- if (isDef(currentIndex) && currentIndex !== state.currentIndex) {
- const shouldEmitChange = state.currentIndex !== null;
- state.currentIndex = currentIndex;
- emit('update:active', currentName.value);
+ if (!isDef(newIndex)) {
+ return;
+ }
+
+ const newTab = children[newIndex];
+ const newName = getTabName(newTab, newIndex);
+ const shouldEmitChange = state.currentIndex !== null;
+
+ state.currentIndex = newIndex;
+
+ if (newName !== props.active) {
+ emit('update:active', newName);
if (shouldEmitChange) {
- emit('change', currentName.value, children[currentIndex].title);
+ emit('change', newName, newTab.title);
}
}
};
@@ -377,9 +385,9 @@ export default createComponent({
watch(
() => children.length,
() => {
- setCurrentIndexByName(props.active || currentName.value);
- setLine();
nextTick(() => {
+ setCurrentIndexByName(props.active || currentName.value);
+ setLine();
scrollIntoView(true);
});
}
diff --git a/types/index.d.ts b/types/index.d.ts
index b1789db02..35631a6c5 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -19,6 +19,7 @@ import { List } from './list';
import { Locale } from './locale';
import { Notify } from './notify';
import { Picker } from './picker';
+import { Progress } from './progress';
import { Sku } from './sku';
import { Swipe } from './swipe';
import { SwipeCell } from './swipe-cell';
@@ -66,7 +67,6 @@ export class Pagination extends VanComponent {}
export class Panel extends VanComponent {}
export class PasswordInput extends VanComponent {}
export class Popup extends VanComponent {}
-export class Progress extends VanComponent {}
export class PullRefresh extends VanComponent {}
export class Radio extends VanComponent {}
export class RadioGroup extends VanComponent {}
@@ -111,6 +111,7 @@ export {
Locale,
Notify,
Picker,
+ Progress,
Sku,
Swipe,
SwipeCell,
diff --git a/types/progress.d.ts b/types/progress.d.ts
new file mode 100644
index 000000000..e54f734f9
--- /dev/null
+++ b/types/progress.d.ts
@@ -0,0 +1,5 @@
+import { VanComponent } from './component';
+
+export class Progress extends VanComponent {
+ resize(): void;
+}
