@syncfusion/ej2-schedule 27.1.48 → 27.1.50

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

@@ -6442,6 +6442,7 @@ var EventBase = /** @__PURE__ @class */ (function () {
         this.parent.activeEventData = { event: eventObject, element: target };
     };
     EventBase.prototype.generateOccurrence = function (event, viewDate, isMaxCount) {
+        var _this = this;
         var startDate = event[this.parent.eventFields.startTime];
         var endDate = event[this.parent.eventFields.endTime];
         var eventRule = event[this.parent.eventFields.recurrenceRule];
@@ -6456,6 +6457,10 @@ var EventBase = /** @__PURE__ @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') &&
+            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]);
+        }
         var 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)) {
@@ -6470,11 +6475,21 @@ var EventBase = /** @__PURE__ @class */ (function () {
                 }
             }
         }
+        var isDSTAdjusted = false;
+        var 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.apply(convertedDates, dates.map(function (date) {
+                return _this.parent.tzModule.convert(new Date(date), event[_this.parent.eventFields.startTimezone], _this.parent.timezone).getTime();
+            }));
+        }
+        convertedDates = convertedDates.length > 0 ? convertedDates : dates;
         var occurrenceCollection = [];
-        for (var _i = 0, dates_1 = dates; _i < dates_1.length; _i++) {
-            var date = dates_1[_i];
+        for (var _i = 0, convertedDates_1 = convertedDates; _i < convertedDates_1.length; _i++) {
+            var date = convertedDates_1[_i];
             var 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];