fix: kbn inside of collector

DevExpress · Dec 2, 2024 · a0bd72e · a0bd72e
1 parent 8a50ed5
commit a0bd72e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts b/packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts
@@ -465,6 +465,10 @@ class SchedulerAppointments extends CollectionWidget {
     const $target = $(e.currentTarget);
     const data = (this as any)._getItemData($target);
 
+    if ($target.is('.dx-scheduler-appointment-collector')) {
+      return;
+    }
+
     if (e.type === 'keydown' || isFakeClickEvent(e)) {
       this.notifyObserver('showEditAppointmentPopup', { data, target: $target });
       return;

diff --git a/packages/devextreme/js/__internal/scheduler/m_scheduler.ts b/packages/devextreme/js/__internal/scheduler/m_scheduler.ts
@@ -1719,9 +1719,7 @@ class Scheduler extends Widget<any> {
       startDayHour: this.option('startDayHour'),
       endDayHour: this.option('endDayHour'),
       viewOffset: this.getViewOffsetMs(),
-      tabIndex: this.option('tabIndex'),
       accessKey: this.option('accessKey'),
-      focusStateEnabled: this.option('focusStateEnabled'),
       cellDuration: this.option('cellDuration'),
       showAllDayPanel: this.option('showAllDayPanel'),
       showCurrentTimeIndicator: this.option('showCurrentTimeIndicator'),

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
@@ -49,6 +49,7 @@ export class DesktopTooltipStrategy extends TooltipStrategyBase {
       onShown: this._onShown.bind(this),
       contentTemplate: this._getContentTemplate(dataList),
       wrapperAttr: { class: APPOINTMENT_TOOLTIP_WRAPPER_CLASS },
+      _loopFocus: true,
     });
   }
 

diff --git a/packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_tooltip_strategy_base.ts b/packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_tooltip_strategy_base.ts
@@ -65,6 +65,10 @@ export class TooltipStrategyBase {
       const listElement = $('<div>');
       $(container).append(listElement);
       this._list = this._createList(listElement, dataList);
+      this._list.registerKeyHandler('escape', () => {
+        this.hide();
+        this._tooltip.option('target').focus();
+      });
     };
   }