@syncfusion/ej2-gantt 20.4.50 → 20.4.52

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 20.4.50
+*  version : 20.4.52
 *  Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-gantt@*",
-  "_id": "@syncfusion/ej2-gantt@20.4.49",
+  "_id": "@syncfusion/ej2-gantt@20.4.51",
   "_inBundle": false,
-  "_integrity": "sha512-jTJbNyyS9d5SDW9xr90+M06NDbvYUmi+pMgpcy+EqQKCZ6hfFqqYXy1w4ITc8QDXYeMwH0tAOWKl13vmPqppZA==",
+  "_integrity": "sha512-MeRVHT0+jrE16XAXCIq90XHt8jCcOhPXqJ7SiE31NEMkf2mPg8+VkaFxcgYxyZ3aUDGikV2mYk1/Vcsuu0zufg==",
   "_location": "/@syncfusion/ej2-gantt",
   "_phantomChildren": {},
   "_requested": {
@@ -23,8 +23,8 @@
     "/@syncfusion/ej2-react-gantt",
     "/@syncfusion/ej2-vue-gantt"
   ],
-  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-gantt/-/ej2-gantt-20.4.49.tgz",
-  "_shasum": "b1c82178bf6662e3a423278ae4d6ae97e37e936b",
+  "_resolved": "https://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-gantt/-/ej2-gantt-20.4.51.tgz",
+  "_shasum": "adf3c3f231d0673d9a16819bcae9da7625a44a1d",
   "_spec": "@syncfusion/ej2-gantt@*",
   "_where": "/jenkins/workspace/ease-automation_release_19.1.0.1/packages/included",
   "author": {
@@ -35,19 +35,19 @@
   },
   "bundleDependencies": false,
   "dependencies": {
-    "@syncfusion/ej2-base": "~20.4.48",
+    "@syncfusion/ej2-base": "~20.4.51",
     "@syncfusion/ej2-buttons": "~20.4.50",
-    "@syncfusion/ej2-calendars": "~20.4.48",
+    "@syncfusion/ej2-calendars": "~20.4.52",
     "@syncfusion/ej2-data": "~20.4.48",
-    "@syncfusion/ej2-dropdowns": "~20.4.50",
-    "@syncfusion/ej2-grids": "~20.4.50",
-    "@syncfusion/ej2-inputs": "~20.4.48",
+    "@syncfusion/ej2-dropdowns": "~20.4.52",
+    "@syncfusion/ej2-grids": "~20.4.52",
+    "@syncfusion/ej2-inputs": "~20.4.52",
     "@syncfusion/ej2-layouts": "~20.4.48",
     "@syncfusion/ej2-lists": "~20.4.50",
-    "@syncfusion/ej2-navigations": "~20.4.49",
+    "@syncfusion/ej2-navigations": "~20.4.52",
     "@syncfusion/ej2-notifications": "~20.4.48",
-    "@syncfusion/ej2-popups": "~20.4.49",
-    "@syncfusion/ej2-richtexteditor": "~20.4.50",
+    "@syncfusion/ej2-popups": "~20.4.52",
+    "@syncfusion/ej2-richtexteditor": "~20.4.52",
     "@syncfusion/ej2-treegrid": "~20.4.49"
   },
   "deprecated": false,
@@ -73,6 +73,6 @@
     "url": "git+https://github.com/syncfusion/ej2-gantt.git"
   },
   "typings": "index.d.ts",
-  "version": "20.4.50",
+  "version": "20.4.52",
   "sideEffects": false
 }

package/src/gantt/actions/dependency.js

@@ -576,7 +576,7 @@ var Dependency = /** @class */ (function () {
         var offsetValue = predecessor.offset;
         var durationUnit = predecessor.offsetUnit;
         if (offsetValue < 0) {
-            resultDate = this.dateValidateModule.getStartDate(this.dateValidateModule.checkEndDate(date, record), (offsetValue * -1), durationUnit, record);
+            resultDate = this.dateValidateModule.getStartDate(this.dateValidateModule.checkEndDate(date, record), (offsetValue * -1), durationUnit, record, true);
         }
         else {
             resultDate = this.dateValidateModule.getEndDate(date, offsetValue, durationUnit, record, false);

package/src/gantt/actions/edit.js

@@ -1070,7 +1070,7 @@ var Edit = /** @class */ (function () {
             durationDiff = this.parent.dateValidationModule.getDuration(validStartDate, validEndDate, 'minute', true, false);
         }
         for (var i = 0; i < childRecords.length; i++) {
-            if (childRecords[i].ganttProperties.isAutoSchedule) {
+            if ((!(this.parent.isUnscheduledTask(childRecords[i].ganttProperties))) && (childRecords[i].ganttProperties.isAutoSchedule)) {
                 if (durationDiff > 0) {
                     var startDate = isScheduledTask(childRecords[i].ganttProperties) ?
                         childRecords[i].ganttProperties.startDate : childRecords[i].ganttProperties.startDate ?
@@ -1098,6 +1098,7 @@ var Edit = /** @class */ (function () {
         }
         if (childRecords.length) {
             this.parent.dataOperation.updateParentItems(ganttRecord, true);
+            this.parent.dataOperation.updateGanttData();
         }
     };
     /**
@@ -1177,9 +1178,21 @@ var Edit = /** @class */ (function () {
         });
     };
     Edit.prototype.dmSuccess = function (e, args) {
-        var eLength = e['length'];
+        var eLength;
+        var rec;
+        if (e.changedRecords) {
+            eLength = e.changedRecords['length'];
+        }
+        else {
+            eLength = e['length'];
+        }
         for (var i = 0; i < eLength; i++) {
-            var rec = e[i];
+            if (e.changedRecords) {
+                rec = e.changedRecords[i];
+            }
+            else {
+                rec = e[i];
+            }
             var _aLength = Object.keys(rec).length;
             for (var j = 0, _a = Object.keys(rec); j < _aLength; j++) {
                 var key = _a[j];
@@ -1421,6 +1434,8 @@ var Edit = /** @class */ (function () {
             this.addRecordAsBottom(cAddedRecord);
             var parentRecord = this.parent.flatData[this.parent.flatData.length - 1];
             this.addNewRecord(updateRecord, parentRecord);
+            var source = this.parent.dataSource;
+            source.push(updateRecord.taskData);
         }
         var updatedData = this.parent.currentViewData.filter(function (data) {
             return (data.ganttProperties.taskId === updateRecord.ganttProperties.taskId &&
@@ -2842,9 +2857,9 @@ var Edit = /** @class */ (function () {
                             var crud = data_2.saveChanges(updatedData_2, _this.parent.taskFields.id, null, query_2);
                             crud.then(function (e) {
                                 if (_this.parent.taskFields.id && !isNullOrUndefined(e.addedRecords[0][_this.parent.taskFields.id]) &&
-                                    e.addedRecords[0][_this.parent.taskFields.id].toString() !== prevID_1) {
+                                    e.addedRecords[0][_this.parent.taskFields.id].toString() == prevID_1) {
                                     _this.parent.setRecordValue('taskId', e.addedRecords[0][_this.parent.taskFields.id], args.data.ganttProperties, true);
-                                    _this.parent.setRecordValue('taskData.' + _this.parent.taskFields.id, e.addedRecords[0][_this.parent.taskFields.id], args.data);
+                                    _this.parent.setRecordValue('taskData', e.addedRecords[0], args.data);
                                     _this.parent.setRecordValue(_this.parent.taskFields.id, e.addedRecords[0][_this.parent.taskFields.id], args.data);
                                     _this.parent.setRecordValue('rowUniqueID', e.addedRecords[0][_this.parent.taskFields.id].toString(), args.data.ganttProperties, true);
                                     var idsIndex = _this.parent.ids.indexOf(prevID_1);

package/src/gantt/actions/taskbar-edit.d.ts

@@ -223,7 +223,7 @@ export declare class TaskbarEdit extends DateProcessor {
      * @returns {Date} .
      * @private
      */
-    getDateByLeft(left: number): Date;
+    getDateByLeft(left: number, isMilestone?: boolean, property?: any): Date;
     /**
      * To set item position.
      *

package/src/gantt/actions/taskbar-edit.js

@@ -594,6 +594,16 @@ var TaskbarEdit = /** @class */ (function (_super) {
                     merge(_this.taskBarEditRecord.ganttProperties, arg.previousData);
                 }
             });
+            this.parent.flatData.map(function (data) {
+                if ((!isNullOrUndefined(_this.taskBarEditRecord.parentItem)) && data.ganttProperties.taskId === _this.taskBarEditRecord.parentItem.taskId) {
+                    data.childRecords.map(function (s) {
+                        if (isNullOrUndefined(s.ganttProperties.startDate) || isNullOrUndefined(s.ganttProperties.endDate) ||
+                            isNullOrUndefined(s.ganttProperties.duration)) {
+                            _this.parent.dataOperation.updateGanttData();
+                        }
+                    });
+                }
+            });
         }
     };
     /**
@@ -1147,7 +1157,7 @@ var TaskbarEdit = /** @class */ (function (_super) {
     };
     TaskbarEdit.prototype.updateChildDrag = function (item) {
         var left = this.getRoundOffStartLeft(item, this.roundOffDuration);
-        var projectStartDate = this.getDateByLeft(left);
+        var projectStartDate = this.getDateByLeft(left, item.isMilestone, item);
         var endDate;
         if (this.segmentIndex === 0) {
             this.parent.setRecordValue('startDate', this.parent.dateValidationModule.checkStartDate(projectStartDate, item, null), item, true);
@@ -1370,10 +1380,16 @@ var TaskbarEdit = /** @class */ (function (_super) {
      * @returns {Date} .
      * @private
      */
-    TaskbarEdit.prototype.getDateByLeft = function (left) {
+    TaskbarEdit.prototype.getDateByLeft = function (left, isMilestone, property) {
         var pStartDate = new Date(this.parent.timelineModule.timelineStartDate.toString());
         var milliSecondsPerPixel = (24 * 60 * 60 * 1000) / this.parent.perDayWidth;
         pStartDate.setTime(pStartDate.getTime() + (left * milliSecondsPerPixel));
+        /* To render the milestone in proper date while editing */
+        if (isMilestone) {
+            pStartDate.setDate(pStartDate.getDate() - 1);
+            this.parent.dateValidationModule.setTime(this.parent.defaultEndTime, pStartDate);
+            pStartDate = this.parent.dateValidationModule.checkStartDate(pStartDate, property, true);
+        }
         var tierMode = this.parent.timelineModule.bottomTier !== 'None' ? this.parent.timelineModule.topTier :
             this.parent.timelineModule.bottomTier;
         if (tierMode !== 'Hour' && tierMode !== 'Minutes') {

package/src/gantt/base/date-processor.d.ts

@@ -121,7 +121,7 @@ export declare class DateProcessor {
      * @returns {Date} .
      * @private
      */
-    getStartDate(endDate: Date, duration: number, durationUnit: string, ganttProp: ITaskData): Date;
+    getStartDate(endDate: Date, duration: number, durationUnit: string, ganttProp: ITaskData, fromValidation?: boolean): Date;
     /**
      * @param {ITaskData} ganttProp .
      * @param {boolean} isLoad .

package/src/gantt/base/date-processor.js

@@ -429,7 +429,7 @@ var DateProcessor = /** @class */ (function () {
      * @returns {Date} .
      * @private
      */
-    DateProcessor.prototype.getStartDate = function (endDate, duration, durationUnit, ganttProp) {
+    DateProcessor.prototype.getStartDate = function (endDate, duration, durationUnit, ganttProp, fromValidation) {
         var tempEnd = new Date(endDate.getTime());
         var startDate = new Date(endDate.getTime());
         var secondDuration = this.getDurationAsSeconds(duration, durationUnit);
@@ -445,6 +445,12 @@ var DateProcessor = /** @class */ (function () {
             }
             tempEnd = new Date(startDate.getTime());
         }
+        /* To render the milestone in proper date while loading */
+        if (fromValidation && ganttProp.isMilestone) {
+            startDate.setDate(startDate.getDate() - 1);
+            this.parent.dateValidationModule.setTime(this.parent.defaultEndTime, startDate);
+            startDate = this.parent.dateValidationModule.checkStartDate(startDate, ganttProp, true);
+        }
         return startDate;
     };
     /**
@@ -496,6 +502,7 @@ var DateProcessor = /** @class */ (function () {
      * @private
      */
     DateProcessor.prototype.getValidStartDate = function (ganttProp, isAuto) {
+        var _this = this;
         var sDate = null;
         var startDate = isAuto ? ganttProp.autoStartDate : ganttProp.startDate;
         var endDate = isAuto ? ganttProp.autoEndDate : ganttProp.endDate;
@@ -506,7 +513,21 @@ var DateProcessor = /** @class */ (function () {
                 this.setTime(this.parent.defaultStartTime, sDate);
             }
             else if (!isNullOrUndefined(duration)) {
-                sDate = this.getProjectStartDate(ganttProp);
+                this.parent.flatData.map(function (record) {
+                    if (record.ganttProperties.taskId == ganttProp.taskId) {
+                        if ((!isNullOrUndefined(record.parentItem)) && (record.parentItem.taskId)) {
+                            _this.parent.flatData.map(function (data) {
+                                if (data.ganttProperties.taskId === record.parentItem.taskId) {
+                                    if (!isNullOrUndefined(data.ganttProperties.startDate))
+                                        sDate = data.ganttProperties.startDate;
+                                }
+                            });
+                        }
+                        else {
+                            sDate = _this.getProjectStartDate(ganttProp);
+                        }
+                    }
+                });
             }
         }
         else {

package/src/gantt/base/gantt.js

@@ -1401,6 +1401,7 @@ var Gantt = /** @class */ (function (_super) {
                 case 'dayWorkingTime':
                 case 'allowUnscheduledTasks':
                 case 'holidays':
+                    this.isLoad = true;
                     if (prop === 'holidays') {
                         this.totalHolidayDates = this.dataOperation.getHolidayDates();
                         this.notify('ui-update', { module: 'day-markers', properties: newProp });
@@ -1409,6 +1410,7 @@ var Gantt = /** @class */ (function (_super) {
                     this.treeGrid.refreshColumns();
                     this.chartRowsModule.initiateTemplates();
                     this.chartRowsModule.refreshGanttRows();
+                    this.isLoad = false;
                     break;
                 case 'addDialogFields':
                 case 'editDialogFields':

package/src/gantt/base/task-processor.d.ts

@@ -218,6 +218,8 @@ export declare class TaskProcessor extends DateProcessor {
     private setRecordDate;
     private getDurationInDay;
     private setRecordDuration;
+    setDataSource(data: any): any;
+    private setStartDate;
     private getWorkInHour;
     /**
      *

package/src/gantt/base/task-processor.js

@@ -172,7 +172,7 @@ var TaskProcessor = /** @class */ (function (_super) {
     TaskProcessor.prototype.constructResourceViewDataSource = function (resources, data, unassignedTasks) {
         var _loop_1 = function (i) {
             var tempData = data[i];
-            var child = this_1.parent.taskFields.child;
+            child = this_1.parent.taskFields.child != null ? this_1.parent.taskFields.child : 'Children';
             var resourceData = tempData && tempData[this_1.parent.taskFields.resourceInfo];
             var resourceIdMapping = this_1.parent.resourceFields.id;
             if ((!tempData[child] || tempData[child].length === 0) && resourceData && resourceData.length) {
@@ -199,7 +199,7 @@ var TaskProcessor = /** @class */ (function (_super) {
                 this_1.constructResourceViewDataSource(resources, tempData[this_1.parent.taskFields.child], unassignedTasks);
             }
         };
-        var this_1 = this;
+        var this_1 = this, child;
         for (var i = 0; i < data.length; i++) {
             _loop_1(i);
         }
@@ -1420,6 +1420,40 @@ var TaskProcessor = /** @class */ (function (_super) {
             task.taskData[this.parent.taskFields.durationUnit] = task.ganttProperties.durationUnit;
         }
     };
+    TaskProcessor.prototype.setDataSource = function (data) {
+        var createData = [];
+        var length = data.length;
+        for (var i = 0; i < length; i++) {
+            var record = data[i];
+            createData.push(record);
+            if (!(isNullOrUndefined(data[i][this.parent.taskFields.child]))) {
+                this.setDataSource(data[i][this.parent.taskFields.child]);
+            }
+        }
+        return createData;
+    };
+    TaskProcessor.prototype.setStartDate = function (task) {
+        var _this = this;
+        var hierarchicalData = [];
+        if (!isNullOrUndefined(this.parent.taskFields.parentID) && !isNullOrUndefined(this.parent.taskFields.id)) {
+            hierarchicalData = this.setDataSource(this.parent.dataSource);
+        }
+        else {
+            hierarchicalData = this.parent.dataSource;
+        }
+        this.parent.flatData.map(function (data) {
+            hierarchicalData.map(function (record) {
+                if (data.ganttProperties.taskId === record[_this.parent.taskFields.id]) {
+                    if (!isNullOrUndefined(_this.parent.taskFields.startDate)) {
+                        task[_this.parent.taskFields.endDate] = record[_this.parent.taskFields.endDate];
+                    }
+                    if (!isNullOrUndefined(_this.parent.taskFields.endDate)) {
+                        task[_this.parent.taskFields.endDate] = record[_this.parent.taskFields.endDate];
+                    }
+                }
+            });
+        });
+    };
     TaskProcessor.prototype.getWorkInHour = function (work, workUnit) {
         if (workUnit === 'day') {
             return work * (this.parent.secondsPerDay / 3600);
@@ -1714,6 +1748,9 @@ var TaskProcessor = /** @class */ (function (_super) {
                 if (!isNullOrUndefined(this.parent.taskFields.duration)) {
                     this.setRecordDuration(ganttData, this.parent.taskFields.duration);
                 }
+                if (this.parent.isLoad) {
+                    this.setStartDate(ganttData);
+                }
                 this.calculateScheduledValues(ganttData, data, false);
             }
             this.updateGanttData();

package/src/gantt/export/pdf-connector-line.d.ts

@@ -27,6 +27,7 @@ export declare class PdfGanttPredecessor {
      */
     add(): PdfGanttPredecessor;
     constructor(parent?: Gantt, pdfGantt?: PdfGantt);
+    findindex(num: number): number;
     /**
      * Calculate the predecesor line point and draw the predecessor
      *

package/src/gantt/export/pdf-connector-line.js

@@ -27,6 +27,13 @@ var PdfGanttPredecessor = /** @class */ (function () {
     PdfGanttPredecessor.prototype.add = function () {
         return new PdfGanttPredecessor(this.parent);
     };
+    PdfGanttPredecessor.prototype.findindex = function (num) {
+        var dataindex;
+        this.parent.currentViewData.map(function (data, index) { if (data.index == num) {
+            dataindex = index;
+        } });
+        return dataindex;
+    };
     /**
      * Calculate the predecesor line point and draw the predecessor
      *
@@ -37,8 +44,8 @@ var PdfGanttPredecessor = /** @class */ (function () {
     PdfGanttPredecessor.prototype.drawPredecessor = function (pdfGantt) {
         this.pdfGantt = pdfGantt;
         var pages = pdfGantt.result.page.section.getPages();
-        var parentTask = pdfGantt.taskbarCollection[this.parentIndex];
-        var childTask = pdfGantt.taskbarCollection[this.childIndex];
+        var parentTask = pdfGantt.taskbarCollection[this.findindex(this.parentIndex)];
+        var childTask = pdfGantt.taskbarCollection[this.findindex(this.childIndex)];
         var startPage = new PdfPage();
         var endPage = new PdfPage();
         var predecessorType = '';

package/src/gantt/renderer/timeline.js

@@ -156,6 +156,9 @@ var Timeline = /** @class */ (function () {
      */
     Timeline.prototype.changeTimelineSettings = function (newTimeline) {
         var _this = this;
+        if (!this.isZoomIn) {
+            this.isSingleTier = newTimeline.topTier.unit === 'None' || newTimeline.bottomTier.unit === 'None' ? true : false;
+        }
         var skipProperty = this.isSingleTier ?
             this.customTimelineSettings.topTier.unit === 'None' ?
                 'topTier' : 'bottomTier' : null;
@@ -167,7 +170,9 @@ var Timeline = /** @class */ (function () {
             else {
                 var value = property === 'topTier' ? 'bottomTier' : 'topTier';
                 var assignValue = 'bottomTier';
-                _this.customTimelineSettings[value] = __assign({}, newTimeline[assignValue]);
+                if (newTimeline[assignValue].unit != "None") {
+                    _this.customTimelineSettings[value] = __assign({}, newTimeline[assignValue]);
+                }
             }
         });
         this.parent.isTimelineRoundOff = this.isZoomToFit ? false : isNullOrUndefined(this.parent.projectStartDate) ? true : false;
@@ -403,7 +408,9 @@ var Timeline = /** @class */ (function () {
             this.customTimelineSettings.bottomTier.count : this.customTimelineSettings.topTier.count;
         var unit = this.customTimelineSettings.bottomTier.unit !== 'None' ?
             this.customTimelineSettings.bottomTier.unit : this.customTimelineSettings.topTier.unit;
-        var zoomLevel = this.getCurrentZoomingLevel(unit, count);
+        var tier = this.customTimelineSettings.bottomTier.unit !== 'None' ?
+            "bottomTier" : "topTier";
+        var zoomLevel = this.getCurrentZoomingLevel(unit, count, tier);
         if (this.parent.toolbarModule) {
             if (zoomLevel === this.parent.zoomingLevels[this.parent.zoomingLevels.length - 1].level) {
                 this.parent.toolbarModule.enableItems([this.parent.controlId + '_zoomin'], false);
@@ -421,7 +428,7 @@ var Timeline = /** @class */ (function () {
      * @returns {number} .
      * @private
      */
-    Timeline.prototype.getCurrentZoomingLevel = function (unit, count) {
+    Timeline.prototype.getCurrentZoomingLevel = function (unit, count, tier) {
         var level;
         var currentZoomCollection;
         var checkSameCountLevels;
@@ -431,16 +438,31 @@ var Timeline = /** @class */ (function () {
             this.parent.zoomingLevels = this.parent.getZoomingLevels();
         }
         var sameUnitLevels = this.parent.zoomingLevels.filter(function (tempLevel) {
-            return tempLevel.bottomTier.unit === unit;
+            if (tier === "bottomTier") {
+                return tempLevel.bottomTier.unit === unit;
+            }
+            else {
+                return tempLevel.topTier.unit === unit;
+            }
         });
         if (sameUnitLevels.length === 0) {
             var closestUnit_1 = this.getClosestUnit(unit, '', false);
             sameUnitLevels = this.parent.zoomingLevels.filter(function (tempLevel) {
-                return tempLevel.bottomTier.unit === closestUnit_1;
+                if (tier === "bottomTier") {
+                    return tempLevel.bottomTier.unit === closestUnit_1;
+                }
+                else {
+                    return tempLevel.topTier.unit === closestUnit_1;
+                }
             });
         }
         var sortedUnitLevels = sameUnitLevels.sort(function (a, b) {
-            return (a.bottomTier.count < b.bottomTier.count) ? 1 : -1;
+            if (tier === "bottomTier") {
+                return (a.bottomTier.count < b.bottomTier.count) ? 1 : -1;
+            }
+            else {
+                return (a.topTier.count < b.topTier.count) ? 1 : -1;
+            }
         });
         for (var i = 0; i < sortedUnitLevels.length; i++) {
             firstValue = sortedUnitLevels[i];
@@ -451,10 +473,15 @@ var Timeline = /** @class */ (function () {
             else {
                 secondValue = sortedUnitLevels[i + 1];
             }
-            if (count >= firstValue.bottomTier.count) {
+            if (count >= firstValue[tier].count) {
                 currentZoomCollection = sortedUnitLevels[i];
                 checkSameCountLevels = sortedUnitLevels.filter(function (tempLevel) {
-                    return tempLevel.bottomTier.count === currentZoomCollection.bottomTier.count;
+                    if (tier === "bottomTier") {
+                        return tempLevel.bottomTier.count === currentZoomCollection.bottomTier.count;
+                    }
+                    else {
+                        return tempLevel.topTier.count === currentZoomCollection.topTier.count;
+                    }
                 });
                 if (checkSameCountLevels.length > 1) {
                     level = this.checkCollectionsWidth(checkSameCountLevels);
@@ -464,10 +491,15 @@ var Timeline = /** @class */ (function () {
                 }
                 break;
             }
-            else if (count < firstValue.bottomTier.count && count > secondValue.bottomTier.count) {
+            else if (count < firstValue[tier].count && count > secondValue[tier].count) {
                 currentZoomCollection = sortedUnitLevels[i + 1];
                 checkSameCountLevels = sortedUnitLevels.filter(function (tempLevel) {
-                    return tempLevel.bottomTier.count === currentZoomCollection.bottomTier.count;
+                    if (tier === "bottomTier") {
+                        return tempLevel.bottomTier.count === currentZoomCollection.bottomTier.count;
+                    }
+                    else {
+                        return tempLevel.topTier.count === currentZoomCollection.topTier.count;
+                    }
                 });
                 if (checkSameCountLevels.length > 1) {
                     level = this.checkCollectionsWidth(checkSameCountLevels);