Merge pull request #1075 from nextcloud/backport/1073/stable28

[stable28] fix: Fix focus lost to body when closing firstrunwizard
nextcloud · Feb 2, 2024 · 7a85f36 · 7a85f36
2 parents 5d266b7 + 7f4a080
commit 7a85f36
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/js/about.js b/js/about.js
@@ -8,7 +8,9 @@ document.addEventListener('DOMContentLoaded', function() {
 			event.stopPropagation();
 			event.preventDefault();
 			OCP.Loader.loadScript('firstrunwizard', 'firstrunwizard-main.js').then(function () {
-				OCA.FirstRunWizard.open();
+				OCA.FirstRunWizard.open({
+					setReturnFocus: document.querySelector('[aria-controls="header-menu-user-menu"]') ?? undefined,
+				});
 				OC.hideMenus(function () {
 					return false;
 				});

diff --git a/js/firstrunwizard-main.js b/js/firstrunwizard-main.js
diff --git a/js/firstrunwizard-main.js.map b/js/firstrunwizard-main.js.map
diff --git a/src/App.vue b/src/App.vue
@@ -28,6 +28,7 @@
 		size="normal"
 		:has-next="hasNext"
 		:has-previous="hasPrevious"
+		:set-return-focus="setReturnFocus"
 		@close="close"
 		@next="goToNextPage"
 		@previous="goToPreviousPage">
@@ -110,6 +111,7 @@ export default {
 			logoURL: imagePath('firstrunwizard', 'nextcloudLogo.svg'),
 			pageSlideDirection: undefined,
 			circleSlideDirection: undefined,
+			setReturnFocus: undefined,
 		}
 	},
 
@@ -147,14 +149,18 @@ export default {
 	},
 
 	methods: {
-		open() {
+		open({ setReturnFocus }) {
+			if (setReturnFocus) {
+				this.setReturnFocus = setReturnFocus
+			}
 			this.page = 0
 			this.showModal = true
 		},
 
 		close() {
 			this.page = 0
 			this.showModal = false
+			this.setReturnFocus = undefined
 			axios.delete(generateUrl('/apps/firstrunwizard/wizard'))
 		},