@syncfusion/ej2-schedule 26.2.14 → 27.1.50

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

@@ -1084,10 +1084,12 @@ class HeaderRenderer {
                 items: args.items,
                 overflowMode: 'Popup',
                 clicked: this.toolbarClickHandler.bind(this),
+                created: this.toolbarCreateHandler.bind(this),
                 enableRtl: this.parent.enableRtl,
                 enableHtmlSanitizer: this.parent.enableHtmlSanitizer,
                 locale: this.parent.locale
             });
+            this.toolbarObj.isStringTemplate = true;
             this.toolbarObj.root = this.parent.root ? this.parent.root : this.parent;
             this.toolbarObj.appendTo(this.parent.element.querySelector('.' + HEADER_TOOLBAR));
             this.toolbarObj.element.setAttribute('aria-label', 'Scheduler');
@@ -1516,6 +1518,12 @@ class HeaderRenderer {
         const views = [].slice.call(this.element.querySelectorAll('.e-views'));
         return views.indexOf(target);
     }
+    toolbarCreateHandler() {
+        if (this.parent && this.parent.portals && this.toolbarObj && this.toolbarObj.portals) {
+            this.parent.portals = this.parent.portals.concat(this.toolbarObj.portals);
+            this.parent['renderReactTemplates']();
+        }
+    }
     toolbarClickHandler(args) {
         if (!args.item) {
             return;
@@ -1659,7 +1667,7 @@ class HeaderRenderer {
         let firstDate = new Date(dates[0].getTime());
         let lastDate = new Date(dates[dates.length - 1].getTime());
         if (this.parent.currentView === 'WorkWeek' || this.parent.currentView === 'TimelineWorkWeek') {
-            firstDate = getWeekFirstDate(resetTime(this.parent.selectedDate), this.parent.firstDayOfWeek);
+            firstDate = getWeekFirstDate(resetTime(this.parent.selectedDate), this.parent.activeViewOptions.firstDayOfWeek);
             lastDate = addDays(firstDate, 7 * this.parent.activeViewOptions.interval);
         }
         else if (this.parent.currentView === 'Month') {
@@ -2085,7 +2093,9 @@ class KeyboardInteraction {
             ctrlShiftUpArrow: 'ctrl+shift+uparrow',
             ctrlShiftDownArrow: 'ctrl+shift+downarrow',
             ctrlShiftLeftArrow: 'ctrl+shift+leftarrow',
-            ctrlShiftRightArrow: 'ctrl+shift+rightarrow'
+            ctrlShiftRightArrow: 'ctrl+shift+rightarrow',
+            shiftAltY: 'shift+alt+y',
+            shiftAltN: 'shift+alt+n'
         };
         this.parent = parent;
         this.parent.element.tabIndex = this.parent.element.tabIndex === -1 ? 0 : this.parent.element.tabIndex;
@@ -2166,6 +2176,43 @@ class KeyboardInteraction {
                     this.processFTwelve(e);
                 }
                 break;
+            case 'shiftAltY':
+                this.parent.changeDate(new Date(), e);
+                break;
+            case 'shiftAltN':
+                if (this.parent.currentView === 'Agenda' || this.parent.currentView === 'MonthAgenda' ||
+                    this.parent.currentView === 'Year') {
+                    return;
+                }
+                this.processShiftAltN(e);
+                break;
+        }
+    }
+    processShiftAltN(e) {
+        const selectedCells = this.parent.getSelectedCells();
+        const target = e.target;
+        let cellData = extend({}, null, true);
+        if (selectedCells.length > 0 && (closest(target, '.' + WORK_CELLS_CLASS)
+            || closest(target, '.' + ALLDAY_CELLS_CLASS) || closest(target, '.' + HEADER_CELLS_CLASS))) {
+            cellData = this.getSelectedElements(target);
+        }
+        else if (closest(target, '.' + APPOINTMENT_CLASS) && !isNullOrUndefined(this.parent.activeEventData.event)) {
+            const event = this.parent.activeEventData.event;
+            cellData.startTime = event.StartTime;
+            cellData.endTime = event.EndTime;
+            cellData.isAllDay = event.IsAllDay;
+        }
+        else {
+            const workHour = this.parent.getStartEndTime(this.parent.workHours.start);
+            const slotInterval = this.parent.activeViewOptions.timeScale.interval /
+                this.parent.activeViewOptions.timeScale.slotCount;
+            cellData.startTime = new Date(this.parent.selectedDate);
+            cellData.startTime.setHours(workHour.getHours(), workHour.getMinutes(), 0, 0);
+            cellData.endTime = new Date(cellData.startTime.getTime() + slotInterval * 60000);
+        }
+        const args = extend(cellData, { cancel: false, event: e });
+        if (args != null) {
+            this.parent.eventWindow.openEditor(args, 'Add');
         }
     }
     processFTwelve(e) {
@@ -2586,8 +2633,11 @@ class KeyboardInteraction {
         return this.parent.eventBase.selectWorkCellByTime([selectedObject]);
     }
     processViewNavigation(e) {
-        const index = parseInt(e.key, 10) - 1;
-        if (!isNullOrUndefined(this.parent.views) && index < this.parent.views.length) {
+        if (isNullOrUndefined(e.code)) {
+            return;
+        }
+        const index = parseInt(e.code.slice(e.code.length - 1), 10) - 1;
+        if (!isNaN(index) && !isNullOrUndefined(this.parent.views) && index < this.parent.views.length) {
             const view = this.parent.viewCollections[parseInt(index.toString(), 10)].option;
             this.parent.changeView(view, e, undefined, index);
             if (this.parent.headerModule) {
@@ -6304,7 +6354,7 @@ class EventBase {
         this.parent.activeEventData = { event: eventObject, element: target };
     }
     generateOccurrence(event, viewDate, isMaxCount) {
-        const startDate = event[this.parent.eventFields.startTime];
+        let startDate = event[this.parent.eventFields.startTime];
         const endDate = event[this.parent.eventFields.endTime];
         const eventRule = event[this.parent.eventFields.recurrenceRule];
         const timeZoneDiff = endDate.getTimezoneOffset() - startDate.getTimezoneOffset();
@@ -6318,6 +6368,10 @@ class EventBase {
         const newTimezone = this.parent.timezone || this.parent.tzModule.getLocalTimezoneName();
         const firstDay = this.parent.activeViewOptions.firstDayOfWeek;
         const calendarMode = this.parent.calendarMode;
+        if (event[this.parent.eventFields.recurrenceRule] && event[this.parent.eventFields.recurrenceRule].includes('BYMONTHDAY') &&
+            this.parent.timezone && event[this.parent.eventFields.startTimezone] && event[this.parent.eventFields.endTimezone]) {
+            startDate = this.parent.tzModule.convert(event[this.parent.eventFields.startTime], this.parent.timezone, event[this.parent.eventFields.startTimezone]);
+        }
         const dates = generate(startDate, eventRule, exception, firstDay, maxCount, viewDate, calendarMode, newTimezone);
         if (this.parent.currentView === 'Agenda' && eventRule.indexOf('COUNT') === -1 && eventRule.indexOf('UNTIL') === -1) {
             if (isNullOrUndefined(event.generatedDates)) {
@@ -6332,10 +6386,18 @@ class EventBase {
                 }
             }
         }
+        let isDSTAdjusted = false;
+        let convertedDates = [];
+        if (event[this.parent.eventFields.recurrenceRule] && event[this.parent.eventFields.recurrenceRule].includes('BYMONTHDAY') &&
+            this.parent.timezone && event[this.parent.eventFields.startTimezone] && event[this.parent.eventFields.endTimezone]) {
+            isDSTAdjusted = true;
+            convertedDates.push(...dates.map((date) => this.parent.tzModule.convert(new Date(date), event[this.parent.eventFields.startTimezone], this.parent.timezone).getTime()));
+        }
+        convertedDates = convertedDates.length > 0 ? convertedDates : dates;
         const occurrenceCollection = [];
-        for (let date of dates) {
+        for (let date of convertedDates) {
             const clonedObject = extend({}, event, null, true);
-            date = this.getDSTAdjustedTime(date, clonedObject);
+            date = !isDSTAdjusted ? this.getDSTAdjustedTime(date, clonedObject) : date;
             clonedObject[this.parent.eventFields.startTime] = new Date(date);
             clonedObject[this.parent.eventFields.endTime] = new Date(new Date(date).setMilliseconds(duration));
             clonedObject[this.parent.eventFields.recurrenceID] = clonedObject[this.parent.eventFields.id];
@@ -7910,7 +7972,10 @@ class MonthEvent extends EventBase {
         if (this.parent.crudModule && this.parent.crudModule.crudObj.isCrudAction) {
             for (let i = 0, len = this.parent.crudModule.crudObj.sourceEvent.length; i < len; i++) {
                 const sourceRes = this.parent.crudModule.crudObj.sourceEvent[parseInt(i.toString(), 10)];
-                this.renderEventsHandler(sourceRes.renderDates, sourceRes.workDays, sourceRes);
+                if (!this.parent.uiStateValues.isGroupAdaptive ||
+                    (this.parent.uiStateValues.groupIndex === sourceRes.groupIndex && this.parent.uiStateValues.isGroupAdaptive)) {
+                    this.renderEventsHandler(sourceRes.renderDates, sourceRes.workDays, sourceRes);
+                }
                 if (this.parent.crudModule.crudObj.sourceEvent[parseInt(i.toString(), 10)].groupIndex !==
                     this.parent.crudModule.crudObj.targetEvent[parseInt(i.toString(), 10)].groupIndex) {
                     const target = this.parent.crudModule.crudObj.targetEvent[parseInt(i.toString(), 10)];
@@ -8375,7 +8440,10 @@ class TimelineEvent extends MonthEvent {
             for (let i = 0, len = this.parent.crudModule.crudObj.sourceEvent.length; i < len; i++) {
                 const source = this.parent.crudModule.crudObj.sourceEvent[parseInt(i.toString(), 10)];
                 this.rowIndex = source.groupIndex;
-                this.renderEventsHandler(this.parent.activeView.renderDates, this.parent.activeViewOptions.workDays, source);
+                if (!this.parent.uiStateValues.isGroupAdaptive ||
+                    (this.parent.uiStateValues.groupIndex === source.groupIndex && this.parent.uiStateValues.isGroupAdaptive)) {
+                    this.renderEventsHandler(this.parent.activeView.renderDates, this.parent.activeViewOptions.workDays, source);
+                }
                 if (this.parent.crudModule.crudObj.targetEvent[parseInt(i.toString(), 10)] && this.parent.crudModule.crudObj.sourceEvent[parseInt(i.toString(), 10)].groupIndex !==
                     this.parent.crudModule.crudObj.targetEvent[parseInt(i.toString(), 10)].groupIndex) {
                     const target = this.parent.crudModule.crudObj.targetEvent[parseInt(i.toString(), 10)];
@@ -8928,7 +8996,15 @@ class InlineEdit {
                 subjectWrap.insertBefore(inlineSubject, subjectWrap.firstChild);
             }
             else {
-                args.element.querySelector('.e-appointment-details').prepend(inlineSubject);
+                const elementSelector = ['TimelineDay', 'TimelineWeek', 'TimelineWorkWeek', 'TimelineMonth'].indexOf(this.parent.currentView) > -1 ?
+                    '.e-inner-wrap' : '.e-appointment-details';
+                const innerWrapElement = args.element.querySelector(elementSelector);
+                if (isNullOrUndefined(innerWrapElement)) {
+                    args.element.querySelector('.e-appointment-details').prepend(inlineSubject);
+                }
+                else {
+                    innerWrapElement.prepend(inlineSubject);
+                }
             }
             inlineSubject.focus();
         }
@@ -13905,6 +13981,7 @@ class VirtualScroll {
             firstTDIndex = (endIndex > this.parent.resourceBase.expandedResources.length) ?
                 (this.parent.resourceBase.expandedResources.length - this.renderedLength) : firstTDIndex;
             firstTDIndex = firstTDIndex < 0 ? 0 : firstTDIndex;
+            this.existingDataCollection = this.parent.resourceBase.renderedResources;
             this.parent.resourceBase.renderedResources = this.parent.resourceBase.expandedResources.slice(firstTDIndex, endIndex);
             if (this.parent.resourceBase.renderedResources.length > 0) {
                 this.updateContent(resWrap, conWrap, eventWrap, this.parent.resourceBase.renderedResources);
@@ -13953,6 +14030,7 @@ class VirtualScroll {
             const scrollHeight = this.parent.rowAutoHeight ?
                 (conTable.offsetHeight - conWrap.offsetHeight) : this.bufferCount * this.itemSize;
             let resCollection = [];
+            this.existingDataCollection = this.parent.resourceBase.renderedResources;
             if ((conWrap.scrollTop) - this.translateY < 0) {
                 resCollection = this.upScroll(conWrap, firstTDIndex);
             }
@@ -14150,18 +14228,47 @@ class VirtualScroll {
             this.parent.element.focus();
         }
         for (let i = 0; i < renderedLength; i++) {
-            remove(resWrap.querySelector('tbody tr'));
-            remove(conWrap.querySelector('tbody tr'));
             remove(eventWrap.querySelector('div'));
         }
         this.parent.resourceBase.renderedResources = resCollection;
+        const currentGroupIndices = this.parent.activeView.getGroupIndices(resCollection);
+        const previousGroupIndices = this.parent.activeView.getGroupIndices(this.existingDataCollection);
+        const newGroupIndices = currentGroupIndices.filter((index) => previousGroupIndices.indexOf(index) < 0);
+        const resWrapRows = Array.from(resWrap.querySelectorAll('tbody tr'));
+        const conWrapRows = Array.from(conWrap.querySelectorAll('tbody tr'));
+        const resWrapBody = resWrap.querySelector('tbody');
+        const conWrapBody = conWrap.querySelector('tbody');
+        this.removeObsoleteRows(resWrapRows, currentGroupIndices);
+        this.removeObsoleteRows(conWrapRows, currentGroupIndices);
         const resourceRows = this.parent.resourceBase.getContentRows(resCollection, true);
         const contentRows = this.parent.activeView.getContentRows();
         const eventRows = this.parent.activeView.getEventRows(resCollection.length);
-        append(resourceRows, resWrap.querySelector('tbody'));
-        append(contentRows, conWrap.querySelector('tbody'));
+        for (let i = 0; i < newGroupIndices.length; i++) {
+            const index = currentGroupIndices.indexOf(newGroupIndices[parseInt(i.toString(), 10)]);
+            if (index === 0) {
+                prepend([resourceRows[parseInt(i.toString(), 10)]], resWrapBody);
+                prepend([contentRows[parseInt(i.toString(), 10)]], conWrapBody);
+            }
+            else if (resWrapBody && conWrapBody && resWrapBody.children[parseInt(index.toString(), 10)] &&
+                conWrapBody.children[parseInt(index.toString(), 10)]) {
+                resWrapBody.insertBefore(resourceRows[parseInt(i.toString(), 10)], resWrapBody.children[parseInt(index.toString(), 10)]);
+                conWrapBody.insertBefore(contentRows[parseInt(i.toString(), 10)], conWrapBody.children[parseInt(index.toString(), 10)]);
+            }
+            else {
+                append([resourceRows[parseInt(i.toString(), 10)]], resWrapBody);
+                append([contentRows[parseInt(i.toString(), 10)]], conWrapBody);
+            }
+        }
         append(eventRows, eventWrap);
     }
+    removeObsoleteRows(elements, currentGroupIndices) {
+        elements.forEach((element) => {
+            const groupIndex = parseInt(element.firstElementChild.getAttribute('data-group-index'), 10);
+            if (currentGroupIndices.indexOf(groupIndex) < 0) {
+                remove(element);
+            }
+        });
+    }
     updateHorizontalContent(conWrap, resCollection) {
         this.existingDataCollection = this.parent.resourceBase.expandedResources;
         this.parent.resourceBase.expandedResources = resCollection;
@@ -14653,10 +14760,10 @@ class Crud {
             addedRecords: args.editParams.addedRecords, changedRecords: args.editParams.changedRecords,
             deletedRecords: args.editParams.deletedRecords
         };
-        if (this.parent.dragAndDropModule && this.parent.dragAndDropModule.actionObj && this.parent.dragAndDropModule.actionObj.element) {
+        if (this.parent.dragAndDropModule && this.parent.dragAndDropModule.actionObj && this.parent.dragAndDropModule.actionObj.element && this.parent.dragAndDropModule.actionObj.action) {
             this.parent.dragAndDropModule.actionObj.element.style.display = 'none';
         }
-        if (this.parent.resizeModule && this.parent.resizeModule.actionObj && this.parent.resizeModule.actionObj.element) {
+        if (this.parent.resizeModule && this.parent.resizeModule.actionObj && this.parent.resizeModule.actionObj.element && this.parent.resizeModule.actionObj.action) {
             this.parent.resizeModule.actionObj.element.style.display = 'none';
         }
         if (this.parent.isSpecificResourceEvents()) {
@@ -15727,7 +15834,11 @@ class ResourceBase {
         const resColl = this.resourceCollection;
         const tr = createElement('tr');
         const td = createElement('td', { attrs: { tabindex: isVirtualScroll ? '-1' : '0' } });
+        const existingGroupIndices = this.parent.activeView.getGroupIndices();
         for (let i = 0; i < resData.length; i++) {
+            if (existingGroupIndices.length > 0 && existingGroupIndices.indexOf(resData[parseInt(i.toString(), 10)].groupIndex) > -1) {
+                continue;
+            }
             const ntd = td.cloneNode();
             rIndex = findIndexInData(resColl, 'name', resData[parseInt(i.toString(), 10)].resource.name);
             if (rIndex === resColl.length - 1) {
@@ -15906,6 +16017,7 @@ class ResourceBase {
         this.setExpandedResources();
         const resourceCount = this.parent.virtualScrollModule.getRenderedCount();
         const startIndex = this.expandedResources.indexOf(this.renderedResources[0]);
+        this.parent.virtualScrollModule.existingDataCollection = this.renderedResources;
         this.renderedResources = this.expandedResources.slice(startIndex, startIndex + resourceCount);
         if (this.renderedResources.length < resourceCount) {
             let sIndex = this.expandedResources.length - resourceCount;
@@ -17936,7 +18048,8 @@ let Schedule = class Schedule extends Component {
     }
     onScheduleResize() {
         if (isNullOrUndefined(this.activeView) || ((this.isAdaptive || isMobile()) && document.activeElement
-            && document.activeElement.classList.contains(SUBJECT_CLASS)) || this.uiStateValues.isTapHold) {
+            && (document.activeElement.classList.contains(SUBJECT_CLASS) ||
+                document.activeElement.classList.contains(INLINE_SUBJECT_CLASS))) || this.uiStateValues.isTapHold) {
             return;
         }
         if (this.virtualScrollModule && this.activeView.isTimelineView()) {
@@ -20541,6 +20654,7 @@ class Resize extends ActionBase {
         EventHandler.remove(document, Browser.touchEndEvent, this.resizeStop);
         clearInterval(this.actionObj.scrollInterval);
         this.actionObj.scrollInterval = null;
+        this.actionObj.action = null;
         this.removeCloneElementClasses();
         this.removeCloneElement();
         this.actionClass('removeClass');
@@ -20887,8 +21001,8 @@ class YearEvent extends TimelineEvent {
             const monthDate = new Date(this.parent.selectedDate.getFullYear(), month, 1);
             const monthStart = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
             const monthEnd = this.parent.calendarUtil.getMonthEndDate(new Date(monthDate.getTime()));
-            let startDate = getWeekFirstDate(monthStart, this.parent.firstDayOfWeek);
-            const endDate = addDays(getWeekLastDate(monthEnd, this.parent.firstDayOfWeek), 1);
+            let startDate = getWeekFirstDate(monthStart, this.parent.activeViewOptions.firstDayOfWeek);
+            const endDate = addDays(getWeekLastDate(monthEnd, this.parent.activeViewOptions.firstDayOfWeek), 1);
             for (let index = 0; startDate.getTime() < endDate.getTime(); index++) {
                 const start = resetTime(new Date(startDate.getTime()));
                 const end = addDays(new Date(start.getTime()), 1);
@@ -23377,6 +23491,15 @@ class ViewBase {
             this.parent.resourceBase.expandedResources = this.colLevels[this.colLevels.length - 1];
         }
     }
+    getGroupIndices(dataCollection) {
+        let groupIndices = [];
+        if (this.parent.virtualScrollModule && this.parent.activeViewOptions.group.resources.length > 0 && (dataCollection ||
+            this.parent.virtualScrollModule.existingDataCollection.length > 0) && !this.parent.uiStateValues.isGroupAdaptive) {
+            dataCollection = isNullOrUndefined(dataCollection) ? this.parent.virtualScrollModule.existingDataCollection : dataCollection;
+            groupIndices = dataCollection.map((data) => data.groupIndex);
+        }
+        return groupIndices;
+    }
     destroy() {
         if (this.element && this.element.parentNode) {
             remove(this.element);
@@ -24033,17 +24156,13 @@ class VerticalView extends ViewBase {
         const rows = [];
         const tr = createElement('tr');
         const td = createElement('td', { attrs: { 'aria-selected': 'false' } });
-        let existingGroupIndices = new Set();
-        if (this.parent.virtualScrollModule && this.parent.activeViewOptions.group.resources.length > 0 &&
-            this.parent.virtualScrollModule.existingDataCollection.length > 0) {
-            existingGroupIndices = new Set(this.parent.virtualScrollModule.existingDataCollection.map((data) => data.groupIndex));
-        }
+        const existingGroupIndices = this.getGroupIndices();
         const handler = (r) => {
             const ntr = tr.cloneNode();
             for (const tdData of this.colLevels[this.colLevels.length - 1]) {
                 let isAllowTdCreation = true;
                 if (this.parent.virtualScrollModule && this.parent.activeViewOptions.group.resources.length > 0) {
-                    if (existingGroupIndices.has(tdData.groupIndex)) {
+                    if (existingGroupIndices.indexOf(tdData.groupIndex) > -1) {
                         isAllowTdCreation = false;
                     }
                 }
@@ -24772,7 +24891,13 @@ class Month extends ViewBase {
         const tr = createElement('tr');
         const td = createElement('td', { attrs: { 'aria-selected': 'false' } });
         const slotDatas = this.getContentSlots();
+        const isTimeline = this.parent.currentView === 'TimelineMonth';
+        const existingGroupIndices = isTimeline ? this.getGroupIndices() : [];
         for (let row = 0; row < slotDatas.length; row++) {
+            if (existingGroupIndices.length > 0 &&
+                existingGroupIndices.indexOf(slotDatas[parseInt(row.toString(), 10)][0].groupIndex) > -1) {
+                continue;
+            }
             const ntr = tr.cloneNode();
             for (let col = 0; col < slotDatas[parseInt(row.toString(), 10)].length; col++) {
                 const ntd = this.createContentTd(slotDatas[parseInt(row.toString(), 10)][parseInt(col.toString(), 10)], td);
@@ -25101,7 +25226,7 @@ class Year extends ViewBase {
         this.setAriaAttributes(contentTable);
         const thead = createElement('thead', { className: 'e-week-header' });
         const tr = createElement('tr');
-        let currentWeek = getWeekFirstDate(firstDateOfMonth(currentDate), this.parent.firstDayOfWeek);
+        let currentWeek = getWeekFirstDate(firstDateOfMonth(currentDate), this.parent.activeViewOptions.firstDayOfWeek);
         if (this.parent.activeViewOptions.showWeekNumber) {
             tr.appendChild(createElement('th'));
         }
@@ -25227,7 +25352,7 @@ class Year extends ViewBase {
         return dateCol;
     }
     getMonthDates(date) {
-        const startDate = getWeekFirstDate(firstDateOfMonth(date), this.parent.firstDayOfWeek);
+        const startDate = getWeekFirstDate(firstDateOfMonth(date), this.parent.activeViewOptions.firstDayOfWeek);
         const endDate = addDays(new Date(+startDate), (6 * WEEK_LENGTH));
         const dateCollection = [];
         for (let start = startDate; start.getTime() < endDate.getTime(); start = addDays(start, 1)) {
@@ -25359,10 +25484,10 @@ class Year extends ViewBase {
         return addDays(addMonths(this.getStartDate(), this.parent.monthsCount), -1);
     }
     startDate() {
-        return this.parent.currentView === 'Year' ? getWeekFirstDate(this.getStartDate(), this.parent.firstDayOfWeek) : this.getStartDate();
+        return this.parent.currentView === 'Year' ? getWeekFirstDate(this.getStartDate(), this.parent.activeViewOptions.firstDayOfWeek) : this.getStartDate();
     }
     endDate() {
-        return this.parent.currentView === 'Year' ? addDays(getWeekLastDate(this.getEndDate(), this.parent.firstDayOfWeek), 1) :
+        return this.parent.currentView === 'Year' ? addDays(getWeekLastDate(this.getEndDate(), this.parent.activeViewOptions.firstDayOfWeek), 1) :
             addDays(this.getEndDate(), 1);
     }
     getEndDateFromStartDate(start) {
@@ -26482,7 +26607,7 @@ class TimelineHeaderRow {
             const jsDate = +new Date(1970, 0, 1);
             const tzOffsetDiff = d.getTimezoneOffset() - new Date(1970, 0, 1).getTimezoneOffset();
             let key = Math.ceil(((((+d - jsDate) - (tzOffsetDiff * 60 * 1000)) / MS_PER_DAY) + new Date(jsDate).getDay() + 1) / 7);
-            if (this.parent.firstDayOfWeek && this.parent.firstDayOfWeek > new Date(+d).getDay()) {
+            if (this.parent.activeViewOptions.firstDayOfWeek && this.parent.activeViewOptions.firstDayOfWeek > new Date(+d).getDay()) {
                 key = key - 1;
             }
             result[parseInt(key.toString(), 10)] = result[parseInt(key.toString(), 10)] || [];
@@ -26782,7 +26907,12 @@ class TimelineViews extends VerticalView {
         const tr = createElement('tr');
         const td = createElement('td', { attrs: { 'aria-selected': 'false' } });
         const trCount = this.getRowCount();
+        const existingGroupIndices = this.getGroupIndices();
         for (let i = 0; i < trCount; i++) {
+            if (existingGroupIndices.length > 0 &&
+                existingGroupIndices.indexOf(this.parent.resourceBase.renderedResources[parseInt(i.toString(), 10)].groupIndex) > -1) {
+                continue;
+            }
             const ntr = tr.cloneNode();
             for (let tdData of this.colLevels[this.colLevels.length - 1]) {
                 if (this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
@@ -27266,13 +27396,17 @@ class TimelineYear extends Year {
     getContentRows() {
         const tRow = [];
         const monthCells = this.getMonths();
+        const existingGroupIndices = this.getGroupIndices();
         for (let row = 0; row < this.parent.resourceBase.renderedResources.length; row++) {
-            const tr = createElement('tr');
-            tRow.push(tr);
             let resData;
             if (this.parent.activeViewOptions.group.resources.length > 0 && !this.parent.uiStateValues.isGroupAdaptive) {
                 resData = this.parent.resourceBase.renderedResources[parseInt(row.toString(), 10)];
+                if (existingGroupIndices.length > 0 && existingGroupIndices.indexOf(resData.groupIndex) > -1) {
+                    continue;
+                }
             }
+            const tr = createElement('tr');
+            tRow.push(tr);
             let monthDate = new Date(this.parent.selectedDate.getFullYear(), monthCells[parseInt(row.toString(), 10)], 1);
             let date = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
             for (let month = 0; month < this.columnCount; month++) {