Skip to content

fix(vue-router): reset tab after other tab reset #31654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
michaelkhabarov wants to merge 1 commit into
base: main
Choose a base branch
from
+45 −1
Open

fix(vue-router): reset tab after other tab reset #31654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion packages/vue-router/src/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -848,10 +848,23 @@ export const createIonRouter = (
}
return;
}
if (delta !== 0) {
if (delta < 0) {
router.go(delta);
return;
}
/**
* The first history entry for this tab is ahead of the current
* entry, so the browser dropped it when another route was pushed
* after going back, and router.go() has nothing to reach. Happens
* after resetting another tab with router.go() and then switching
* to this tab. Replace with `originalHref` instead.
*/
if (delta > 0) {
if (originalHref) {
handleNavigate(originalHref, "pop", "back", undefined, tab);
}
return;
}
/**
* The first history entry for this tab is the current entry,
* so there's nothing earlier to traverse back to. Happens
Expand Down
31 changes: 31 additions & 0 deletions packages/vue/test/base/tests/e2e/playwright/tabs.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,35 @@ test.describe('Tabs', () => {
await tabClick(page, 'tab1');
await ionPageVisible(page, 'tab1');
});

test('tab button should reset its tab after another tab was reset', async ({ page }) => {
await page.goto('/tabs/tab1');
await ionPageVisible(page, 'tab1');

await page.locator('div.ion-page[data-pageid=tab1] #child-one').click();
await ionPageVisible(page, 'tab1childone');

await tabClick(page, 'tab2');
await ionPageVisible(page, 'tab2');

await page.locator('div.ion-page[data-pageid=tab2] #child-one').click();
await ionPageVisible(page, 'tab2childone');

await tabClick(page, 'tab1');
await ionPageVisible(page, 'tab1childone');

// Resetting tab1 goes back to its root via router.go(-4)
await tabClick(page, 'tab1');
await ionPageVisible(page, 'tab1');
await ionPageDoesNotExist(page, 'tab1childone');

// Pushing tab2's child drops the browser history entry of the tab2 root
await tabClick(page, 'tab2');
await ionPageVisible(page, 'tab2childone');

await tabClick(page, 'tab2');
await ionPageVisible(page, 'tab2');
await ionPageDoesNotExist(page, 'tab2childone');
await expect(page).toHaveURL(/\/tabs\/tab2(\?|$)/);
});
});
Loading