Merge pull request #2298 from nextcloud/backport/2297/stable28

[stable28] enh(a11y): Fix modal close button overlapping content
nextcloud · Feb 2, 2024 · 33d1cf8 · 33d1cf8
2 parents 96e7996 + f8aad21
commit 33d1cf8
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 38 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/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-88a20b.js b/...ue-material-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-88a20b.js
diff --git a/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-88a20b.js.map b/...aterial-design-icons_PackageVariant_vue-node_modules_vue-material-design-ic-88a20b.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_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_FaceContent_vue.js b/js/photos-src_views_FaceContent_vue.js
diff --git a/js/photos-src_views_FaceContent_vue.js.map b/js/photos-src_views_FaceContent_vue.js.map
diff --git a/src/mixins/FaceContent.scss b/src/mixins/FaceContent.scss
@@ -106,6 +106,6 @@
 	padding: 16px;
 
 	input {
-		width: 80%;
+		width: 100%;
 	}
-}
+}
diff --git a/src/views/AlbumContent.vue b/src/views/AlbumContent.vue
@@ -156,11 +156,13 @@
 			</CollaboratorsSelectionForm>
 		</NcModal>
 
-		<NcModal v-if="showEditAlbumForm"
+		<NcDialog v-if="showEditAlbumForm"
 			:name="t('photos', 'Edit album details')"
-			@close="showEditAlbumForm = false">
+			close-on-click-outside
+			size="normal"
+			@closing="showEditAlbumForm = false">
 			<AlbumForm :album="album" @done="redirectToNewName" />
-		</NcModal>
+		</NcDialog>
 	</div>
 </template>
 
@@ -169,7 +171,7 @@ import { mapActions } from 'vuex'
 
 import { Folder, addNewFileMenuEntry, removeNewFileMenuEntry } from '@nextcloud/files'
 import { getCurrentUser } from '@nextcloud/auth'
-import { NcActions, NcActionButton, NcButton, NcModal, NcEmptyContent, NcActionSeparator, NcLoadingIcon, isMobile } from '@nextcloud/vue'
+import { NcActions, NcActionButton, NcButton, NcDialog, NcModal, NcEmptyContent, NcActionSeparator, NcLoadingIcon, isMobile } from '@nextcloud/vue'
 import { UploadPicker, getUploader } from '@nextcloud/upload'
 import { translate } from '@nextcloud/l10n'
 import debounce from 'debounce'
@@ -220,6 +222,7 @@ export default {
 		NcActions,
 		NcActionSeparator,
 		NcButton,
+		NcDialog,
 		NcEmptyContent,
 		NcLoadingIcon,
 		NcModal,

diff --git a/src/views/FaceContent.vue b/src/views/FaceContent.vue
@@ -136,9 +136,11 @@
 				@select-toggled="onFileSelectToggle" />
 		</FilesListViewer>
 
-		<NcModal v-if="showRenameModal"
+		<NcDialog v-if="showRenameModal"
 			:name="t('photos', 'Rename person')"
-			@close="showRenameModal = false">
+			close-on-click-outside
+			size="small"
+			@closing="showRenameModal = false">
 			<div class="rename-form">
 				<input ref="nameInput"
 					v-focus
@@ -148,6 +150,8 @@
 					required
 					:placeholder="t('photos', 'Name of this person')"
 					@keydown.enter="handleRenameFace($refs.nameInput.value)">
+			</div>
+			<template #actions>
 				<NcButton :aria-label="t('photos', 'Save.')"
 					type="primary"
 					:disabled="$refs.nameInput && $refs.nameInput.value.trim() === ''"
@@ -158,19 +162,24 @@
 					</template>
 					{{ t('photos', 'Save') }}
 				</NcButton>
-			</div>
-		</NcModal>
+			</template>
+		</NcDialog>
 
-		<NcModal v-if="showMergeModal"
+		<NcDialog v-if="showMergeModal"
 			:name="t('photos', 'Merge person')"
-			@close="showMergeModal = false">
+			close-on-click-outside
+			size="normal"
+			@closing="showMergeModal = false">
 			<FaceMergeForm :first-face="faceName" @select="handleMerge($event)" />
-		</NcModal>
-		<NcModal v-if="showMoveModal"
+		</NcDialog>
+
+		<NcDialog v-if="showMoveModal"
 			:name="t('photos', 'Move to different person')"
-			@close="showMoveModal = false">
+			close-on-click-outside
+			size="normal"
+			@closing="showMoveModal = false">
 			<FaceMergeForm :first-face="faceName" @select="handleMove($event, selectedFileIds)" />
-		</NcModal>
+		</NcDialog>
 	</div>
 </template>
 
@@ -187,7 +196,7 @@ import ArrowLeft from 'vue-material-design-icons/ArrowLeft.vue'
 import AccountSwitch from 'vue-material-design-icons/AccountSwitch.vue'
 import AccountBoxMultipleOutline from 'vue-material-design-icons/AccountBoxMultipleOutline.vue'
 
-import { NcActions, NcActionButton, NcModal, NcEmptyContent, NcButton, NcLoadingIcon } from '@nextcloud/vue'
+import { NcActions, NcActionButton, NcDialog, NcEmptyContent, NcButton, NcLoadingIcon } from '@nextcloud/vue'
 
 import FetchFilesMixin from '../mixins/FetchFilesMixin.js'
 import FilesSelectionMixin from '../mixins/FilesSelectionMixin.js'
@@ -217,7 +226,7 @@ export default {
 		NcEmptyContent,
 		NcActions,
 		NcActionButton,
-		NcModal,
+		NcDialog,
 		NcButton,
 		AccountSwitch,
 	},

diff --git a/src/views/UnassignedFaces.vue b/src/views/UnassignedFaces.vue
@@ -96,11 +96,13 @@
 				@select-toggled="onFileSelectToggle" />
 		</FilesListViewer>
 
-		<NcModal v-if="showMoveModal"
+		<NcDialog v-if="showMoveModal"
 			:name="t('photos', 'Move to different person')"
-			@close="showMoveModal = false">
+			close-on-click-outside
+			size="normal"
+			@closing="showMoveModal = false">
 			<FaceMergeForm :first-face="'-1'" @select="handleMove($event, selectedFileIds)" />
-		</NcModal>
+		</NcDialog>
 	</div>
 </template>
 
@@ -112,7 +114,7 @@ import Download from 'vue-material-design-icons/Download.vue'
 import ArrowLeft from 'vue-material-design-icons/ArrowLeft.vue'
 import AccountSwitch from 'vue-material-design-icons/AccountSwitch.vue'
 
-import { NcActions, NcActionButton, NcModal, NcEmptyContent, NcLoadingIcon } from '@nextcloud/vue'
+import { NcActions, NcActionButton, NcDialog, NcEmptyContent, NcLoadingIcon } from '@nextcloud/vue'
 
 import FetchFilesMixin from '../mixins/FetchFilesMixin.js'
 import FilesSelectionMixin from '../mixins/FilesSelectionMixin.js'
@@ -137,7 +139,7 @@ export default {
 		NcEmptyContent,
 		NcActions,
 		NcActionButton,
-		NcModal,
+		NcDialog,
 		AccountSwitch,
 	},