@syncfusion/ej2-schedule 21.1.35 → 21.1.37

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

@@ -2318,7 +2318,7 @@ var KeyboardInteraction = /** @__PURE__ @class */ (function () {
             nextAppEle = isReverse ? appointments[appointments.length - 1] : appointments[0];
         }
         if (nextAppEle) {
-            this.parent.eventBase.addSelectedAppointments([nextAppEle]);
+            this.parent.eventBase.addSelectedAppointments([nextAppEle], true);
             nextAppEle.focus();
             addClass([nextAppEle], AGENDA_SELECTED_CELL);
         }
@@ -2345,7 +2345,7 @@ var KeyboardInteraction = /** @__PURE__ @class */ (function () {
             if (filteredElements_1.length > 0) {
                 var selectedElement = isReverse ? filteredElements_1[filteredElements_1.length - 1] : filteredElements_1[0];
                 var focusElements = this.getAppointmentElementsByGuid(selectedElement.getAttribute('data-guid'));
-                this.parent.eventBase.addSelectedAppointments(focusElements);
+                this.parent.eventBase.addSelectedAppointments(focusElements, true);
                 (focusElements[focusElements.length - 1]).focus();
             }
         }
@@ -2804,7 +2804,7 @@ var KeyboardInteraction = /** @__PURE__ @class */ (function () {
             if (appElements.length > 0) {
                 this.parent.eventBase.removeSelectedAppointmentClass();
                 var focusAppointment = isReverse ? appElements.slice(-1)[0] : appElements[0];
-                this.parent.eventBase.addSelectedAppointments([focusAppointment]);
+                this.parent.eventBase.addSelectedAppointments([focusAppointment], true);
                 focusAppointment.focus();
                 e.preventDefault();
             }
@@ -2906,7 +2906,7 @@ var KeyboardInteraction = /** @__PURE__ @class */ (function () {
             var nextAppEle = eventEle[0];
             if (nextAppEle) {
                 this.parent.eventBase.removeSelectedAppointmentClass();
-                this.parent.eventBase.addSelectedAppointments([nextAppEle]);
+                this.parent.eventBase.addSelectedAppointments([nextAppEle], true);
                 nextAppEle.focus();
             }
         }
@@ -2918,7 +2918,7 @@ var KeyboardInteraction = /** @__PURE__ @class */ (function () {
             if (appElements.length > 0) {
                 this.parent.eventBase.removeSelectedAppointmentClass();
                 var focusAppointment = appElements[0];
-                this.parent.eventBase.addSelectedAppointments([focusAppointment]);
+                this.parent.eventBase.addSelectedAppointments([focusAppointment], true);
                 focusAppointment.focus();
                 e.preventDefault();
             }
@@ -5746,7 +5746,7 @@ var EventBase = /** @__PURE__ @class */ (function () {
             }
         }
         if (target && this.parent.selectedElements.length > 0) {
-            this.addSelectedAppointments(this.parent.selectedElements);
+            this.addSelectedAppointments(this.parent.selectedElements, false);
         }
         return this.parent.selectedElements;
     };
@@ -5776,12 +5776,12 @@ var EventBase = /** @__PURE__ @class */ (function () {
             removeClass(selectedAppointments, AGENDA_SELECTED_CELL);
         }
     };
-    EventBase.prototype.addSelectedAppointments = function (cells) {
+    EventBase.prototype.addSelectedAppointments = function (cells, preventFocus) {
         if (this.parent.currentView !== 'MonthAgenda') {
             this.parent.removeSelectedClass();
         }
         addClass(cells, APPOINTMENT_BORDER);
-        if (cells.length > 0) {
+        if (cells.length > 0 && !preventFocus) {
             cells[cells.length - 1].focus();
         }
     };
@@ -5805,6 +5805,10 @@ var EventBase = /** @__PURE__ @class */ (function () {
         }
         var selectedAppointments = this.getSelectedAppointments();
         if (selectedAppointments.length > 0) {
+            if (this.parent.activeEventData && this.parent.activeEventData.element && selectedAppointments.indexOf(this.parent.activeEventData.element) > -1) {
+                this.parent.activeEventData.element.focus();
+                return;
+            }
             selectedAppointments[selectedAppointments.length - 1].focus();
             return;
         }
@@ -6104,7 +6108,7 @@ var EventBase = /** @__PURE__ @class */ (function () {
         var target = closest(eventData.target, '.' + APPOINTMENT_CLASS);
         var guid = target.getAttribute('data-guid');
         if (isMultiple) {
-            this.addSelectedAppointments([].slice.call(this.parent.element.querySelectorAll('div[data-guid="' + guid + '"]')));
+            this.addSelectedAppointments([].slice.call(this.parent.element.querySelectorAll('div[data-guid="' + guid + '"]')), true);
             target.focus();
         }
         var eventObject = this.getEventByGuid(guid);
@@ -17126,6 +17130,9 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
                         if (_this.headerModule) {
                             _this.headerModule.setCalendarDate(navigationArgs.currentDate);
                         }
+                        if (_this.currentView === 'MonthAgenda' && _this.monthAgendaModule) {
+                            _this.monthAgendaModule.monthAgendaDate = new Date('' + _this.selectedDate);
+                        }
                         _this.initializeView(_this.currentView);
                         _this.animateLayout();
                         args = { requestType: 'dateNavigate', cancel: false, event: event };
@@ -18027,6 +18034,7 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
             this.changeDate(this.selectedDate);
         }
         else if (state.isLayout) {
+            this.activeCellsData = null;
             this.initializeView(this.currentView);
         }
         else if (state.isDataManager && this.crudModule) {
@@ -19077,7 +19085,7 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
             var element = this.element.querySelector('div[data-guid="' + selectEvent.Guid + '"]');
             if (element) {
                 this.eventBase.removeSelectedAppointmentClass();
-                this.eventBase.addSelectedAppointments([element]);
+                this.eventBase.addSelectedAppointments([element], false);
                 this.activeEventData = { event: selectEvent, element: element };
                 if (this.currentView === 'Agenda' || this.currentView === 'MonthAgenda') {
                     addClass([this.activeEventData.element], AGENDA_SELECTED_CELL);