@syncfusion/ej2-schedule 21.1.35 → 21.1.37

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

@@ -2306,7 +2306,7 @@ class KeyboardInteraction {
             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);
         }
@@ -2332,7 +2332,7 @@ class KeyboardInteraction {
             if (filteredElements.length > 0) {
                 const selectedElement = isReverse ? filteredElements[filteredElements.length - 1] : filteredElements[0];
                 const focusElements = this.getAppointmentElementsByGuid(selectedElement.getAttribute('data-guid'));
-                this.parent.eventBase.addSelectedAppointments(focusElements);
+                this.parent.eventBase.addSelectedAppointments(focusElements, true);
                 (focusElements[focusElements.length - 1]).focus();
             }
         }
@@ -2790,7 +2790,7 @@ class KeyboardInteraction {
             if (appElements.length > 0) {
                 this.parent.eventBase.removeSelectedAppointmentClass();
                 const focusAppointment = isReverse ? appElements.slice(-1)[0] : appElements[0];
-                this.parent.eventBase.addSelectedAppointments([focusAppointment]);
+                this.parent.eventBase.addSelectedAppointments([focusAppointment], true);
                 focusAppointment.focus();
                 e.preventDefault();
             }
@@ -2892,7 +2892,7 @@ class KeyboardInteraction {
             const nextAppEle = eventEle[0];
             if (nextAppEle) {
                 this.parent.eventBase.removeSelectedAppointmentClass();
-                this.parent.eventBase.addSelectedAppointments([nextAppEle]);
+                this.parent.eventBase.addSelectedAppointments([nextAppEle], true);
                 nextAppEle.focus();
             }
         }
@@ -2904,7 +2904,7 @@ class KeyboardInteraction {
             if (appElements.length > 0) {
                 this.parent.eventBase.removeSelectedAppointmentClass();
                 const focusAppointment = appElements[0];
-                this.parent.eventBase.addSelectedAppointments([focusAppointment]);
+                this.parent.eventBase.addSelectedAppointments([focusAppointment], true);
                 focusAppointment.focus();
                 e.preventDefault();
             }
@@ -5682,7 +5682,7 @@ class EventBase {
             }
         }
         if (target && this.parent.selectedElements.length > 0) {
-            this.addSelectedAppointments(this.parent.selectedElements);
+            this.addSelectedAppointments(this.parent.selectedElements, false);
         }
         return this.parent.selectedElements;
     }
@@ -5711,12 +5711,12 @@ class EventBase {
             removeClass(selectedAppointments, AGENDA_SELECTED_CELL);
         }
     }
-    addSelectedAppointments(cells) {
+    addSelectedAppointments(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();
         }
     }
@@ -5740,6 +5740,10 @@ class EventBase {
         }
         const 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;
         }
@@ -6030,7 +6034,7 @@ class EventBase {
         const target = closest(eventData.target, '.' + APPOINTMENT_CLASS);
         const 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();
         }
         let eventObject = this.getEventByGuid(guid);
@@ -16506,6 +16510,9 @@ let Schedule = class Schedule extends Component {
                         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 };
@@ -17401,6 +17408,7 @@ let Schedule = class Schedule extends Component {
             this.changeDate(this.selectedDate);
         }
         else if (state.isLayout) {
+            this.activeCellsData = null;
             this.initializeView(this.currentView);
         }
         else if (state.isDataManager && this.crudModule) {
@@ -18438,7 +18446,7 @@ let Schedule = class Schedule extends Component {
             const 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);