diff --git a/src/core/features/block/components/side-blocks-tour/side-blocks-tour.html b/src/core/features/block/components/side-blocks-tour/side-blocks-tour.html
index 00793c3ff..49c98e116 100644
--- a/src/core/features/block/components/side-blocks-tour/side-blocks-tour.html
+++ b/src/core/features/block/components/side-blocks-tour/side-blocks-tour.html
@@ -1,4 +1,4 @@
-
{{ 'core.block.tour_navigation_dashboard_title' | translate }}
+{{ 'core.block.tour_navigation_dashboard_title' | translate }}
{{ 'core.block.tour_navigation_dashboard_content' | translate }}
{{ 'core.endonesteptour' | translate }}
diff --git a/src/core/features/course/components/course-index-tour/course-index-tour.html b/src/core/features/course/components/course-index-tour/course-index-tour.html
index dbf65101b..3b70e4244 100644
--- a/src/core/features/course/components/course-index-tour/course-index-tour.html
+++ b/src/core/features/course/components/course-index-tour/course-index-tour.html
@@ -1,4 +1,4 @@
-{{ 'core.course.tour_navigation_course_index_student_title' | translate }}
+{{ 'core.course.tour_navigation_course_index_student_title' | translate }}
{{ 'core.course.tour_navigation_course_index_student_content' | translate }}
{{ 'core.endonesteptour' | translate }}
diff --git a/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.html b/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.html
index efef95b50..d3556b828 100644
--- a/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.html
+++ b/src/core/features/mainmenu/components/user-menu-tour/user-menu-tour.html
@@ -1,4 +1,4 @@
-{{ 'core.mainmenu.usermenutourtitle' | translate }}
+{{ 'core.mainmenu.usermenutourtitle' | translate }}
{{ 'core.mainmenu.usermenutourdescription' | translate }}
{{ 'core.endonesteptour' | translate }}
diff --git a/src/core/features/usertours/services/user-tours.ts b/src/core/features/usertours/services/user-tours.ts
index a79b60f93..a098732cb 100644
--- a/src/core/features/usertours/services/user-tours.ts
+++ b/src/core/features/usertours/services/user-tours.ts
@@ -115,6 +115,7 @@ export class CoreUserToursService {
await CoreUtils.wait(delay ?? 200);
const container = document.querySelector('ion-app') ?? document.body;
+ const viewContainer = container.querySelector('ion-router-outlet, ion-nav, #ion-view-container-root');
const element = await AngularFrameworkDelegate.attachViewToDom(
container,
CoreUserToursUserTourComponent,
@@ -122,6 +123,8 @@ export class CoreUserToursService {
);
const tour = CoreDirectivesRegistry.require(element, CoreUserToursUserTourComponent);
+ viewContainer?.setAttribute('aria-hidden', 'true');
+
return this.startTour(tour, options.watch ?? (options as CoreUserToursFocusedOptions).focus);
}
@@ -132,6 +135,15 @@ export class CoreUserToursService {
*/
async dismiss(acknowledge: boolean = true): Promise {
await this.getForegroundTour()?.dismiss(acknowledge);
+
+ if (this.hasVisibleTour()) {
+ return;
+ }
+
+ const container = document.querySelector('ion-app') ?? document.body;
+ const viewContainer = container.querySelector('ion-router-outlet, ion-nav, #ion-view-container-root');
+
+ viewContainer?.removeAttribute('aria-hidden');
}
/**
@@ -241,6 +253,15 @@ export class CoreUserToursService {
return this.tours.find(({ visible }) => visible)?.component;
}
+ /**
+ * Check whether any tour is visible.
+ *
+ * @returns Whether any tour is visible.
+ */
+ protected hasVisibleTour(): boolean {
+ return this.tours.some(({ visible }) => visible);
+ }
+
/**
* Returns the tour index in the stack.
*