@syncfusion/ej2-schedule 26.2.12 → 27.1.48

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

@@ -1096,10 +1096,12 @@ var HeaderRenderer = /** @__PURE__ @class */ (function () {
                 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');
@@ -1532,6 +1534,12 @@ var HeaderRenderer = /** @__PURE__ @class */ (function () {
         var views = [].slice.call(this.element.querySelectorAll('.e-views'));
         return views.indexOf(target);
     };
+    HeaderRenderer.prototype.toolbarCreateHandler = function () {
+        if (this.parent && this.parent.portals && this.toolbarObj && this.toolbarObj.portals) {
+            this.parent.portals = this.parent.portals.concat(this.toolbarObj.portals);
+            this.parent['renderReactTemplates']();
+        }
+    };
     HeaderRenderer.prototype.toolbarClickHandler = function (args) {
         if (!args.item) {
             return;
@@ -1675,7 +1683,7 @@ var HeaderRenderer = /** @__PURE__ @class */ (function () {
         var firstDate = new Date(dates[0].getTime());
         var 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') {
@@ -2105,7 +2113,9 @@ var KeyboardInteraction = /** @__PURE__ @class */ (function () {
             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;
@@ -2186,6 +2196,43 @@ var KeyboardInteraction = /** @__PURE__ @class */ (function () {
                     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;
+        }
+    };
+    KeyboardInteraction.prototype.processShiftAltN = function (e) {
+        var selectedCells = this.parent.getSelectedCells();
+        var target = e.target;
+        var 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)) {
+            var event_1 = this.parent.activeEventData.event;
+            cellData.startTime = event_1.StartTime;
+            cellData.endTime = event_1.EndTime;
+            cellData.isAllDay = event_1.IsAllDay;
+        }
+        else {
+            var workHour = this.parent.getStartEndTime(this.parent.workHours.start);
+            var 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);
+        }
+        var args = extend(cellData, { cancel: false, event: e });
+        if (args != null) {
+            this.parent.eventWindow.openEditor(args, 'Add');
         }
     };
     KeyboardInteraction.prototype.processFTwelve = function (e) {
@@ -2611,8 +2658,11 @@ var KeyboardInteraction = /** @__PURE__ @class */ (function () {
         return this.parent.eventBase.selectWorkCellByTime([selectedObject]);
     };
     KeyboardInteraction.prototype.processViewNavigation = function (e) {
-        var index = parseInt(e.key, 10) - 1;
-        if (!isNullOrUndefined(this.parent.views) && index < this.parent.views.length) {
+        if (isNullOrUndefined(e.code)) {
+            return;
+        }
+        var index = parseInt(e.code.slice(e.code.length - 1), 10) - 1;
+        if (!isNaN(index) && !isNullOrUndefined(this.parent.views) && index < this.parent.views.length) {
             var view = this.parent.viewCollections[parseInt(index.toString(), 10)].option;
             this.parent.changeView(view, e, undefined, index);
             if (this.parent.headerModule) {
@@ -8096,7 +8146,10 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
         if (this.parent.crudModule && this.parent.crudModule.crudObj.isCrudAction) {
             for (var i = 0, len = this.parent.crudModule.crudObj.sourceEvent.length; i < len; i++) {
                 var 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) {
                     var target = this.parent.crudModule.crudObj.targetEvent[parseInt(i.toString(), 10)];
@@ -8591,7 +8644,10 @@ var TimelineEvent = /** @__PURE__ @class */ (function (_super) {
             for (var i = 0, len = this.parent.crudModule.crudObj.sourceEvent.length; i < len; i++) {
                 var 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) {
                     var target = this.parent.crudModule.crudObj.targetEvent[parseInt(i.toString(), 10)];
@@ -9148,7 +9204,15 @@ var InlineEdit = /** @__PURE__ @class */ (function () {
                 subjectWrap.insertBefore(inlineSubject, subjectWrap.firstChild);
             }
             else {
-                args.element.querySelector('.e-appointment-details').prepend(inlineSubject);
+                var elementSelector = ['TimelineDay', 'TimelineWeek', 'TimelineWorkWeek', 'TimelineMonth'].indexOf(this.parent.currentView) > -1 ?
+                    '.e-inner-wrap' : '.e-appointment-details';
+                var innerWrapElement = args.element.querySelector(elementSelector);
+                if (isNullOrUndefined(innerWrapElement)) {
+                    args.element.querySelector('.e-appointment-details').prepend(inlineSubject);
+                }
+                else {
+                    innerWrapElement.prepend(inlineSubject);
+                }
             }
             inlineSubject.focus();
         }
@@ -10904,7 +10968,8 @@ var EventTooltip = /** @__PURE__ @class */ (function () {
             var fields = this.parent.eventFields;
             var eventStart = new Date('' + record[fields.startTime]);
             var eventEnd = new Date('' + record[fields.endTime]);
-            eventEnd = (eventEnd.getHours() === 0 && eventEnd.getMinutes() === 0) ? new Date(eventEnd.setMilliseconds(-1000)) : eventEnd;
+            eventEnd = ((eventEnd.getTime() - eventStart.getTime() !== 0) && eventEnd.getHours() === 0 && eventEnd.getMinutes() === 0) ?
+                new Date(eventEnd.setMilliseconds(-1000)) : eventEnd;
             var startDate = resetTime(new Date('' + eventStart));
             var endDate = resetTime(new Date('' + eventEnd));
             var tooltipSubject = (record[fields.subject] || this.parent.eventSettings.fields.subject.default
@@ -14226,6 +14291,7 @@ var VirtualScroll = /** @__PURE__ @class */ (function () {
             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);
@@ -14275,6 +14341,7 @@ var VirtualScroll = /** @__PURE__ @class */ (function () {
             var scrollHeight = this.parent.rowAutoHeight ?
                 (conTable.offsetHeight - conWrap.offsetHeight) : this.bufferCount * this.itemSize;
             var resCollection = [];
+            this.existingDataCollection = this.parent.resourceBase.renderedResources;
             if ((conWrap.scrollTop) - this.translateY < 0) {
                 resCollection = this.upScroll(conWrap, firstTDIndex);
             }
@@ -14478,18 +14545,47 @@ var VirtualScroll = /** @__PURE__ @class */ (function () {
             this.parent.element.focus();
         }
         for (var i = 0; i < renderedLength; i++) {
-            remove(resWrap.querySelector('tbody tr'));
-            remove(conWrap.querySelector('tbody tr'));
             remove(eventWrap.querySelector('div'));
         }
         this.parent.resourceBase.renderedResources = resCollection;
+        var currentGroupIndices = this.parent.activeView.getGroupIndices(resCollection);
+        var previousGroupIndices = this.parent.activeView.getGroupIndices(this.existingDataCollection);
+        var newGroupIndices = currentGroupIndices.filter(function (index) { return previousGroupIndices.indexOf(index) < 0; });
+        var resWrapRows = Array.from(resWrap.querySelectorAll('tbody tr'));
+        var conWrapRows = Array.from(conWrap.querySelectorAll('tbody tr'));
+        var resWrapBody = resWrap.querySelector('tbody');
+        var conWrapBody = conWrap.querySelector('tbody');
+        this.removeObsoleteRows(resWrapRows, currentGroupIndices);
+        this.removeObsoleteRows(conWrapRows, currentGroupIndices);
         var resourceRows = this.parent.resourceBase.getContentRows(resCollection, true);
         var contentRows = this.parent.activeView.getContentRows();
         var eventRows = this.parent.activeView.getEventRows(resCollection.length);
-        append(resourceRows, resWrap.querySelector('tbody'));
-        append(contentRows, conWrap.querySelector('tbody'));
+        for (var i = 0; i < newGroupIndices.length; i++) {
+            var 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);
     };
+    VirtualScroll.prototype.removeObsoleteRows = function (elements, currentGroupIndices) {
+        elements.forEach(function (element) {
+            var groupIndex = parseInt(element.firstElementChild.getAttribute('data-group-index'), 10);
+            if (currentGroupIndices.indexOf(groupIndex) < 0) {
+                remove(element);
+            }
+        });
+    };
     VirtualScroll.prototype.updateHorizontalContent = function (conWrap, resCollection) {
         this.existingDataCollection = this.parent.resourceBase.expandedResources;
         this.parent.resourceBase.expandedResources = resCollection;
@@ -15062,10 +15158,10 @@ var Crud = /** @__PURE__ @class */ (function () {
             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()) {
@@ -15454,16 +15550,32 @@ var Crud = /** @__PURE__ @class */ (function () {
         var updateSeriesEvents = (eventData instanceof Array) ? eventData : [eventData];
         var args = {
             requestType: action === 'EditSeries' ? 'eventChange' : 'eventRemove', cancel: false,
-            addedRecords: [], changedRecords: updateSeriesEvents, deletedRecords: []
+            addedRecords: [], changedRecords: [], deletedRecords: []
         };
         args.data = seriesData;
+        if (action === 'EditSeries') {
+            args.changedRecords = updateSeriesEvents;
+        }
+        else {
+            args.deletedRecords = updateSeriesEvents;
+        }
+        if (action === 'EditSeries' && !this.parent.uiStateValues.isIgnoreOccurrence) {
+            var seriesEvents = seriesData instanceof Array ? seriesData : [seriesData];
+            for (var a = 0, count = args.changedRecords.length; a < count; a++) {
+                var parentEvent = seriesEvents[parseInt(a.toString(), 10)];
+                var eventCollections = this.parent.eventBase.getEventCollections(parentEvent);
+                var deletedEvents = eventCollections.follow.concat(eventCollections.occurrence);
+                args.deletedRecords = args.deletedRecords.concat(deletedEvents);
+            }
+        }
         this.parent.trigger(actionBegin, args, function (seriesArgs) {
             if (!seriesArgs.cancel) {
                 var fields_2 = _this.parent.eventFields;
                 var editParams = { addedRecords: [], changedRecords: [], deletedRecords: [] };
                 var seriesEvents = seriesData instanceof Array ? seriesData : [seriesData];
+                var records = action === 'EditSeries' ? seriesArgs.changedRecords : seriesArgs.deletedRecords;
                 var _loop_4 = function (a, count) {
-                    var childEvent = seriesArgs.changedRecords[parseInt(a.toString(), 10)];
+                    var childEvent = records[parseInt(a.toString(), 10)];
                     var parentEvent = seriesEvents[parseInt(a.toString(), 10)];
                     var eventCollections = _this.parent.eventBase.getEventCollections(parentEvent);
                     var deletedEvents = eventCollections.follow.concat(eventCollections.occurrence);
@@ -15493,11 +15605,11 @@ var Crud = /** @__PURE__ @class */ (function () {
                             break;
                     }
                 };
-                for (var a = 0, count = seriesArgs.changedRecords.length; a < count; a++) {
+                for (var a = 0, count = records.length; a < count; a++) {
                     _loop_4(a, count);
                 }
                 var promise = _this.parent.dataModule.dataManager.saveChanges(editParams, fields_2.id, _this.getTable(), _this.getQuery());
-                var cloneEvent = extend({}, seriesArgs.changedRecords[seriesArgs.changedRecords.length - 1], null, true);
+                var cloneEvent = extend({}, records[records.length - 1], null, true);
                 _this.parent.eventBase.selectWorkCellByTime(action === 'EditSeries' ? [_this.parent.eventBase.processTimezone(cloneEvent)] : [cloneEvent]);
                 var crudArgs = {
                     requestType: action === 'EditSeries' ? 'eventChanged' : 'eventRemoved',
@@ -16258,7 +16370,11 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
         var resColl = this.resourceCollection;
         var tr = createElement('tr');
         var td = createElement('td', { attrs: { tabindex: isVirtualScroll ? '-1' : '0' } });
+        var existingGroupIndices = this.parent.activeView.getGroupIndices();
         for (var i = 0; i < resData.length; i++) {
+            if (existingGroupIndices.length > 0 && existingGroupIndices.indexOf(resData[parseInt(i.toString(), 10)].groupIndex) > -1) {
+                continue;
+            }
             var ntd = td.cloneNode();
             rIndex = findIndexInData(resColl, 'name', resData[parseInt(i.toString(), 10)].resource.name);
             if (rIndex === resColl.length - 1) {
@@ -16439,6 +16555,7 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
         this.setExpandedResources();
         var resourceCount = this.parent.virtualScrollModule.getRenderedCount();
         var 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) {
             var sIndex = this.expandedResources.length - resourceCount;
@@ -18582,7 +18699,8 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
     };
     Schedule.prototype.onScheduleResize = function () {
         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()) {
@@ -21244,6 +21362,7 @@ var Resize = /** @__PURE__ @class */ (function (_super) {
         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');
@@ -21608,8 +21727,8 @@ var YearEvent = /** @__PURE__ @class */ (function (_super) {
             var monthDate = new Date(this.parent.selectedDate.getFullYear(), month, 1);
             var monthStart = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
             var monthEnd = this.parent.calendarUtil.getMonthEndDate(new Date(monthDate.getTime()));
-            var startDate = getWeekFirstDate(monthStart, this.parent.firstDayOfWeek);
-            var endDate = addDays(getWeekLastDate(monthEnd, this.parent.firstDayOfWeek), 1);
+            var startDate = getWeekFirstDate(monthStart, this.parent.activeViewOptions.firstDayOfWeek);
+            var endDate = addDays(getWeekLastDate(monthEnd, this.parent.activeViewOptions.firstDayOfWeek), 1);
             for (var index = 0; startDate.getTime() < endDate.getTime(); index++) {
                 var start = resetTime(new Date(startDate.getTime()));
                 var end = addDays(new Date(start.getTime()), 1);
@@ -24163,6 +24282,15 @@ var ViewBase = /** @__PURE__ @class */ (function () {
             this.parent.resourceBase.expandedResources = this.colLevels[this.colLevels.length - 1];
         }
     };
+    ViewBase.prototype.getGroupIndices = function (dataCollection) {
+        var 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(function (data) { return data.groupIndex; });
+        }
+        return groupIndices;
+    };
     ViewBase.prototype.destroy = function () {
         if (this.element && this.element.parentNode) {
             remove(this.element);
@@ -24846,18 +24974,14 @@ var VerticalView = /** @__PURE__ @class */ (function (_super) {
         var rows = [];
         var tr = createElement('tr');
         var td = createElement('td', { attrs: { 'aria-selected': 'false' } });
-        var 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(function (data) { return data.groupIndex; }));
-        }
+        var existingGroupIndices = this.getGroupIndices();
         var handler = function (r) {
             var ntr = tr.cloneNode();
             for (var _i = 0, _a = _this.colLevels[_this.colLevels.length - 1]; _i < _a.length; _i++) {
                 var tdData = _a[_i];
                 var 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;
                     }
                 }
@@ -25659,7 +25783,13 @@ var Month = /** @__PURE__ @class */ (function (_super) {
         var tr = createElement('tr');
         var td = createElement('td', { attrs: { 'aria-selected': 'false' } });
         var slotDatas = this.getContentSlots();
+        var isTimeline = this.parent.currentView === 'TimelineMonth';
+        var existingGroupIndices = isTimeline ? this.getGroupIndices() : [];
         for (var row = 0; row < slotDatas.length; row++) {
+            if (existingGroupIndices.length > 0 &&
+                existingGroupIndices.indexOf(slotDatas[parseInt(row.toString(), 10)][0].groupIndex) > -1) {
+                continue;
+            }
             var ntr = tr.cloneNode();
             for (var col = 0; col < slotDatas[parseInt(row.toString(), 10)].length; col++) {
                 var ntd = this.createContentTd(slotDatas[parseInt(row.toString(), 10)][parseInt(col.toString(), 10)], td);
@@ -26004,7 +26134,7 @@ var Year = /** @__PURE__ @class */ (function (_super) {
         this.setAriaAttributes(contentTable);
         var thead = createElement('thead', { className: 'e-week-header' });
         var tr = createElement('tr');
-        var currentWeek = getWeekFirstDate(firstDateOfMonth(currentDate), this.parent.firstDayOfWeek);
+        var currentWeek = getWeekFirstDate(firstDateOfMonth(currentDate), this.parent.activeViewOptions.firstDayOfWeek);
         if (this.parent.activeViewOptions.showWeekNumber) {
             tr.appendChild(createElement('th'));
         }
@@ -26133,7 +26263,7 @@ var Year = /** @__PURE__ @class */ (function (_super) {
         return dateCol;
     };
     Year.prototype.getMonthDates = function (date) {
-        var startDate = getWeekFirstDate(firstDateOfMonth(date), this.parent.firstDayOfWeek);
+        var startDate = getWeekFirstDate(firstDateOfMonth(date), this.parent.activeViewOptions.firstDayOfWeek);
         var endDate = addDays(new Date(+startDate), (6 * WEEK_LENGTH));
         var dateCollection = [];
         for (var start = startDate; start.getTime() < endDate.getTime(); start = addDays(start, 1)) {
@@ -26269,10 +26399,10 @@ var Year = /** @__PURE__ @class */ (function (_super) {
         return addDays(addMonths(this.getStartDate(), this.parent.monthsCount), -1);
     };
     Year.prototype.startDate = function () {
-        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();
     };
     Year.prototype.endDate = function () {
-        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);
     };
     Year.prototype.getEndDateFromStartDate = function (start) {
@@ -27455,7 +27585,7 @@ var TimelineHeaderRow = /** @__PURE__ @class */ (function () {
             var jsDate = +new Date(1970, 0, 1);
             var tzOffsetDiff = d.getTimezoneOffset() - new Date(1970, 0, 1).getTimezoneOffset();
             var 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)] || [];
@@ -27778,7 +27908,12 @@ var TimelineViews = /** @__PURE__ @class */ (function (_super) {
         var tr = createElement('tr');
         var td = createElement('td', { attrs: { 'aria-selected': 'false' } });
         var trCount = this.getRowCount();
+        var existingGroupIndices = this.getGroupIndices();
         for (var i = 0; i < trCount; i++) {
+            if (existingGroupIndices.length > 0 &&
+                existingGroupIndices.indexOf(this.parent.resourceBase.renderedResources[parseInt(i.toString(), 10)].groupIndex) > -1) {
+                continue;
+            }
             var ntr = tr.cloneNode();
             for (var _i = 0, _a = this.colLevels[this.colLevels.length - 1]; _i < _a.length; _i++) {
                 var tdData = _a[_i];
@@ -28298,13 +28433,17 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
     TimelineYear.prototype.getContentRows = function () {
         var tRow = [];
         var monthCells = this.getMonths();
+        var existingGroupIndices = this.getGroupIndices();
         for (var row = 0; row < this.parent.resourceBase.renderedResources.length; row++) {
-            var tr = createElement('tr');
-            tRow.push(tr);
             var resData = void 0;
             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;
+                }
             }
+            var tr = createElement('tr');
+            tRow.push(tr);
             var monthDate = new Date(this.parent.selectedDate.getFullYear(), monthCells[parseInt(row.toString(), 10)], 1);
             var date = this.parent.calendarUtil.getMonthStartDate(new Date(monthDate.getTime()));
             for (var month = 0; month < this.columnCount; month++) {