@syncfusion/ej2-schedule 27.1.55 → 27.1.57

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 27.1.55
+*  version : 27.1.57
 *  Copyright Syncfusion Inc. 2001 - 2023. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-schedule@*",
-  "_id": "@syncfusion/ej2-schedule@27.1.53",
+  "_id": "@syncfusion/ej2-schedule@27.1.56",
   "_inBundle": false,
-  "_integrity": "sha512-eCYWez3dZD5pMKNeAPRVDLdH/X+5htZeVD65OxMdfIMS5/Fqmwjh4rZ0JmgowSEZon522i41/I5gF2TzCTvm0g==",
+  "_integrity": "sha512-YIlG9bJsGCuonDNYM09yocSiXcLknCUFzXopeuZ5GhZSnZmQyAMVwGViZW9BZxHVzlgbQ24Trg6Rzf1SO+3O6Q==",
   "_location": "/@syncfusion/ej2-schedule",
   "_phantomChildren": {},
   "_requested": {
@@ -23,8 +23,8 @@
     "/@syncfusion/ej2-react-schedule",
     "/@syncfusion/ej2-vue-schedule"
   ],
-  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-schedule/-/ej2-schedule-27.1.53.tgz",
-  "_shasum": "10390d6fc7e1a6861d7b096db0238f3b84f463c5",
+  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-schedule/-/ej2-schedule-27.1.56.tgz",
+  "_shasum": "f1385b2a923b0dc507f2abd750598c7c31f22a94",
   "_spec": "@syncfusion/ej2-schedule@*",
   "_where": "/jenkins/workspace/elease-automation_release_27.1.1/packages/included",
   "author": {
@@ -37,14 +37,14 @@
   "dependencies": {
     "@syncfusion/ej2-base": "~27.1.55",
     "@syncfusion/ej2-buttons": "~27.1.53",
-    "@syncfusion/ej2-calendars": "~27.1.55",
+    "@syncfusion/ej2-calendars": "~27.1.57",
     "@syncfusion/ej2-data": "~27.1.52",
-    "@syncfusion/ej2-dropdowns": "~27.1.55",
+    "@syncfusion/ej2-dropdowns": "~27.1.57",
     "@syncfusion/ej2-excel-export": "~27.1.50",
     "@syncfusion/ej2-inputs": "~27.1.55",
     "@syncfusion/ej2-lists": "~27.1.50",
-    "@syncfusion/ej2-navigations": "~27.1.55",
-    "@syncfusion/ej2-popups": "~27.1.55"
+    "@syncfusion/ej2-navigations": "~27.1.57",
+    "@syncfusion/ej2-popups": "~27.1.57"
   },
   "deprecated": false,
   "description": "Flexible scheduling library with more built-in features and enhanced customization options similar to outlook and google calendar, allowing the users to plan and manage their appointments with efficient data-binding support.",
@@ -73,6 +73,6 @@
     "url": "git+https://github.com/syncfusion/ej2-javascript-ui-controls.git"
   },
   "typings": "index.d.ts",
-  "version": "27.1.55",
+  "version": "27.1.57",
   "sideEffects": false
 }

package/src/recurrence-editor/date-generator.js

@@ -153,7 +153,7 @@ export function generate(startDate, rule, excludeDate, startDayOfWeek, maximumCo
             dailyType(modifiedDate, ruleObject.until, data, ruleObject);
             break;
         case 'WEEKLY':
-            weeklyType(modifiedDate, ruleObject.until, data, ruleObject);
+            weeklyType(modifiedDate, ruleObject.until, data, ruleObject, startDayOfWeek);
             break;
         case 'MONTHLY':
             monthlyType(modifiedDate, ruleObject.until, data, ruleObject);
@@ -256,10 +256,11 @@ function dailyType(startDate, endDate, data, ruleObject) {
  * @param {Date} endDate Accepts the end date
  * @param {number[]} data Accepts the collection of dates
  * @param {RecRule} ruleObject Accepts the recurrence rule object
+ * @param {number} startDayOfWeek Accepts the start day index of week
  * @returns {void}
  * @private
  */
-function weeklyType(startDate, endDate, data, ruleObject) {
+function weeklyType(startDate, endDate, data, ruleObject, startDayOfWeek) {
     var tempDate = new Date(startDate.getTime());
     if (!ruleObject.day.length) {
         ruleObject.day.push(DAYINDEX[startDate.getDay()]);
@@ -308,7 +309,7 @@ function weeklyType(startDate, endDate, data, ruleObject) {
     }
     else {
         tempDate = getStartDateForWeek(startDate, ruleObject.day);
-        if (interval > 1 && dayIndex.indexOf(ruleObject.day[0]) < startDate.getDay()) {
+        if (interval > 1 && dayIndex.indexOf(ruleObject.day[0]) < (startDate.getDay() - startDayOfWeek)) {
             tempDate.setDate(tempDate.getDate() + ((interval - 1) * 7));
         }
         while (compareDates(tempDate, endDate)) {

package/src/schedule/base/constant.d.ts

@@ -55,6 +55,14 @@ export declare const cellSelect: string;
 export declare const virtualScrollStart: string;
 /** @private */
 export declare const virtualScrollStop: string;
+/** @private */
+export declare const noEvents: string;
+/** @private */
+export declare const agendaCells: string;
+/** @private */
+export declare const resourceHeader: string;
+/** @private */
+export declare const dateHeader: string;
 /**
  * Specifies schedule internal events
  */

package/src/schedule/base/constant.js

@@ -55,6 +55,14 @@ export var cellSelect = 'cellSelect';
 export var virtualScrollStart = 'virtualScrollStart';
 /** @private */
 export var virtualScrollStop = 'virtualScrollStop';
+/** @private */
+export var noEvents = 'noEvents';
+/** @private */
+export var agendaCells = 'agendaCells';
+/** @private */
+export var resourceHeader = 'resourceHeader';
+/** @private */
+export var dateHeader = 'dateHeader';
 /**
  * Specifies schedule internal events
  */

package/src/schedule/event-renderer/agenda-base.d.ts

@@ -9,7 +9,7 @@ export declare class AgendaBase extends ViewBase {
     calculateResourceTableElement(tBody: Element, noOfDays: number, agendaDate: Date, agendaEnd?: Date): void;
     private createResourceTableRow;
     createDateHeaderElement(date: Date): Element;
-    renderEmptyContent(tBody: Element, agendaDate: Date): void;
+    renderEmptyContent(tBody: Element, agendaDate: Date, hasNoEvents?: boolean): void;
     createTableRowElement(date: Date, type: string): Element;
     destroy(): void;
 }

package/src/schedule/event-renderer/agenda-base.js

@@ -335,12 +335,24 @@ var AgendaBase = /** @class */ (function (_super) {
                 }
                 else if (data.type === 'eventColumn') {
                     var elementType = (data.eventData.length === 0) ? 'noEvents' : 'data';
+                    for (var i = 0; i < ntr.childNodes.length; i++) {
+                        var currentElement = ntr.childNodes.item(i);
+                        var renderCellElementType = currentElement.classList.contains('e-resource-column') ?
+                            event.resourceHeader : event.dateHeader;
+                        this.parent.trigger(event.renderCell, {
+                            elementType: renderCellElementType, element: currentElement, date: data.date, groupIndex: data.groupIndex
+                        });
+                    }
                     ntd = this.createAgendaContentElement(elementType, data.eventData, ntd, data.groupOrder, data.groupIndex);
                     ntd.setAttribute('data-date', data.date.getTime().toString());
                     if (this.parent.activeViewOptions.group.byDate || this.parent.currentView === 'MonthAgenda') {
                         addClass([ntd], [cls.AGENDA_CELLS_CLASS, cls.AGENDA_DAY_PADDING_CLASS]);
                     }
                     ntr.appendChild(ntd);
+                    var renderCellType = (data.eventData.length === 0) ? event.noEvents : event.agendaCells;
+                    this.parent.trigger(event.renderCell, {
+                        elementType: renderCellType, element: ntd, date: data.date, groupIndex: data.groupIndex
+                    });
                 }
                 else {
                     ntd.setAttribute('rowspan', data.rowSpan.toString());
@@ -381,7 +393,7 @@ var AgendaBase = /** @class */ (function (_super) {
         }
         return dateHeader;
     };
-    AgendaBase.prototype.renderEmptyContent = function (tBody, agendaDate) {
+    AgendaBase.prototype.renderEmptyContent = function (tBody, agendaDate, hasNoEvents) {
         var eTr = this.createTableRowElement(agendaDate, 'noEvents');
         var eTd = eTr.children[0];
         var noEvents = createElement('div', {
@@ -390,6 +402,9 @@ var AgendaBase = /** @class */ (function (_super) {
         });
         eTd.appendChild(noEvents);
         tBody.appendChild(eTr);
+        if (hasNoEvents) {
+            this.parent.trigger(event.renderCell, { elementType: event.noEvents, element: eTd, date: agendaDate });
+        }
     };
     AgendaBase.prototype.createTableRowElement = function (date, type) {
         var daysCount = util.getDaysCount(this.parent.selectedDate.getTime(), date.getTime());

package/src/schedule/event-renderer/event-base.d.ts

@@ -42,6 +42,7 @@ export declare class EventBase {
     getSelectedAppointments(): Element[];
     focusElement(isFocused?: boolean): void;
     selectWorkCellByTime(eventsData: Record<string, any>[]): Element;
+    private findNearestSlot;
     getGroupIndexFromEvent(eventData: Record<string, any>): number;
     isAllDayAppointment(event: Record<string, any>): boolean;
     addEventListener(): void;
@@ -59,6 +60,7 @@ export declare class EventBase {
     getEventMaxID(resourceId?: number): number | string;
     private activeEventData;
     generateOccurrence(event: Record<string, any>, viewDate?: Date, isMaxCount?: boolean): Record<string, any>[];
+    private isDayBasedRecurrence;
     private getDSTAdjustedTime;
     private getDSTDiff;
     getParentEvent(eventObj: Record<string, any>, isParent?: boolean): Record<string, any>;

package/src/schedule/event-renderer/event-base.js

@@ -584,11 +584,14 @@ var EventBase = /** @class */ (function () {
         if (eventsData.length > 0) {
             var selectedObject = eventsData[eventsData.length - 1];
             var eventStartTime = selectedObject[this.parent.eventFields.startTime];
-            var nearestTime = new Date(+eventStartTime).setMinutes(0, 0, 0);
+            var nearestTime = void 0;
             var isAllDay = this.isAllDayAppointment(selectedObject);
-            if (this.parent.currentView === 'Month' || isAllDay) {
+            if (this.parent.currentView === 'Month' || isAllDay || !this.parent.activeViewOptions.timeScale.enable) {
                 nearestTime = new Date(+eventStartTime).setHours(0, 0, 0, 0);
             }
+            else {
+                nearestTime = this.findNearestSlot(eventStartTime);
+            }
             var targetArea = void 0;
             if (isAllDay && ['Day', 'Week', 'WorkWeek'].indexOf(this.parent.currentView) !== -1) {
                 targetArea = this.parent.getAllDayRow();
@@ -597,7 +600,8 @@ var EventBase = /** @class */ (function () {
                 targetArea = this.parent.getContentTable();
             }
             var queryString = '[data-date="' + new Date(nearestTime).getTime() + '"]';
-            if (this.parent.activeViewOptions.group.resources.length > 0) {
+            if (!isNullOrUndefined(this.parent.activeViewOptions.group.resources) &&
+                this.parent.activeViewOptions.group.resources.length > 0) {
                 queryString += '[data-group-index="' + this.getGroupIndexFromEvent(selectedObject) + '"]';
             }
             target = targetArea.querySelector(queryString);
@@ -611,6 +615,25 @@ var EventBase = /** @class */ (function () {
         }
         return target;
     };
+    EventBase.prototype.findNearestSlot = function (appointmentTime) {
+        var msMajorInterval = this.parent.activeViewOptions.timeScale.interval * util.MS_PER_MINUTE;
+        var msInterval = msMajorInterval / this.parent.activeViewOptions.timeScale.slotCount;
+        var numberOfSlots = Math.round(util.MS_PER_DAY / msInterval);
+        var startTime = new Date(appointmentTime);
+        startTime.setHours(0, 0, 0, 0);
+        var slots = Array.from({ length: numberOfSlots }, function (_, i) {
+            var slotTime = new Date(startTime.getTime() + i * msInterval);
+            return slotTime;
+        });
+        var nearestSlot = slots.reduce(function (nearest, slot) {
+            var difference = Math.abs(appointmentTime.getTime() - slot.getTime());
+            if (!nearest || difference < Math.abs(appointmentTime.getTime() - nearest.getTime())) {
+                return slot;
+            }
+            return nearest;
+        }, null);
+        return Math.trunc(nearestSlot.getTime() / 1000) * 1000;
+    };
     EventBase.prototype.getGroupIndexFromEvent = function (eventData) {
         var levelIndex;
         var resource;
@@ -912,7 +935,7 @@ var EventBase = /** @class */ (function () {
         var newTimezone = this.parent.timezone || this.parent.tzModule.getLocalTimezoneName();
         var firstDay = this.parent.activeViewOptions.firstDayOfWeek;
         var calendarMode = this.parent.calendarMode;
-        if (event[this.parent.eventFields.recurrenceRule] && event[this.parent.eventFields.recurrenceRule].includes('BYMONTHDAY') &&
+        if (event[this.parent.eventFields.recurrenceRule] && this.isDayBasedRecurrence(event) &&
             this.parent.timezone && event[this.parent.eventFields.startTimezone] && event[this.parent.eventFields.endTimezone]) {
             startDate = this.parent.tzModule.convert(event[this.parent.eventFields.startTime], this.parent.timezone, event[this.parent.eventFields.startTimezone]);
         }
@@ -932,7 +955,7 @@ var EventBase = /** @class */ (function () {
         }
         var isDSTAdjusted = false;
         var convertedDates = [];
-        if (event[this.parent.eventFields.recurrenceRule] && event[this.parent.eventFields.recurrenceRule].includes('BYMONTHDAY') &&
+        if (event[this.parent.eventFields.recurrenceRule] && this.isDayBasedRecurrence(event) &&
             this.parent.timezone && event[this.parent.eventFields.startTimezone] && event[this.parent.eventFields.endTimezone]) {
             isDSTAdjusted = true;
             convertedDates.push.apply(convertedDates, dates.map(function (date) {
@@ -955,6 +978,10 @@ var EventBase = /** @class */ (function () {
         }
         return occurrenceCollection;
     };
+    EventBase.prototype.isDayBasedRecurrence = function (event) {
+        return (event[this.parent.eventFields.recurrenceRule].includes('BYMONTHDAY')
+            || event[this.parent.eventFields.recurrenceRule].includes('BYDAY'));
+    };
     EventBase.prototype.getDSTAdjustedTime = function (date, event) {
         var occurDate = date;
         if (this.parent.timezone &&

package/src/schedule/renderer/agenda.js

@@ -142,7 +142,7 @@ var Agenda = /** @class */ (function (_super) {
             }
         }
         if (tBody.childNodes.length <= 0) {
-            this.renderEmptyContent(tBody, agendaDate);
+            this.renderEmptyContent(tBody, agendaDate, true);
         }
     };
     Agenda.prototype.renderContent = function (tBody, agendaDate, lastDate) {
@@ -200,11 +200,15 @@ var Agenda = /** @class */ (function (_super) {
                         var elementType = (!this.parent.hideEmptyAgendaDays && filterData.length === 0) ? 'noEvents' : 'data';
                         dTd.appendChild(this.createDateHeaderElement(agendaDate));
                         nTr.appendChild(dTd);
+                        this.parent.trigger(event.renderCell, { elementType: event.dateHeader, element: dTd, date: agendaDate });
                         var cTd = this.createAgendaContentElement(elementType, filterData, aTd);
                         nTr.appendChild(cTd);
                         if (cTd.querySelectorAll('li').length > 0) {
                             tBody.appendChild(nTr);
                         }
+                        var renderCellElementType = (!this.parent.hideEmptyAgendaDays && filterData.length === 0) ?
+                            event.noEvents : event.agendaCells;
+                        this.parent.trigger(event.renderCell, { elementType: renderCellElementType, element: cTd, date: agendaDate });
                     }
                     else if (this.parent.activeViewOptions.allowVirtualScrolling) {
                         day--;