@syncfusion/ej2-schedule 19.4.55 → 20.1.50

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

@@ -3631,6 +3631,10 @@ function generate(startDate, rule, excludeDate, startDayOfWeek, maximumCount = M
     }
     maxOccurrence = maximumCount;
     setFirstDayOfWeek(DAYINDEX[startDayOfWeek]);
+    if (ruleObject.until) {
+        const end = resetTime(ruleObject.until);
+        ruleObject.until = new Date(end.getFullYear(), end.getMonth(), end.getDate(), 23, 59, 59);
+    }
     switch (ruleObject.freq) {
         case 'DAILY':
             dailyType(modifiedDate, ruleObject.until, data, ruleObject);
@@ -3727,6 +3731,9 @@ function dailyType(startDate, endDate, data, ruleObject) {
             }
         }
         tempDate.setDate(tempDate.getDate() + interval);
+        if (tempDate.getHours() !== startDate.getHours()) {
+            tempDate.setHours(startDate.getHours());
+        }
     }
 }
 /**
@@ -3771,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);
             }
@@ -4652,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;
@@ -7096,7 +7106,7 @@ class MonthEvent extends EventBase {
         if (appElement.length > 0) {
             appElement = (this.parent.currentView === 'Month') ? appElement : [appElement[0]];
             for (const wrap of appElement) {
-                if (!wrap.classList.contains('e-more-indicator') && wrap.parentElement && wrap.parentElement.parentNode) {
+                if (wrap.parentElement && wrap.parentElement.parentNode) {
                     remove(wrap.parentElement);
                 }
             }
@@ -7226,11 +7236,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] :
@@ -7529,21 +7546,17 @@ class MonthEvent extends EventBase {
         if (day < 0) {
             return;
         }
-        if ((startTime.getTime() < this.parent.minDate.getTime()) || (endTime.getTime() > this.parent.maxDate.getTime())) {
-            return;
-        }
         const overlapCount = this.getIndex(startTime);
         event.Index = overlapCount;
-        let appHeight = this.eventHeight;
-        this.renderedEvents.push(extend({}, event, null, true));
         const diffInDays = event.data.count;
         if (startTime.getTime() <= endTime.getTime()) {
             const appWidth = (diffInDays * this.cellWidth) - 5;
             const cellTd = this.workCells[day];
-            const appTop = (overlapCount * (appHeight + EVENT_GAP));
-            const height = this.monthHeaderHeight + ((overlapCount + 1) * (appHeight + EVENT_GAP)) + this.moreIndicatorHeight;
+            const appTop = (overlapCount * (this.eventHeight + EVENT_GAP));
+            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.renderedEvents.push(extend({}, event, null, true));
                 let appointmentElement;
                 if (this.inlineValue) {
                     appointmentElement = this.parent.inlineModule.createInlineAppointmentElement();
@@ -7562,24 +7575,26 @@ class MonthEvent extends EventBase {
             }
             else {
                 for (let i = 0; i < diffInDays; i++) {
-                    const cellTd = this.workCells[day + i];
-                    if (cellTd && isNullOrUndefined(cellTd.querySelector('.' + MORE_INDICATOR_CLASS))) {
-                        const startDate = new Date(this.dateRender[day + i].getTime());
-                        const endDate = addDays(this.dateRender[day + i], 1);
-                        const groupIndex = cellTd.getAttribute('data-group-index');
-                        const filterEvents = this.getFilteredEvents(startDate, endDate, groupIndex);
-                        const appArea = this.cellHeight - this.monthHeaderHeight - this.moreIndicatorHeight;
-                        appHeight = this.withIndicator ? appArea : appHeight;
-                        const renderedAppCount = Math.floor(appArea / (appHeight + EVENT_GAP));
-                        const count = (filterEvents.length - renderedAppCount) <= 0 ? 1 : (filterEvents.length - renderedAppCount);
-                        const moreIndicatorElement = this.getMoreIndicatorElement(count, startDate, endDate);
-                        if (!isNullOrUndefined(groupIndex)) {
-                            moreIndicatorElement.setAttribute('data-group-index', groupIndex);
+                    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 = appArea + 'px';
-                        moreIndicatorElement.style.width = this.cellWidth - 2 + 'px';
-                        this.renderElement(cellTd, moreIndicatorElement);
-                        EventHandler.add(moreIndicatorElement, 'click', this.moreIndicatorClick, this);
                     }
                 }
             }
@@ -7615,8 +7630,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);
@@ -7697,9 +7712,10 @@ class MonthEvent extends EventBase {
     getMoreIndicatorElement(count, startDate, endDate) {
         const moreIndicatorElement = createElement('div', {
             className: MORE_INDICATOR_CLASS,
-            innerHTML: '+' + this.parent.globalize.formatNumber(count) + '&nbsp;' + (this.parent.isAdaptive ? '' : this.parent.localeObj.getConstant('more')),
+            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'
@@ -7707,6 +7723,9 @@ class MonthEvent extends EventBase {
         });
         return moreIndicatorElement;
     }
+    getMoreIndicatorText(count) {
+        return '+' + this.parent.globalize.formatNumber(count) + '&nbsp;' + (this.parent.isAdaptive ? '' : this.parent.localeObj.getConstant('more'));
+    }
     removeHeightProperty(selector) {
         const rows = [].slice.call(this.element.querySelectorAll('.' + selector + ' tbody tr'));
         for (const row of rows) {
@@ -7986,7 +8005,8 @@ class TimelineEvent extends MonthEvent {
         }
     }
     updateCellHeight(cell, height) {
-        if ((height > this.cellHeight)) {
+        const cellHeight = cell.style.height === '' ? this.cellHeight : parseInt(cell.style.height, 10);
+        if (height > cellHeight) {
             setStyleAttribute(cell, { 'height': height + 'px' });
             if (this.parent.activeViewOptions.group.resources.length > 0) {
                 const resourceCell = this.parent.element.querySelector('.' + RESOURCE_COLUMN_TABLE_CLASS + ' ' + 'tbody td[data-group-index="' +
@@ -11730,7 +11750,8 @@ class EventWindow {
         return labelText;
     }
     onChange(args) {
-        const target = args.event.currentTarget.querySelector('input');
+        const targetSelector = `.${EVENT_WINDOW_ALL_DAY_CLASS},.${TIME_ZONE_CLASS},.${EVENT_WINDOW_REPEAT_CLASS}`;
+        const target = closest(args.event.target, targetSelector);
         if (target.classList.contains(EVENT_WINDOW_ALL_DAY_CLASS)) {
             this.onAllDayChange(args.checked);
         }
@@ -11894,7 +11915,8 @@ class EventWindow {
     }
     showDetails(eventData) {
         const eventObj = extend({}, eventData, null, true);
-        if (eventObj[this.fields.endTime].getHours() === 0 && eventObj[this.fields.endTime].getMinutes() === 0) {
+        if ((!this.cellClickAction || this.cellClickAction && !isNullOrUndefined(this.parent.editorTemplate)) &&
+            eventObj[this.fields.endTime].getHours() === 0 && eventObj[this.fields.endTime].getMinutes() === 0) {
             this.trimAllDay(eventObj);
         }
         this.eventData = eventObj;
@@ -13182,7 +13204,8 @@ class Render {
             this.parent.virtualScrollModule.destroy();
             this.parent.virtualScrollModule = null;
         }
-        if (this.parent.currentView.indexOf('Timeline') !== -1 && this.parent.currentView.indexOf('Year') === -1
+        if (this.parent.currentView.indexOf('Timeline') !== -1 && (this.parent.currentView.indexOf('Year') === -1 ||
+            (this.parent.currentView === 'TimelineYear' && this.parent.activeViewOptions.orientation === 'Vertical'))
             && this.parent.activeViewOptions.allowVirtualScrolling
             && this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
             this.parent.virtualScrollModule = new VirtualScroll(this.parent);
@@ -15728,6 +15751,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.viewIndex = navigationArgs.viewIndex;
                         this.setProperties({ currentView: view }, true);
                         if (this.headerModule) {
@@ -16346,6 +16370,9 @@ let Schedule = class Schedule extends Component {
                 if (document.querySelectorAll(template).length) {
                     return compile(document.querySelector(template).innerHTML.trim());
                 }
+                else {
+                    return compile(template);
+                }
             }
             catch (error) {
                 return compile(template);
@@ -19151,7 +19178,9 @@ class YearEvent extends TimelineEvent {
         this.eventHeight = getElementHeightFromClass(eventTable, APPOINTMENT_CLASS);
         const wrapperCollection = [].slice.call(this.parent.element.querySelectorAll('.' + APPOINTMENT_CONTAINER_CLASS));
         const resources = this.parent.uiStateValues.isGroupAdaptive ?
-            [this.parent.resourceBase.lastResourceLevel[this.parent.uiStateValues.groupIndex]] : this.parent.resourceBase.lastResourceLevel;
+            [this.parent.resourceBase.lastResourceLevel[this.parent.uiStateValues.groupIndex]] :
+            this.parent.activeViewOptions.allowVirtualScrolling ? this.parent.resourceBase.renderedResources :
+                this.parent.resourceBase.lastResourceLevel;
         const months = this.getMonths();
         if (this.parent.activeViewOptions.orientation === 'Horizontal') {
             for (let month = 0; month < months.length; month++) {
@@ -21930,8 +21959,9 @@ class VerticalView extends ViewBase {
         const msStartHour = startHour.getTime();
         const msEndHour = endHour.getTime();
         if (msStartHour !== msEndHour) {
+            const duration = this.parent.activeViewOptions.timeScale.interval / this.parent.activeViewOptions.timeScale.slotCount;
             length = (Math.abs(msEndHour - msStartHour) / msInterval) - ((new Date(msEndHour).getTimezoneOffset()
-                - new Date(msStartHour).getTimezoneOffset()) / (60 / this.parent.activeViewOptions.timeScale.slotCount));
+                - new Date(msStartHour).getTimezoneOffset()) / duration);
         }
         if (!this.parent.activeViewOptions.timeScale.enable) {
             length = 1;
@@ -22106,6 +22136,8 @@ class Month extends ViewBase {
         this.parent.notify(virtualScroll, e);
         this.scrollTopPanel(e.target);
         this.scrollLeftPanel(e.target);
+        this.parent.uiStateValues.top = e.target.scrollTop;
+        this.parent.uiStateValues.left = e.target.scrollLeft;
         this.setPersistence();
     }
     scrollLeftPanel(target) {
@@ -22138,26 +22170,41 @@ class Month extends ViewBase {
             header.style[args.cssProperties.padding] = '';
         }
         this.setColWidth(content);
-        if (args.scrollPosition) {
+        if (args.scrollPosition || !args.isPreventScrollUpdate && this.parent.currentView === 'TimelineMonth') {
+            const top = this.parent.currentView === 'TimelineMonth' ? this.parent.uiStateValues.top : args.scrollPosition.top;
             if (leftPanel) {
-                leftPanel.scrollTop = args.scrollPosition.top;
+                leftPanel.scrollTop = top;
             }
-            content.scrollTop = args.scrollPosition.top;
-            content.scrollLeft = args.scrollPosition.left;
-        }
-        else {
-            const headerCell = this.element.querySelector('.' + HEADER_CELLS_CLASS + '[data-date="'
-                + this.parent.selectedDate.getTime().toString() + '"]');
-            if (!isNullOrUndefined(headerCell)) {
-                content.scrollLeft = !this.parent.enableRtl ?
-                    headerCell.offsetLeft : -(this.parent.getContentTable().offsetWidth - headerCell.offsetLeft - headerCell.offsetWidth);
+            content.scrollTop = top;
+            if (this.parent.uiStateValues.isInitial) {
+                this.scrollToSelectedDate();
+                this.parent.uiStateValues.isInitial = false;
             }
             else {
-                content.scrollLeft = 0;
+                content.scrollLeft = this.parent.currentView === 'TimelineMonth' ? this.parent.uiStateValues.left :
+                    args.scrollPosition.left;
             }
         }
+        else {
+            this.scrollToSelectedDate();
+        }
         this.retainScrollPosition();
     }
+    scrollToSelectedDate() {
+        const headerCell = this.element.querySelector('.' + HEADER_CELLS_CLASS + '[data-date="'
+            + this.parent.selectedDate.getTime().toString() + '"]');
+        const content = this.getContentAreaElement();
+        if (!isNullOrUndefined(headerCell)) {
+            content.scrollLeft = !this.parent.enableRtl ?
+                headerCell.offsetLeft : -(this.parent.getContentTable().offsetWidth - headerCell.offsetLeft - headerCell.offsetWidth);
+        }
+        else {
+            content.scrollLeft = 0;
+        }
+        if (content.scrollLeft === 0 && this.parent.uiStateValues.isInitial) {
+            this.parent.uiStateValues.left = 0;
+        }
+    }
     setContentHeight(content, leftPanelElement, height) {
         content.style.height = 'auto';
         if (this.parent.currentView === 'Month') {
@@ -22712,6 +22759,9 @@ class Year extends ViewBase {
         const viewTypeClass = this.parent.activeViewOptions.orientation === 'Horizontal' ? 'e-horizontal' : 'e-vertical';
         addClass([this.element], [this.viewClass, viewTypeClass, className]);
         this.renderPanel(className);
+        if (this.parent.activeViewOptions.allowVirtualScrolling) {
+            addClass([this.element], [VIRTUAL_SCROLL_CLASS]);
+        }
         const calendarTable = this.createTableLayout(OUTER_TABLE_CLASS);
         this.element.appendChild(calendarTable);
         this.element.querySelector('table').setAttribute('role', 'presentation');
@@ -22924,6 +22974,7 @@ class Year extends ViewBase {
     onContentScroll(e) {
         const target = e.target;
         const headerWrapper = this.getDatesHeaderElement();
+        this.parent.notify(virtualScroll, e);
         if (headerWrapper) {
             headerWrapper.firstElementChild.scrollLeft = target.scrollLeft;
         }
@@ -22932,6 +22983,10 @@ class Year extends ViewBase {
         if (scrollTopElement) {
             scrollTopElement.scrollTop = target.scrollTop;
         }
+        if (!this.parent.isAdaptive) {
+            this.parent.uiStateValues.top = e.target.scrollTop;
+        }
+        this.parent.uiStateValues.left = e.target.scrollLeft;
         this.setPersistence();
     }
     onScrollUiUpdate(args) {
@@ -22962,6 +23017,18 @@ class Year extends ViewBase {
             const isYScroll = contentWrapper.scrollWidth > contentWrapper.clientWidth;
             leftPanelElement.style.height = formatUnit(height - (isYScroll ? 17 : 0));
         }
+        if (!args.isPreventScrollUpdate) {
+            if (this.parent.uiStateValues.isInitial) {
+                this.parent.uiStateValues.isInitial = false;
+            }
+            else {
+                if (leftPanelElement) {
+                    leftPanelElement.scrollTop = this.parent.uiStateValues.top;
+                }
+                contentWrapper.scrollTop = this.parent.uiStateValues.top;
+                contentWrapper.scrollLeft = this.parent.uiStateValues.left;
+            }
+        }
         this.retainScrollPosition();
     }
     getStartDate() {
@@ -23064,7 +23131,7 @@ class AgendaBase extends ViewBase {
                 moduleName: 'agenda',
                 listClass: this.parent.activeView.viewClass,
                 itemClass: this.parent.activeView.viewClass,
-                template: '<div class=' + AGENDA_NO_EVENT_CLASS + '>${subject}</div>'
+                template: `<div class="${AGENDA_NO_EVENT_CLASS}">${this.parent.localeObj.getConstant('noEvents')}</div>`
             });
         }
         else {
@@ -24608,7 +24675,7 @@ class TimelineYear extends Year {
             !this.parent.uiStateValues.isGroupAdaptive) {
             tdCollection.push(firstTd);
             firstTd.appendChild(this.parent.resourceBase.createResourceColumn());
-            this.rowCount = this.parent.resourceBase.lastResourceLevel.length;
+            this.rowCount = this.parent.resourceBase.renderedResources.length;
         }
         else {
             tdCollection.push(firstTd);
@@ -24625,6 +24692,9 @@ class TimelineYear extends Year {
         content.appendChild(contentTable);
         const eventWrapper = createElement('div', { className: EVENT_TABLE_CLASS });
         content.appendChild(eventWrapper);
+        if (this.parent.virtualScrollModule) {
+            this.parent.virtualScrollModule.renderVirtualTrack(content);
+        }
         const contentTBody = contentTable.querySelector('tbody');
         if (this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
             if (this.parent.rowAutoHeight) {
@@ -24742,6 +24812,47 @@ class TimelineYear extends Year {
             }
         }
     }
+    getContentRows() {
+        const tRow = [];
+        const monthCells = this.getMonths();
+        for (let row = 0; row < this.parent.resourceBase.renderedResources.length; row++) {
+            const tr = createElement('tr', { attrs: { 'role': 'row' } });
+            tRow.push(tr);
+            let resData;
+            if (this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
+                resData = this.parent.resourceBase.renderedResources[row];
+            }
+            let monthDate = new Date(this.parent.selectedDate.getFullYear(), monthCells[row], 1);
+            let date = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
+            for (let month = 0; month < this.columnCount; month++) {
+                let classList$$1 = [];
+                const groupIndex = resData.groupIndex;
+                classList$$1 = classList$$1.concat(resData.className);
+                if (classList$$1.indexOf(RESOURCE_PARENT_CLASS) > -1) {
+                    classList$$1.push(RESOURCE_GROUP_CELLS_CLASS);
+                }
+                else {
+                    classList$$1.push(WORKDAY_CLASS);
+                }
+                monthDate = new Date(this.parent.selectedDate.getFullYear(), monthCells[month], 1);
+                date = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
+                const tdELe = createElement('td', {
+                    className: WORK_CELLS_CLASS,
+                    attrs: {
+                        'role': 'gridcell', 'aria-selected': 'false',
+                        'data-date': date.getTime().toString()
+                    }
+                });
+                addClass([tdELe], classList$$1);
+                tdELe.setAttribute('data-group-index', groupIndex.toString());
+                this.renderCellTemplate({ date: date, type: 'resourceGroupCells', groupIndex: groupIndex }, tdELe);
+                this.wireEvents(tdELe, 'cell');
+                this.parent.trigger(renderCell, { elementType: 'resourceGroupCells', element: tdELe, date: date });
+                tr.appendChild(tdELe);
+            }
+        }
+        return tRow;
+    }
     renderResourceContent(wrapper, monthBody, contentBody) {
         const months = this.getMonths();
         for (let row = 0; row < this.rowCount; row++) {
@@ -24749,8 +24860,8 @@ class TimelineYear extends Year {
             const tr = createElement('tr', { attrs: { 'role': 'row' } });
             contentBody.appendChild(tr);
             let resData;
-            if (this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
-                resData = this.parent.resourceBase.lastResourceLevel[row];
+            if (this.parent.activeViewOptions.orientation === 'Vertical' && this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
+                resData = this.parent.resourceBase.renderedResources[row];
             }
             let monthDate = new Date(this.parent.selectedDate.getFullYear(), months[row], 1);
             let date = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
@@ -24771,8 +24882,9 @@ class TimelineYear extends Year {
             }
             for (let month = 0; month < this.columnCount; month++) {
                 let classList$$1 = [];
-                let groupIndex = row;
+                let groupIndex;
                 if (this.parent.activeViewOptions.orientation === 'Vertical') {
+                    groupIndex = resData.groupIndex;
                     classList$$1 = classList$$1.concat(resData.className);
                     if (classList$$1.indexOf(RESOURCE_PARENT_CLASS) > -1) {
                         classList$$1.push(RESOURCE_GROUP_CELLS_CLASS);
@@ -24874,7 +24986,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(',');