@syncfusion/ej2-schedule 27.1.48 → 27.1.50

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

@@ -6354,7 +6354,7 @@ class EventBase {
         this.parent.activeEventData = { event: eventObject, element: target };
     }
     generateOccurrence(event, viewDate, isMaxCount) {
-        const startDate = event[this.parent.eventFields.startTime];
+        let startDate = event[this.parent.eventFields.startTime];
         const endDate = event[this.parent.eventFields.endTime];
         const eventRule = event[this.parent.eventFields.recurrenceRule];
         const timeZoneDiff = endDate.getTimezoneOffset() - startDate.getTimezoneOffset();
@@ -6368,6 +6368,10 @@ class EventBase {
         const newTimezone = this.parent.timezone || this.parent.tzModule.getLocalTimezoneName();
         const firstDay = this.parent.activeViewOptions.firstDayOfWeek;
         const calendarMode = this.parent.calendarMode;
+        if (event[this.parent.eventFields.recurrenceRule] && event[this.parent.eventFields.recurrenceRule].includes('BYMONTHDAY') &&
+            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]);
+        }
         const dates = generate(startDate, eventRule, exception, firstDay, maxCount, viewDate, calendarMode, newTimezone);
         if (this.parent.currentView === 'Agenda' && eventRule.indexOf('COUNT') === -1 && eventRule.indexOf('UNTIL') === -1) {
             if (isNullOrUndefined(event.generatedDates)) {
@@ -6382,10 +6386,18 @@ class EventBase {
                 }
             }
         }
+        let isDSTAdjusted = false;
+        let convertedDates = [];
+        if (event[this.parent.eventFields.recurrenceRule] && event[this.parent.eventFields.recurrenceRule].includes('BYMONTHDAY') &&
+            this.parent.timezone && event[this.parent.eventFields.startTimezone] && event[this.parent.eventFields.endTimezone]) {
+            isDSTAdjusted = true;
+            convertedDates.push(...dates.map((date) => this.parent.tzModule.convert(new Date(date), event[this.parent.eventFields.startTimezone], this.parent.timezone).getTime()));
+        }
+        convertedDates = convertedDates.length > 0 ? convertedDates : dates;
         const occurrenceCollection = [];
-        for (let date of dates) {
+        for (let date of convertedDates) {
             const clonedObject = extend({}, event, null, true);
-            date = this.getDSTAdjustedTime(date, clonedObject);
+            date = !isDSTAdjusted ? this.getDSTAdjustedTime(date, clonedObject) : date;
             clonedObject[this.parent.eventFields.startTime] = new Date(date);
             clonedObject[this.parent.eventFields.endTime] = new Date(new Date(date).setMilliseconds(duration));
             clonedObject[this.parent.eventFields.recurrenceID] = clonedObject[this.parent.eventFields.id];