From 365be9100e256d7112fa452ac497e4a1e756effb Mon Sep 17 00:00:00 2001 From: Roman Semenov Date: Tue, 3 Dec 2024 17:11:20 +0400 Subject: [PATCH] fix --- .../scheduler/m_compact_appointments_helper.ts | 1 + .../m_desktop_tooltip_strategy.ts | 14 +++++++++++--- .../devextreme/js/localization/messages/ar.json | 3 +++ .../devextreme/js/localization/messages/ca.json | 3 +++ .../devextreme/js/localization/messages/cs.json | 3 +++ .../devextreme/js/localization/messages/de.json | 3 +++ .../devextreme/js/localization/messages/el.json | 3 +++ .../devextreme/js/localization/messages/en.json | 3 +++ .../devextreme/js/localization/messages/es.json | 3 +++ .../devextreme/js/localization/messages/fa.json | 3 +++ .../devextreme/js/localization/messages/fi.json | 3 +++ .../devextreme/js/localization/messages/fr.json | 3 +++ .../devextreme/js/localization/messages/hu.json | 3 +++ .../devextreme/js/localization/messages/it.json | 3 +++ .../devextreme/js/localization/messages/ja.json | 3 +++ .../devextreme/js/localization/messages/lt.json | 3 +++ .../devextreme/js/localization/messages/lv.json | 3 +++ .../devextreme/js/localization/messages/nb.json | 3 +++ .../devextreme/js/localization/messages/nl.json | 3 +++ .../devextreme/js/localization/messages/pl.json | 3 +++ .../devextreme/js/localization/messages/pt.json | 3 +++ .../devextreme/js/localization/messages/ro.json | 3 +++ .../devextreme/js/localization/messages/ru.json | 3 +++ .../devextreme/js/localization/messages/sl.json | 3 +++ .../devextreme/js/localization/messages/sv.json | 3 +++ .../devextreme/js/localization/messages/tr.json | 3 +++ .../devextreme/js/localization/messages/vi.json | 3 +++ .../devextreme/js/localization/messages/zh-tw.json | 3 +++ .../devextreme/js/localization/messages/zh.json | 3 +++ 29 files changed, 93 insertions(+), 3 deletions(-) diff --git a/packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts b/packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts index c43e764f13c9..28b5cd402aec 100644 --- a/packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts +++ b/packages/devextreme/js/__internal/scheduler/m_compact_appointments_helper.ts @@ -76,6 +76,7 @@ export class CompactAppointmentsHelper { dragBehavior: options.allowDrag && this._createTooltipDragBehavior($appointmentCollector).bind(this), dropDownAppointmentTemplate: this.instance.option().dropDownAppointmentTemplate, // TODO deprecated option isButtonClick: true, + _loopFocus: true, }; } diff --git a/packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_desktop_tooltip_strategy.ts b/packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_desktop_tooltip_strategy.ts index dd76d688ee66..4e52ba124577 100644 --- a/packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_desktop_tooltip_strategy.ts +++ b/packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_desktop_tooltip_strategy.ts @@ -1,3 +1,4 @@ +import messageLocalization from '@js/localization/message'; import supportUtils from '@ts/core/utils/m_support'; import Tooltip from '@ts/ui/m_tooltip'; @@ -40,17 +41,24 @@ export class DesktopTooltipStrategy extends TooltipStrategyBase { } _createTooltip(target, dataList) { - const tooltip = this._createTooltipElement(APPOINTMENT_TOOLTIP_WRAPPER_CLASS); + const tooltipElement = this._createTooltipElement(APPOINTMENT_TOOLTIP_WRAPPER_CLASS); - return this._options.createComponent(tooltip, Tooltip, { + const tooltip = this._options.createComponent(tooltipElement, Tooltip, { target, maxHeight: MAX_TOOLTIP_HEIGHT, rtlEnabled: this._extraOptions.rtlEnabled, onShown: this._onShown.bind(this), contentTemplate: this._getContentTemplate(dataList), wrapperAttr: { class: APPOINTMENT_TOOLTIP_WRAPPER_CLASS }, - _loopFocus: true, + _loopFocus: this._extraOptions._loopFocus, }); + + tooltip.setAria({ + role: 'dialog', + label: messageLocalization.format('dxScheduler-appointmentListAriaLabel'), + }); + + return tooltip; } _onListRender(e) { diff --git a/packages/devextreme/js/localization/messages/ar.json b/packages/devextreme/js/localization/messages/ar.json index 65228a55697a..333d1899dc8c 100644 --- a/packages/devextreme/js/localization/messages/ar.json +++ b/packages/devextreme/js/localization/messages/ar.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "الموضوع", "dxScheduler-editorLabelStartDate": "تاريخ البدء", "dxScheduler-editorLabelEndDate": "تاريخ الانتهاء", diff --git a/packages/devextreme/js/localization/messages/ca.json b/packages/devextreme/js/localization/messages/ca.json index 410ba2ddb2d9..3215478be21d 100644 --- a/packages/devextreme/js/localization/messages/ca.json +++ b/packages/devextreme/js/localization/messages/ca.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Assignatura", "dxScheduler-editorLabelStartDate": "Data d'inici", "dxScheduler-editorLabelEndDate": "Data de finalització", diff --git a/packages/devextreme/js/localization/messages/cs.json b/packages/devextreme/js/localization/messages/cs.json index 03051ab8f007..16733cff1295 100644 --- a/packages/devextreme/js/localization/messages/cs.json +++ b/packages/devextreme/js/localization/messages/cs.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Předmět", "dxScheduler-editorLabelStartDate": "Počáteční datum", "dxScheduler-editorLabelEndDate": "Koncové datum", diff --git a/packages/devextreme/js/localization/messages/de.json b/packages/devextreme/js/localization/messages/de.json index 6cca61636786..71dfb3a9a765 100644 --- a/packages/devextreme/js/localization/messages/de.json +++ b/packages/devextreme/js/localization/messages/de.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Betreff", "dxScheduler-editorLabelStartDate": "Anfangszeit", "dxScheduler-editorLabelEndDate": "Endzeit", diff --git a/packages/devextreme/js/localization/messages/el.json b/packages/devextreme/js/localization/messages/el.json index ca16d98d683a..46c447951600 100644 --- a/packages/devextreme/js/localization/messages/el.json +++ b/packages/devextreme/js/localization/messages/el.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Θέμα", "dxScheduler-editorLabelStartDate": "Ημερομηνία έναρξης", "dxScheduler-editorLabelEndDate": "Ημερομηνία λήξης", diff --git a/packages/devextreme/js/localization/messages/en.json b/packages/devextreme/js/localization/messages/en.json index dafe6cdd7985..30a1389442ff 100644 --- a/packages/devextreme/js/localization/messages/en.json +++ b/packages/devextreme/js/localization/messages/en.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Subject", "dxScheduler-editorLabelStartDate": "Start Date", "dxScheduler-editorLabelEndDate": "End Date", diff --git a/packages/devextreme/js/localization/messages/es.json b/packages/devextreme/js/localization/messages/es.json index 872a33ef5d17..9a4d21a64c70 100644 --- a/packages/devextreme/js/localization/messages/es.json +++ b/packages/devextreme/js/localization/messages/es.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Asunto", "dxScheduler-editorLabelStartDate": "Fecha inicial", "dxScheduler-editorLabelEndDate": "Fecha final", diff --git a/packages/devextreme/js/localization/messages/fa.json b/packages/devextreme/js/localization/messages/fa.json index 36274fc31f52..94d282c87ed3 100644 --- a/packages/devextreme/js/localization/messages/fa.json +++ b/packages/devextreme/js/localization/messages/fa.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "موضوع", "dxScheduler-editorLabelStartDate": "تاریخ شروع", "dxScheduler-editorLabelEndDate": "تاریخ پایان", diff --git a/packages/devextreme/js/localization/messages/fi.json b/packages/devextreme/js/localization/messages/fi.json index c3d3f12c5cee..4af2997994dc 100644 --- a/packages/devextreme/js/localization/messages/fi.json +++ b/packages/devextreme/js/localization/messages/fi.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Aihe", "dxScheduler-editorLabelStartDate": "Alkamispäivä", "dxScheduler-editorLabelEndDate": "Päättymispäivä", diff --git a/packages/devextreme/js/localization/messages/fr.json b/packages/devextreme/js/localization/messages/fr.json index b0468e7acb8c..09de3725fc56 100644 --- a/packages/devextreme/js/localization/messages/fr.json +++ b/packages/devextreme/js/localization/messages/fr.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Titre", "dxScheduler-editorLabelStartDate": "Date de début", "dxScheduler-editorLabelEndDate": "Date de fin", diff --git a/packages/devextreme/js/localization/messages/hu.json b/packages/devextreme/js/localization/messages/hu.json index 393220e3b7dc..20e963e5e1e0 100644 --- a/packages/devextreme/js/localization/messages/hu.json +++ b/packages/devextreme/js/localization/messages/hu.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Tárgy", "dxScheduler-editorLabelStartDate": "Kezdés dátuma", "dxScheduler-editorLabelEndDate": "Befejezés dátuma", diff --git a/packages/devextreme/js/localization/messages/it.json b/packages/devextreme/js/localization/messages/it.json index fddc4babd0b5..82fa7868b794 100644 --- a/packages/devextreme/js/localization/messages/it.json +++ b/packages/devextreme/js/localization/messages/it.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Oggetto", "dxScheduler-editorLabelStartDate": "Data inizio", "dxScheduler-editorLabelEndDate": "Data fine", diff --git a/packages/devextreme/js/localization/messages/ja.json b/packages/devextreme/js/localization/messages/ja.json index b7940b62e4d3..9733fd7ea4ef 100644 --- a/packages/devextreme/js/localization/messages/ja.json +++ b/packages/devextreme/js/localization/messages/ja.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "件名", "dxScheduler-editorLabelStartDate": "開始時刻", "dxScheduler-editorLabelEndDate": "終了時刻", diff --git a/packages/devextreme/js/localization/messages/lt.json b/packages/devextreme/js/localization/messages/lt.json index 22b38788ef08..e84d0392b587 100644 --- a/packages/devextreme/js/localization/messages/lt.json +++ b/packages/devextreme/js/localization/messages/lt.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Tema", "dxScheduler-editorLabelStartDate": "Pradžios data", "dxScheduler-editorLabelEndDate": "Pabaigos data", diff --git a/packages/devextreme/js/localization/messages/lv.json b/packages/devextreme/js/localization/messages/lv.json index 178ff2738117..3a78ba533c88 100644 --- a/packages/devextreme/js/localization/messages/lv.json +++ b/packages/devextreme/js/localization/messages/lv.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Nosaukums", "dxScheduler-editorLabelStartDate": "Sākuma Datums", "dxScheduler-editorLabelEndDate": "Beigu Datums", diff --git a/packages/devextreme/js/localization/messages/nb.json b/packages/devextreme/js/localization/messages/nb.json index 46d6bf7e9399..3bb8d7df6746 100644 --- a/packages/devextreme/js/localization/messages/nb.json +++ b/packages/devextreme/js/localization/messages/nb.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Emne", "dxScheduler-editorLabelStartDate": "Startdato", "dxScheduler-editorLabelEndDate": "Sluttdato", diff --git a/packages/devextreme/js/localization/messages/nl.json b/packages/devextreme/js/localization/messages/nl.json index 35d652d2b97d..406f5c3f3735 100644 --- a/packages/devextreme/js/localization/messages/nl.json +++ b/packages/devextreme/js/localization/messages/nl.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Onderwerp", "dxScheduler-editorLabelStartDate": "Startdatum", "dxScheduler-editorLabelEndDate": "Einddatum", diff --git a/packages/devextreme/js/localization/messages/pl.json b/packages/devextreme/js/localization/messages/pl.json index e663073bc636..b1b4adc838e1 100644 --- a/packages/devextreme/js/localization/messages/pl.json +++ b/packages/devextreme/js/localization/messages/pl.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Dotyczy", "dxScheduler-editorLabelStartDate": "Czas rozpoczęcia", "dxScheduler-editorLabelEndDate": "Czas zakończenia", diff --git a/packages/devextreme/js/localization/messages/pt.json b/packages/devextreme/js/localization/messages/pt.json index aafee7918c61..e67f21c6156e 100644 --- a/packages/devextreme/js/localization/messages/pt.json +++ b/packages/devextreme/js/localization/messages/pt.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Assunto", "dxScheduler-editorLabelStartDate": "Data de Início", "dxScheduler-editorLabelEndDate": "Data Final", diff --git a/packages/devextreme/js/localization/messages/ro.json b/packages/devextreme/js/localization/messages/ro.json index 13dfa0bb5fdd..5455ff34e2c4 100644 --- a/packages/devextreme/js/localization/messages/ro.json +++ b/packages/devextreme/js/localization/messages/ro.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Subiect", "dxScheduler-editorLabelStartDate": "Data de început", "dxScheduler-editorLabelEndDate": "Data de încheiere", diff --git a/packages/devextreme/js/localization/messages/ru.json b/packages/devextreme/js/localization/messages/ru.json index 64aeee0fd4d9..5c3d320c1042 100644 --- a/packages/devextreme/js/localization/messages/ru.json +++ b/packages/devextreme/js/localization/messages/ru.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Название", "dxScheduler-editorLabelStartDate": "Дата начала", "dxScheduler-editorLabelEndDate": "Дата завершения", diff --git a/packages/devextreme/js/localization/messages/sl.json b/packages/devextreme/js/localization/messages/sl.json index b7fc4f96a3b2..2f7f4197794e 100644 --- a/packages/devextreme/js/localization/messages/sl.json +++ b/packages/devextreme/js/localization/messages/sl.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Predmet", "dxScheduler-editorLabelStartDate": "Datum začetka", "dxScheduler-editorLabelEndDate": "Datum konca", diff --git a/packages/devextreme/js/localization/messages/sv.json b/packages/devextreme/js/localization/messages/sv.json index 1b5feaefa4a2..3141f9302fce 100644 --- a/packages/devextreme/js/localization/messages/sv.json +++ b/packages/devextreme/js/localization/messages/sv.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Ämne", "dxScheduler-editorLabelStartDate": "Startdatum", "dxScheduler-editorLabelEndDate": "Slutdatum", diff --git a/packages/devextreme/js/localization/messages/tr.json b/packages/devextreme/js/localization/messages/tr.json index 6ec988021ec8..9ebc7dd1bc2c 100644 --- a/packages/devextreme/js/localization/messages/tr.json +++ b/packages/devextreme/js/localization/messages/tr.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Konu", "dxScheduler-editorLabelStartDate": "Başlangıç Tarihi", "dxScheduler-editorLabelEndDate": "Bitiş Tarihi", diff --git a/packages/devextreme/js/localization/messages/vi.json b/packages/devextreme/js/localization/messages/vi.json index afc15c878990..c54a3fe15e53 100644 --- a/packages/devextreme/js/localization/messages/vi.json +++ b/packages/devextreme/js/localization/messages/vi.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "Chủ đề", "dxScheduler-editorLabelStartDate": "Ngày bắt đầu", "dxScheduler-editorLabelEndDate": "Ngày kết thúc", diff --git a/packages/devextreme/js/localization/messages/zh-tw.json b/packages/devextreme/js/localization/messages/zh-tw.json index d366e540023d..f1bb88b78a73 100644 --- a/packages/devextreme/js/localization/messages/zh-tw.json +++ b/packages/devextreme/js/localization/messages/zh-tw.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "標題", "dxScheduler-editorLabelStartDate": "開始日期", "dxScheduler-editorLabelEndDate": "結束日期", diff --git a/packages/devextreme/js/localization/messages/zh.json b/packages/devextreme/js/localization/messages/zh.json index adf31adfffd2..3f429d8119b7 100644 --- a/packages/devextreme/js/localization/messages/zh.json +++ b/packages/devextreme/js/localization/messages/zh.json @@ -255,6 +255,9 @@ "dxScheduler-appointmentAriaLabel-group": "Group: {0}", "dxScheduler-appointmentAriaLabel-recurring": "Recurring appointment", + "dxScheduler-appointmentListAriaLabel": "Appointment list", + + "dxScheduler-editorLabelTitle": "标题", "dxScheduler-editorLabelStartDate": "开始日期", "dxScheduler-editorLabelEndDate": "结束日期",