Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable28] enh(a11y): Fix modal close button overlapping content #2298

Merged
merged 2 commits into from
Feb 2, 2024
Merged

[stable28] enh(a11y): Fix modal close button overlapping content #2298

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f60b8ad
enh(a11y): Fix modal close button overlapping content
Pytal Jan 31, 2024
f8aad21
chore(assets): Recompile assets
nextcloud-command Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/mixins/FaceContent.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,6 @@
padding: 16px;

input {
width: 80%;
width: 100%;
}
}
}
11 changes: 7 additions & 4 deletions src/views/AlbumContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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'
Expand Down Expand Up @@ -220,6 +222,7 @@ export default {
NcActions,
NcActionSeparator,
NcButton,
NcDialog,
NcEmptyContent,
NcLoadingIcon,
NcModal,
Expand Down
33 changes: 21 additions & 12 deletions src/views/FaceContent.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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() === ''"
Expand All @@ -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>

Expand All @@ -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'
Expand Down Expand Up @@ -217,7 +226,7 @@ export default {
NcEmptyContent,
NcActions,
NcActionButton,
NcModal,
NcDialog,
NcButton,
AccountSwitch,
},
Expand Down
12 changes: 7 additions & 5 deletions src/views/UnassignedFaces.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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'
Expand All @@ -137,7 +139,7 @@ export default {
NcEmptyContent,
NcActions,
NcActionButton,
NcModal,
NcDialog,
AccountSwitch,
},

Expand Down
Loading