@syncfusion/ej2-schedule 27.1.56 → 27.1.58

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 27.1.56
+*  version : 27.1.58
 *  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.55",
+  "_id": "@syncfusion/ej2-schedule@27.1.57",
   "_inBundle": false,
-  "_integrity": "sha512-5voLaihRI8Cl4b+vp/Krva3umpRr8awwCVvCMSofVIDvpD3N7qGisdFknBShYr1Ph7aJbysvOIT/uFPKqZNlHA==",
+  "_integrity": "sha512-Nfn3W+XeW1/wtDhCxCvFKCyD0gCRCyEPB3r/AoHB+Rb6RMRCt3JQvcnlZp66Eix1Dsnj1Nrigvqbe0YepHQKrw==",
   "_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.55.tgz",
-  "_shasum": "b024fa4861634b50578a28bb08c0dd1081c1cb26",
+  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-schedule/-/ej2-schedule-27.1.57.tgz",
+  "_shasum": "938ad7e4dc8096d9db5917e81a2bc31c61062e88",
   "_spec": "@syncfusion/ej2-schedule@*",
   "_where": "/jenkins/workspace/elease-automation_release_27.1.1/packages/included",
   "author": {
@@ -36,15 +36,15 @@
   "bundleDependencies": false,
   "dependencies": {
     "@syncfusion/ej2-base": "~27.1.55",
-    "@syncfusion/ej2-buttons": "~27.1.53",
-    "@syncfusion/ej2-calendars": "~27.1.55",
+    "@syncfusion/ej2-buttons": "~27.1.58",
+    "@syncfusion/ej2-calendars": "~27.1.57",
     "@syncfusion/ej2-data": "~27.1.52",
-    "@syncfusion/ej2-dropdowns": "~27.1.55",
+    "@syncfusion/ej2-dropdowns": "~27.1.58",
     "@syncfusion/ej2-excel-export": "~27.1.50",
-    "@syncfusion/ej2-inputs": "~27.1.55",
+    "@syncfusion/ej2-inputs": "~27.1.58",
     "@syncfusion/ej2-lists": "~27.1.50",
-    "@syncfusion/ej2-navigations": "~27.1.56",
-    "@syncfusion/ej2-popups": "~27.1.56"
+    "@syncfusion/ej2-navigations": "~27.1.58",
+    "@syncfusion/ej2-popups": "~27.1.58"
   },
   "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.56",
+  "version": "27.1.58",
   "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/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/exports/print.js

@@ -169,10 +169,12 @@ var Print = /** @class */ (function () {
         var _this = this;
         this.printWindow = basePrint(this.printInstance.element, this.printWindow);
         this.printWindow.onbeforeunload = function () {
-            _this.printInstance.off(events.print, _this.contentReady);
-            _this.printInstance.element.remove();
-            _this.printInstance.destroy();
-            _this.printInstance = null;
+            if (_this.printInstance) {
+                _this.printInstance.off(events.print, _this.contentReady);
+                _this.printInstance.element.remove();
+                _this.printInstance.destroy();
+                _this.printInstance = null;
+            }
             _this.printWindow = null;
         };
     };