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

Jump to bottom

Fix aspects of share flow accessibility #2622

Merged
merged 1 commit into from
Dec 17, 2019
Merged

Fix aspects of share flow accessibility #2622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 11 additions & 7 deletions apps/files/src/components/Collaborators/NewCollaborator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
:placeholder="$_ocCollaborationStatus_autocompletePlacholder"
@update:input="onAutocompleteInput"
:filter="filterRecipients"
:fillOnSelection="false"
id="oc-sharing-autocomplete"
ref="ocSharingAutocomplete"
class="uk-width-1-1"
Expand Down Expand Up @@ -41,13 +42,12 @@
(<translate>group</translate>)
</span>
</div>
<oc-icon
name="close"
variation="danger"
class="oc-cursor-pointer"
role="button"
@click="$_ocCollaborators_removeFromSelection(collaborator)"
/>
<oc-button :ariaLabel="$gettext('Delete share')" variation="raw" class="oc-cursor-pointer" @click="$_ocCollaborators_removeFromSelection(collaborator)">
<oc-icon
name="close"
variation="danger"
/>
</oc-button>
</div>
</div>
</div>
Expand All @@ -70,6 +70,7 @@
</oc-button>
</div>
</oc-grid>
<oc-hidden-announcer level="assertive" :announcement="announcement" />
</div>
</template>

Expand All @@ -91,6 +92,8 @@ export default {
data () {
return {
autocompleteResults: [],
announcement: '',
announcementWhenCollaboratorAdded: this.$gettext('Collaborator was added'),
autocompleteInProgress: false,
selectedCollaborators: [],
selectedRole: null,
Expand Down Expand Up @@ -173,6 +176,7 @@ export default {
return false
}

this.announcement = this.announcementWhenCollaboratorAdded
return true
})

Expand Down
34 changes: 20 additions & 14 deletions apps/files/src/components/FileSharingSidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div id="oc-files-sharing-sidebar" class="uk-position-relative">
<div>
<div :aria-hidden="visiblePanel == 'newCollaborator'" :inert="visiblePanel == 'newCollaborator'">
<oc-loader v-if="sharesLoading" aria-label="Loading collaborator list" />
<template v-else>
<div v-if="$_ocCollaborators_canShare" class="uk-text-right">
Expand All @@ -20,11 +20,15 @@
<template v-for="user in $_ocCollaborators_users">
<oc-grid :key="user.info.id" gutter="small" class="files-collaborators-collaborator">
<div>
<oc-icon class="files-collaborators-collaborator-delete" role="button" name="close" :aria-label="$gettext('Delete share')" @click="$_ocCollaborators_deleteShare(user)" />
<oc-button :ariaLabel="$gettext('Delete share')" @click="$_ocCollaborators_deleteShare(user)" variation="raw" class="files-collaborators-collaborator-delete">
<oc-icon name="close" />
</oc-button>
</div>
<collaborator class="uk-width-expand" :collaborator="user" />
<div class="uk-width-auto">
<oc-icon class="files-collaborators-collaborator-edit" role="button" name="edit" :aria-label="$gettext('Edit share')" @click="$_ocCollaborators_editShare(user)" />
<oc-button :aria-label="$gettext('Edit share')" @click="$_ocCollaborators_editShare(user)" variation="raw" class="files-collaborators-collaborator-edit">
<oc-icon name="edit" />
</oc-button>
</div>
</oc-grid>
</template>
Expand All @@ -36,24 +40,26 @@
</h5>
<template v-for="group in $_ocCollaborators_groups">
<oc-grid :key="group.info.id" gutter="small" class="files-collaborators-collaborator">
<div>
<oc-icon class="files-collaborators-collaborator-delete uk-vertical-align" role="button" name="close" :aria-label="$gettext('Delete share')" @click="$_ocCollaborators_deleteShare(group)" />
</div>
<oc-button :aria-label="$gettext('Delete share')" @click="$_ocCollaborators_deleteShare(group)" variation="raw" class="files-collaborators-collaborator-delete uk-vertical-align">
<oc-icon name="close" />
</oc-button>
<collaborator class="uk-width-expand" :collaborator="group" />
<div class="uk-width-auto">
<oc-icon class="files-collaborators-collaborator-edit" role="button" name="edit" :aria-label="$gettext('Edit share')" @click="$_ocCollaborators_editShare(group)" />
</div>
<oc-button :aria-label="$gettext('Edit share')" @click="$_ocCollaborators_editShare(group)" variation="raw" class="files-collaborators-collaborator-edit">
<oc-icon name="edit" />
</oc-button>
</oc-grid>
</template>
</div>
<div v-if="!shares.length && !sharesLoading" key="oc-collaborators-no-results"><translate>No collaborators</translate></div>
</template>
</div>
<transition name="custom-classes-transition" enter-active-class="uk-animation-slide-right uk-animation-fast" leave-active-class="uk-animation-slide-right uk-animation-reverse uk-animation-fast">
<div v-if="visiblePanel == 'newCollaborator'" class="uk-position-cover oc-default-background">
<new-collaborator v-if="$_ocCollaborators_canShare" key="new-collaborator" @close="visiblePanel='collaboratorList'" />
</div>
</transition>
<div :aria-hidden="visiblePanel != 'newCollaborator'" :inert="visiblePanel != 'newCollaborator'">
<transition name="custom-classes-transition" enter-active-class="uk-animation-slide-right uk-animation-fast" leave-active-class="uk-animation-slide-right uk-animation-reverse uk-animation-fast">
<div v-if="visiblePanel == 'newCollaborator'" class="uk-position-cover oc-default-background" >
<new-collaborator v-if="$_ocCollaborators_canShare" key="new-collaborator" @close="visiblePanel='collaboratorList'" />
</div>
</transition>
</div>
<transition name="custom-classes-transition" enter-active-class="uk-animation-slide-right uk-animation-fast" leave-active-class="uk-animation-slide-right uk-animation-reverse uk-animation-fast">
<div v-if="visiblePanel == 'editCollaborator'" class="uk-position-cover oc-default-background">
<edit-collaborator v-if="$_ocCollaborators_canShare" key="edit-collaborator" @close="visiblePanel='collaboratorList'; currentShare = null" :collaborator="currentShare" />
Expand Down