@syncfusion/ej2-schedule 32.1.19 → 32.1.22

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

@@ -10043,7 +10043,9 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
     QuickPopups.prototype.render = function () {
         this.renderQuickPopup();
         this.renderMorePopup();
-        this.renderQuickDialog();
+        if (this.parent.prerenderDialogs) {
+            this.renderQuickDialog();
+        }
     };
     QuickPopups.prototype.renderQuickPopup = function () {
         var quickPopupWrapper = createElement('div', { className: POPUP_WRAPPER_CLASS + ' e-popup-close', attrs: { role: 'dialog' } });
@@ -10203,6 +10205,9 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
         this.fieldValidator.renderFormValidator(form, rules, this.quickPopup.element, this.parent.locale);
     };
     QuickPopups.prototype.openRecurrenceAlert = function () {
+        if (!this.parent.prerenderDialogs) {
+            this.renderQuickDialog();
+        }
         var editDeleteOnly = this.quickDialog.element.querySelector('.' + QUICK_DIALOG_ALERT_OK);
         if (editDeleteOnly) {
             editDeleteOnly.innerHTML = this.l10n.getConstant(this.parent.currentAction === 'Delete' ? 'deleteEvent' : 'editEvent');
@@ -10224,6 +10229,9 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
         this.showQuickDialog('RecurrenceAlert');
     };
     QuickPopups.prototype.openRecurrenceValidationAlert = function (type) {
+        if (!this.parent.prerenderDialogs) {
+            this.renderQuickDialog();
+        }
         this.quickDialogClass('Alert');
         var okButton = this.quickDialog.element.querySelector('.' + QUICK_DIALOG_ALERT_OK);
         okButton.innerHTML = this.l10n.getConstant('ok');
@@ -10267,6 +10275,9 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
         if (this.parent.activeViewOptions.readonly) {
             return;
         }
+        if (!this.parent.prerenderDialogs) {
+            this.renderQuickDialog();
+        }
         var okButton = this.quickDialog.element.querySelector('.' + QUICK_DIALOG_ALERT_OK);
         if (okButton) {
             okButton.innerHTML = this.l10n.getConstant('delete');
@@ -10285,6 +10296,9 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
         this.showQuickDialog('DeleteAlert');
     };
     QuickPopups.prototype.openValidationError = function (type, eventData) {
+        if (!this.parent.prerenderDialogs) {
+            this.renderQuickDialog();
+        }
         this.quickDialog.header = this.l10n.getConstant('alert');
         this.quickDialog.content = this.l10n.getConstant(type);
         var okButton = this.quickDialog.element.querySelector('.' + QUICK_DIALOG_ALERT_OK);
@@ -10314,6 +10328,9 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
             if (!popupArgs.cancel) {
                 _this.quickDialog.show();
             }
+            if (!_this.parent.prerenderDialogs && popupArgs.cancel) {
+                _this.destroyQuickDialog();
+            }
         });
     };
     QuickPopups.prototype.createMoreEventList = function (eventCollection, groupOrder, groupIndex) {
@@ -10631,6 +10648,7 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
             var cellDetails = void 0;
             var argsData = void 0;
             var resourceText = this.getResourceText(args, type.toLowerCase());
+            var isResourceEmpty = this.parent.isResourceCollectionEmpty();
             switch (type) {
                 case 'Cell':
                     cellDetails = this.getFormattedString(data);
@@ -10665,7 +10683,7 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
                         content += '<div class="' + DESCRIPTION_CLASS + '"><div class="' + DESCRIPTION_ICON_CLASS + ' ' + ICON +
                             '"></div><div class="' + DESCRIPTION_DETAILS_CLASS + ' ' + TEXT_ELLIPSIS + '"></div></div>';
                     }
-                    if (this.parent.resourceCollection.length > 0) {
+                    if (this.parent.resourceCollection.length > 0 && !isResourceEmpty) {
                         content += '<div class="' + RESOURCE_CLASS + '"><div class="' + RESOURCE_ICON_CLASS + ' ' + ICON +
                             '"></div><div class="' + RESOURCE_DETAILS_CLASS + ' ' + TEXT_ELLIPSIS + '"></div></div>';
                     }
@@ -10728,7 +10746,8 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
         return footerTemplate;
     };
     QuickPopups.prototype.getResourceText = function (args, type) {
-        if (this.parent.resourceCollection.length === 0) {
+        var isResourceEmpty = this.parent.isResourceCollectionEmpty();
+        if (this.parent.resourceCollection.length === 0 || isResourceEmpty) {
             return null;
         }
         var resourceValue = '';
@@ -10968,7 +10987,6 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
     };
     QuickPopups.prototype.dialogButtonClick = function (event) {
         this.dialogEvent = event;
-        this.quickDialog.hide();
         var target = event.target;
         var cancelBtn = this.quickDialog.element.querySelector('.' + QUICK_DIALOG_ALERT_CANCEL);
         var eventData = this.parent.activeEventData.event;
@@ -11013,6 +11031,9 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
             this.parent.uiStateValues.isIgnoreOccurrence = target.classList.contains(QUICK_DIALOG_ALERT_CANCEL);
             this.parent.eventWindow.eventSave(event, this.l10n.getConstant('ok'));
         }
+        if (!isNullOrUndefined(this.quickDialog)) {
+            this.quickDialog.hide();
+        }
     };
     QuickPopups.prototype.updateTapHoldEventPopup = function (target) {
         var selectedElements = this.parent.eventBase.getSelectedEventElements(target);
@@ -11080,6 +11101,9 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
         this.parent.trigger(popupClose, args, function (popupCloseArgs) {
             if (!popupCloseArgs.cancel) {
                 _this.parent.eventBase.focusElement(true);
+                if (!_this.parent.prerenderDialogs) {
+                    _this.destroyQuickDialog();
+                }
             }
         });
     };
@@ -11406,7 +11430,9 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
     };
     QuickPopups.prototype.refreshQuickDialog = function () {
         this.destroyQuickDialog();
-        this.renderQuickDialog();
+        if (this.parent.prerenderDialogs) {
+            this.renderQuickDialog();
+        }
     };
     QuickPopups.prototype.refreshQuickPopup = function () {
         this.destroyQuickPopup();
@@ -11417,7 +11443,7 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
         this.renderMorePopup();
     };
     QuickPopups.prototype.destroyQuickDialog = function () {
-        if (this.quickDialog.element) {
+        if (this.quickDialog && this.quickDialog.element) {
             this.quickDialog.destroy();
             remove(this.quickDialog.element);
             this.quickDialog = null;
@@ -12823,7 +12849,9 @@ var EventWindow = /** @__PURE__ @class */ (function () {
         this.l10n = this.parent.localeObj;
         this.fields = this.parent.eventFields;
         this.eventWindowTime = { startTime: new Date(), endTime: new Date() };
-        this.renderEventWindow();
+        if (this.parent.prerenderDialogs) {
+            this.renderEventWindow();
+        }
     }
     EventWindow.prototype.renderEventWindow = function () {
         this.element = createElement('div', { id: this.parent.element.id + '_dialog_wrapper' });
@@ -12911,6 +12939,9 @@ var EventWindow = /** @__PURE__ @class */ (function () {
         }
     };
     EventWindow.prototype.openEditor = function (data, type, isEventData, repeatType) {
+        if (!this.parent.prerenderDialogs) {
+            this.renderEventWindow();
+        }
         this.parent.currentAction = type;
         this.parent.removeNewEventElement();
         if (this.parent.quickPopup) {
@@ -13099,6 +13130,9 @@ var EventWindow = /** @__PURE__ @class */ (function () {
             }
             callBackPromise.resolve(args);
         });
+        if (!this.parent.prerenderDialogs && args.cancel) {
+            this.destroy(true);
+        }
         return callBackPromise;
     };
     EventWindow.prototype.onBeforeClose = function (args) {
@@ -13126,6 +13160,9 @@ var EventWindow = /** @__PURE__ @class */ (function () {
                     _this.resetForm();
                     _this.parent.eventBase.focusElement(true);
                     _this.eventCrudData = null;
+                    if (!_this.parent.prerenderDialogs) {
+                        _this.destroy(true);
+                    }
                 }
             }
             callBackPromise.resolve(args);
@@ -13222,7 +13259,8 @@ var EventWindow = /** @__PURE__ @class */ (function () {
         else {
             this.createRecurrenceEditor(parentDiv);
         }
-        if (this.parent.resourceCollection.length > 0) {
+        var isResourceEmpty = this.parent.isResourceCollectionEmpty();
+        if (this.parent.resourceCollection.length > 0 && !isResourceEmpty) {
             var resourceParentDiv = this.createDivElement(EVENT_WINDOW_RESOURCES_DIV_CLASS);
             for (var _i = 0, _a = this.parent.resourceBase.resourceCollection; _i < _a.length; _i++) {
                 var resource = _a[_i];
@@ -13767,7 +13805,8 @@ var EventWindow = /** @__PURE__ @class */ (function () {
         if (cellsData.RecurrenceRule) {
             eventObj[this.fields.recurrenceRule] = cellsData.RecurrenceRule;
         }
-        if (this.parent.resourceCollection.length > 0 || this.parent.activeViewOptions.group.resources.length > 0) {
+        var isResourceEmpty = this.parent.isResourceCollectionEmpty();
+        if ((this.parent.resourceCollection.length > 0 && !isResourceEmpty) || this.parent.activeViewOptions.group.resources.length > 0) {
             this.parent.resourceBase.setResourceValues(eventObj);
         }
     };
@@ -14376,7 +14415,7 @@ var EventWindow = /** @__PURE__ @class */ (function () {
             if (endDate.getTime() >= new Date(+startDate).setMonth(startDate.getMonth() + interval)) {
                 alertMessage = 'createError';
             }
-            if (isNullOrUndefined(alertMessage)) {
+            if (isNullOrUndefined(alertMessage) && !isNullOrUndefined(this.parent.quickPopup.quickDialog)) {
                 this.parent.quickPopup.quickDialog.hide();
             }
         }
@@ -17424,14 +17463,16 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
                         resourceId: levelId,
                         resourceName: treeLevel.resourceData[resource.textField],
                         resource: treeLevel.resource,
-                        resourceData: treeLevel.resourceData
+                        resourceData: treeLevel.resourceData,
+                        date: _this.parent.selectedDate
                     };
                 }
                 else {
                     resObj = {
                         type: 'resourceHeader', resource: treeLevel.resource,
                         resourceData: treeLevel.resourceData, groupIndex: groupIndex,
-                        groupOrder: treeLevel.groupOrder
+                        groupOrder: treeLevel.groupOrder,
+                        date: _this.parent.selectedDate
                     };
                     resTreeColl.push(resObj);
                     groupIndex++;
@@ -17759,9 +17800,15 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
         }
         this.lastResourceLevel = headerLevels.slice(-1)[0] || [];
         if (!this.parent.activeViewOptions.group.byDate) {
+            for (var levelIndex = 0; levelIndex < headerLevels.length; levelIndex++) {
+                for (var _d = 0, _e = headerLevels[parseInt(levelIndex.toString(), 10)]; _d < _e.length; _d++) {
+                    var levelItem = _e[_d];
+                    levelItem.date = this.parent.selectedDate;
+                }
+            }
             var index = 0;
-            for (var _d = 0, _e = this.lastResourceLevel; _d < _e.length; _d++) {
-                var lastLevelResource = _e[_d];
+            for (var _f = 0, _g = this.lastResourceLevel; _f < _g.length; _f++) {
+                var lastLevelResource = _g[_f];
                 for (var i = 0; i < lastLevelResource.colSpan; i++) {
                     lastColumnDates[parseInt(index.toString(), 10)].groupIndex = lastLevelResource.groupIndex;
                     index++;
@@ -17845,8 +17892,8 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
                 dateIndex++;
             };
             var this_3 = this;
-            for (var _f = 0, headerDates_1 = headerDates; _f < headerDates_1.length; _f++) {
-                var headerDate = headerDates_1[_f];
+            for (var _h = 0, headerDates_1 = headerDates; _h < headerDates_1.length; _h++) {
+                var headerDate = headerDates_1[_h];
                 _loop_3(headerDate);
             }
             this.resourceDateTree = this.resourceDateTree.filter(function (data) { return data.length > 0; });
@@ -17859,19 +17906,23 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
             return dateHeaderLevels;
         }
         var dateColSpan = 0;
-        for (var _g = 0, _h = levels[0]; _g < _h.length; _g++) {
-            var firstRowTd = _h[_g];
+        for (var _j = 0, _k = levels[0]; _j < _k.length; _j++) {
+            var firstRowTd = _k[_j];
             dateColSpan += firstRowTd.colSpan;
         }
-        for (var _j = 0, headerDates_2 = headerDates; _j < headerDates_2.length; _j++) {
-            var headerDate = headerDates_2[_j];
+        for (var _l = 0, headerDates_2 = headerDates; _l < headerDates_2.length; _l++) {
+            var headerDate = headerDates_2[_l];
             headerDate.colSpan = dateColSpan;
             datesColumn.push(headerDate);
             var resGroup = extend([], levels, null, true);
             for (var k = 0, length_2 = resGroup.length; k < length_2; k++) {
+                for (var _m = 0, _o = resGroup[parseInt(k.toString(), 10)]; _m < _o.length; _m++) {
+                    var resTd = _o[_m];
+                    resTd.date = headerDate.date;
+                }
                 if (k === resGroup.length - 1) {
-                    for (var _k = 0, _l = resGroup[parseInt(k.toString(), 10)]; _k < _l.length; _k++) {
-                        var resTd = _l[_k];
+                    for (var _p = 0, _q = resGroup[parseInt(k.toString(), 10)]; _p < _q.length; _p++) {
+                        var resTd = _q[_p];
                         resTd.date = headerDate.date;
                         resTd.workDays = headerDate.workDays;
                         resTd.startHour = this.parent.getStartEndTime(resTd.resourceData[resTd.resource.startHourField]) ||
@@ -17925,10 +17976,13 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
         if (isNullOrUndefined(groupOrder) && this.parent.activeViewOptions.group.allowGroupEdit && resource.allowMultiple) {
             return undefined;
         }
-        var id = isNullOrUndefined(groupOrder) ? eventObj[resource.field] : groupOrder[parseInt(colorFieldIndex.toString(), 10)];
-        var data = this.filterData(resource.dataSource, resource.idField, id);
-        if (data.length > 0) {
-            return data[0][resource.colorField];
+        var isResourceEmpty = this.parent.isResourceCollectionEmpty();
+        if (!isResourceEmpty) {
+            var id = isNullOrUndefined(groupOrder) ? eventObj[resource.field] : groupOrder[parseInt(colorFieldIndex.toString(), 10)];
+            var data = this.filterData(resource.dataSource, resource.idField, id);
+            if (data.length > 0) {
+                return data[0][resource.colorField];
+            }
         }
         return undefined;
     };
@@ -18579,6 +18633,19 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
                 (currentIndex === -1) ? 0 : currentIndex;
         }
     };
+    /**
+     * Checks if resources have empty dataSource
+     *
+     * @returns {boolean} Returns true if resources have empty dataSource, otherwise false
+     * @private
+     */
+    Schedule.prototype.isResourceCollectionEmpty = function () {
+        return this.resourceCollection.length > 0 &&
+            this.resourceCollection.some(function (res) {
+                var ds = res && res.dataSource;
+                return Array.isArray(ds) ? ds.length === 0 : !ds;
+            });
+    };
     Schedule.prototype.getActiveViewOptions = function () {
         var timeScale = {
             enable: this.timeScale.enable,
@@ -18587,12 +18654,20 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
             majorSlotTemplate: this.timeScale.majorSlotTemplate,
             minorSlotTemplate: this.timeScale.minorSlotTemplate
         };
+        var isResourceEmpty = this.isResourceCollectionEmpty();
         var isYearView = this.viewCollections[this.viewIndex].option.indexOf('Year') > -1;
+        var groupResources = [];
+        if ((!isNullOrUndefined(this.group.resources) && this.group.resources.length > 0) && !isResourceEmpty) {
+            groupResources = this.group.resources;
+        }
+        else if (this.resources.length > 0 && !isResourceEmpty) {
+            groupResources = [];
+        }
         var group = {
-            byDate: isYearView ? false : this.group.byDate,
+            byDate: (isYearView || isResourceEmpty) ? false : this.group.byDate,
             byGroupID: this.group.byGroupID,
             allowGroupEdit: this.group.allowGroupEdit,
-            resources: isNullOrUndefined(this.group.resources) ? [] : this.group.resources,
+            resources: groupResources,
             headerTooltipTemplate: this.group.headerTooltipTemplate,
             enableCompactView: this.group.enableCompactView,
             hideNonWorkingDays: ['Day', 'Week', 'WorkWeek', 'Month'].indexOf(this.currentView) > -1 ? this.group.hideNonWorkingDays : false
@@ -19107,7 +19182,7 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
      * @private
      */
     Schedule.prototype.removeSelectedClass = function () {
-        var selectedCells = this.getSelectedCells();
+        var selectedCells = [].slice.call(this.element.querySelectorAll('.' + SELECTED_CELL_CLASS));
         for (var _i = 0, selectedCells_1 = selectedCells; _i < selectedCells_1.length; _i++) {
             var cell = selectedCells_1[_i];
             cell.removeAttribute('tabindex');
@@ -19540,7 +19615,23 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
      * @private
      */
     Schedule.prototype.getSelectedCells = function () {
-        return [].slice.call(this.element.querySelectorAll('.' + SELECTED_CELL_CLASS));
+        var selectedCells = [].slice.call(this.element.querySelectorAll('.' + SELECTED_CELL_CLASS));
+        if (!selectedCells || selectedCells.length === 0) {
+            return [];
+        }
+        else if (selectedCells.length === 1) {
+            return selectedCells;
+        }
+        if (selectedCells && selectedCells.length > 1) {
+            var hasAnyWorkCells = selectedCells.some(function (cell) { return cell.classList.contains(WORK_CELLS_CLASS); });
+            var workCells = hasAnyWorkCells ?
+                selectedCells.filter(function (cell) { return !cell.classList.contains(ALLDAY_CELLS_CLASS); }) : selectedCells;
+            if (!workCells || workCells.length === 0) {
+                return [];
+            }
+            return workCells.slice().sort(function (a, b) { return (+a.dataset.date || 0) - (+b.dataset.date || 0); });
+        }
+        return selectedCells;
     };
     /**
      * Method to generate the announcement string
@@ -19739,6 +19830,17 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
                         state.isLayout = true;
                     }
                     break;
+                case 'prerenderDialogs': {
+                    if (newProp.prerenderDialogs) {
+                        this.eventWindow.renderEventWindow();
+                        this.quickPopup.renderQuickDialog();
+                    }
+                    else {
+                        this.eventWindow.destroy(true);
+                        this.quickPopup.destroyQuickDialog();
+                    }
+                    break;
+                }
                 case 'showWeekend':
                 case 'startHour':
                 case 'endHour':
@@ -21048,6 +21150,9 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
      */
     Schedule.prototype.openOverlapAlert = function (args) {
         var _this = this;
+        if (!this.prerenderDialogs) {
+            return;
+        }
         if (this.quickPopup) {
             var eventProp = {
                 type: 'OverlapAlert',
@@ -21071,6 +21176,9 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
      */
     Schedule.prototype.closeOverlapAlert = function () {
         var _this = this;
+        if (!this.prerenderDialogs) {
+            return;
+        }
         if (this.quickPopup) {
             var args = {
                 type: 'OverlapAlert',
@@ -21382,6 +21490,9 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
     __decorate$b([
         Property(true)
     ], Schedule.prototype, "showQuickInfo", void 0);
+    __decorate$b([
+        Property(true)
+    ], Schedule.prototype, "prerenderDialogs", void 0);
     __decorate$b([
         Property(false)
     ], Schedule.prototype, "allowInline", void 0);
@@ -21648,7 +21759,7 @@ var ActionBase = /** @__PURE__ @class */ (function () {
         var startHour = this.parent.activeView.getStartHour();
         var intervalInMS = MS_PER_MINUTE * this.actionObj.interval;
         dateInMS += (startHour.getHours() * 60 + startHour.getMinutes()) * MS_PER_MINUTE + startHour.getSeconds() * 1000;
-        dateInMS = dateInMS + Math.floor((date.getTime() - dateInMS) / intervalInMS) * intervalInMS;
+        dateInMS = dateInMS + ((date.getTime() - dateInMS) / intervalInMS) * intervalInMS;
         return new Date(dateInMS);
     };
     ActionBase.prototype.getContentAreaDimension = function () {
@@ -22440,7 +22551,7 @@ var Resize = /** @__PURE__ @class */ (function (_super) {
                     var offsetWidth = (Math.round(offset / this.actionObj.cellWidth) *
                         this.actionObj.cellWidth) + (isLeft ? 0 : (this.parent.getElementWidth(this.actionObj.clone) -
                         this.actionObj.cellWidth));
-                    cellIndex = Math.floor(offsetWidth / this.actionObj.cellWidth);
+                    cellIndex = Math.ceil(offsetWidth / this.actionObj.cellWidth);
                 }
                 isLastCell = cellIndex === tdCollections.length;
                 cellIndex = this.getIndex(cellIndex);
@@ -22458,13 +22569,29 @@ var Resize = /** @__PURE__ @class */ (function (_super) {
             }
             else {
                 if (!isLeft) {
-                    offset += this.parent.getElementWidth(this.actionObj.clone);
-                }
-                var spanMinutes = Math.floor((this.actionObj.slotInterval / this.actionObj.cellWidth) *
+                    var cloneWidth = this.parent.getElementWidth(this.actionObj.clone);
+                    var pixelsPerInterval = this.actionObj.cellWidth /
+                        (this.actionObj.slotInterval / this.actionObj.interval);
+                    var numIntervals = Math.round(cloneWidth / pixelsPerInterval);
+                    cloneWidth = numIntervals * pixelsPerInterval;
+                    offset = offset + cloneWidth;
+                }
+                var spanMinutes = Math.ceil((this.actionObj.slotInterval / this.actionObj.cellWidth) *
                     (offset - Math.floor(offset / this.actionObj.cellWidth) * this.actionObj.cellWidth));
                 spanMinutes = (isLastCell || (!isLeft && spanMinutes === 0)) ? this.actionObj.slotInterval : spanMinutes;
                 resizeTime = new Date(resizeDate.getTime());
                 resizeTime = new Date(resizeDate.getTime() + (spanMinutes * MS_PER_MINUTE));
+                var isCustomResizeInterval = this.actionObj.interval !== this.actionObj.slotInterval;
+                var initialCellTime = new Date(resizeTime.getTime());
+                var intervalInMS = this.actionObj.interval * 60000;
+                if (intervalInMS > 0 && isCustomResizeInterval) {
+                    if (this.resizeEdges.right || this.resizeEdges.left) {
+                        var eventTime = this.resizeEdges.right ? eventEnd : eventStart;
+                        var timeDifferenceMs = initialCellTime.getTime() - eventTime.getTime();
+                        var intervalCount = Math.round(timeDifferenceMs / intervalInMS);
+                        resizeTime = new Date(eventTime.getTime() + intervalCount * intervalInMS);
+                    }
+                }
                 this.updateTimePosition(resizeTime);
             }
         }
@@ -24872,14 +24999,18 @@ var ViewBase = /** @__PURE__ @class */ (function () {
         }
     };
     ViewBase.prototype.getHeaderBarHeight = function () {
-        var headerBarHeight = 2;
+        var computedStyle = getComputedStyle(this.parent.element);
+        var borderTop = parseFloat(computedStyle.borderTopWidth) || 1;
+        var borderBottom = parseFloat(computedStyle.borderBottomWidth) || 1;
+        var border = Math.round(borderTop + borderBottom);
+        var headerBarHeight = border;
         if (this.parent.headerModule) {
             headerBarHeight += getOuterHeight(this.parent.headerModule.getHeaderElement());
         }
         if (this.parent.uiStateValues.isGroupAdaptive) {
             var resHeader = this.parent.element.querySelector('.' + RESOURCE_HEADER_TOOLBAR);
             if (resHeader) {
-                headerBarHeight += resHeader.offsetHeight;
+                headerBarHeight += getOuterHeight(resHeader);
             }
         }
         return headerBarHeight;
@@ -25167,7 +25298,7 @@ var ViewBase = /** @__PURE__ @class */ (function () {
     ViewBase.prototype.setResourceHeaderContent = function (tdElement, tdData, className) {
         if (className === void 0) { className = TEXT_ELLIPSIS; }
         if (this.parent.activeViewOptions.resourceHeaderTemplate) {
-            var data = { resource: tdData.resource, resourceData: tdData.resourceData };
+            var data = { resource: tdData.resource, resourceData: tdData.resourceData, date: tdData.date };
             var scheduleId = this.parent.element.id + '_';
             var viewName = this.parent.activeViewOptions.resourceHeaderTemplateName;
             var templateId = scheduleId + viewName + 'resourceHeaderTemplate';
@@ -27814,7 +27945,7 @@ var AgendaBase = /** @__PURE__ @class */ (function (_super) {
                                         groupOrder: resData[parseInt(res.toString(), 10)].groupOrder.slice(0, -1),
                                         resourceData: resData[parseInt(res.toString(), 10)].resourceData,
                                         groupIndex: (lastLevelInfo.length - data.length), className: [RESOURCE_NAME],
-                                        date: agendaDate
+                                        date: this.parent.activeViewOptions.group.byDate ? firstDate : agendaDate
                                     };
                                     lastLevelInfo[parseInt((lastLevelInfo.length - data.length).toString(), 10)].push(tempObj);
                                     tempLastLevelInfo.push(extend({}, tempObj, null, true));
@@ -27842,7 +27973,8 @@ var AgendaBase = /** @__PURE__ @class */ (function (_super) {
                                 tempGroupedData[0].type = 'parentColumnLevel_' + (y + 1);
                                 tempGroupedData[0].resource = topResources[topResources.length - (y + 1)];
                                 tempGroupedData[0].resourceData = data[parseInt(x.toString(), 10)];
-                                tempGroupedData[0].date = agendaDate;
+                                tempGroupedData[0].date = this.parent.activeViewOptions.group.byDate ?
+                                    tempLastLevelInfo[parseInt(u.toString(), 10)].date : agendaDate;
                                 lastLevelInfo[tempGroupedData[0].groupIndex].push(tempGroupedData[0]);
                                 tempGroupedData = [];
                                 totalRowSpan = 0;