Merge pull request #2282 from nextcloud/backport/2231/stable28

[stable28] fix(a11y): Return focus to Add button on dialog close
nextcloud · Feb 2, 2024 · f47d336 · f47d336
2 parents 1a6e304 + 84cfdeb
commit f47d336
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 19 deletions.
diff --git a/js/photos-main.js b/js/photos-main.js
diff --git a/js/photos-main.js.map b/js/photos-main.js.map
diff --git a/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js b/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js
diff --git a/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js.map b/js/photos-node_modules_vue-material-design-icons_ArrowLeft_vue-src_views_Timeline_vue.js.map
diff --git a/js/photos-public.js b/js/photos-public.js
diff --git a/js/photos-public.js.map b/js/photos-public.js.map
diff --git a/js/photos-src_components_Albums_AlbumForm_vue.js b/js/photos-src_components_Albums_AlbumForm_vue.js
diff --git a/js/photos-src_components_Albums_AlbumForm_vue.js.map b/js/photos-src_components_Albums_AlbumForm_vue.js.map
diff --git a/js/photos-src_views_AlbumContent_vue.js b/js/photos-src_views_AlbumContent_vue.js
diff --git a/js/photos-src_views_AlbumContent_vue.js.map b/js/photos-src_views_AlbumContent_vue.js.map
diff --git a/js/photos-src_views_Albums_vue.js b/js/photos-src_views_Albums_vue.js
diff --git a/js/photos-src_views_Albums_vue.js.map b/js/photos-src_views_Albums_vue.js.map
diff --git a/src/components/Albums/AlbumForm.vue b/src/components/Albums/AlbumForm.vue
@@ -27,7 +27,6 @@
 				type="text"
 				name="name"
 				:required="true"
-				autofocus="true"
 				:label="t('photos', 'Name of the album')" />
 			<NcTextField :value.sync="albumLocation"
 				name="location"

diff --git a/src/views/Timeline.vue b/src/views/Timeline.vue
@@ -39,6 +39,7 @@
 			<div class="timeline__header__left">
 				<!-- TODO: UploadPicker -->
 				<NcActions v-if="selectedFileIds.length === 0"
+					ref="addActions"
 					:force-menu="true"
 					:menu-name="t('photos', 'Add')">
 					<template #icon>
@@ -126,6 +127,7 @@
 
 		<NcModal v-if="showAlbumCreationForm"
 			key="albumCreationForm"
+			:set-return-focus="$refs.addActions?.$refs.menuButton?.$el"
 			@close="showAlbumCreationForm = false">
 			<h2 class="timeline__heading">
 				{{ t('photos', 'New album') }}