@syncfusion/ej2-calendars 32.1.23 → 32.1.25

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

@@ -628,15 +628,21 @@ let CalendarBase = class CalendarBase extends Component {
                 e.preventDefault();
                 break;
             case 'tab':
-                if ((this.getModuleName() === 'datepicker' || this.getModuleName() === 'datetimepicker') && e.target === this.todayElement) {
-                    e.preventDefault();
-                    if (this.isAngular) {
-                        this.inputElement.focus();
-                    }
-                    else {
-                        this.element.focus();
+                if (this.getModuleName() === 'datepicker' || this.getModuleName() === 'datetimepicker') {
+                    const hasToday = this.showTodayButton && !isNullOrUndefined(this.todayElement);
+                    const isLastFocusable = hasToday
+                        ? (e.target === this.todayElement)
+                        : (e.target === this.table);
+                    if (isLastFocusable) {
+                        e.preventDefault();
+                        if (this.isAngular) {
+                            this.inputElement.focus();
+                        }
+                        else {
+                            this.element.focus();
+                        }
+                        this.hide();
                     }
-                    this.hide();
                 }
                 break;
             case 'shiftTab':