@syncfusion/ej2-schedule 27.1.48 → 27.1.51

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

@@ -2009,6 +2009,9 @@ class ScheduleTouch {
         this.element.style.transform = 'translatex(' + (this.parent.enableRtl ? prevWidth : -this.currentPanel.element.offsetLeft) + 'px)';
     }
     onTransitionEnd() {
+        if (!isNullOrUndefined(this.element) && !this.element.classList.contains(TRANSLATE_CLASS)) {
+            return;
+        }
         removeClass([this.element], TRANSLATE_CLASS);
         this.element.style.transitionDuration = '';
         this.element.style.transform = '';
@@ -6354,7 +6357,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 +6371,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 +6389,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];
@@ -6825,8 +6840,8 @@ class VerticalEvent extends EventBase {
         this.slotCount = this.parent.activeViewOptions.timeScale.slotCount;
         this.interval = this.parent.activeViewOptions.timeScale.interval;
         this.allDayLevel = 0;
-        this.startHour = this.parent.activeView.getStartHour();
-        this.endHour = this.parent.activeView.getEndHour();
+        this.startHour = this.getStartEndHours(this.parent.activeViewOptions.startHour);
+        this.endHour = this.getStartEndHours(this.parent.activeViewOptions.endHour);
         this.element = this.parent.activeView.getPanel();
         this.fields = this.parent.eventFields;
         this.animation = new Animation({ progress: this.animationUiUpdate.bind(this) });
@@ -6954,7 +6969,7 @@ class VerticalEvent extends EventBase {
             const renderDates = this.dateRender[parseInt(resource.toString(), 10)];
             for (let day = 0, length = renderDates.length; day < length; day++) {
                 const startDate = new Date(renderDates[parseInt(day.toString(), 10)].getTime());
-                const endDate = addDays(renderDates[parseInt(day.toString(), 10)], 1);
+                const endDate = resetTime(addDays(renderDates[parseInt(day.toString(), 10)], 1));
                 const filterEvents = this.filterEvents(startDate, endDate, this.parent.blockProcessed, this.resources[parseInt(resource.toString(), 10)]);
                 for (const event of filterEvents) {
                     if (this.parent.resourceBase) {
@@ -6984,7 +6999,7 @@ class VerticalEvent extends EventBase {
             }
             else {
                 blockHeight = formatUnit(this.getHeight(eStart, eEnd));
-                blockTop = formatUnit(this.getTopValue(eStart, dayIndex, resource));
+                blockTop = formatUnit(this.getTopValue(eStart));
             }
             const appointmentElement = this.createBlockAppointmentElement(eventObj, resource, this.isResourceEventTemplate);
             setStyleAttribute(appointmentElement, { 'width': '100%', 'height': blockHeight, 'top': blockTop });
@@ -7017,7 +7032,7 @@ class VerticalEvent extends EventBase {
                 renderDates[parseInt(day.toString(), 10)] <= renderedDate[renderedDate.length - 1]; day++) {
                 this.renderedEvents = [];
                 const startDate = new Date(renderDates[parseInt(day.toString(), 10)].getTime());
-                const endDate = addDays(renderDates[parseInt(day.toString(), 10)], 1);
+                const endDate = resetTime(addDays(renderDates[parseInt(day.toString(), 10)], 1));
                 const filterEvents = this.filterEvents(startDate, endDate, eventCollection, this.resources[parseInt(resource.toString(), 10)]);
                 if (isRender) {
                     for (const event of filterEvents) {
@@ -7349,7 +7364,7 @@ class VerticalEvent extends EventBase {
         if (eStart <= eEnd && isValidEvent && this.isWorkDayAvailable(resource, eStart)) {
             const appHeight = record.isSpanned.isSameDuration ? this.cellHeight : this.getHeight(eStart, eEnd);
             if (eStart.getTime() >= schedule.startHour.getTime()) {
-                topValue = this.getTopValue(eStart, dayIndex, resource);
+                topValue = this.getTopValue(eStart);
             }
             const appIndex = this.getOverlapIndex(record, dayIndex, false, resource);
             record.Index = appIndex;
@@ -7410,13 +7425,20 @@ class VerticalEvent extends EventBase {
         const tempLeft = (parseFloat(appWidth) + 1) * index;
         return (tempLeft > 99 ? 99 : tempLeft) + '%';
     }
-    getTopValue(date, day, resource) {
-        const viewDate = resetTime(this.dateRender[parseInt(resource.toString(), 10)][parseInt(day.toString(), 10)]);
-        const startEndHours = getStartEndHours(viewDate, this.startHour, this.endHour);
-        const startHour = startEndHours.startHour;
-        const adjustedStartHour = isDaylightSavingTime(viewDate) && (startHour.getHours() !== this.startHour.getHours()) ?
-            this.startHour.getHours() : startHour.getHours();
-        const diffInMinutes = ((date.getHours() - adjustedStartHour) * 60) + (date.getMinutes() - startHour.getMinutes());
+    getStartEndHours(startEndTime) {
+        if (!isNullOrUndefined(startEndTime) && startEndTime !== '') {
+            const startEndDate = new Date(2000, 0, 0, 0);
+            const timeString = startEndTime.split(':');
+            if (timeString.length === 2) {
+                startEndDate.setHours(parseInt(timeString[0], 10), parseInt(timeString[1], 10), 0);
+            }
+            return startEndDate;
+        }
+        return null;
+    }
+    getTopValue(date) {
+        const startHour = this.getStartEndHours(this.parent.activeViewOptions.startHour);
+        const diffInMinutes = ((date.getHours() - startHour.getHours()) * 60) + (date.getMinutes() - startHour.getMinutes());
         return (this.parent.activeViewOptions.timeScale.enable) ? ((diffInMinutes * this.cellHeight * this.slotCount) / this.interval) : 0;
     }
     getOverlapIndex(record, day, isAllDay, resource) {
@@ -21550,13 +21572,16 @@ class DragAndDrop extends ActionBase {
         this.isCursorAhead = false;
         this.enableCurrentViewDrag = false;
         this.isPreventMultiDrag = false;
+        this.slotsUptoCursor = -1;
+        this.eleTop = 0;
     }
     wireDragEvent(element) {
+        const isVerticalView = ['Day', 'Week', 'WorkWeek'].indexOf(this.parent.currentView) > -1;
         new Draggable(element, {
             abort: '.' + EVENT_RESIZE_CLASS,
             clone: true,
             isDragScroll: true,
-            enableTailMode: (this.parent.eventDragArea) ? true : false,
+            enableTailMode: (this.parent.eventDragArea || isVerticalView) ? true : false,
             cursorAt: (this.parent.eventDragArea) ? { left: -20, top: -20 } : { left: 0, top: 0 },
             dragArea: this.dragArea,
             dragStart: this.dragStart.bind(this),
@@ -21579,6 +21604,8 @@ class DragAndDrop extends ActionBase {
         }
         this.setDragActionDefaultValues();
         this.actionObj.element = e.element;
+        this.eleTop = parseFloat(this.actionObj.element.style.top);
+        this.slotsUptoCursor = -1;
         this.actionObj.action = 'drag';
         let elements = [];
         if (!this.parent.allowMultiDrag || isNullOrUndefined(this.parent.selectedElements) || this.parent.selectedElements.length === 0 ||
@@ -21657,7 +21684,13 @@ class DragAndDrop extends ActionBase {
             }
             let top = parseInt(e.top, 10);
             top = top < 0 ? 0 : top;
-            topValue = formatUnit(Math.floor(top / cellHeight) * cellHeight);
+            if (this.slotsUptoCursor < 0) {
+                const cellsCountUptoCursor = Math.floor(top / cellHeight);
+                const cellsCountUptoEleTop = Math.floor(this.eleTop / cellHeight);
+                this.slotsUptoCursor = cellsCountUptoCursor - cellsCountUptoEleTop;
+            }
+            top = (Math.floor((top + 1) / cellHeight) - this.slotsUptoCursor) * cellHeight;
+            topValue = formatUnit(top < 0 ? 0 : top);
             const scrollHeight = this.parent.element.querySelector('.e-content-wrap').scrollHeight;
             const cloneBottom = parseInt(topValue, 10) + this.actionObj.clone.offsetHeight;
             if (cloneBottom > scrollHeight) {
@@ -22086,7 +22119,7 @@ class DragAndDrop extends ActionBase {
                 (dragArea.scrollTop + dragArea.offsetHeight - this.actionObj.clone.offsetHeight + window.pageYOffset) +
                     (this.actionObj.clone.offsetHeight - this.heightUptoCursorPoint);
             offsetTop = Math.round(offsetTop / this.actionObj.cellHeight) * this.actionObj.cellHeight;
-            if (dragArea.scrollTop > 0) {
+            if (dragArea.scrollTop > 0 && offsetTop < dragArea.scrollHeight) {
                 this.actionObj.clone.style.top = formatUnit(offsetTop);
             }
         }
@@ -22333,7 +22366,7 @@ class DragAndDrop extends ActionBase {
                     let appHeight = this.parent.activeViewOptions.timeScale.enable ? this.verticalEvent.getHeight(eStart, eEnd) :
                         this.actionObj.element.offsetHeight;
                     let topValue = this.parent.activeViewOptions.timeScale.enable ?
-                        this.verticalEvent.getTopValue(eStart, dayIndex, indexGroup) : this.actionObj.element.offsetTop;
+                        this.verticalEvent.getTopValue(eStart) : this.actionObj.element.offsetTop;
                     if (isNullOrUndefined(index)) {
                         if (i === 0) {
                             this.actionObj.clone.style.top = formatUnit(topValue);
@@ -23121,6 +23154,10 @@ class ViewBase {
         }
         startHour.setMilliseconds(0);
         endHour.setMilliseconds(0);
+        if (resetTime(date).getTime() !== resetTime(startHour).getTime()) {
+            startHour = new Date(2000, 0, 0, startHour.getHours(), startHour.getMinutes(), startHour.getMilliseconds());
+            endHour = new Date(2000, 0, 0, endHour.getHours(), endHour.getMinutes(), endHour.getMilliseconds());
+        }
         return !(getDateInMs(date) < getDateInMs(startHour) || getDateInMs(date) >= getDateInMs(endHour) ||
             !this.isWorkDay(date, workDays));
     }
@@ -23837,7 +23874,7 @@ class VerticalView extends ViewBase {
         }
     }
     getTopFromDateTime(date) {
-        const startHour = this.getStartHour();
+        const startHour = this.getStartEndHours(this.parent.activeViewOptions.startHour);
         const diffInMinutes = ((date.getHours() - startHour.getHours()) * 60) + (date.getMinutes() - startHour.getMinutes());
         return (diffInMinutes * this.getWorkCellHeight() * this.parent.activeViewOptions.timeScale.slotCount) /
             this.parent.activeViewOptions.timeScale.interval;