@syncfusion/ej2-schedule 19.3.53 → 19.4.41

package/src/schedule/renderer/month.js

@@ -144,10 +144,11 @@ var Month = /** @class */ (function (_super) {
     Month.prototype.getDateSlots = function (renderDates, workDays) {
         var count = this.parent.activeViewOptions.showWeekend ? util.WEEK_LENGTH : workDays.length;
         var dateSlots = [];
+        var isCurrentMonth = this.isCurrentMonth(this.parent.selectedDate);
         for (var col = 0; col < count; col++) {
             var classList = [cls.HEADER_CELLS_CLASS];
             var currentDateIndex = renderDates.slice(0, count).map(function (date) { return date.getDay(); });
-            if (this.isCurrentMonth(this.parent.selectedDate) && currentDateIndex.indexOf(this.parent.getCurrentTime().getDay()) === col) {
+            if (isCurrentMonth && currentDateIndex.indexOf(this.parent.getCurrentTime().getDay()) === col) {
                 classList.push(cls.CURRENT_DAY_CLASS);
             }
             dateSlots.push({ date: renderDates[col], type: 'monthDay', className: classList, colSpan: 1, workDays: workDays });
@@ -186,6 +187,9 @@ var Month = /** @class */ (function (_super) {
             this.renderResourceMobileLayout();
         }
         this.parent.notify(event.contentReady, {});
+        if (this.parent.uiStateValues.isCustomMonth) {
+            this.parent.uiStateValues.isCustomMonth = false;
+        }
     };
     Month.prototype.refreshHeader = function () {
         remove(this.element.querySelector('tbody tr'));
@@ -371,7 +375,7 @@ var Month = /** @class */ (function (_super) {
         return slotDatas;
     };
     Month.prototype.updateClassList = function (data) {
-        if (this.isOtherMonth(data.date)) {
+        if (!this.isCustomMonth() && this.isOtherMonth(data.date)) {
             data.className.push(cls.OTHERMONTH_CLASS);
         }
         if (!this.parent.isMinMaxDate(data.date)) {
@@ -480,15 +484,34 @@ var Month = /** @class */ (function (_super) {
         }
     };
     Month.prototype.getMonthStart = function (currentDate) {
-        var monthStart = util.getWeekFirstDate(this.parent.calendarUtil.firstDateOfMonth(currentDate), this.parent.activeViewOptions.firstDayOfWeek);
-        var start = new Date(monthStart.getFullYear(), monthStart.getMonth(), monthStart.getDate());
-        return start;
+        var useDisplayDate = this.parent.currentView === 'Month' && !isNullOrUndefined(this.parent.activeViewOptions.displayDate) && (this.parent.uiStateValues.isCustomMonth || this.isCustomRange());
+        var date = useDisplayDate ? this.parent.activeViewOptions.displayDate : !(this.parent.uiStateValues.isCustomMonth ||
+            this.isCustomRange()) && this.isCustomMonth() ? currentDate : this.parent.calendarUtil.firstDateOfMonth(currentDate);
+        var monthStart = util.getWeekFirstDate(date, this.parent.activeViewOptions.firstDayOfWeek);
+        return new Date(monthStart.getFullYear(), monthStart.getMonth(), monthStart.getDate());
     };
     Month.prototype.getMonthEnd = function (currentDate) {
-        var endDate = util.addMonths(currentDate, this.parent.activeViewOptions.interval - 1);
-        var lastWeekOfMonth = util.getWeekFirstDate(this.parent.calendarUtil.lastDateOfMonth(endDate), this.parent.activeViewOptions.firstDayOfWeek);
-        var monthEnd = util.addDays(lastWeekOfMonth, util.WEEK_LENGTH - 1);
-        return monthEnd;
+        if (this.isCustomMonth()) {
+            var start = this.getMonthStart(currentDate);
+            var numberOfDays = util.WEEK_LENGTH * (this.parent.activeViewOptions.numberOfWeeks > 0 ?
+                this.parent.activeViewOptions.numberOfWeeks : util.DEFAULT_WEEKS);
+            return util.addDays(start, (numberOfDays - 1));
+        }
+        else {
+            var endDate = util.addMonths(currentDate, this.parent.activeViewOptions.interval - 1);
+            var lastWeekOfMonth = util.getWeekFirstDate(this.parent.calendarUtil.lastDateOfMonth(endDate), this.parent.activeViewOptions.firstDayOfWeek);
+            return util.addDays(lastWeekOfMonth, util.WEEK_LENGTH - 1);
+        }
+    };
+    Month.prototype.isCustomRange = function () {
+        var dates = this.parent.getCurrentViewDates();
+        if (dates && dates.length > 0) {
+            var selectedTime = util.resetTime(this.parent.selectedDate).getTime();
+            var weekFirstDate = util.getWeekFirstDate(dates[dates.length - 1], this.parent.activeViewOptions.firstDayOfWeek);
+            return !(selectedTime >= util.getWeekFirstDate(dates[0], this.parent.activeViewOptions.firstDayOfWeek).getTime() &&
+                selectedTime <= util.addDays(weekFirstDate, 6).getTime());
+        }
+        return false;
     };
     Month.prototype.getRenderDates = function (workDays) {
         var renderDates = [];
@@ -518,34 +541,57 @@ var Month = /** @class */ (function (_super) {
         return renderDates;
     };
     Month.prototype.getNextPreviousDate = function (type) {
-        if (type === 'next') {
-            return util.addMonths(this.parent.selectedDate, this.parent.activeViewOptions.interval);
+        if (this.isCustomMonth()) {
+            var dates = this.parent.getCurrentViewDates();
+            var date = util.getWeekFirstDate(type === 'next' ? dates[dates.length - 1]
+                : dates[0], this.parent.activeViewOptions.firstDayOfWeek);
+            return util.addDays(date, type === 'next' ? util.WEEK_LENGTH : -(this.parent.activeViewOptions.numberOfWeeks > 0 ?
+                this.parent.activeViewOptions.numberOfWeeks : util.DEFAULT_WEEKS) * util.WEEK_LENGTH);
         }
         else {
-            return util.addMonths(this.parent.selectedDate, -(this.parent.activeViewOptions.interval));
+            return util.addMonths(this.parent.selectedDate, ((type === 'next' ? 1 : -1) * this.parent.activeViewOptions.interval));
         }
     };
+    Month.prototype.getStartDate = function () {
+        return this.getMonthStart(this.parent.selectedDate);
+    };
+    Month.prototype.getEndDate = function () {
+        return this.getMonthEnd(this.parent.selectedDate);
+    };
     Month.prototype.getEndDateFromStartDate = function (start) {
         return util.addDays(new Date(start.getTime()), 1);
     };
     Month.prototype.getDateRangeText = function () {
         if (this.parent.isAdaptive || isNullOrUndefined(this.parent.activeViewOptions.dateFormat)) {
-            if (this.parent.activeViewOptions.interval > 1) {
-                var endDate = util.addMonths(util.lastDateOfMonth(this.parent.selectedDate), this.parent.activeViewOptions.interval - 1);
-                if (this.parent.selectedDate.getFullYear() === endDate.getFullYear()) {
-                    var monthNames = (this.parent.globalize.formatDate(this.parent.selectedDate, { format: 'MMMM', calendar: this.parent.getCalendarMode() })) + ' - ' +
+            var startDate = this.parent.selectedDate;
+            var endDate = void 0;
+            var updateCustomRange = false;
+            if (this.isCustomMonth()) {
+                var dates = this.parent.getCurrentViewDates();
+                updateCustomRange = dates[0].getMonth() !== dates[dates.length - 1].getMonth() ||
+                    dates[0].getFullYear() !== dates[dates.length - 1].getFullYear();
+                if (updateCustomRange) {
+                    startDate = dates[0];
+                    endDate = dates[dates.length - 1];
+                }
+            }
+            var isUpdateDateRange = (this.parent.currentView !== 'Month' || !this.isCustomMonth());
+            if (this.parent.activeViewOptions.interval > 1 && isUpdateDateRange || updateCustomRange) {
+                endDate = endDate ? endDate : util.addMonths(util.lastDateOfMonth(startDate), this.parent.activeViewOptions.interval - 1);
+                if (startDate.getFullYear() === endDate.getFullYear()) {
+                    var monthNames = (this.parent.globalize.formatDate(startDate, { format: 'MMMM', calendar: this.parent.getCalendarMode() })) + ' - ' +
                         (this.parent.globalize.formatDate(endDate, { format: 'MMMM ', calendar: this.parent.getCalendarMode() })) +
                         this.parent.globalize.formatDate(endDate, { skeleton: 'y', calendar: this.parent.getCalendarMode() });
                     return util.capitalizeFirstWord(monthNames, 'single');
                 }
-                var text = (this.parent.globalize.formatDate(this.parent.selectedDate, { format: 'MMMM', calendar: this.parent.getCalendarMode() })) + ' ' +
-                    this.parent.selectedDate.getFullYear() + ' - ' +
+                var text = (this.parent.globalize.formatDate(startDate, { format: 'MMMM', calendar: this.parent.getCalendarMode() })) + ' ' +
+                    startDate.getFullYear() + ' - ' +
                     this.parent.globalize.formatDate(endDate, { format: 'MMMM ', calendar: this.parent.getCalendarMode() }) +
                     this.parent.globalize.formatDate(endDate, { skeleton: 'y', calendar: this.parent.getCalendarMode() });
                 return util.capitalizeFirstWord(text, 'single');
             }
             var format = (this.parent.activeViewOptions.dateFormat) ? this.parent.activeViewOptions.dateFormat : 'MMMM y';
-            return util.capitalizeFirstWord(this.parent.globalize.formatDate(this.parent.selectedDate, { format: format, calendar: this.parent.getCalendarMode() }), 'single');
+            return util.capitalizeFirstWord(this.parent.globalize.formatDate(startDate, { format: format, calendar: this.parent.getCalendarMode() }), 'single');
         }
         return this.formatDateRange(this.parent.selectedDate);
     };
@@ -570,6 +616,10 @@ var Month = /** @class */ (function (_super) {
             EventHandler.remove(contentScrollableEle, 'scroll', this.onContentScroll);
         }
     };
+    Month.prototype.isCustomMonth = function () {
+        return this.parent.currentView === 'Month' &&
+            (!isNullOrUndefined(this.parent.activeViewOptions.displayDate) || this.parent.activeViewOptions.numberOfWeeks > 0);
+    };
     Month.prototype.getModuleName = function () {
         return 'month';
     };

package/src/schedule/renderer/renderer.js

@@ -18,7 +18,12 @@ var Render = /** @class */ (function () {
     };
     Render.prototype.initializeLayout = function (viewName) {
         if (this.parent.activeView) {
-            this.parent.resetTemplates();
+            var templates = [
+                'cellTemplate', 'eventTemplate', 'tooltipTemplate', 'majorSlotTemplate', 'minorSlotTemplate',
+                'headerTooltipTemplate', 'dateHeaderTemplate', 'dayHeaderTemplate', 'mothHeaderTemplate',
+                'headerIndentTemplate', 'resourceHeaderTemplate', 'cellHeaderTemplate'
+            ];
+            this.parent.resetTemplates(templates);
             this.parent.activeView.removeEventListener();
             this.parent.activeView.destroy();
         }

package/src/schedule/renderer/timeline-year.js

@@ -43,6 +43,9 @@ var TimelineYear = /** @class */ (function (_super) {
             tr.appendChild(leftHeaderCells);
             leftHeaderCells.appendChild(this.renderResourceHeader(cls.LEFT_INDENT_WRAP_CLASS));
         }
+        var isHorizontal = this.parent.activeViewOptions.orientation === 'Horizontal';
+        var isGroup = this.parent.activeViewOptions.group.resources.length > 0;
+        this.isInverseTableSelect = isHorizontal && !isGroup ? false : true;
         var td = createElement('td');
         tr.appendChild(td);
         var container = createElement('div', { className: cls.DATE_HEADER_CONTAINER_CLASS });
@@ -75,7 +78,7 @@ var TimelineYear = /** @class */ (function (_super) {
                 }
                 else {
                     if (this.parent.monthHeaderTemplate) {
-                        append(this.renderDayMonthHeaderTemplate(date, months[column], 'mothHeaderTemplate'), innerTd);
+                        append(this.renderDayMonthHeaderTemplate(date, months[column], 'monthHeaderTemplate'), innerTd);
                     }
                     else {
                         innerTd.innerHTML = "<span>" + this.getMonthName(date) + "</span>";

package/src/schedule/renderer/view-base.js

@@ -209,6 +209,10 @@ var ViewBase = /** @class */ (function () {
         return date.setHours(0, 0, 0, 0) === this.parent.getCurrentTime().setHours(0, 0, 0, 0);
     };
     ViewBase.prototype.isCurrentMonth = function (date) {
+        if (this.parent.activeViewOptions.displayDate || this.parent.activeViewOptions.numberOfWeeks > 0) {
+            return this.parent.activeView.getStartDate().getTime() <= this.parent.getCurrentTime().getTime() &&
+                this.parent.activeView.getEndDate().getTime() >= this.parent.getCurrentTime().getTime();
+        }
         return date.getFullYear() ===
             this.parent.getCurrentTime().getFullYear() && date.getMonth() === this.parent.getCurrentTime().getMonth();
     };
@@ -441,6 +445,13 @@ var ViewBase = /** @class */ (function () {
                     setStyleAttribute(resourceColumn, { 'height': formatUnit(content.clientHeight) });
                 }
             }
+            var cssClass = "." + cls.HEADER_CELLS_CLASS + ",." + cls.TIME_SLOT_CLASS + ",." + cls.HEADER_WEEK_CELLS_CLASS + ",." + cls.HEADER_MONTH_CELLS_CLASS + ",." + cls.HEADER_YEAR_CELLS_CLASS;
+            var headerCellElements = [].slice.call(this.element.querySelectorAll(cssClass));
+            headerCellElements.forEach(function (ele) {
+                var colSpan = isNullOrUndefined(ele.getAttribute('colspan')) ? '1' : ele.getAttribute('colspan');
+                var headerCellColSpan = parseInt(colSpan, 10);
+                setStyleAttribute(ele, { 'width': formatUnit(colWidth_1 * headerCellColSpan) });
+            });
         }
     };
     ViewBase.prototype.resetColWidth = function () {

package/src/schedule/renderer/year.d.ts

@@ -29,8 +29,8 @@ export declare class Year extends ViewBase implements IRenderer {
     private onCellClick;
     onContentScroll(e: Event): void;
     onScrollUiUpdate(args: NotifyEventArgs): void;
-    private getStartDate;
-    private getEndDate;
+    getStartDate(): Date;
+    getEndDate(): Date;
     startDate(): Date;
     endDate(): Date;
     getEndDateFromStartDate(start: Date): Date;

package/src/schedule/renderer/year.js

@@ -236,10 +236,27 @@ var Year = /** @class */ (function (_super) {
     Year.prototype.onCellClick = function (e) {
         var target = closest(e.target, '.' + cls.WORK_CELLS_CLASS);
         var startDate = this.parent.getDateFromElement(target);
-        var endDate = util.addDays(new Date(startDate.getTime()), 1);
-        var filteredEvents = this.parent.eventBase.filterEvents(startDate, endDate);
-        var moreEventArgs = { date: startDate, event: filteredEvents, element: e.target };
-        this.parent.quickPopup.moreEventClick(moreEventArgs, endDate);
+        this.parent.activeCellsData = this.parent.getCellDetails(target);
+        var isPrevious = startDate.getTime() < this.getStartDate().getTime();
+        if (isPrevious || startDate.getTime() > this.getEndDate().getTime()) {
+            this.parent.changeDate(this.parent.activeView.getNextPreviousDate(isPrevious ? 'previous' : 'next'), e);
+            var activeDate = this.parent.activeCellsData.startTime.getTime();
+            var inRange = activeDate >= this.getStartDate().getTime() && activeDate <= this.getEndDate().getTime();
+            var dateAttr = inRange ? activeDate : (isPrevious ? this.getEndDate() : this.getStartDate()).getTime();
+            var selectedCell = this.parent.element.querySelector(':not(.' + cls.OTHERMONTH_CLASS + ')[data-date="' + dateAttr + '"]');
+            this.parent.selectCell(selectedCell);
+            this.parent.activeCellsData = this.parent.getCellDetails(selectedCell);
+        }
+        else {
+            var endDate = util.addDays(new Date(startDate.getTime()), 1);
+            var filteredEvents = this.parent.eventBase.filterEvents(startDate, endDate);
+            var moreEventArgs = { date: startDate, event: filteredEvents, element: e.target };
+            if (target.classList.contains(cls.OTHERMONTH_CLASS)) {
+                target = this.parent.element.querySelector(':not(.' + cls.OTHERMONTH_CLASS + ')[data-date="' + target.getAttribute('data-date') + '"]');
+            }
+            this.parent.activeCellsData = this.parent.getCellDetails(target);
+            this.parent.quickPopup.moreEventClick(moreEventArgs, endDate);
+        }
     };
     Year.prototype.onContentScroll = function (e) {
         var target = e.target;
@@ -291,10 +308,10 @@ var Year = /** @class */ (function (_super) {
         return util.addDays(util.addMonths(this.getStartDate(), this.parent.monthsCount), -1);
     };
     Year.prototype.startDate = function () {
-        return util.getWeekFirstDate(this.getStartDate(), this.parent.firstDayOfWeek);
+        return this.parent.currentView === 'Year' ? util.getWeekFirstDate(this.getStartDate(), this.parent.firstDayOfWeek) : this.getStartDate();
     };
     Year.prototype.endDate = function () {
-        return util.addDays(util.getWeekLastDate(this.getEndDate(), this.parent.firstDayOfWeek), 1);
+        return this.parent.currentView === 'Year' ? util.addDays(util.getWeekLastDate(this.getEndDate(), this.parent.firstDayOfWeek), 1) : this.getEndDate();
     };
     Year.prototype.getEndDateFromStartDate = function (start) {
         var date = new Date(start.getTime());
@@ -337,6 +354,7 @@ var Year = /** @class */ (function (_super) {
                 EventHandler.add(element, 'click', this.onCellClick, this);
             }
             else {
+                EventHandler.add(element, 'mousedown', this.parent.workCellAction.cellMouseDown, this.parent.workCellAction);
                 EventHandler.add(element, 'click', this.parent.workCellAction.cellClick, this.parent.workCellAction);
                 if (!this.parent.isAdaptive) {
                     EventHandler.add(element, 'dblclick', this.parent.workCellAction.cellDblClick, this.parent.workCellAction);