@syncfusion/ej2-schedule 21.2.6 → 21.2.10

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

@@ -1118,7 +1118,7 @@ class HeaderRenderer {
         }
         else {
             const text = this.parent.activeView.getDateRangeText(date);
-            selEle.setAttribute('aria-label', text);
+            selEle.firstElementChild.setAttribute('aria-label', text);
             textEle.textContent = text;
         }
         this.refresh();
@@ -1149,16 +1149,16 @@ class HeaderRenderer {
         const items = [];
         items.push({
             align: 'Left', prefixIcon: 'e-icon-prev', tooltipText: 'Previous', overflow: 'Show',
-            cssClass: 'e-prev', htmlAttributes: { 'aria-label': 'previous period', 'role': 'navigation' }
+            cssClass: 'e-prev', htmlAttributes: { 'role': 'navigation' }
         });
         items.push({
             align: 'Left', prefixIcon: 'e-icon-next', tooltipText: 'Next', overflow: 'Show',
-            cssClass: 'e-next', htmlAttributes: { 'aria-label': 'next period', 'role': 'navigation' }
+            cssClass: 'e-next', htmlAttributes: { 'role': 'navigation' }
         });
         items.push({
             align: 'Left', text: this.getDateRangeText(), suffixIcon: 'e-icon-down-arrow', cssClass: 'e-date-range',
             overflow: 'Show',
-            htmlAttributes: { 'aria-atomic': 'true', 'aria-live': 'assertive', 'aria-label': 'title', 'role': 'navigation' }
+            htmlAttributes: { 'aria-atomic': 'true', 'aria-live': 'assertive', 'role': 'navigation' }
         });
         if (this.parent.isAdaptive || this.parent.enableAdaptiveUI) {
             items.push({
@@ -7984,7 +7984,8 @@ class TimelineEvent extends MonthEvent {
         if (this.parent.activeViewOptions.headerRows.length > 0 &&
             this.parent.activeViewOptions.headerRows.slice(-1)[0].option !== 'Hour') {
             this.renderType = 'day';
-            this.cellWidth = this.content.offsetWidth / this.dateRender.length;
+            const workCell = this.content.querySelector('.' + WORK_CELLS_CLASS);
+            this.cellWidth = workCell.getBoundingClientRect().width / +(workCell.getAttribute('colspan') || 1);
             this.slotsPerDay = 1;
         }
         else {
@@ -8186,7 +8187,7 @@ class TimelineEvent extends MonthEvent {
     renderTimelineMoreIndicator(startTime, startDate, endDate, appHeight, interval, resIndex, appointmentsList, top, appLeft, appRight, cellTd, moreIndicator, appPos, position) {
         appLeft = (this.parent.enableRtl) ? appRight = position : position;
         appPos = (this.parent.enableRtl) ? appRight : appLeft;
-        appPos = (Math.round(appPos / this.cellWidth) * this.cellWidth);
+        appPos = (Math.floor(appPos / this.cellWidth) * this.cellWidth);
         if ((cellTd && isNullOrUndefined(moreIndicator)) ||
             (!this.isAlreadyAvail(appPos, cellTd))) {
             const startDateTime = (this.parent.activeViewOptions.option === 'TimelineMonth' || this.renderType === 'day') ? new Date(+startTime) : startDate;
@@ -8213,8 +8214,8 @@ class TimelineEvent extends MonthEvent {
             }
             moreIndicatorElement.style.top = top + appArea + 'px';
             moreIndicatorElement.style.width = this.cellWidth + 'px';
-            moreIndicatorElement.style.left = ((appLeft / this.cellWidth) * this.cellWidth) + 'px';
-            moreIndicatorElement.style.right = ((appRight / this.cellWidth) * this.cellWidth) + 'px';
+            moreIndicatorElement.style.left = (Math.floor(appLeft / this.cellWidth) * this.cellWidth) + 'px';
+            moreIndicatorElement.style.right = (Math.floor(appRight / this.cellWidth) * this.cellWidth) + 'px';
             this.renderElement(cellTd, moreIndicatorElement);
             EventHandler.add(moreIndicatorElement, 'click', this.moreIndicatorClick, this);
         }
@@ -11614,6 +11615,7 @@ class EventWindow {
         }
     }
     onBeforeOpen(args) {
+        const endTime = this.eventData[this.fields.endTime].getTime();
         const eventProp = {
             type: 'Editor',
             data: this.eventData,
@@ -11638,6 +11640,12 @@ class EventWindow {
         this.parent.trigger(popupOpen, eventProp, (popupArgs) => {
             args.cancel = popupArgs.cancel;
             this.duration = this.cellClickAction ? popupArgs.duration : null;
+            if (this.eventData[this.fields.endTime].getTime() === endTime && !this.cellClickAction &&
+                this.eventData[this.fields.endTime].getHours() === 0 &&
+                this.eventData[this.fields.endTime].getMinutes() === 0) {
+                this.eventData = extend({}, this.eventData, null, true);
+                this.trimAllDay(this.eventData);
+            }
             this.refreshDateTimePicker(this.duration);
             if (this.cellClickAction && popupArgs.duration !== this.getSlotDuration() && isNullOrUndefined(this.parent.editorTemplate)) {
                 const startObj = this.getInstance(EVENT_WINDOW_START_CLASS);
@@ -12303,12 +12311,12 @@ class EventWindow {
         this.fieldValidator.renderFormValidator(form, rules, this.element, this.parent.locale);
     }
     showDetails(eventData) {
+        this.eventData = eventData;
         const eventObj = extend({}, eventData, null, true);
         if ((!this.cellClickAction || this.cellClickAction && !isNullOrUndefined(this.parent.editorTemplate)) &&
             eventObj[this.fields.endTime].getHours() === 0 && eventObj[this.fields.endTime].getMinutes() === 0) {
             this.trimAllDay(eventObj);
         }
-        this.eventData = eventObj;
         const formElements = this.getFormElements(EVENT_WINDOW_DIALOG_CLASS);
         const keyNames = Object.keys(eventObj);
         for (const curElement of formElements) {
@@ -20998,7 +21006,9 @@ 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;
-            this.actionObj.clone.style.top = formatUnit(offsetTop);
+            if (dragArea.scrollTop > 0) {
+                this.actionObj.clone.style.top = formatUnit(offsetTop);
+            }
         }
         const rowIndex = (this.parent.activeViewOptions.timeScale.enable) ? (offsetTop / this.actionObj.cellHeight) : 0;
         const heightPerMinute = this.actionObj.cellHeight / this.actionObj.slotInterval;
@@ -25524,18 +25534,22 @@ class TimelineViews extends VerticalView {
     }
     getLeftFromDateTime(currentDateIndex, date) {
         const startHour = this.getStartHour();
-        const endHour = this.getEndHour();
         let diffInDates = 0;
         let diffInMinutes = ((date.getHours() - startHour.getHours()) * 60) + (date.getMinutes() - startHour.getMinutes());
         if (!isNullOrUndefined(currentDateIndex)) {
-            const end = (endHour.getHours() === 0) ? 24 : endHour.getHours();
             if (currentDateIndex[0] !== 0) {
-                diffInDates = (currentDateIndex[0]) * ((end - startHour.getHours()) * 60) + (endHour.getMinutes() - startHour.getMinutes());
+                if (this.parent.activeView.colLevels[0] && this.parent.activeView.colLevels[0][0].colSpan) {
+                    diffInDates = currentDateIndex[0] * this.parent.activeView.colLevels[0][0].colSpan * this.getWorkCellWidth();
+                }
+                else {
+                    const endHour = this.getEndHour();
+                    const end = (endHour.getHours() === 0) ? 24 : endHour.getHours();
+                    diffInMinutes = diffInMinutes + ((currentDateIndex[0]) * (((end - startHour.getHours()) * 60) + (endHour.getMinutes() - startHour.getMinutes())));
+                }
             }
-            diffInMinutes = diffInDates + diffInMinutes;
         }
-        return (diffInMinutes * this.getWorkCellWidth() * this.parent.activeViewOptions.timeScale.slotCount) /
-            this.parent.activeViewOptions.timeScale.interval;
+        return diffInDates + ((diffInMinutes * this.getWorkCellWidth() * this.parent.activeViewOptions.timeScale.slotCount) /
+            this.parent.activeViewOptions.timeScale.interval);
     }
     getWorkCellWidth() {
         return this.element.querySelector('.e-work-cells').getBoundingClientRect().width;