From 04751b12268490d324ca18c3091723581d0098ef Mon Sep 17 00:00:00 2001 From: Egor Didenko Date: Thu, 19 Mar 2026 11:15:36 -0400 Subject: [PATCH 1/4] fix: updated button text for file selection based on multiple upload option --- .../file-uploader/minimal/FileUploaderMinimal.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/solutions/file-uploader/minimal/FileUploaderMinimal.ts b/src/solutions/file-uploader/minimal/FileUploaderMinimal.ts index 5b122f160..144e3b4ea 100644 --- a/src/solutions/file-uploader/minimal/FileUploaderMinimal.ts +++ b/src/solutions/file-uploader/minimal/FileUploaderMinimal.ts @@ -42,6 +42,9 @@ export class FileUploaderMinimal extends LitSolutionBlock { @state() private _classStartFrom = EMPTY_CLASS; + @state() + private _buttonTextKey = 'choose-file'; + private _getInitActivity(): string { return (this.getCssData('--cfg-init-activity') as string | undefined) || LitActivityBlock.activities.START_FROM; } @@ -136,6 +139,10 @@ export class FileUploaderMinimal extends LitSolutionBlock { }); }); + this.subConfigValue('multiple', (val) => { + this._buttonTextKey = val ? 'choose-files' : 'choose-file'; + }); + this.modalManager?.subscribe(ModalEvents.OPEN, this._handleModalOpen); this.modalManager?.subscribe(ModalEvents.CLOSE, this._handleModalClose); } @@ -155,7 +162,7 @@ export class FileUploaderMinimal extends LitSolutionBlock { initflow clickable tabindex="0" - >${this.l10n('choose-file')} + >${this.l10n(this._buttonTextKey)} From 7e3a8c85be8057197333f928752c03bdcc521c26 Mon Sep 17 00:00:00 2001 From: Egor Didenko Date: Thu, 19 Mar 2026 11:29:58 -0400 Subject: [PATCH 2/4] fix: add missing 'drop-file-here' field for multiple upload option in localization files --- src/locales/file-uploader/ar.ts | 1 + src/locales/file-uploader/az.ts | 1 + src/locales/file-uploader/ca.ts | 1 + src/locales/file-uploader/cs.ts | 1 + src/locales/file-uploader/da.ts | 1 + src/locales/file-uploader/de.ts | 1 + src/locales/file-uploader/el.ts | 1 + src/locales/file-uploader/en.ts | 1 + src/locales/file-uploader/es.ts | 1 + src/locales/file-uploader/et.ts | 1 + src/locales/file-uploader/fi.ts | 1 + src/locales/file-uploader/fr.ts | 1 + src/locales/file-uploader/he.ts | 1 + src/locales/file-uploader/hy.ts | 1 + src/locales/file-uploader/is.ts | 1 + src/locales/file-uploader/it.ts | 1 + src/locales/file-uploader/ja.ts | 1 + src/locales/file-uploader/ka.ts | 1 + src/locales/file-uploader/kk.ts | 1 + src/locales/file-uploader/ko.ts | 1 + src/locales/file-uploader/lv.ts | 1 + src/locales/file-uploader/nb.ts | 1 + src/locales/file-uploader/nl.ts | 1 + src/locales/file-uploader/pl.ts | 1 + src/locales/file-uploader/pt.ts | 1 + src/locales/file-uploader/ro.ts | 1 + src/locales/file-uploader/ru.ts | 1 + src/locales/file-uploader/sk.ts | 1 + src/locales/file-uploader/sr.ts | 1 + src/locales/file-uploader/sv.ts | 1 + src/locales/file-uploader/tr.ts | 1 + src/locales/file-uploader/uk.ts | 1 + src/locales/file-uploader/vi.ts | 1 + src/locales/file-uploader/zh-TW.ts | 1 + src/locales/file-uploader/zh.ts | 1 + 35 files changed, 35 insertions(+) diff --git a/src/locales/file-uploader/ar.ts b/src/locales/file-uploader/ar.ts index 08bf9c646..7151dbc1d 100644 --- a/src/locales/file-uploader/ar.ts +++ b/src/locales/file-uploader/ar.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'اختر ملف', 'choose-files': 'اختر ملفات', 'drop-files-here': 'أسقط الملفات هنا', + 'drop-file-here': 'أسقط الملف هنا', 'select-file-source': 'اختر مصدر الملف', selected: 'مختار', upload: 'رفع', diff --git a/src/locales/file-uploader/az.ts b/src/locales/file-uploader/az.ts index 25d8ff150..6cde08c4c 100644 --- a/src/locales/file-uploader/az.ts +++ b/src/locales/file-uploader/az.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Fayl seç', 'choose-files': 'Faylları seç', 'drop-files-here': 'Faylları buraya atın', + 'drop-file-here': 'Faylı buraya atın', 'select-file-source': 'Fayl mənbəyi seç', selected: 'Seçildi', upload: 'Yüklə', diff --git a/src/locales/file-uploader/ca.ts b/src/locales/file-uploader/ca.ts index 07ed3da7e..528ae3832 100644 --- a/src/locales/file-uploader/ca.ts +++ b/src/locales/file-uploader/ca.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Tria fitxer', 'choose-files': 'Tria fitxers', 'drop-files-here': 'Deixa caure els fitxers aquí', + 'drop-file-here': 'Deixa caure el fitxer aquí', 'select-file-source': "Selecciona l'origen del fitxer", selected: 'Seleccionat', upload: 'Pujar', diff --git a/src/locales/file-uploader/cs.ts b/src/locales/file-uploader/cs.ts index 624eb6a48..bf764aaa8 100644 --- a/src/locales/file-uploader/cs.ts +++ b/src/locales/file-uploader/cs.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Vybrat soubor', 'choose-files': 'Vybrat soubory', 'drop-files-here': 'Přetáhněte soubory sem', + 'drop-file-here': 'Přetáhněte soubor sem', 'select-file-source': 'Vyberte zdroj souboru', selected: 'Vybráno', upload: 'Nahrát', diff --git a/src/locales/file-uploader/da.ts b/src/locales/file-uploader/da.ts index 42f4eb7a5..388105a9e 100644 --- a/src/locales/file-uploader/da.ts +++ b/src/locales/file-uploader/da.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Vælg fil', 'choose-files': 'Vælg filer', 'drop-files-here': 'Slip filer her', + 'drop-file-here': 'Slip filen her', 'select-file-source': 'Vælg filkilde', selected: 'Valgt', upload: 'Upload', diff --git a/src/locales/file-uploader/de.ts b/src/locales/file-uploader/de.ts index c9f6bd3d4..6ab193a4e 100644 --- a/src/locales/file-uploader/de.ts +++ b/src/locales/file-uploader/de.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Datei wählen', 'choose-files': 'Dateien wählen', 'drop-files-here': 'Dateien hier ablegen', + 'drop-file-here': 'Datei hier ablegen', 'select-file-source': 'Dateiquelle auswählen', selected: 'Ausgewählt', upload: 'Hochladen', diff --git a/src/locales/file-uploader/el.ts b/src/locales/file-uploader/el.ts index 08d89ed12..9cf452af7 100644 --- a/src/locales/file-uploader/el.ts +++ b/src/locales/file-uploader/el.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Επιλογή αρχείου', 'choose-files': 'Επιλογή αρχείων', 'drop-files-here': 'Αφήστε τα αρχεία εδώ', + 'drop-file-here': 'Αφήστε το αρχείο εδώ', 'select-file-source': 'Επιλέξτε πηγή αρχείου', selected: 'Επιλεγμένο', upload: 'Μεταφόρτωση', diff --git a/src/locales/file-uploader/en.ts b/src/locales/file-uploader/en.ts index c36a13a45..9e61f283d 100644 --- a/src/locales/file-uploader/en.ts +++ b/src/locales/file-uploader/en.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Choose file', 'choose-files': 'Choose files', 'drop-files-here': 'Drop files here', + 'drop-file-here': 'Drop file here', 'select-file-source': 'Select file source', selected: 'Selected', upload: 'Upload', diff --git a/src/locales/file-uploader/es.ts b/src/locales/file-uploader/es.ts index 466011a6c..b11727a98 100644 --- a/src/locales/file-uploader/es.ts +++ b/src/locales/file-uploader/es.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Elegir archivo', 'choose-files': 'Elegir archivos', 'drop-files-here': 'Suelta los archivos aquí', + 'drop-file-here': 'Suelta el archivo aquí', 'select-file-source': 'Seleccionar fuente del archivo', selected: 'Seleccionado', upload: 'Subir', diff --git a/src/locales/file-uploader/et.ts b/src/locales/file-uploader/et.ts index 5245048a1..14eecd65c 100644 --- a/src/locales/file-uploader/et.ts +++ b/src/locales/file-uploader/et.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Vali fail', 'choose-files': 'Vali failid', 'drop-files-here': 'Lohista failid siia', + 'drop-file-here': 'Lohista fail siia', 'select-file-source': 'Vali faili allikas', selected: 'Valitud', upload: 'Lae üles', diff --git a/src/locales/file-uploader/fi.ts b/src/locales/file-uploader/fi.ts index fa68092db..e82ee5f91 100644 --- a/src/locales/file-uploader/fi.ts +++ b/src/locales/file-uploader/fi.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Valitse tiedosto', 'choose-files': 'Valitse tiedostoja', 'drop-files-here': 'Raahaa tiedostot tänne', + 'drop-file-here': 'Raahaa tiedosto tänne', 'select-file-source': 'Valitse tiedoston lähde', selected: 'Valittu', upload: 'Lataa', diff --git a/src/locales/file-uploader/fr.ts b/src/locales/file-uploader/fr.ts index 550869076..16438968a 100644 --- a/src/locales/file-uploader/fr.ts +++ b/src/locales/file-uploader/fr.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Choisir un fichier', 'choose-files': 'Choisir des fichiers', 'drop-files-here': 'Déposez les fichiers ici', + 'drop-file-here': 'Déposez le fichier ici', 'select-file-source': 'Sélectionnez la source du fichier', selected: 'Sélectionné', upload: 'Télécharger', diff --git a/src/locales/file-uploader/he.ts b/src/locales/file-uploader/he.ts index cddb7290a..82174081f 100644 --- a/src/locales/file-uploader/he.ts +++ b/src/locales/file-uploader/he.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'בחר קובץ', 'choose-files': 'בחר קבצים', 'drop-files-here': 'שחרר קבצים כאן', + 'drop-file-here': 'שחרר קובץ כאן', 'select-file-source': 'בחר מקור קבצים', selected: 'נבחר', upload: 'העלה', diff --git a/src/locales/file-uploader/hy.ts b/src/locales/file-uploader/hy.ts index a06be6134..37a9da1b9 100644 --- a/src/locales/file-uploader/hy.ts +++ b/src/locales/file-uploader/hy.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Ընտրեք ֆայլը', 'choose-files': 'Ընտրեք ֆայլերը', 'drop-files-here': 'Թողարկեք ֆայլերը այստեղ', + 'drop-file-here': 'Թողարկեք ֆայլը այստեղ', 'select-file-source': 'Ընտրեք ֆայլի աղբյուրը', selected: 'Ընտրված է', upload: 'Բեռնել', diff --git a/src/locales/file-uploader/is.ts b/src/locales/file-uploader/is.ts index 2dc008e4e..de7273817 100644 --- a/src/locales/file-uploader/is.ts +++ b/src/locales/file-uploader/is.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Veldu skrá', 'choose-files': 'Veldu skrár', 'drop-files-here': 'Slepptu skrám hér', + 'drop-file-here': 'Slepptu skrá hér', 'select-file-source': 'Veldu uppruna skrár', selected: 'Valið', upload: 'Hlaða upp', diff --git a/src/locales/file-uploader/it.ts b/src/locales/file-uploader/it.ts index 7bd84fbfa..ae6aedc6b 100644 --- a/src/locales/file-uploader/it.ts +++ b/src/locales/file-uploader/it.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Scegli file', 'choose-files': 'Scegli files', 'drop-files-here': 'Trascina i file qui', + 'drop-file-here': 'Trascina il file qui', 'select-file-source': 'Seleziona sorgente file', selected: 'Selezionato', upload: 'Carica', diff --git a/src/locales/file-uploader/ja.ts b/src/locales/file-uploader/ja.ts index 75e8fec46..a839a8309 100644 --- a/src/locales/file-uploader/ja.ts +++ b/src/locales/file-uploader/ja.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'ファイルを選択', 'choose-files': 'ファイルを選択する', 'drop-files-here': 'ここにファイルをドロップしてください', + 'drop-file-here': 'ここにファイルをドロップしてください', 'select-file-source': 'ファイルソースを選択', selected: '選択された', upload: 'アップロード', diff --git a/src/locales/file-uploader/ka.ts b/src/locales/file-uploader/ka.ts index 58f4be770..2d321ff7e 100644 --- a/src/locales/file-uploader/ka.ts +++ b/src/locales/file-uploader/ka.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'აირჩიეთ ფაილი', 'choose-files': 'აირჩიეთ ფაილები', 'drop-files-here': 'ჩააგდეთ ფაილები აქ', + 'drop-file-here': 'ჩააგდეთ ფაილი აქ', 'select-file-source': 'აირჩიეთ ფაილის წყარო', selected: 'არჩეულია', upload: 'ატვირთვა', diff --git a/src/locales/file-uploader/kk.ts b/src/locales/file-uploader/kk.ts index a883bf15a..ecde954ad 100644 --- a/src/locales/file-uploader/kk.ts +++ b/src/locales/file-uploader/kk.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Файл таңдаңыз', 'choose-files': 'Файлдарды таңдаңыз', 'drop-files-here': 'Файлдарды мұнда тастаңыз', + 'drop-file-here': 'Файлды мұнда тастаңыз', 'select-file-source': 'Файл көзін таңдаңыз', selected: 'Таңдалған', upload: 'Жүктеу', diff --git a/src/locales/file-uploader/ko.ts b/src/locales/file-uploader/ko.ts index 8d5ea8cbb..b5e779c00 100644 --- a/src/locales/file-uploader/ko.ts +++ b/src/locales/file-uploader/ko.ts @@ -6,6 +6,7 @@ export default { 'choose-file': '파일 선택', 'choose-files': '파일 선택', 'drop-files-here': '여기에 파일을 놓으세요', + 'drop-file-here': '여기에 파일을 놓으세요', 'select-file-source': '파일 소스 선택', selected: '선택됨', upload: '업로드', diff --git a/src/locales/file-uploader/lv.ts b/src/locales/file-uploader/lv.ts index 6e8d9d51f..9681a49d0 100644 --- a/src/locales/file-uploader/lv.ts +++ b/src/locales/file-uploader/lv.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Izvēlēties failu', 'choose-files': 'Izvēlēties failus', 'drop-files-here': 'Nomest failus šeit', + 'drop-file-here': 'Nomest failu šeit', 'select-file-source': 'Izvēlēties faila avotu', selected: 'Izvēlēts', upload: 'Augšupielādēt', diff --git a/src/locales/file-uploader/nb.ts b/src/locales/file-uploader/nb.ts index 491a0c1fe..1c5b16ae7 100644 --- a/src/locales/file-uploader/nb.ts +++ b/src/locales/file-uploader/nb.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Velg fil', 'choose-files': 'Velg filer', 'drop-files-here': 'Slipp filer her', + 'drop-file-here': 'Slipp filen her', 'select-file-source': 'Velg filkilde', selected: 'Valgt', upload: 'Last opp', diff --git a/src/locales/file-uploader/nl.ts b/src/locales/file-uploader/nl.ts index 3d1aa3953..a87f30825 100644 --- a/src/locales/file-uploader/nl.ts +++ b/src/locales/file-uploader/nl.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Kies bestand', 'choose-files': 'Kies bestanden', 'drop-files-here': 'Bestanden hier neerzetten', + 'drop-file-here': 'Bestand hier neerzetten', 'select-file-source': 'Selecteer bestandsbron', selected: 'Geselecteerd', upload: 'Uploaden', diff --git a/src/locales/file-uploader/pl.ts b/src/locales/file-uploader/pl.ts index aaae2d90d..fd139c37f 100644 --- a/src/locales/file-uploader/pl.ts +++ b/src/locales/file-uploader/pl.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Wybierz plik', 'choose-files': 'Wybierz pliki', 'drop-files-here': 'Upuść pliki tutaj', + 'drop-file-here': 'Upuść plik tutaj', 'select-file-source': 'Wybierz źródło pliku', selected: 'Wybrane', upload: 'Prześlij', diff --git a/src/locales/file-uploader/pt.ts b/src/locales/file-uploader/pt.ts index 8a8d699e0..ee67dff3f 100644 --- a/src/locales/file-uploader/pt.ts +++ b/src/locales/file-uploader/pt.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Escolher arquivo', 'choose-files': 'Escolher arquivos', 'drop-files-here': 'Solte os arquivos aqui', + 'drop-file-here': 'Solte o arquivo aqui', 'select-file-source': 'Selecionar origem do arquivo', selected: 'Selecionado', upload: 'Carregar', diff --git a/src/locales/file-uploader/ro.ts b/src/locales/file-uploader/ro.ts index cdd34fbf0..0327994ea 100644 --- a/src/locales/file-uploader/ro.ts +++ b/src/locales/file-uploader/ro.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Alegeți fișierul', 'choose-files': 'Alegeți fișierele', 'drop-files-here': 'Depuneți fișierele aici', + 'drop-file-here': 'Depuneți fișierul aici', 'select-file-source': 'Selectați sursa fișierului', selected: 'Selectat', upload: 'Încărcați', diff --git a/src/locales/file-uploader/ru.ts b/src/locales/file-uploader/ru.ts index 6e63407ea..1109bc37a 100644 --- a/src/locales/file-uploader/ru.ts +++ b/src/locales/file-uploader/ru.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Выбрать файл', 'choose-files': 'Выбрать файлы', 'drop-files-here': 'Перетащите файлы сюда', + 'drop-file-here': 'Перетащите файл сюда', 'select-file-source': 'Выбрать источник файла', selected: 'Выбрано', upload: 'Загрузить', diff --git a/src/locales/file-uploader/sk.ts b/src/locales/file-uploader/sk.ts index 3361625fd..c661a1bc5 100644 --- a/src/locales/file-uploader/sk.ts +++ b/src/locales/file-uploader/sk.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Vybrať súbor', 'choose-files': 'Vybrať súbory', 'drop-files-here': 'Pretiahnite súbory sem', + 'drop-file-here': 'Pretiahnite súbor sem', 'select-file-source': 'Vyberte zdroj súboru', selected: 'Vybrané', upload: 'Nahrať', diff --git a/src/locales/file-uploader/sr.ts b/src/locales/file-uploader/sr.ts index 7105aabed..79081df64 100644 --- a/src/locales/file-uploader/sr.ts +++ b/src/locales/file-uploader/sr.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Изабери датотеку', 'choose-files': 'Изабери датотеке', 'drop-files-here': 'Повуци датотеке овде', + 'drop-file-here': 'Повуци датотеку овде', 'select-file-source': 'Изабери извор датотеке', selected: 'Изабрано', upload: 'Отпреми', diff --git a/src/locales/file-uploader/sv.ts b/src/locales/file-uploader/sv.ts index 6767fe7c5..a99dea7b2 100644 --- a/src/locales/file-uploader/sv.ts +++ b/src/locales/file-uploader/sv.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Välj fil', 'choose-files': 'Välj filer', 'drop-files-here': 'Släpp filer här', + 'drop-file-here': 'Släpp filen här', 'select-file-source': 'Välj filkälla', selected: 'Vald', upload: 'Ladda upp', diff --git a/src/locales/file-uploader/tr.ts b/src/locales/file-uploader/tr.ts index fb01c3151..cb86a0600 100644 --- a/src/locales/file-uploader/tr.ts +++ b/src/locales/file-uploader/tr.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Dosya seç', 'choose-files': 'Dosyaları seç', 'drop-files-here': 'Dosyaları buraya bırak', + 'drop-file-here': 'Dosyayı buraya bırak', 'select-file-source': 'Dosya kaynağı seç', selected: 'Seçildi', upload: 'Yükle', diff --git a/src/locales/file-uploader/uk.ts b/src/locales/file-uploader/uk.ts index d0f52e6bd..ce2878066 100644 --- a/src/locales/file-uploader/uk.ts +++ b/src/locales/file-uploader/uk.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Обрати файл', 'choose-files': 'Обрати файли', 'drop-files-here': 'Перетягніть файли сюди', + 'drop-file-here': 'Перетягніть файл сюди', 'select-file-source': 'Виберіть джерело файлу', selected: 'Вибрано', upload: 'Завантажити', diff --git a/src/locales/file-uploader/vi.ts b/src/locales/file-uploader/vi.ts index 348a1800d..5942695e7 100644 --- a/src/locales/file-uploader/vi.ts +++ b/src/locales/file-uploader/vi.ts @@ -6,6 +6,7 @@ export default { 'choose-file': 'Chọn tệp', 'choose-files': 'Chọn các tệp', 'drop-files-here': 'Thả các tệp vào đây', + 'drop-file-here': 'Thả tệp vào đây', 'select-file-source': 'Chọn nguồn tệp', selected: 'Đã chọn', upload: 'Tải lên', diff --git a/src/locales/file-uploader/zh-TW.ts b/src/locales/file-uploader/zh-TW.ts index 295e2e326..282cab6b4 100644 --- a/src/locales/file-uploader/zh-TW.ts +++ b/src/locales/file-uploader/zh-TW.ts @@ -6,6 +6,7 @@ export default { 'choose-file': '選擇檔案', 'choose-files': '選擇多個檔案', 'drop-files-here': '將檔案拖曳至此', + 'drop-file-here': '將檔案拖曳至此', 'select-file-source': '選擇檔案來源', selected: '已選擇', upload: '上傳', diff --git a/src/locales/file-uploader/zh.ts b/src/locales/file-uploader/zh.ts index 7cbdfb91f..a2a9d45fc 100644 --- a/src/locales/file-uploader/zh.ts +++ b/src/locales/file-uploader/zh.ts @@ -6,6 +6,7 @@ export default { 'choose-file': '选择文件', 'choose-files': '选择多个文件', 'drop-files-here': '将文件拖到此处', + 'drop-file-here': '将文件拖到此处', 'select-file-source': '选择文件源', selected: '已选择', upload: '上传', From b0a85d480ee36ca16bd7fdeb1f209e0be144f845 Mon Sep 17 00:00:00 2001 From: Egor Didenko Date: Thu, 19 Mar 2026 11:35:28 -0400 Subject: [PATCH 3/4] fix: updated drop text handling for multiple upload option in DropArea component --- src/blocks/DropArea/DropArea.ts | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/blocks/DropArea/DropArea.ts b/src/blocks/DropArea/DropArea.ts index fce7dc904..3e170eda1 100644 --- a/src/blocks/DropArea/DropArea.ts +++ b/src/blocks/DropArea/DropArea.ts @@ -52,13 +52,8 @@ export class DropArea extends LitUploaderBlock { @state() private _isVisible = true; - private get _localizedText() { - const customText = this.text; - if (typeof customText === 'string' && customText.length > 0) { - return this.l10n(customText) || customText; - } - return this.l10n('drop-files-here'); - } + @state() + private _dropTextKey = 'drop-files-here'; private _destroyDropzone: (() => void) | null = null; private _destroyContentWrapperDropzone: (() => void) | null = null; @@ -144,6 +139,15 @@ export class DropArea extends LitUploaderBlock { this._updateIsEnabled(); this._updateVisibility(); }); + + this.subConfigValue('multiple', (val) => { + const customText = this.text; + if (typeof customText === 'string' && customText.length > 0) { + this._dropTextKey = this.l10n(customText) || customText; + return; + } + this._dropTextKey = val ? this.l10n('drop-files-here') : this.l10n('drop-file-here'); + }); } protected override willUpdate(changedProperties: PropertyValues): void { @@ -278,7 +282,7 @@ export class DropArea extends LitUploaderBlock { - ${this._localizedText} + ${this._dropTextKey} `, )} `; From cd08d7f0a076aa8aed2afd27fdc887ae7298bfff Mon Sep 17 00:00:00 2001 From: Egor Didenko Date: Thu, 19 Mar 2026 13:10:49 -0400 Subject: [PATCH 4/4] test: updated text for minimal and bundle --- src/blocks/DropArea/DropArea.ts | 24 +++++++++++++++++------- tests/bundles.e2e.test.tsx | 2 +- tests/file-uploader-minimal.e2e.test.tsx | 6 +++--- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/blocks/DropArea/DropArea.ts b/src/blocks/DropArea/DropArea.ts index 3e170eda1..45a75d142 100644 --- a/src/blocks/DropArea/DropArea.ts +++ b/src/blocks/DropArea/DropArea.ts @@ -55,6 +55,16 @@ export class DropArea extends LitUploaderBlock { @state() private _dropTextKey = 'drop-files-here'; + private _isMultiple = false; + private _updateDropText(): void { + const customText = this.text; + if (typeof customText === 'string' && customText.length > 0) { + this._dropTextKey = this.l10n(customText) || customText; + return; + } + this._dropTextKey = this._isMultiple ? this.l10n('drop-files-here') : this.l10n('drop-file-here'); + } + private _destroyDropzone: (() => void) | null = null; private _destroyContentWrapperDropzone: (() => void) | null = null; private _contentWrapperRef: Ref = createRef(); @@ -141,22 +151,22 @@ export class DropArea extends LitUploaderBlock { }); this.subConfigValue('multiple', (val) => { - const customText = this.text; - if (typeof customText === 'string' && customText.length > 0) { - this._dropTextKey = this.l10n(customText) || customText; - return; - } - this._dropTextKey = val ? this.l10n('drop-files-here') : this.l10n('drop-file-here'); + this._isMultiple = Boolean(val); + this._updateDropText(); }); } - protected override willUpdate(changedProperties: PropertyValues): void { + protected override willUpdate(changedProperties: PropertyValues): void { super.willUpdate(changedProperties); if (changedProperties.has('disabled')) { this._updateIsEnabled(); this._updateVisibility(); } + + if (changedProperties.has('text') || changedProperties.has('localeId')) { + this._updateDropText(); + } } protected override updated(changedProperties: PropertyValues): void { diff --git a/tests/bundles.e2e.test.tsx b/tests/bundles.e2e.test.tsx index d604bc2b6..aa7130264 100644 --- a/tests/bundles.e2e.test.tsx +++ b/tests/bundles.e2e.test.tsx @@ -158,7 +158,7 @@ describe('Bundles', () => { , ); - await expect.element(page.getByText('Choose file', { exact: true })).toBeVisible(); + await expect.element(page.getByText('Choose files', { exact: true })).toBeVisible(); }); test('web/uc-file-uploader-regular.min.js', async () => { diff --git a/tests/file-uploader-minimal.e2e.test.tsx b/tests/file-uploader-minimal.e2e.test.tsx index 6b058e1e8..8f898529a 100644 --- a/tests/file-uploader-minimal.e2e.test.tsx +++ b/tests/file-uploader-minimal.e2e.test.tsx @@ -25,11 +25,11 @@ beforeEach(() => { describe('File uploader minimal', () => { describe('Upload button', () => { it('should be rendered', async () => { - await expect.element(page.getByText('Choose file', { exact: true })).toBeVisible(); + await expect.element(page.getByText('Choose files', { exact: true })).toBeVisible(); }); it('should open file dialog on click', async () => { - await page.getByText('Choose file', { exact: true }).click(); + await page.getByText('Choose files', { exact: true }).click(); const startFrom = page.getByTestId('uc-start-from'); await expect(startFrom).toBeDefined(); }); @@ -46,7 +46,7 @@ describe('File uploader minimal', () => { }); it('should open cloud image editor modal on edit button click', async () => { - await page.getByText('Choose file', { exact: true }).click(); + await page.getByText('Choose files', { exact: true }).click(); const startFrom = page.getByTestId('uc-start-from'); const uploadList = page.getByTestId('uc-upload-list');