Pass the sidebar as additional focus trap element

Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Aug 18, 2022 · 7e61528 · 7e61528
1 parent b8e7cdc
commit 7e61528
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 77 deletions.
diff --git a/js/viewer-main.js b/js/viewer-main.js
diff --git a/js/viewer-main.js.LICENSE.txt b/js/viewer-main.js.LICENSE.txt
@@ -31,6 +31,16 @@ object-assign
  * Released under the MIT License.
  */
 
+/*!
+* focus-trap 6.9.4
+* @license MIT, https://github.com/focus-trap/focus-trap/blob/master/LICENSE
+*/
+
+/*!
+* tabbable 5.3.3
+* @license MIT, https://github.com/focus-trap/tabbable/blob/master/LICENSE
+*/
+
 /*! For license information please see ActionButton.js.LICENSE.txt */
 
 /*! For license information please see ActionLink.js.LICENSE.txt */

diff --git a/js/viewer-main.js.map b/js/viewer-main.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/views/Viewer.vue b/src/views/Viewer.vue
@@ -42,6 +42,7 @@
 		:data-handler="handlerId"
 		@close="close"
 		@previous="previous"
+		:additional-trap-elements="trapElements"
 		@next="next">
 		<!-- ACTIONS -->
 		<template #actions>
@@ -203,6 +204,8 @@ export default {
 			theme: null,
 			root: getRootPath(),
 			handlerId: '',
+
+			trapElements: [],
 		}
 	},
 
@@ -805,11 +808,13 @@ export default {
 			const sidebar = document.querySelector('aside.app-sidebar')
 			if (sidebar) {
 				this.sidebarWidth = sidebar.offsetWidth
+				this.trapElements = [sidebar]
 			}
 		},
 
 		handleAppSidebarClose() {
 			this.isSidebarShown = false
+			this.trapElements = []
 		},
 
 		onResize(event) {