@syncfusion/ej2-calendars 33.2.13 → 34.1.29

package/dist/es6/ej2-calendars.es5.js

@@ -645,32 +645,29 @@ var CalendarBase = /** @__PURE__ @class */ (function (_super) {
                 break;
             case 'tab':
                 if (this.getModuleName() === 'datepicker' || this.getModuleName() === 'datetimepicker') {
-                    var hasToday = this.showTodayButton && !isNullOrUndefined(this.todayElement);
-                    var isLastFocusable = hasToday
-                        ? (e.target === this.todayElement)
-                        : (e.target === this.table);
-                    if (isLastFocusable) {
-                        e.preventDefault();
-                        if (this.isAngular) {
-                            this.inputElement.focus();
-                        }
-                        else {
-                            this.element.focus();
+                    var popupEl = this.popupWrapper;
+                    if (!isNullOrUndefined(popupEl)) {
+                        var focusable = this.getPopupFocusableElements(popupEl);
+                        var lastIndex = focusable.length - 1;
+                        if (focusable.length > 0 && e.target === focusable[lastIndex]) {
+                            e.preventDefault();
+                            focusable[0].focus();
+                            // popup stays open — no hide() call
                         }
-                        this.hide();
                     }
                 }
                 break;
             case 'shiftTab':
-                if ((this.getModuleName() === 'datepicker' || this.getModuleName() === 'datetimepicker') && e.target === this.headerTitleElement) {
-                    e.preventDefault();
-                    if (this.isAngular) {
-                        this.inputElement.focus();
-                    }
-                    else {
-                        this.element.focus();
+                if (this.getModuleName() === 'datepicker' || this.getModuleName() === 'datetimepicker') {
+                    var popupEl = this.popupWrapper;
+                    if (!isNullOrUndefined(popupEl)) {
+                        var focusable = this.getPopupFocusableElements(popupEl);
+                        if (focusable.length > 0 && e.target === focusable[0]) {
+                            e.preventDefault();
+                            focusable[focusable.length - 1].focus();
+                            // popup stays open — no hide() call
+                        }
                     }
-                    this.hide();
                 }
                 break;
             case 'escape':
@@ -680,6 +677,15 @@ var CalendarBase = /** @__PURE__ @class */ (function (_super) {
                 break;
         }
     };
+    CalendarBase.prototype.getPopupFocusableElements = function (container) {
+        var selector = [
+            'button:not([disabled]):not([tabindex="-1"])',
+            'td[tabindex="0"]:not([aria-disabled="true"])',
+            '[tabindex="0"]:not([disabled])'
+        ].join(', ');
+        return Array.from(container.querySelectorAll(selector))
+            .filter(function (el) { return !isNullOrUndefined(el.offsetParent); });
+    };
     CalendarBase.prototype.keyboardNavigate = function (number, currentView, e, max, min) {
         var date = new Date(this.checkValue(this.currentDate));
         switch (currentView) {
@@ -6797,6 +6803,7 @@ var DateRangePicker = /** @__PURE__ @class */ (function (_super) {
                 if (isLeftCalendar && +date === +rightLimit) {
                     ele = this.keyCalendarUpdate(false, ele);
                 }
+                view = this.getViewNumber(this.currentView());
                 this.keyboardNavigate(1, view, e, max, min);
                 this.keyNavigation(ele, e);
                 break;
@@ -6808,6 +6815,7 @@ var DateRangePicker = /** @__PURE__ @class */ (function (_super) {
                         ele = this.keyCalendarUpdate(true, ele);
                     }
                 }
+                view = this.getViewNumber(this.currentView());
                 this.keyboardNavigate(-1, view, e, max, min);
                 this.keyNavigation(ele, e);
                 break;
@@ -6880,6 +6888,7 @@ var DateRangePicker = /** @__PURE__ @class */ (function (_super) {
                 if (this.tabKeyValidation(ele, RIGHTCALENDER)) {
                     ele = this.keyCalendarUpdate(true, ele, false);
                     this.currentDate = this.firstCellToFocus(this.leftCalendar);
+                    view = this.getViewNumber(this.currentView());
                     this.keyboardNavigate(0, view, e, max, min);
                     this.keyNavigation(ele, e);
                 }