@syncfusion/ej2-schedule 25.1.35 → 25.1.39

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

@@ -558,6 +558,8 @@ var RTL = 'e-rtl';
 /** @private */
 var DEVICE_CLASS = 'e-device';
 /** @private */
+var ADAPTIVE_CLASS = 'e-adaptive';
+/** @private */
 var MULTI_DRAG = 'e-multi-drag';
 /** @private */
 var ICON = 'e-icons';
@@ -672,6 +674,8 @@ var TIMELINE_WRAPPER_CLASS = 'e-timeline-wrapper';
 /** @private */
 var APPOINTMENT_WRAPPER_CLASS = 'e-appointment-wrapper';
 /** @private */
+var APPOINTMENT_WRAPPER_HIDDEN_CLASS = 'e-appointment-wrapper-hidden';
+/** @private */
 var DAY_WRAPPER_CLASS = 'e-day-wrapper';
 /** @private */
 var TOOLBAR_CONTAINER = 'e-schedule-toolbar-container';
@@ -1095,6 +1099,7 @@ var HeaderRenderer = /** @__PURE__ @class */ (function () {
             });
             _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');
             var prevNavEle = _this.toolbarObj.element.querySelector('.e-prev');
             if (prevNavEle) {
                 prevNavEle.firstElementChild.setAttribute('title', _this.l10n.getConstant('previous'));
@@ -1282,7 +1287,7 @@ var HeaderRenderer = /** @__PURE__ @class */ (function () {
                 switch (item.name) {
                     case 'Today':
                         tbItem = {
-                            showAlwaysInPopup: (this.parent.isAdaptive || this.parent.enableAdaptiveUI), prefixIcon: 'e-icon-day',
+                            showAlwaysInPopup: (this.parent.isAdaptive || this.parent.enableAdaptiveUI), prefixIcon: 'e-icon-today',
                             text: this.l10n.getConstant('today'), cssClass: 'e-today', overflow: 'Show'
                         };
                         tbItem.align = propItem.align ? propItem.align : item.align;
@@ -1369,7 +1374,7 @@ var HeaderRenderer = /** @__PURE__ @class */ (function () {
         }
         else {
             items.push({
-                align: 'Right', showAlwaysInPopup: (this.parent.isAdaptive || this.parent.enableAdaptiveUI), prefixIcon: 'e-icon-day',
+                align: 'Right', showAlwaysInPopup: (this.parent.isAdaptive || this.parent.enableAdaptiveUI), prefixIcon: 'e-icon-today',
                 text: this.l10n.getConstant('today'), cssClass: 'e-today', overflow: 'Show'
             });
             if (this.parent.views.length > 1) {
@@ -6745,11 +6750,13 @@ var EventBase = /** @__PURE__ @class */ (function () {
         if (index === void 0) { index = 0; }
         var tr = createElement('tr');
         var levels = this.parent.activeView.colLevels.slice(-1)[0];
+        var className = this.parent.isReact && this.parent.activeViewOptions.eventTemplate ?
+            ' ' + APPOINTMENT_WRAPPER_HIDDEN_CLASS : '';
         for (var i = 0, len = levels.length; i < len; i++) {
             var col = levels[parseInt(i.toString(), 10)];
             var appointmentWrap = createElement('td', {
-                className: (type === 'allDay') ? ALLDAY_APPOINTMENT_WRAPPER_CLASS : (type === 'timeIndicator') ?
-                    TIMELINE_WRAPPER_CLASS : DAY_WRAPPER_CLASS, attrs: { 'data-date': col.date.getTime().toString() }
+                className: (type === 'allDay') ? ALLDAY_APPOINTMENT_WRAPPER_CLASS + className : (type === 'timeIndicator') ?
+                    TIMELINE_WRAPPER_CLASS : DAY_WRAPPER_CLASS + className, attrs: { 'data-date': col.date.getTime().toString() }
             });
             if (!isNullOrUndefined(col.groupIndex)) {
                 appointmentWrap.setAttribute('data-group-index', col.groupIndex.toString());
@@ -6872,6 +6879,7 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
         return _this;
     }
     VerticalEvent.prototype.renderAppointments = function () {
+        var _this = this;
         if (isNullOrUndefined(this.parent)) {
             return;
         }
@@ -6882,6 +6890,14 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
         var wrapperElements = [].slice.call(this.parent.element.querySelectorAll('.' + BLOCK_APPOINTMENT_CLASS +
             ',.' + APPOINTMENT_CLASS + ',.' + ROW_COUNT_WRAPPER_CLASS));
         var isDragging = (this.parent.crudModule && this.parent.crudModule.crudObj.isCrudAction) ? true : false;
+        var hideWrapper = function (wrapper) {
+            if (_this.parent.isReact && !isNullOrUndefined(_this.parent.activeViewOptions.eventTemplate)) {
+                var appWrapper = closest(wrapper, '.' + DAY_WRAPPER_CLASS + ',.' + ALLDAY_APPOINTMENT_WRAPPER_CLASS);
+                if (appWrapper && !appWrapper.classList.contains(APPOINTMENT_WRAPPER_HIDDEN_CLASS)) {
+                    addClass([appWrapper], APPOINTMENT_WRAPPER_HIDDEN_CLASS);
+                }
+            }
+        };
         for (var _i = 0, wrapperElements_1 = wrapperElements; _i < wrapperElements_1.length; _i++) {
             var wrapper = wrapperElements_1[_i];
             if (isDragging && !(wrapper.classList.contains(ALLDAY_APPOINTMENT_CLASS) ||
@@ -6890,11 +6906,13 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
                 for (var j = 0, len = this.parent.crudModule.crudObj.sourceEvent.length; j < len; j++) {
                     if (groupIndex === this.parent.crudModule.crudObj.sourceEvent[parseInt(j.toString(), 10)].groupIndex ||
                         groupIndex === this.parent.crudModule.crudObj.targetEvent[parseInt(j.toString(), 10)].groupIndex) {
+                        hideWrapper(wrapper);
                         remove(wrapper);
                     }
                 }
             }
             else {
+                hideWrapper(wrapper);
                 remove(wrapper);
             }
         }
@@ -6931,7 +6949,12 @@ var VerticalEvent = /** @__PURE__ @class */ (function (_super) {
         if (isDragging) {
             this.parent.crudModule.crudObj.isCrudAction = false;
         }
-        this.parent.renderTemplates();
+        this.parent.renderTemplates(function () {
+            if (_this.parent.isReact && _this.parent.activeViewOptions.eventTemplate) {
+                var wraps = [].slice.call(_this.parent.element.querySelectorAll('.' + APPOINTMENT_WRAPPER_HIDDEN_CLASS));
+                removeClass(wraps, APPOINTMENT_WRAPPER_HIDDEN_CLASS);
+            }
+        });
     };
     VerticalEvent.prototype.initializeValues = function () {
         this.resources = (this.parent.activeViewOptions.group.resources.length > 0) ? this.parent.uiStateValues.isGroupAdaptive ?
@@ -8360,8 +8383,7 @@ var MonthEvent = /** @__PURE__ @class */ (function (_super) {
             attrs: {
                 'role': 'button',
                 'tabindex': '0',
-                'aria-label': this.parent.globalize.formatNumber(count) + '&nbsp;'
-                    + (this.parent.isAdaptive ? '' : this.parent.localeObj.getConstant('more')),
+                'aria-label': this.parent.globalize.formatNumber(count) + ' ' + this.parent.localeObj.getConstant('moreEvents'),
                 'data-count': count.toString(),
                 'data-start-date': startDate.getTime().toString(),
                 'data-end-date': endDate.getTime().toString()
@@ -8485,11 +8507,18 @@ var TimelineEvent = /** @__PURE__ @class */ (function (_super) {
     };
     TimelineEvent.prototype.getOverlapSortComparerEvents = function (startDate, endDate, appointmentsCollection) {
         var appointments = [];
-        for (var _i = 0, appointmentsCollection_1 = appointmentsCollection; _i < appointmentsCollection_1.length; _i++) {
-            var app = appointmentsCollection_1[_i];
-            if (this.renderType === 'day') {
-                if ((resetTime(app[this.fields.startTime]).getTime() <= resetTime(new Date(startDate.getTime())).getTime()) &&
-                    (resetTime(app[this.fields.endTime]).getTime() >= resetTime(new Date(startDate.getTime())).getTime())) {
+        var _loop_1 = function (app) {
+            if (this_1.renderType === 'day') {
+                var start_1 = resetTime(startDate).getTime();
+                var end_1 = resetTime(endDate).getTime();
+                var appStart_1 = resetTime(app[this_1.fields.startTime]).getTime();
+                var appEnd_1 = resetTime(app[this_1.fields.endTime]).getTime();
+                var isEndOverlap = function () {
+                    var endTime = (end_1 - (getDateInMs(endDate) <= 0 ? MS_PER_DAY : 0));
+                    endTime = start_1 > endTime ? start_1 : endTime;
+                    return appEnd_1 >= endTime && appStart_1 <= endTime;
+                };
+                if (appStart_1 <= start_1 && appEnd_1 >= start_1 || isEndOverlap() || appStart_1 > start_1 && appEnd_1 < end_1) {
                     appointments.push(app);
                 }
             }
@@ -8500,6 +8529,11 @@ var TimelineEvent = /** @__PURE__ @class */ (function (_super) {
                     appointments.push(app);
                 }
             }
+        };
+        var this_1 = this;
+        for (var _i = 0, appointmentsCollection_1 = appointmentsCollection; _i < appointmentsCollection_1.length; _i++) {
+            var app = appointmentsCollection_1[_i];
+            _loop_1(app);
         }
         return appointments;
     };
@@ -9374,7 +9408,7 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
     QuickPopups.prototype.renderMorePopup = function () {
         var moreEventPopup = "<div class=\"" + MORE_EVENT_POPUP_CLASS + "\"><div class=\"" + MORE_EVENT_HEADER_CLASS + "\">" +
             ("<div class=\"" + MORE_EVENT_CLOSE_CLASS + "\" title=\"" + this.l10n.getConstant('close') + "\" tabindex=\"0\" role=\"button\"></div>") +
-            ("<div class=\"" + MORE_EVENT_DATE_HEADER_CLASS + "\"><div class=\"" + MORE_EVENT_HEADER_DAY_CLASS + "\"></div>") +
+            ("<div class=\"" + MORE_EVENT_DATE_HEADER_CLASS + "\"><div class=\"" + MORE_EVENT_HEADER_DAY_CLASS + "\" id=\"" + this.parent.element.id + "_more_popup\"></div>") +
             ("<div class=\"" + MORE_EVENT_HEADER_DATE_CLASS + " " + NAVIGATE_CLASS + "\" tabindex=\"0\" role=\"link\"></div></div></div></div>");
         var moreEventWrapper = createElement('div', {
             className: MORE_POPUP_WRAPPER_CLASS + ' e-popup-close',
@@ -9399,6 +9433,8 @@ var QuickPopups = /** @__PURE__ @class */ (function () {
             viewPortElement: (this.parent.isAdaptive ? document.body : this.parent.element),
             zIndex: (this.parent.isAdaptive ? 1002 : 2)
         });
+        this.morePopup.element.setAttribute('role', 'dialog');
+        this.morePopup.element.setAttribute('aria-labelledby', this.parent.element.id + '_more_popup');
         var closeButton = this.morePopup.element.querySelector('.' + MORE_EVENT_CLOSE_CLASS);
         this.renderButton('e-round', ICON + ' ' + CLOSE_ICON_CLASS, false, closeButton, this.closeClick);
         EventHandler.add(this.morePopup.element.querySelector('.' + MORE_EVENT_HEADER_DATE_CLASS), 'click', this.navigationClick, this);
@@ -11598,7 +11634,6 @@ var RecurrenceEditor = /** @__PURE__ @class */ (function (_super) {
     RecurrenceEditor.prototype.setTemplate = function () {
         var dayData = this.getDayData('narrow');
         var fullDay = this.getDayData('wide');
-        var labelId = this.element.id + '_' + 'end_label';
         this.element.innerHTML = '<div class="' + HEADER + '">' +
             '<div class="' + INPUTWARAPPER + ' ' + FORMLEFT + '">' +
             '<input type="text" tabindex="0" class="' + REPEATELEMENT +
@@ -11645,7 +11680,7 @@ var RecurrenceEditor = /** @__PURE__ @class */ (function (_super) {
             '</div></div>' +
             '<div class="' + INPUTWARAPPERSIDE + ' ' + ENDON + ' ' + FORMRIGHT + '">' +
             '<div class="' + INPUTWARAPPER + ' ' + ENDONLEFT + '">' +
-            '<input type="text" tabindex="0" class="' + ENDONELEMENT + '" aria-labelledby="' + labelId + '"title="' + this.localeObj.getConstant(END) + '" />' +
+            '<input type="text" tabindex="0" class="' + ENDONELEMENT + '"title="' + this.localeObj.getConstant(END) + '" />' +
             '</div>' +
             '<div class="' + INPUTWARAPPER + ' ' + ENDONDATE + '" >' +
             '<input type="text" tabindex="0" class="' + UNTILDATE + '"title="' + this.localeObj.getConstant(UNTIL$1) + '" />' +
@@ -14111,6 +14146,27 @@ var VirtualScroll = /** @__PURE__ @class */ (function () {
             this.itemSize = getElementHeightFromClass(this.parent.activeView.element, WORK_CELLS_CLASS) || this.itemSize;
         }
     };
+    VirtualScroll.prototype.refreshLayout = function () {
+        var initialHeight = this.parent.uiStateValues.scheduleHeight;
+        this.parent.uiStateValues.scheduleHeight = this.parent.element.offsetHeight;
+        var preRenderedLength = this.renderedLength;
+        if (this.parent.uiStateValues.scheduleHeight !== initialHeight) {
+            if (preRenderedLength < this.getRenderedCount()) {
+                this.isRemoteRefresh = true;
+            }
+            var resWrap = this.parent.element.querySelector('.' + RESOURCE_COLUMN_WRAP_CLASS);
+            var conWrap = this.parent.element.querySelector('.' + CONTENT_WRAP_CLASS);
+            var eventWrap = this.parent.element.querySelector('.' + EVENT_TABLE_CLASS);
+            var firstTDIndex = parseInt(resWrap.querySelector('tbody td').getAttribute('data-group-index'), 10);
+            var endIndex = (firstTDIndex + this.renderedLength);
+            firstTDIndex = (endIndex > this.parent.resourceBase.expandedResources.length) ?
+                (this.parent.resourceBase.expandedResources.length - this.renderedLength) : firstTDIndex;
+            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);
+            }
+        }
+    };
     VirtualScroll.prototype.renderEvents = function () {
         this.setTabIndex();
         var dynamicData = this.triggerScrollEvent(virtualScrollStop);
@@ -14146,7 +14202,9 @@ var VirtualScroll = /** @__PURE__ @class */ (function () {
             var eventWrap = this.parent.element.querySelector('.' + EVENT_TABLE_CLASS);
             var timeIndicator = this.parent.element.querySelector('.' + CURRENT_TIMELINE_CLASS);
             var conTable = this.parent.element.querySelector('.' + CONTENT_TABLE_CLASS);
-            addClass([conWrap], 'e-transition');
+            if (!this.parent.rowAutoHeight) {
+                addClass([conWrap, resWrap], 'e-transition');
+            }
             this.renderedLength = resWrap.querySelector('tbody').children.length;
             var firstTDIndex = parseInt(resWrap.querySelector('tbody td').getAttribute('data-group-index'), 10);
             var scrollHeight = this.parent.rowAutoHeight ?
@@ -14548,6 +14606,7 @@ var Render = /** @__PURE__ @class */ (function () {
             }
             throw Error('Inject required modules');
         }
+        this.parent.uiStateValues.scheduleHeight = this.parent.element.offsetHeight;
         this.parent.activeView.viewIndex = this.parent.viewIndex;
         this.updateLabelText(viewName);
         this.parent.activeView.addEventListener();
@@ -14812,6 +14871,9 @@ var Crud = /** @__PURE__ @class */ (function () {
             return;
         }
         this.parent.trigger(dataBinding, e, function (args) {
+            if (args.cancel) {
+                return;
+            }
             var resultData = extend([], args.result, null, true);
             _this.parent.eventsData = resultData.filter(function (data) { return !data[_this.parent.eventFields.isBlock]; });
             _this.parent.blockData = resultData.filter(function (data) { return data[_this.parent.eventFields.isBlock]; });
@@ -16465,6 +16527,7 @@ var ResourceBase = /** @__PURE__ @class */ (function () {
                 args = {
                     cancel: false, event: (event) ? event.event : null, groupIndex: _this.parent.uiStateValues.groupIndex, requestType: 'resourceChanged'
                 };
+                _this.parent.adaptiveGroupIndex = _this.parent.uiStateValues.groupIndex;
                 _this.parent.trigger(actionComplete, args);
             }
         });
@@ -17205,7 +17268,9 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
      * @param {string | HTMLElement} element Accepts the DOM element reference
      */
     function Schedule(options, element) {
-        return _super.call(this, options, element) || this;
+        var _this = _super.call(this, options, element) || this;
+        _this.adaptiveGroupIndex = 0;
+        return _this;
     }
     /**
      * Core method that initializes the control rendering.
@@ -17229,6 +17294,12 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
         else {
             removeClasses.push(DEVICE_CLASS);
         }
+        if (this.enableAdaptiveUI) {
+            addClasses.push(ADAPTIVE_CLASS);
+        }
+        else {
+            removeClasses.push(ADAPTIVE_CLASS);
+        }
         if (this.allowMultiDrag) {
             addClasses.push(MULTI_DRAG);
         }
@@ -17841,7 +17912,7 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
         if (this && isNullOrUndefined(this.uiStateValues) || !(this.enablePersistence)) {
             this.uiStateValues = {
                 expand: false, isInitial: true, left: 0, top: 0, isGroupAdaptive: false,
-                isIgnoreOccurrence: false, groupIndex: 0, action: false, isBlock: false, isCustomMonth: true, isPreventTimezone: false
+                isIgnoreOccurrence: false, groupIndex: this.adaptiveGroupIndex, action: false, isBlock: false, isCustomMonth: true, isPreventTimezone: false
             };
         }
         this.currentTimezoneDate = this.getCurrentTime();
@@ -18335,6 +18406,9 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
             && document.activeElement.classList.contains(SUBJECT_CLASS))) {
             return;
         }
+        if (this.virtualScrollModule && this.activeView.isTimelineView()) {
+            this.virtualScrollModule.refreshLayout();
+        }
         if (this.activeViewOptions.timeScale.enable && this.activeView) {
             this.activeView.highlightCurrentTime();
         }
@@ -18346,7 +18420,12 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
             && !this.activeViewOptions.timeScale.enable) || this.activeView.isTimelineView()) {
             this.activeView.resetColWidth();
             this.notify(scrollUiUpdate, { cssProperties: this.getCssProperties(), isPreventScrollUpdate: true });
-            this.refreshEvents(false);
+            var isRemoteRefresh = false;
+            if (this.activeViewOptions.enableLazyLoading && this.virtualScrollModule && this.virtualScrollModule.isRemoteRefresh) {
+                isRemoteRefresh = this.virtualScrollModule.isRemoteRefresh;
+                this.virtualScrollModule.isRemoteRefresh = false;
+            }
+            this.refreshEvents(isRemoteRefresh);
         }
         else {
             this.notify(contentReady, {});
@@ -18529,7 +18608,7 @@ var Schedule = /** @__PURE__ @class */ (function (_super) {
      * @private
      */
     Schedule.prototype.getPersistData = function () {
-        return this.addOnPersist(['currentView', 'selectedDate', 'scrollTop', 'scrollLeft']);
+        return this.addOnPersist(['currentView', 'selectedDate', 'scrollTop', 'scrollLeft', 'adaptiveGroupIndex']);
     };
     /**
      * Called internally, if any of the property value changed.
@@ -23672,7 +23751,7 @@ var ViewBase = /** @__PURE__ @class */ (function () {
             var colWidth_1 = (getElementWidth(contentBody) / (colElements.length / 2));
             if (content.offsetHeight !== content.clientHeight) {
                 var resourceColumn = this.parent.element.querySelector('.' + RESOURCE_COLUMN_WRAP_CLASS);
-                if (!isNullOrUndefined(resourceColumn)) {
+                if (!isNullOrUndefined(resourceColumn) && resourceColumn.offsetHeight !== content.clientHeight) {
                     setStyleAttribute(resourceColumn, { 'height': formatUnit(content.clientHeight) });
                 }
             }
@@ -24519,6 +24598,20 @@ var VerticalView = /** @__PURE__ @class */ (function (_super) {
             append(tooltipTemplate, ntd);
         }
         ntd.setAttribute('data-date', cellDate.getTime().toString());
+        var skeleton = 'full';
+        if (!this.parent.activeViewOptions.timeScale.enable) {
+            var announcementText = this.parent.globalize.formatDate(tdData.date, { skeleton: skeleton, calendar: this.parent.getCalendarMode() });
+            ntd.setAttribute('aria-label', announcementText);
+        }
+        else {
+            var startDateText = this.parent.globalize.formatDate(cellDate, {
+                type: 'dateTime', skeleton: skeleton, calendar: this.parent.getCalendarMode()
+            });
+            var endDateText = this.parent.globalize.formatDate(this.getEndDateFromStartDate(cellDate), {
+                type: 'dateTime', skeleton: skeleton, calendar: this.parent.getCalendarMode()
+            });
+            ntd.setAttribute('aria-label', startDateText + ' ' + this.parent.localeObj.getConstant('endAt') + ' ' + endDateText);
+        }
         if (!isNullOrUndefined(tdData.groupIndex) || this.parent.uiStateValues.isGroupAdaptive) {
             var groupIndex = this.parent.uiStateValues.isGroupAdaptive ? this.parent.uiStateValues.groupIndex :
                 tdData.groupIndex;
@@ -26083,7 +26176,8 @@ var AgendaBase = /** @__PURE__ @class */ (function (_super) {
             EventHandler.add(element, 'click', this.parent.agendaModule.dayNavigationClick, this);
         }
     };
-    AgendaBase.prototype.calculateResourceTableElement = function (tBody, noOfDays, agendaDate) {
+    AgendaBase.prototype.calculateResourceTableElement = function (tBody, noOfDays, agendaDate, agendaEnd) {
+        if (agendaEnd === void 0) { agendaEnd = null; }
         if (isNullOrUndefined(this.parent.resourceBase.lastResourceLevel)) {
             var level = this.getDateSlots(this.renderDates, this.parent.activeViewOptions.workDays);
             this.parent.resourceBase.generateResourceLevels(level);
@@ -26092,7 +26186,9 @@ var AgendaBase = /** @__PURE__ @class */ (function (_super) {
         var days = (this.parent.activeViewOptions.group.byDate || this.parent.currentView === 'MonthAgenda') ? noOfDays : 1;
         var resColl = this.parent.resourceBase.resourceCollection;
         var resData = this.parent.resourceBase.lastResourceLevel;
+        var agendaStart = agendaDate;
         var initialDate = agendaDate;
+        var showWeekend = this.parent.activeViewOptions.showWeekend;
         for (var i = 0; i < days; i++) {
             var lastLevelInfo = [];
             var tempLastLevelInfo = [];
@@ -26100,6 +26196,21 @@ var AgendaBase = /** @__PURE__ @class */ (function (_super) {
             var eventObj = void 0;
             var dateObj = void 0;
             var firstDate = addDays(initialDate, i);
+            if (this.parent.currentView === 'Agenda' && this.parent.activeViewOptions.group.byDate &&
+                this.parent.activeViewOptions.allowVirtualScrolling && !showWeekend && !this.isWorkDay(firstDate)) {
+                do {
+                    firstDate = addDays(firstDate, 1);
+                    if (firstDate >= agendaEnd) {
+                        break;
+                    }
+                } while (!this.isWorkDay(firstDate) ||
+                    this.parent.eventBase.filterEvents(firstDate, addDays(firstDate, 1)).length < 1);
+                if (firstDate >= agendaEnd) {
+                    break;
+                }
+                initialDate = addDays(firstDate, -i);
+                agendaLastDate = addDays(firstDate, 1);
+            }
             var finalDate = (this.parent.activeViewOptions.group.byDate || this.parent.currentView === 'MonthAgenda')
                 ? addDays(firstDate, 1) : agendaLastDate;
             var agendaCollection = this.parent.eventBase.filterEvents(firstDate, finalDate);
@@ -26114,7 +26225,9 @@ var AgendaBase = /** @__PURE__ @class */ (function (_super) {
                         for (var r = 0; r < noOfDays; r++) {
                             // eslint-disable-next-line max-len
                             var resDayCollection = this.parent.eventBase.filterEvents(agendaDate, addDays(agendaDate, 1), resDataCollection, undefined);
-                            if (resDayCollection.length > 0 || !this.parent.hideEmptyAgendaDays ||
+                            if (((showWeekend || !showWeekend && (this.parent.group.byDate ? this.isWorkDay(agendaDate) :
+                                this.isWorkDay(agendaDate, resData[parseInt(res.toString(), 10)].workDays)))
+                                && (resDayCollection.length > 0 || !this.parent.hideEmptyAgendaDays)) ||
                                 this.parent.currentView === 'MonthAgenda') {
                                 data.push(resDayCollection[0]);
                                 eventObj = {
@@ -26140,16 +26253,18 @@ var AgendaBase = /** @__PURE__ @class */ (function (_super) {
                             agendaDate = addDays(agendaDate, 1);
                             if (agendaDate.getTime() >= agendaLastDate.getTime() || this.parent.activeViewOptions.group.byDate
                                 || this.parent.currentView === 'MonthAgenda') {
-                                lastLevelInfo[lastLevelInfo.length - 1][1].cssClass = AGENDA_DAY_BORDER_CLASS;
-                                var tempObj = {
-                                    rowSpan: data.length, type: 'resourceColumn', resource: resColl[parseInt((resColl.length - 1).toString(), 10)],
-                                    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
-                                };
-                                lastLevelInfo[parseInt((lastLevelInfo.length - data.length).toString(), 10)].push(tempObj);
-                                tempLastLevelInfo.push(extend({}, tempObj, null, true));
+                                if (data.length > 0) {
+                                    lastLevelInfo[lastLevelInfo.length - 1][1].cssClass = AGENDA_DAY_BORDER_CLASS;
+                                    var tempObj = {
+                                        rowSpan: data.length, type: 'resourceColumn', resource: resColl[parseInt((resColl.length - 1).toString(), 10)],
+                                        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
+                                    };
+                                    lastLevelInfo[parseInt((lastLevelInfo.length - data.length).toString(), 10)].push(tempObj);
+                                    tempLastLevelInfo.push(extend({}, tempObj, null, true));
+                                }
                                 break;
                             }
                         }
@@ -26184,9 +26299,9 @@ var AgendaBase = /** @__PURE__ @class */ (function (_super) {
                 this.createResourceTableRow(lastLevelInfo, tBody);
             }
         }
-        var totalCollection = this.parent.eventBase.filterEvents(initialDate, agendaLastDate);
+        var totalCollection = this.parent.eventBase.filterEvents(agendaStart, agendaLastDate);
         if (totalCollection.length === 0 && !this.parent.activeViewOptions.allowVirtualScrolling && this.parent.hideEmptyAgendaDays) {
-            this.renderEmptyContent(tBody, initialDate);
+            this.renderEmptyContent(tBody, agendaStart);
         }
     };
     AgendaBase.prototype.createResourceTableRow = function (tContent, tBody) {
@@ -26459,9 +26574,20 @@ var Agenda = /** @__PURE__ @class */ (function (_super) {
         var firstDate = new Date(agendaDate.getTime());
         var isObject = this.appointmentFiltering(firstDate, lastDate);
         if (isObject.length > 0 && this.parent.activeViewOptions.allowVirtualScrolling && this.parent.hideEmptyAgendaDays) {
-            agendaDate = isObject[0][fieldMapping.startTime];
-            agendaDate = new Date(new Date(agendaDate.getTime()).setHours(0, 0, 0, 0));
-            this.updateHeaderText(isObject[0][fieldMapping.startTime]);
+            if (!this.parent.activeViewOptions.showWeekend && !this.isAgendaWorkDay(isObject[0][fieldMapping.startTime])) {
+                for (var _i = 0, isObject_1 = isObject; _i < isObject_1.length; _i++) {
+                    var event_2 = isObject_1[_i];
+                    if (this.isAgendaWorkDay(event_2[fieldMapping.startTime])) {
+                        agendaDate = new Date(new Date(event_2[fieldMapping.startTime].getTime()).setHours(0, 0, 0, 0));
+                        this.updateHeaderText(event_2[fieldMapping.startTime]);
+                        break;
+                    }
+                }
+            }
+            else {
+                agendaDate = new Date(new Date(isObject[0][fieldMapping.startTime].getTime()).setHours(0, 0, 0, 0));
+                this.updateHeaderText(isObject[0][fieldMapping.startTime]);
+            }
         }
         var endDate;
         if (!this.parent.hideEmptyAgendaDays || (this.parent.agendaDaysCount > 0 && isObject.length > 0)) {
@@ -26475,18 +26601,25 @@ var Agenda = /** @__PURE__ @class */ (function (_super) {
                         this.parent.headerModule.updateHeaderItems('remove');
                     }
                 }
-                this.calculateResourceTableElement(tBody, this.parent.agendaDaysCount, date);
+                this.calculateResourceTableElement(tBody, this.parent.agendaDaysCount, date, lastDate);
             }
             else {
                 for (var day = 0; day < this.parent.agendaDaysCount; day++) {
-                    var filterData = this.appointmentFiltering(agendaDate);
                     var nTr = this.createTableRowElement(agendaDate, 'data');
-                    if (this.element.querySelector('tr[data-row-index="' + parseInt(nTr.getAttribute('data-row-index'), 10) + '"]')) {
+                    var virtualContent = this.element.querySelector('tr[data-row-index="' + (+(nTr.dataset.rowIndex)) + '"]');
+                    if (virtualContent || !this.parent.activeViewOptions.showWeekend && !this.isAgendaWorkDay(agendaDate)) {
                         agendaDate = addDays(agendaDate, 1);
+                        if (!virtualContent && this.parent.activeViewOptions.allowVirtualScrolling) {
+                            day--;
+                        }
+                        if (agendaDate.getTime() > lastDate.getTime()) {
+                            break;
+                        }
                         continue;
                     }
                     var dTd = nTr.children[0];
                     var aTd = nTr.children[1];
+                    var filterData = this.appointmentFiltering(agendaDate);
                     if (filterData.length > 0 || (!this.parent.hideEmptyAgendaDays && filterData.length === 0)) {
                         var elementType = (!this.parent.hideEmptyAgendaDays && filterData.length === 0) ? 'noEvents' : 'data';
                         dTd.appendChild(this.createDateHeaderElement(agendaDate));
@@ -26513,6 +26646,14 @@ var Agenda = /** @__PURE__ @class */ (function (_super) {
         }
         this.agendaDates = { start: firstDate, end: endDate };
     };
+    Agenda.prototype.isAgendaWorkDay = function (date) {
+        if (this.parent.uiStateValues.isGroupAdaptive && !this.parent.group.byDate) {
+            return this.isWorkDay(date, this.parent.resourceBase.lastResourceLevel[this.parent.uiStateValues.groupIndex].workDays);
+        }
+        else {
+            return this.isWorkDay(date);
+        }
+    };
     Agenda.prototype.agendaScrolling = function (event) {
         if (this.parent.quickPopup) {
             this.parent.quickPopup.quickPopupHide();
@@ -26617,9 +26758,12 @@ var Agenda = /** @__PURE__ @class */ (function (_super) {
         var lastDate = this.getEndDateFromStartDate(date);
         var daysCount = 0;
         do {
-            var filterData = this.appointmentFiltering(currentDate);
-            if (filterData.length > 0 || !this.parent.hideEmptyAgendaDays) {
-                daysCount++;
+            if (this.parent.activeViewOptions.showWeekend || !this.parent.activeViewOptions.showWeekend &&
+                this.isAgendaWorkDay(currentDate)) {
+                var filterData = this.appointmentFiltering(currentDate);
+                if (filterData.length > 0 || !this.parent.hideEmptyAgendaDays) {
+                    daysCount++;
+                }
             }
             currentDate = addDays(currentDate, (type === 'next') ? 1 : -1);
             if (currentDate < firstDate || currentDate > lastDate) {
@@ -27918,11 +28062,14 @@ var TimelineYear = /** @__PURE__ @class */ (function (_super) {
                     groupIndex = this.colLevels.slice(-1)[0][parseInt(month.toString(), 10)].groupIndex;
                     classList$$1.push(WORKDAY_CLASS);
                 }
+                var startDateText = this.parent.globalize.formatDate(date, { type: 'dateTime', skeleton: 'full', calendar: this.parent.getCalendarMode() });
+                var endDateText = this.parent.globalize.formatDate(this.parent.calendarUtil.getMonthEndDate(new Date(monthDate.getTime())), { type: 'dateTime', skeleton: 'full', calendar: this.parent.getCalendarMode() });
                 var td = createElement('td', {
                     className: WORK_CELLS_CLASS,
                     attrs: {
                         'aria-selected': 'false',
-                        'data-date': date.getTime().toString()
+                        'data-date': date.getTime().toString(),
+                        'aria-label': startDateText + ' ' + this.parent.localeObj.getConstant('endAt') + ' ' + endDateText
                     }
                 });
                 addClass([td], classList$$1);