@syncfusion/ej2-schedule 20.1.48 → 20.1.55

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

@@ -3731,6 +3731,9 @@ function dailyType(startDate, endDate, data, ruleObject) {
             }
         }
         tempDate.setDate(tempDate.getDate() + interval);
+        if (tempDate.getHours() !== startDate.getHours()) {
+            tempDate.setHours(startDate.getHours());
+        }
     }
 }
 /**
@@ -3775,6 +3778,9 @@ function weeklyType(startDate, endDate, data, ruleObject) {
                     break;
                 }
                 tempDate.setDate(tempDate.getDate() + 1);
+                if (tempDate.getHours() !== startDate.getHours()) {
+                    tempDate.setHours(startDate.getHours());
+                }
                 compareTempDate = new Date(tempDate.getTime());
                 compareTempDate = resetTime(compareTempDate);
             }
@@ -4656,7 +4662,7 @@ function insertDateCollection(state, startDate, endDate, data, ruleObject, dayDa
 function weekCount(year, startDayOfWeek, monthCollection, week, ruleObject) {
     const firstDayOfWeek = startDayOfWeek || 0;
     const firstOfMonth = new Date(year, ruleObject.month[0] - 1, 1);
-    const lastOfMonth = new Date(year, ruleObject.month[0] - 1, 0);
+    const lastOfMonth = new Date(year, ruleObject.month[0], 0);
     const numberOfDaysInMonth = lastOfMonth.getDate();
     const firstWeekDay = (firstOfMonth.getDay() - firstDayOfWeek + 7) % 7;
     const used = firstWeekDay + numberOfDaysInMonth;
@@ -5609,6 +5615,9 @@ class EventBase {
             this.parent.removeSelectedClass();
         }
         addClass(cells, APPOINTMENT_BORDER);
+        if (cells.length > 0) {
+            cells[cells.length - 1].focus();
+        }
     }
     getSelectedAppointments() {
         return [].slice.call(this.parent.element.querySelectorAll('.' + APPOINTMENT_BORDER + ',.' + APPOINTMENT_CLASS + ':focus'));
@@ -6777,6 +6786,9 @@ class VerticalEvent extends EventBase {
         const currentDate = resetTime(new Date(this.dateRender[resource][dayIndex].getTime()));
         const schedule = getStartEndHours(currentDate, this.startHour, this.endHour);
         const isValidEvent = this.isValidEvent(eventObj, eStart, eEnd, schedule);
+        if ((eStart.getTime() < this.parent.minDate.getTime()) || (eEnd.getTime() > this.parent.maxDate.getTime())) {
+            return;
+        }
         if (eStart <= eEnd && isValidEvent) {
             const appHeight = this.getHeight(eStart, eEnd);
             if (eStart.getTime() > schedule.startHour.getTime()) {
@@ -7082,7 +7094,6 @@ class MonthEvent extends EventBase {
     constructor(parent) {
         super(parent);
         this.renderedEvents = [];
-        this.eventsRendered = [];
         this.monthHeaderHeight = 0;
         this.moreIndicatorHeight = 19;
         this.renderType = 'day';
@@ -7196,7 +7207,6 @@ class MonthEvent extends EventBase {
     }
     renderEventsHandler(dateRender, workDays, resData) {
         this.renderedEvents = [];
-        this.eventsRendered = [];
         let eventsList;
         let blockList;
         let resIndex = 0;
@@ -7232,11 +7242,18 @@ class MonthEvent extends EventBase {
         const filteredDates = this.getRenderedDates(dateRender);
         this.getSlotDates(workDays || this.parent.activeViewOptions.workDays);
         this.processBlockEvents(blockList, resIndex, resData);
+        let events = [];
         for (const event of eventsList) {
             if (this.parent.resourceBase && !resData) {
                 this.cssClass = this.parent.resourceBase.getCssClass(event);
             }
-            const spannedEvents = this.splitEvent(event, filteredDates || this.dateRender);
+            events = events.concat(this.splitEvent(event, filteredDates || this.dateRender));
+        }
+        for (let level = 0; level < this.slots.length; level++) {
+            this.renderedEvents = [];
+            const slot = this.slots[level];
+            const endDate = addDays(new Date(slot[slot.length - 1]), 1);
+            const spannedEvents = this.filterEvents(new Date(slot[0]), endDate, events);
             for (const event of spannedEvents) {
                 if (this.maxHeight) {
                     const sDate = this.parent.currentView === 'Month' ? event[this.fields.startTime] :
@@ -7532,15 +7549,11 @@ class MonthEvent extends EventBase {
         const startTime = event[this.fields.startTime];
         const endTime = event[this.fields.endTime];
         const day = this.parent.getIndexOfDate(this.dateRender, resetTime(startTime));
-        if (day < 0) {
-            return;
-        }
-        if ((startTime.getTime() < this.parent.minDate.getTime()) || (endTime.getTime() > this.parent.maxDate.getTime())) {
+        if ((day < 0) || (startTime.getTime() < this.parent.minDate.getTime()) || (endTime.getTime() > this.parent.maxDate.getTime())) {
             return;
         }
         const overlapCount = this.getIndex(startTime);
         event.Index = overlapCount;
-        this.renderedEvents.push(extend({}, event, null, true));
         const diffInDays = event.data.count;
         if (startTime.getTime() <= endTime.getTime()) {
             const appWidth = (diffInDays * this.cellWidth) - 5;
@@ -7549,7 +7562,7 @@ class MonthEvent extends EventBase {
             const height = this.monthHeaderHeight + ((overlapCount + 1) * (this.eventHeight + EVENT_GAP)) + this.moreIndicatorHeight;
             const enableAppRender = this.maxOrIndicator ? overlapCount < 1 ? true : false : this.cellHeight > height;
             if (this.parent.rowAutoHeight || enableAppRender) {
-                this.eventsRendered.push(extend({}, event, null, true));
+                this.renderedEvents.push(extend({}, event, null, true));
                 let appointmentElement;
                 if (this.inlineValue) {
                     appointmentElement = this.parent.inlineModule.createInlineAppointmentElement();
@@ -7565,37 +7578,30 @@ class MonthEvent extends EventBase {
                     const firstChild = cellTd.parentElement.firstElementChild;
                     this.updateCellHeight(firstChild, height);
                 }
-                else if (cellTd.querySelector('.' + MORE_INDICATOR_CLASS)) {
-                    this.renderMoreIndicators(diffInDays, day);
-                }
             }
             else {
-                this.renderMoreIndicators(diffInDays, day);
-            }
-        }
-    }
-    renderMoreIndicators(diffInDays, day) {
-        for (let i = 0; i < diffInDays; i++) {
-            if (this.workCells[day + i]) {
-                const startDate = new Date(this.dateRender[day + i].getTime());
-                const endDate = addDays(this.dateRender[day + i], 1);
-                const groupIndex = this.workCells[day + i].getAttribute('data-group-index');
-                const filterEvents = this.getFilteredEvents(startDate, endDate, groupIndex);
-                const renderedAppCount = this.getOverlapEvents(startDate, this.eventsRendered).length;
-                const count = (filterEvents.length - renderedAppCount) <= 0 ? 1 : (filterEvents.length - renderedAppCount);
-                const indicator = this.workCells[day + i].querySelector('.' + MORE_INDICATOR_CLASS);
-                if (indicator) {
-                    indicator.innerHTML = this.getMoreIndicatorText(count);
-                }
-                else {
-                    const moreIndicatorElement = this.getMoreIndicatorElement(count, startDate, endDate);
-                    if (!isNullOrUndefined(groupIndex)) {
-                        moreIndicatorElement.setAttribute('data-group-index', groupIndex);
+                for (let i = 0; i < diffInDays; i++) {
+                    if (this.workCells[day + i]) {
+                        const indicator = this.workCells[day + i].querySelector('.' + MORE_INDICATOR_CLASS);
+                        if (indicator) {
+                            const count = parseInt(indicator.getAttribute('data-count'), 10) + 1;
+                            indicator.setAttribute('data-count', count.toString());
+                            indicator.innerHTML = this.getMoreIndicatorText(count);
+                        }
+                        else {
+                            const startDate = new Date(this.dateRender[day + i].getTime());
+                            const endDate = addDays(this.dateRender[day + i], 1);
+                            const groupIndex = this.workCells[day + i].getAttribute('data-group-index');
+                            const moreIndicatorElement = this.getMoreIndicatorElement(1, startDate, endDate);
+                            if (!isNullOrUndefined(groupIndex)) {
+                                moreIndicatorElement.setAttribute('data-group-index', groupIndex);
+                            }
+                            moreIndicatorElement.style.top = (this.cellHeight - this.monthHeaderHeight - this.moreIndicatorHeight) + 'px';
+                            moreIndicatorElement.style.width = this.cellWidth - 2 + 'px';
+                            this.renderElement(this.workCells[day + i], moreIndicatorElement);
+                            EventHandler.add(moreIndicatorElement, 'click', this.moreIndicatorClick, this);
+                        }
                     }
-                    moreIndicatorElement.style.top = (this.cellHeight - this.monthHeaderHeight - this.moreIndicatorHeight) + 'px';
-                    moreIndicatorElement.style.width = this.cellWidth - 2 + 'px';
-                    this.renderElement(this.workCells[day + i], moreIndicatorElement);
-                    EventHandler.add(moreIndicatorElement, 'click', this.moreIndicatorClick, this);
                 }
             }
         }
@@ -7630,8 +7636,8 @@ class MonthEvent extends EventBase {
     }
     getOverlapEvents(date, appointments) {
         const appointmentsList = [];
+        const dateTime = resetTime(date).getTime();
         for (const app of appointments) {
-            const dateTime = resetTime(date).getTime();
             if ((resetTime(app[this.fields.startTime]).getTime() <= dateTime) &&
                 (resetTime(app[this.fields.endTime]).getTime() >= dateTime)) {
                 appointmentsList.push(app);
@@ -7715,6 +7721,7 @@ class MonthEvent extends EventBase {
             innerHTML: this.getMoreIndicatorText(count),
             attrs: {
                 'tabindex': '0',
+                'data-count': count.toString(),
                 'data-start-date': startDate.getTime().toString(),
                 'data-end-date': endDate.getTime().toString(),
                 'role': 'list'
@@ -15750,7 +15757,7 @@ let Schedule = class Schedule extends Component {
                 };
                 this.trigger(navigating, navArgs, (navigationArgs) => {
                     if (!navigationArgs.cancel) {
-                        this.uiStateValues.isInitial = ['TimelineMonth', 'TimelineYear', 'Year'].indexOf(view) > -1 ? true : this.uiStateValues.isInitial;
+                        this.uiStateValues.isInitial = view.indexOf('Timeline') > -1 || this.currentView.indexOf('Timeline') > -1 ? true : this.uiStateValues.isInitial;
                         this.viewIndex = navigationArgs.viewIndex;
                         this.setProperties({ currentView: view }, true);
                         if (this.headerModule) {
@@ -24985,7 +24992,7 @@ class ICalendarExport {
             const editedExDate = [];
             if (eventObj[fields.recurrenceID]) {
                 const filter = this.filterEvents(filterCollection, fields.id, eventObj[fields.recurrenceID]);
-                uId = filter[0].UID;
+                uId = filter.length > 0 ? filter[0].UID : uId;
             }
             if (!eventObj[fields.recurrenceID] && eventObj[fields.recurrenceRule] && eventObj[fields.recurrenceException]) {
                 const exDate = (eventObj[fields.recurrenceException]).split(',');