Skip to content

Commit 6c48f3e

Browse files
committed
Fix: Tour route check fails if coming from info page
Fixes #1405
1 parent aa74cd4 commit 6c48f3e

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

Tekst-Web/src/composables/tour.ts

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,31 +26,31 @@ const steps: TourStep[] = [
2626
text: () => $t('tour.intro.text', { platformName }),
2727
},
2828
{
29-
route: 'browse',
29+
route: { name: 'browse' },
3030
title: () => $t('tour.browseView.title'),
3131
text: () => $t('tour.browseView.text'),
3232
},
3333
{
3434
key: 'browseTextSelect',
35-
route: 'browse',
35+
route: { name: 'browse' },
3636
title: () => $t('tour.browseTextSelect.title'),
3737
text: () => $t('tour.browseTextSelect.text'),
3838
},
3939
{
4040
key: 'browseNav',
41-
route: 'browse',
41+
route: { name: 'browse' },
4242
title: () => $t('tour.browseNav.title'),
4343
text: () => $t('tour.browseNav.text'),
4444
},
4545
{
4646
key: 'browseFocus',
47-
route: 'browse',
47+
route: { name: 'browse' },
4848
title: () => $t('tour.browseFocus.title'),
4949
text: () => $t('tour.browseFocus.text'),
5050
},
5151
{
5252
key: 'browseResourceSelect',
53-
route: 'browse',
53+
route: { name: 'browse' },
5454
title: () => $t('tour.browseResourceSelect.title'),
5555
text: () => $t('tour.browseResourceSelect.text'),
5656
},
@@ -85,11 +85,14 @@ const steps: TourStep[] = [
8585
export function useGuidedTour() {
8686
const router = useRouter();
8787

88-
const stepTransition = async (oldStep: TourStep, newStep?: TourStep) => {
89-
await oldStep.after?.();
88+
const stepTransition = async (oldStep?: TourStep, newStep?: TourStep) => {
89+
await oldStep?.after?.();
9090
if (!newStep) return;
91-
if (newStep.route && router.currentRoute.value.name !== router.resolve(newStep.route).name) {
92-
await router.push(newStep.route);
91+
if (newStep.route) {
92+
const targetRoute = router.resolve(newStep.route);
93+
if (router.currentRoute.value.name !== targetRoute.name) {
94+
await router.push(targetRoute);
95+
}
9396
}
9497
await newStep.before?.();
9598
let waitedMs = 0;
@@ -135,6 +138,7 @@ export function useGuidedTour() {
135138
driverObj.value = undefined;
136139
},
137140
});
141+
stepTransition(undefined, steps[0]);
138142
driverObj.value.drive();
139143
};
140144

0 commit comments

Comments
 (0)