Skip to content

Bump @nextcloud/vue to v8 beta 5 + add some visible labels #40084

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

Merged
Pytal merged 6 commits into from
Aug 29, 2023
Merged

Bump @nextcloud/vue to v8 beta 5 + add some visible labels #40084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b240cc1
chore(deps): Bump @nextcloud/vue to v8 beta 5
Pytal Aug 28, 2023
ffe2951
chore: Migrate to new @nextcloud/vue API
Pytal Aug 28, 2023
e9fd375
enh(a11y): Always visible file rename label
Pytal Aug 28, 2023
7b1f839
enh(a11y): Always visible user management labels
Pytal Aug 28, 2023
5ed9536
chore: compile assets
Pytal Aug 28, 2023
7b93438
chore: Update dav snapshot
Pytal Aug 29, 2023
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
60 changes: 30 additions & 30 deletions apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,31 +75,31 @@ exports[`CalDavSettings interactions 1`] = `
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-51081647=""
data-v-7c88e201=""
data-v-dec41432=""
style="--icon-size: 36px;"
>
<input
class="checkbox-radio-switch__input"
data-v-dec41432=""
data-v-51081647=""
id="caldavSendInvitations"
type="checkbox"
value=""
/>

<label
class="checkbox-radio-switch__label"
data-v-dec41432=""
data-v-51081647=""
for="caldavSendInvitations"
>
<div
class="checkbox-radio-switch__icon"
data-v-dec41432=""
data-v-51081647=""
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
data-v-dec41432=""
data-v-51081647=""
role="img"
>
<svg
Expand All @@ -120,7 +120,7 @@ exports[`CalDavSettings interactions 1`] = `

<span
class="checkbox-radio-switch__label-text"
data-v-dec41432=""
data-v-51081647=""
>

Send invitations to attendees
Expand All @@ -147,31 +147,31 @@ exports[`CalDavSettings interactions 1`] = `
>
<span
class="checkbox-radio-switch checkbox checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-51081647=""
data-v-7c88e201=""
data-v-dec41432=""
style="--icon-size: 36px;"
>
<input
class="checkbox-radio-switch__input"
data-v-dec41432=""
data-v-51081647=""
id="caldavGenerateBirthdayCalendar"
type="checkbox"
value=""
/>

<label
class="checkbox-radio-switch__label"
data-v-dec41432=""
data-v-51081647=""
for="caldavGenerateBirthdayCalendar"
>
<div
class="checkbox-radio-switch__icon"
data-v-dec41432=""
data-v-51081647=""
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
data-v-dec41432=""
data-v-51081647=""
role="img"
>
<svg
Expand All @@ -192,7 +192,7 @@ exports[`CalDavSettings interactions 1`] = `

<span
class="checkbox-radio-switch__label-text"
data-v-dec41432=""
data-v-51081647=""
>

Automatically generate a birthday calendar
Expand Down Expand Up @@ -227,31 +227,31 @@ exports[`CalDavSettings interactions 1`] = `
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-51081647=""
data-v-7c88e201=""
data-v-dec41432=""
style="--icon-size: 36px;"
>
<input
class="checkbox-radio-switch__input"
data-v-dec41432=""
data-v-51081647=""
id="caldavSendEventReminders"
type="checkbox"
value=""
/>

<label
class="checkbox-radio-switch__label"
data-v-dec41432=""
data-v-51081647=""
for="caldavSendEventReminders"
>
<div
class="checkbox-radio-switch__icon"
data-v-dec41432=""
data-v-51081647=""
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
data-v-dec41432=""
data-v-51081647=""
role="img"
>
<svg
Expand All @@ -272,7 +272,7 @@ exports[`CalDavSettings interactions 1`] = `

<span
class="checkbox-radio-switch__label-text"
data-v-dec41432=""
data-v-51081647=""
>

Send notifications for events
Expand Down Expand Up @@ -312,31 +312,31 @@ exports[`CalDavSettings interactions 1`] = `
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-51081647=""
data-v-7c88e201=""
data-v-dec41432=""
style="--icon-size: 36px;"
>
<input
class="checkbox-radio-switch__input"
data-v-dec41432=""
data-v-51081647=""
id="caldavSendEventRemindersToSharedGroupMembers"
type="checkbox"
value=""
/>

<label
class="checkbox-radio-switch__label"
data-v-dec41432=""
data-v-51081647=""
for="caldavSendEventRemindersToSharedGroupMembers"
>
<div
class="checkbox-radio-switch__icon"
data-v-dec41432=""
data-v-51081647=""
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
data-v-dec41432=""
data-v-51081647=""
role="img"
>
<svg
Expand All @@ -357,7 +357,7 @@ exports[`CalDavSettings interactions 1`] = `

<span
class="checkbox-radio-switch__label-text"
data-v-dec41432=""
data-v-51081647=""
>

Send reminder notifications to calendar sharees as well
Expand All @@ -381,31 +381,31 @@ exports[`CalDavSettings interactions 1`] = `
>
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-51081647=""
data-v-7c88e201=""
data-v-dec41432=""
style="--icon-size: 36px;"
>
<input
class="checkbox-radio-switch__input"
data-v-dec41432=""
data-v-51081647=""
id="caldavSendEventRemindersPush"
type="checkbox"
value=""
/>

<label
class="checkbox-radio-switch__label"
data-v-dec41432=""
data-v-51081647=""
for="caldavSendEventRemindersPush"
>
<div
class="checkbox-radio-switch__icon"
data-v-dec41432=""
data-v-51081647=""
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
data-v-dec41432=""
data-v-51081647=""
role="img"
>
<svg
Expand All @@ -426,7 +426,7 @@ exports[`CalDavSettings interactions 1`] = `

<span
class="checkbox-radio-switch__label-text"
data-v-dec41432=""
data-v-51081647=""
>

Enable notifications for events via push
Expand Down
10 changes: 9 additions & 1 deletion apps/files/src/components/FileEntry.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
class="files-list__row-rename"
@submit.prevent.stop="onRename">
<NcTextField ref="renameInput"
:aria-label="t('files', 'File name')"
:label="renameLabel"
:autofocus="true"
:minlength="1"
:required="true"
Expand Down Expand Up @@ -479,6 +479,14 @@ export default Vue.extend({
return this.source.attributes.favorite === 1
},

renameLabel() {
const matchLabel: Record<FileType, string> = {
[FileType.File]: t('files', 'File name'),
[FileType.Folder]: t('files', 'Folder name'),
}
return matchLabel[this.source.type]
},

isRenaming() {
return this.renamingStore.renamingNode === this.source
},
Expand Down
2 changes: 0 additions & 2 deletions apps/settings/src/components/PasswordSection.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<form id="passwordform" method="POST" @submit.prevent="changePassword">
<NcPasswordField id="old-pass"
:label="t('settings', 'Current password')"
:label-visible="true"
name="oldpassword"
:value.sync="oldPass"
autocomplete="current-password"
Expand All @@ -30,7 +29,6 @@

<NcPasswordField id="new-pass"
:label="t('settings', 'New password')"
:label-visible="true"
:value.sync="newPass"
:maxlength="469"
autocomplete="new-password"
Expand Down
4 changes: 0 additions & 4 deletions apps/settings/src/components/Users/NewUserModal.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
:value.sync="newUser.id"
:disabled="settings.newUserGenerateUserID"
:label="usernameLabel"
:label-visible="true"
autocapitalize="none"
autocomplete="off"
autocorrect="off"
Expand All @@ -45,7 +44,6 @@
data-test="displayName"
:value.sync="newUser.displayName"
:label="t('settings', 'Display name')"
:label-visible="true"
autocapitalize="none"
autocomplete="off"
autocorrect="off" />
Expand All @@ -62,7 +60,6 @@
:maxlength="469"
aria-describedby="password-email-hint"
:label="newUser.mailAddress === '' ? t('settings', 'Password (required)') : t('settings', 'Password')"
:label-visible="true"
autocapitalize="none"
autocomplete="new-password"
autocorrect="off"
Expand All @@ -73,7 +70,6 @@
:value.sync="newUser.mailAddress"
aria-describedby="password-email-hint"
:label="newUser.password === '' || settings.newUserRequireEmail ? t('settings', 'Email (required)') : t('settings', 'Email')"
:label-visible="true"
autocapitalize="none"
autocomplete="off"
autocorrect="off"
Expand Down
39 changes: 15 additions & 24 deletions apps/settings/src/components/Users/UserRow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,19 @@
<td class="row__cell row__cell--displayname"
:data-test="user.id">
<template v-if="idState.editing && user.backendCapabilities.setDisplayName">
<label class="hidden-visually"
:for="'displayName' + uniqueId">
{{ t('settings', 'Edit display name') }}
</label>
<NcTextField :id="'displayName' + uniqueId"
ref="displayNameField"
<NcTextField ref="displayNameField"
data-test="displayNameField"
:show-trailing-button="true"
class="user-row-text-field"
:class="{ 'icon-loading-small': idState.loading.displayName }"
:show-trailing-button="true"
:disabled="idState.loading.displayName || isLoadingField"
:label="t('settings', 'Change display name')"
trailing-button-icon="arrowRight"
:value.sync="idState.editedDisplayName"
autocapitalize="off"
autocomplete="off"
autocorrect="off"
spellcheck="false"
type="text"
@trailing-button-click="updateDisplayName" />
</template>
<template v-else>
Expand All @@ -71,18 +66,13 @@
<td class="row__cell"
:class="{ 'row__cell--obfuscated': hasObfuscated }">
<template v-if="idState.editing && settings.canChangePassword && user.backendCapabilities.setPassword">
<label class="hidden-visually"
:for="'password' + uniqueId">
{{ t('settings', 'Add new password') }}
</label>
<NcTextField :id="'password' + uniqueId"
:show-trailing-button="true"
class="user-row-text-field"
<NcTextField class="user-row-text-field"
:class="{'icon-loading-small': idState.loading.password}"
:show-trailing-button="true"
:disabled="idState.loading.password || isLoadingField"
:minlength="minPasswordLength"
maxlength="469"
:placeholder="t('settings', 'Add new password')"
:label="t('settings', 'Add new password')"
trailing-button-icon="arrowRight"
:value.sync="idState.editedPassword"
autocapitalize="off"
Expand All @@ -100,16 +90,11 @@

<td class="row__cell">
<template v-if="idState.editing">
<label class="hidden-visually"
:for="'mailAddress' + uniqueId">
{{ t('settings', 'Add new email address') }}
</label>
<NcTextField :id="'mailAddress' + uniqueId"
:show-trailing-button="true"
class="user-row-text-field"
<NcTextField class="user-row-text-field"
:class="{'icon-loading-small': idState.loading.mailAddress}"
:show-trailing-button="true"
:disabled="idState.loading.mailAddress || isLoadingField"
:placeholder="t('settings', 'Add new email address')"
:label="t('settings', 'Add new email address')"
trailing-button-icon="arrowRight"
:value.sync="idState.editedMail"
autocapitalize="off"
Expand Down Expand Up @@ -927,6 +912,12 @@ export default {
height: 48px !important;
}

.input-field__input {
&:placeholder-shown:not(:focus) + .input-field__label {
inset-block-start: 16px !important;
}
}

.button-vue--icon-only {
height: 44px !important;
}
Expand Down
1 change: 0 additions & 1 deletion apps/theming/src/components/admin/TextField.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
<div class="field">
<NcTextField :value.sync="localValue"
:label="displayName"
:label-visible="true"
:placeholder="placeholder"
:type="type"
:maxlength="maxlength"
Expand Down
Loading