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.

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

feat(a11y): Added title to button #723

Merged
merged 3 commits into from
Aug 15, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
3 changes: 2 additions & 1 deletion blocks/CloudImageEditor/src/EditorButtonControl.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export class EditorButtonControl extends Block {
title: '',
icon: '',
'on.click': null,
'title-prop': '',
};

initCallback() {
Expand Down Expand Up @@ -37,7 +38,7 @@ export class EditorButtonControl extends Block {
}

EditorButtonControl.template = /* HTML */ `
<button type="button" role="option">
<button type="button" role="option" l10n="@title:title-prop">
<uc-icon set="@name: icon;"></uc-icon>
<div class="uc-title" ref="title-el">{{title}}</div>
</button>
Expand Down
7 changes: 6 additions & 1 deletion blocks/CloudImageEditor/src/EditorCropButtonControl.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,14 @@ export class EditorCropButtonControl extends EditorButtonControl {
/** @private */
this._operation = operation;
this.$['icon'] = operation;
this.bindL10n('title-prop', () =>
this.l10n('a11y-cloud-editor-apply-crop', {
filterName: this.l10n(operation).toLowerCase(),
}),
);
});

this.$['on.click'] = (e) => {
this.$['on.click'] = () => {
let prev = this.$['*cropperEl'].getValue(this._operation);
let next = nextValue(this._operation, prev);
this.$['*cropperEl'].setValue(this._operation, next);
Expand Down
8 changes: 7 additions & 1 deletion blocks/CloudImageEditor/src/EditorFilterControl.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@ export class EditorFilterControl extends EditorButtonControl {
this._filter = filter;
this.$.isOriginal = filter === FAKE_ORIGINAL_FILTER;
this.$.icon = this.$.isOriginal ? 'original' : 'slider';

this.bindL10n('title-prop', () =>
this.l10n('a11y-cloud-editor-apply-filter', {
filterName: filter.toLowerCase(),
}),
);
},
);

Expand Down Expand Up @@ -158,7 +164,7 @@ export class EditorFilterControl extends EditorButtonControl {
}

EditorFilterControl.template = /* HTML */ `
<button type="button" role="option">
<button type="button" role="option" l10n="@title:title-prop">
<div class="uc-preview" ref="preview-el"></div>
<uc-icon ref="icon-el" set="@name: icon; @size: iconSize;"></uc-icon>
</button>
Expand Down
5 changes: 5 additions & 0 deletions blocks/CloudImageEditor/src/EditorOperationControl.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
initCallback() {
super.initCallback();

this.$['on.click'] = (e) => {

Check warning on line 14 in blocks/CloudImageEditor/src/EditorOperationControl.js

View workflow job for this annotation

GitHub Actions / build

'e' is defined but never used
this.$['*sliderEl'].setOperation(this._operation);
this.$['*showSlider'] = true;
this.$['*currentOperation'] = this._operation;
Expand All @@ -21,6 +21,11 @@
if (operation) {
this._operation = operation;
this.$['icon'] = operation;
this.bindL10n('title-prop', () =>
this.l10n('a11y-cloud-editor-apply-tuning', {
filterName: this.l10n(operation).toLowerCase(),
}),
);
this.bindL10n('title', () => this.l10n(operation));
}
});
Expand Down
16 changes: 11 additions & 5 deletions blocks/CloudImageEditor/src/EditorToolbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function renderTabToggle(id) {
ref="tab-toggle-${id}"
data-id="${id}"
icon="${id}"
set="onclick: on.clickTab; aria-role:tab_role; aria-controls:tab_${id}"
set="onclick: on.clickTab; aria-role:tab_role; aria-controls:tab_${id}; title-prop: a11y-editor-tab-${id}"
>
</uc-btn-ui>
</uc-presence-toggle>
Expand Down Expand Up @@ -130,6 +130,11 @@ export class EditorToolbar extends Block {
[`tab_${TabId.TUNING}`]: `tab_${TabId.TUNING}`,
[`tab_${TabId.CROP}`]: `tab_${TabId.CROP}`,
[`tab_${TabId.FILTERS}`]: `tab_${TabId.FILTERS}`,
cancel: 'cancel',
apply: 'apply',
'a11y-editor-tab-filters': 'a11y-editor-tab-filters',
'a11y-editor-tab-tuning': 'a11y-editor-tab-tuning',
'a11y-editor-tab-crop': 'a11y-editor-tab-crop',
};

/** @private */
Expand Down Expand Up @@ -421,8 +426,9 @@ EditorToolbar.template = /* HTML */ `
<div ref="tabs-indicator" class="uc-tab-toggles_indicator"></div>
${ALL_TABS.map(renderTabToggle).join('')}
</uc-presence-toggle>
<uc-btn-ui style="order: -1" theme="secondary-icon" icon="closeMax" set="onclick: on.cancel"> </uc-btn-ui>
<uc-btn-ui theme="primary-icon" icon="done" set="onclick: on.apply"> </uc-btn-ui>
<uc-btn-ui style="order: -1" theme="secondary-icon" icon="closeMax" set="onclick: on.cancel; title-prop:cancel">
</uc-btn-ui>
<uc-btn-ui theme="primary-icon" icon="done" set="onclick: on.apply; title-prop:apply"> </uc-btn-ui>
</div>
</uc-presence-toggle>
<uc-presence-toggle
Expand All @@ -433,8 +439,8 @@ EditorToolbar.template = /* HTML */ `
<uc-editor-slider ref="slider-el"></uc-editor-slider>
</div>
<div class="uc-controls-row">
<uc-btn-ui theme="secondary" set="onclick: on.cancelSlider;" l10n="@text:cancel"> </uc-btn-ui>
<uc-btn-ui theme="primary" set="onclick: on.applySlider;" l10n="@text:apply"> </uc-btn-ui>
<uc-btn-ui theme="secondary" set="onclick: on.cancelSlider" l10n="@text:cancel"> </uc-btn-ui>
<uc-btn-ui theme="primary" set="onclick: on.applySlider" l10n="@text:apply"> </uc-btn-ui>
</div>
</uc-presence-toggle>
</div>
Expand Down
11 changes: 11 additions & 0 deletions blocks/CloudImageEditor/src/css/common.css
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,13 @@ uc-editor-filter-control > button .uc-title {
text-transform: uppercase;
}

uc-editor-button-control > button uc-icon,
uc-editor-operation-control > button uc-icon,
uc-editor-crop-button-control > button uc-icon,
uc-editor-filter-control > button uc-icon {
pointer-events: none;
}

uc-editor-filter-control > button .uc-preview {
position: absolute;
right: 0;
Expand Down Expand Up @@ -869,6 +876,10 @@ uc-btn-ui > button {
user-select: none;
}

uc-btn-ui > button > uc-icon {
pointer-events: none;
}

uc-btn-ui .uc-text {
white-space: nowrap;
}
Expand Down
7 changes: 6 additions & 1 deletion blocks/CloudImageEditor/src/elements/button/BtnUi.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
theme: null,
'aria-role': '',
'aria-controls': '',
'title-prop': '',
};

this.defineAccessor('active', (active) => {
Expand Down Expand Up @@ -52,7 +53,7 @@
}
});

this.sub('text', (txt) => {

Check warning on line 56 in blocks/CloudImageEditor/src/elements/button/BtnUi.js

View workflow job for this annotation

GitHub Actions / build

'txt' is defined but never used
this._iconSingle = false;
});

Expand All @@ -67,6 +68,10 @@
this.defineAccessor('aria-controls', (value) => {
this.$['aria-controls'] = value || '';
});

this.defineAccessor('title-prop', (value) => {
this.$['title-prop'] = value || '';
});
}

set reverse(val) {
Expand All @@ -83,7 +88,7 @@
BtnUi.bindAttributes({ text: 'text', icon: 'icon', reverse: 'reverse', theme: 'theme' });

BtnUi.template = /* HTML */ `
<button type="button" set="@role:aria-role; @aria-controls: aria-controls">
<button type="button" set="@role:aria-role; @aria-controls: aria-controls;" l10n="@title:title-prop">
<uc-icon set="className: iconCss; @name: icon; @hidden: !icon"></uc-icon>
<div class="uc-text">{{text}}</div>
</button>
Expand Down
2 changes: 2 additions & 0 deletions blocks/Modal/Modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,10 @@ export class Modal extends Block {
this.sub('isOpen', (isOpen) => {
if (isOpen) {
this.show();
this.setAttribute('aria-modal', 'true');
} else {
this.hide();
this.setAttribute('aria-modal', 'false');
}
});
}
Expand Down
7 changes: 6 additions & 1 deletion blocks/UploadList/UploadList.js
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,12 @@ export class UploadList extends UploaderBlock {
UploadList.template = /* HTML */ `
<uc-activity-header>
<span class="uc-header-text">{{headerText}}</span>
<button type="button" class="uc-mini-btn uc-close-btn" set="onclick: *closeModal">
<button
type="button"
class="uc-mini-btn uc-close-btn"
set="onclick: *closeModal"
l10n="@title:a11y-activity-header-button-close"
>
<uc-icon name="close"></uc-icon>
</button>
</uc-activity-header>
Expand Down
13 changes: 11 additions & 2 deletions locales/file-uploader/ar.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,15 @@ export default {
'images-only-accepted': 'يتم قبول ملفات الصور فقط.',
'file-type-not-allowed': 'رفع هذه أنواع الملفات غير مسموح به.',
'some-files-were-not-uploaded': 'لم يتم رفع بعض الملفات.',
'file-item-edit-button': 'زر التحرير',
'file-item-remove-button': 'زر الإزالة',
'file-item-edit-button': 'تحرير',
'file-item-remove-button': 'إزالة',
'a11y-activity-header-button-close': 'إغلاق',
'a11y-editor-tab-filters': 'فلاتر',
'a11y-editor-tab-tuning': 'ضبط',
'a11y-editor-tab-crop': 'قص',
flip: 'قلب',
mirror: 'مرآة',
'a11y-cloud-editor-apply-filter': 'تطبيق فلتر {{filterName}}',
'a11y-cloud-editor-apply-crop': 'تطبيق عملية {{filterName}}',
'a11y-cloud-editor-apply-tuning': 'تطبيق ضبط {{filterName}}',
};
13 changes: 11 additions & 2 deletions locales/file-uploader/az.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,15 @@ export default {
'images-only-accepted': 'Yalnız şəkil faylları qəbul edilir.',
'file-type-not-allowed': 'Bu fayl növlərinin yüklənməsinə icazə verilmir.',
'some-files-were-not-uploaded': 'Bəzi fayllar yüklənmədi.',
'file-item-edit-button': 'Düzəliş düyməsi',
'file-item-remove-button': 'Sil düyməsi',
'file-item-edit-button': 'Dəyişdir',
'file-item-remove-button': 'Sil',
'a11y-activity-header-button-close': 'Bağla',
'a11y-editor-tab-filters': 'Filtrlər',
'a11y-editor-tab-tuning': 'Tənzimləmə',
'a11y-editor-tab-crop': 'Kəsmə',
flip: 'Tərsinə çevir',
mirror: 'Ayna',
'a11y-cloud-editor-apply-filter': '{{filterName}} filtrini tətbiq et',
'a11y-cloud-editor-apply-crop': '{{filterName}} əməliyyatını tətbiq et',
'a11y-cloud-editor-apply-tuning': '{{filterName}} tənzimləməsini tətbiq et',
};
13 changes: 11 additions & 2 deletions locales/file-uploader/ca.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,15 @@ export default {
'images-only-accepted': "Només s'accepten fitxers d'imatge.",
'file-type-not-allowed': "No està permès pujar fitxers d'aquest tipus.",
'some-files-were-not-uploaded': "Alguns fitxers no s'han pujat.",
'file-item-edit-button': "Botó d'edició",
'file-item-remove-button': 'Botó de supressió',
'file-item-edit-button': 'Editar',
'file-item-remove-button': 'Eliminar',
'a11y-activity-header-button-close': 'Tancar',
'a11y-editor-tab-filters': 'Filtres',
'a11y-editor-tab-tuning': 'Ajust',
'a11y-editor-tab-crop': 'Retallar',
flip: 'Capgirar',
mirror: 'Mirall',
'a11y-cloud-editor-apply-filter': 'Aplicar el filtre {{filterName}}',
'a11y-cloud-editor-apply-crop': "Aplicar l'operació {{filterName}}",
'a11y-cloud-editor-apply-tuning': "Aplicar l'ajust {{filterName}}",
};
13 changes: 11 additions & 2 deletions locales/file-uploader/cs.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,15 @@ export default {
'images-only-accepted': 'Přijímány jsou pouze obrázkové soubory.',
'file-type-not-allowed': 'Nahrávání těchto typů souborů není povoleno.',
'some-files-were-not-uploaded': 'Některé soubory nebyly nahrány.',
'file-item-edit-button': 'Tlačítko upravit',
'file-item-remove-button': 'Tlačítko odstranit',
'file-item-edit-button': 'Upravit',
'file-item-remove-button': 'Odstranit',
'a11y-activity-header-button-close': 'Zavřít',
'a11y-editor-tab-filters': 'Filtry',
'a11y-editor-tab-tuning': 'Ladění',
'a11y-editor-tab-crop': 'Oříznutí',
flip: 'Převrátit',
mirror: 'Zrcadlit',
'a11y-cloud-editor-apply-filter': 'Použít filtr {{filterName}}',
'a11y-cloud-editor-apply-crop': 'Použít operaci {{filterName}}',
'a11y-cloud-editor-apply-tuning': 'Použít ladění {{filterName}}',
};
13 changes: 11 additions & 2 deletions locales/file-uploader/da.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,15 @@ export default {
'images-only-accepted': 'Kun billedfiler accepteres.',
'file-type-not-allowed': 'Upload af denne filtype er ikke tilladt.',
'some-files-were-not-uploaded': 'Nogle filer blev ikke uploadet.',
'file-item-edit-button': 'Redigeringsknap',
'file-item-remove-button': 'Fjernknap',
'file-item-edit-button': 'Rediger',
'file-item-remove-button': 'Fjern',
'a11y-activity-header-button-close': 'Luk',
'a11y-editor-tab-filters': 'Filtre',
'a11y-editor-tab-tuning': 'Justering',
'a11y-editor-tab-crop': 'Beskær',
flip: 'Vend',
mirror: 'Spejl',
'a11y-cloud-editor-apply-filter': 'Anvend {{filterName}} filter',
'a11y-cloud-editor-apply-crop': 'Anvend {{filterName}} handling',
'a11y-cloud-editor-apply-tuning': 'Anvend {{filterName}} justering',
};
13 changes: 11 additions & 2 deletions locales/file-uploader/de.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,15 @@ export default {
'images-only-accepted': 'Nur Bilddateien werden akzeptiert.',
'file-type-not-allowed': 'Das Hochladen dieser Dateitypen ist nicht erlaubt.',
'some-files-were-not-uploaded': 'Einige Dateien wurden nicht hochgeladen.',
'file-item-edit-button': 'Bearbeiten-Taste',
'file-item-remove-button': 'Entfernen-Taste',
'file-item-edit-button': 'Bearbeiten',
'file-item-remove-button': 'Entfernen',
'a11y-activity-header-button-close': 'Schließen',
'a11y-editor-tab-filters': 'Filter',
'a11y-editor-tab-tuning': 'Feinabstimmung',
'a11y-editor-tab-crop': 'Zuschneiden',
flip: 'Drehen',
mirror: 'Spiegeln',
'a11y-cloud-editor-apply-filter': '{{filterName}}-Filter anwenden',
'a11y-cloud-editor-apply-crop': '{{filterName}}-Operation anwenden',
'a11y-cloud-editor-apply-tuning': '{{filterName}}-Abstimmung anwenden',
};
13 changes: 11 additions & 2 deletions locales/file-uploader/el.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,15 @@ export default {
'images-only-accepted': 'Επιτρέπονται μόνο αρχεία εικόνων.',
'file-type-not-allowed': 'Η μεταφόρτωση αυτών των τύπων αρχείων δεν επιτρέπεται.',
'some-files-were-not-uploaded': 'Κάποια αρχεία δεν μεταφορτώθηκαν.',
'file-item-edit-button': 'Κουμπί επεξεργασίας',
'file-item-remove-button': 'Κουμπί αφαίρεσης',
'file-item-edit-button': 'Επεξεργασία',
'file-item-remove-button': 'Αφαίρεση',
'a11y-activity-header-button-close': 'Κλείσιμο',
'a11y-editor-tab-filters': 'Φίλτρα',
'a11y-editor-tab-tuning': 'Ρύθμιση',
'a11y-editor-tab-crop': 'Περικοπή',
flip: 'Αναστροφή',
mirror: 'Καθρέφτης',
'a11y-cloud-editor-apply-filter': 'Εφαρμογή φίλτρου {{filterName}}',
'a11y-cloud-editor-apply-crop': 'Εφαρμογή της λειτουργίας {{filterName}}',
'a11y-cloud-editor-apply-tuning': 'Εφαρμογή της ρύθμισης {{filterName}}',
};
13 changes: 11 additions & 2 deletions locales/file-uploader/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,15 @@ export default {
'images-only-accepted': 'Only image files are accepted.',
'file-type-not-allowed': 'Uploading of these file types is not allowed.',
'some-files-were-not-uploaded': 'Some files were not uploaded.',
'file-item-edit-button': 'Edit button',
'file-item-remove-button': 'Remove button',
'file-item-edit-button': 'Edit',
'file-item-remove-button': 'Remove',
'a11y-editor-tab-filters': 'Filters',
'a11y-editor-tab-tuning': 'Tuning',
'a11y-editor-tab-crop': 'Crop',
'a11y-activity-header-button-close': 'Close',
flip: 'Flip',
mirror: 'Mirror',
'a11y-cloud-editor-apply-filter': 'Apply {{filterName}} filter',
'a11y-cloud-editor-apply-crop': 'Apply {{filterName}} operation',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's rename filterName to just name? Because filterName sounds ok for the "apply filter" key but for crop and tuning it is irrelevant a bit.

'a11y-cloud-editor-apply-tuning': 'Apply {{filterName}} tuning',
};
13 changes: 11 additions & 2 deletions locales/file-uploader/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,15 @@ export default {
'images-only-accepted': 'Solo se aceptan archivos de imagen.',
'file-type-not-allowed': 'No se permite la subida de estos tipos de archivos.',
'some-files-were-not-uploaded': 'Algunos archivos no fueron subidos.',
'file-item-edit-button': 'Botón de edición',
'file-item-remove-button': 'Botón de eliminación',
'file-item-edit-button': 'Editar',
'file-item-remove-button': 'Eliminar',
'a11y-activity-header-button-close': 'Cerrar',
'a11y-editor-tab-filters': 'Filtros',
'a11y-editor-tab-tuning': 'Ajustes',
'a11y-editor-tab-crop': 'Recortar',
flip: 'Voltear',
mirror: 'Espejo',
'a11y-cloud-editor-apply-filter': 'Aplicar filtro {{filterName}}',
'a11y-cloud-editor-apply-crop': 'Aplicar operación {{filterName}}',
'a11y-cloud-editor-apply-tuning': 'Aplicar ajuste {{filterName}}',
};
13 changes: 11 additions & 2 deletions locales/file-uploader/et.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,15 @@ export default {
'images-only-accepted': 'Aktsepteeritud on ainult pildifailid.',
'file-type-not-allowed': 'Nende failitüüpide üleslaadimine pole lubatud.',
'some-files-were-not-uploaded': 'Mõned failid ei laetud üles.',
'file-item-edit-button': 'Muuda nupp',
'file-item-remove-button': 'Eemalda nupp',
'file-item-edit-button': 'Redigeeri',
'file-item-remove-button': 'Eemalda',
'a11y-activity-header-button-close': 'Sulge',
'a11y-editor-tab-filters': 'Filtrid',
'a11y-editor-tab-tuning': 'Häälestus',
'a11y-editor-tab-crop': 'Kärbi',
flip: 'Pööra',
mirror: 'Peegelda',
'a11y-cloud-editor-apply-filter': 'Rakenda filter {{filterName}}',
'a11y-cloud-editor-apply-crop': 'Rakenda toiming {{filterName}}',
'a11y-cloud-editor-apply-tuning': 'Rakenda häälestus {{filterName}}',
};
13 changes: 11 additions & 2 deletions locales/file-uploader/fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,15 @@ export default {
'images-only-accepted': 'Seuls les fichiers image sont acceptés.',
'file-type-not-allowed': "Le téléchargement de ces types de fichiers n'est pas autorisé.",
'some-files-were-not-uploaded': "Certains fichiers n'ont pas été téléchargés.",
'file-item-edit-button': "Bouton d'édition",
'file-item-remove-button': 'Bouton de suppression',
'file-item-edit-button': 'Modifier',
'file-item-remove-button': 'Supprimer',
'a11y-activity-header-button-close': 'Fermer',
'a11y-editor-tab-filters': 'Filtres',
'a11y-editor-tab-tuning': 'Réglage',
'a11y-editor-tab-crop': 'Recadrer',
flip: 'Retourner',
mirror: 'Miroir',
'a11y-cloud-editor-apply-filter': 'Appliquer le filtre {{filterName}}',
'a11y-cloud-editor-apply-crop': "Appliquer l'opération {{filterName}}",
'a11y-cloud-editor-apply-tuning': 'Appliquer le réglage {{filterName}}',
};
Loading
Loading