@sapui5/sap.gantt 1.119.0 → 1.120.1

package/src/sap/gantt/simple/GanttPrinting.js

@@ -60,7 +60,10 @@ sap.ui.define([
 		"sap/gantt/simple/AggregationUtils",
 		"../simple/GanttUtils",
 		"sap/ui/core/date/UI5Date",
-		"sap/ui/core/format/DateFormat"
+		"sap/ui/core/format/DateFormat",
+		"sap/ui/table/rowmodes/Fixed",
+		"sap/ui/core/library",
+		"sap/ui/model/FilterType"
 	],	function (
 		GanttLibrary,
 		$,
@@ -116,7 +119,10 @@ sap.ui.define([
 		AggregationUtils,
 		GanttUtils,
 		UI5Date,
-		DateFormat
+		DateFormat,
+		FixedRowMode,
+		coreLibrary,
+		FilterType
 	) {
 		"use strict";
 
@@ -125,6 +131,7 @@ sap.ui.define([
 		html2canvas = window.html2canvas;
 		jsPDF = window.jsPDF;
 		svg2pdf = window.svg2pdf;
+		var ValueState = coreLibrary.ValueState;
 
 		/**
 		 * Constructor for a new GanttPrinting control.
@@ -139,7 +146,7 @@ sap.ui.define([
 		 * @extend sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.119.0
+		 * @version 1.120.1
 		 * @since 1.66
 		 *
 		 * @constructor
@@ -376,8 +383,9 @@ sap.ui.define([
 				var iRowCount = that._getOriginalGanttChart().getTable()._getTotalRowCount();
 				that.iThreshold = Math.min(that.iThreshold, iRowCount - rowVal);
 				that.bLast = counter + 1 >= lastVal ? true : false;
-				that._ganttChartClone.getTable().setVisibleRowCountMode(sap.ui.table.VisibleRowCountMode.Fixed);
-				that._ganttChartClone.getTable().setVisibleRowCount(that.iThreshold);
+				that._ganttChartClone.getTable().setRowMode(new FixedRowMode({
+					rowCount: that.iThreshold
+				}));
 				that.bFirst = (index === 0) ? true : false;
 				that._ganttChartClone.getTable().setFirstVisibleRow(rowVal);
 				if (Core.getConfiguration().getRTL()) {
@@ -408,7 +416,7 @@ sap.ui.define([
 				}).then(function (oUpdatedCanvas) {
 					return canvasArray.push(oUpdatedCanvas);
 				}).then(function () {
-					if (index === 0 && (counter + 1 < lastVal)) {
+					if (index === 0) {
 						that._ganttChartClone.setShowGanttHeader(false);
 					}
 					counter = counter + 1;
@@ -462,8 +470,9 @@ sap.ui.define([
 				var iRowCount = that._getOriginalGanttChart().getTable()._getTotalRowCount();
 				that.iThreshold = Math.min(that.iThreshold, iRowCount - rowVal);
 				that.bLast = counter + 1 >= lastVal ? true : false;
-				that._ganttChartClone.getTable().setVisibleRowCountMode(sap.ui.table.VisibleRowCountMode.Fixed);
-				that._ganttChartClone.getTable().setVisibleRowCount(that.iThreshold);
+				that._ganttChartClone.getTable().setRowMode(new FixedRowMode({
+					rowCount: that.iThreshold
+				}));
 				that.bFirst = (index === 0) ? true : false;
 				that._ganttChartClone.getTable().setFirstVisibleRow(rowVal);
 				if (Core.getConfiguration().getRTL()) {
@@ -494,7 +503,7 @@ sap.ui.define([
 				}).then(function (oDom) {
 					return that._oDomToPrint.push(oDom);
 				}).then(function () {
-					if (index === 0 && (counter + 1 < lastVal)) {
+					if (index === 0) {
 						that._ganttChartClone.setShowGanttHeader(false);
 					}
 					counter = counter + 1;
@@ -696,8 +705,9 @@ sap.ui.define([
 				this.iThreshold = Math.min(Math.round(oGanttChart.getPrintingBatchSize() / iZoomLevel), oGanttChart.getTable()._getTotalRowCount());
 				this._bMultipleBatches = oGanttChart.getTable()._getTotalRowCount() > this.iThreshold;
 				this.bFirst = true;
-				this._ganttChartClone.getTable().setVisibleRowCountMode(sap.ui.table.VisibleRowCountMode.Fixed);
-				this._ganttChartClone.getTable().setVisibleRowCount(this.iThreshold);
+				this._ganttChartClone.getTable().setRowMode(new FixedRowMode({
+					rowCount: this.iThreshold
+				}));
 				this._ganttChartClone.getTable().setThreshold(this.iThreshold);
 				this._ganttChartClone.setParent(this._getOriginalGanttChart(), "originalGanttChart", true);
 			} else {
@@ -1288,20 +1298,20 @@ sap.ui.define([
 			this._oComboBoxDuration.setSelectedKey("custom");
 			if (this._oDatePickerFrom.isValidValue() && this._oDatePickerTo.isValidValue()) {
 				if ((this._oDatePickerFrom.getDateValue().getTime() <= this._oDatePickerTo.getDateValue().getTime())) {
-					this._oDatePickerFrom.setValueState(sap.ui.core.ValueState.None);
-					this._oDatePickerTo.setValueState(sap.ui.core.ValueState.None);
+					this._oDatePickerFrom.setValueState(ValueState.None);
+					this._oDatePickerTo.setValueState(ValueState.None);
 					if (bSinglePage) {
 						this._updateGanttPdf();
 					} else {
 						this._updateGanttCanvas();
 					}
 				} else {
-					this._oDatePickerFrom.setValueState(sap.ui.core.ValueState.Error);
-					this._oDatePickerTo.setValueState(sap.ui.core.ValueState.Error);
+					this._oDatePickerFrom.setValueState(ValueState.Error);
+					this._oDatePickerTo.setValueState(ValueState.Error);
 				}
 			} else {
-				var sFromValueState = this._oDatePickerFrom.isValidValue() ? sap.ui.core.ValueState.None : sap.ui.core.ValueState.Error;
-				var sToValueState = this._oDatePickerTo.isValidValue() ? sap.ui.core.ValueState.None : sap.ui.core.ValueState.Error;
+				var sFromValueState = this._oDatePickerFrom.isValidValue() ? ValueState.None : ValueState.Error;
+				var sToValueState = this._oDatePickerTo.isValidValue() ? ValueState.None : ValueState.Error;
 				this._oDatePickerFrom.setValueState(sFromValueState);
 				this._oDatePickerTo.setValueState(sToValueState);
 			}
@@ -1515,7 +1525,7 @@ sap.ui.define([
 		};
 
 		GanttPrinting.prototype._getOriginalGanttChart = function () {
-			return sap.ui.getCore().byId(this.getAssociation("ganttChart"));
+			return Core.byId(this.getAssociation("ganttChart"));
 		};
 
 		/**
@@ -1570,7 +1580,7 @@ sap.ui.define([
 		 */
 		GanttPrinting.prototype._setCloneDivHeight = function () {
 			var iCloneHeaderHeight = this.bFirst ? document.getElementById(this._ganttChartClone.getId() + "-header-svg").height.baseVal.value : 0;
-			var iVisibleRowCount = this._ganttChartClone.getTable().getVisibleRowCount();
+			var iVisibleRowCount = this._ganttChartClone.getTable().getRowMode().getRowCount();
 			var sum = 0;
 			var iBuffer = this.bLast ? 3 : 0;
 			var iFirstRowIndex = this._ganttChartClone.getTable().getRows()[0].getIndex();
@@ -1863,14 +1873,16 @@ sap.ui.define([
 			}
 			if (oClonedGantt.getEnablePseudoShapes()){
 				var oClonedGanttRowSettingsTemp = oTable.getRowSettingsTemplate();
-				if (oClonedGanttRowSettingsTemp && !oClonedGanttRowSettingsTemp.getBindingInfo("tasks")){
-					var oClone = GanttRowSettings.prototype.clone.call(oOriginalGantt.getTable().getRowSettingsTemplate());
+				var oOriginalGanttRowSettingsTemp = oOriginalGantt.getTable().getRowSettingsTemplate();
+				if (oClonedGanttRowSettingsTemp && oOriginalGanttRowSettingsTemp.getBindingInfo("tasks") && !oClonedGanttRowSettingsTemp.getBindingInfo("tasks")){
+					var oClone = GanttRowSettings.prototype.clone.call(oOriginalGanttRowSettingsTemp);
 					oClonedGanttRowSettingsTemp.bindAggregation("tasks", oClone.getBindingInfo("tasks"));
 				}
 			}
 			if (this._ganttChartClone._enableOptimisation) {
-				oTable.setVisibleRowCountMode(sap.ui.table.VisibleRowCountMode.Fixed);
-				oTable.setVisibleRowCount(this.iThreshold);
+				oTable.setRowMode(new FixedRowMode({
+					rowCount: this.iThreshold
+				}));
 				oTable.setThreshold(this.iThreshold);
 			}
 			var oOriginalRowBinding = oOriginalGantt.getTable().getBinding("rows"),
@@ -1883,7 +1895,7 @@ sap.ui.define([
 					oClonedRowBinding.filter(oOriginalRowBinding.aFilters);
 				}
 				if (oOriginalRowBinding.aApplicationFilters && oOriginalRowBinding.aApplicationFilters.length > 0) {
-					oClonedRowBinding.filter(oOriginalRowBinding.aApplicationFilters, sap.ui.model.FilterType.Application);
+					oClonedRowBinding.filter(oOriginalRowBinding.aApplicationFilters, FilterType.Application);
 				}
 				if (oOriginalRowBinding.aSorters && oOriginalRowBinding.aSorters.length > 0) {
 					oClonedRowBinding.sort(oOriginalRowBinding.aSorters);
@@ -2834,25 +2846,29 @@ sap.ui.define([
 				format: sPaperSize === "Custom" ? [fPaperWidth * SCALEFACTORCONSTANT, fPaperHeight * SCALEFACTORCONSTANT] : sPaperSize.toLowerCase()
 			});
 			var aPages = this._pageToBeExported();
-				for (var i = 0; i < aPages.length; i++) {
-					var oCanvas = this._getCanvasOfPageN(aPages[i], true);
+			for (var i = 0; i < aPages.length; i++) {
+				var oCanvas = this._getCanvasOfPageN(aPages[i], true);
 
-					if (!oCanvas) {
-						continue;
-					}
+				if (!oCanvas) {
+					continue;
+				}
 
-					if (i !== 0) {
-						oPdf.addPage();
-					}
+				if (i !== 0) {
+					oPdf.addPage();
+				}
 
-					if (bExportAsJPEG) {
-						oPdf.addImage(oCanvas.toDataURL("image/jpeg", fCompressionQuality), "JPEG", 0, 0);
-					} else {
-						oPdf.addImage(oCanvas.toDataURL("image/png"), "PNG", 0, 0);
-					}
+				if (bExportAsJPEG) {
+					oPdf.addImage(oCanvas.toDataURL("image/jpeg", fCompressionQuality), "JPEG", 0, 0);
+				} else {
+					oPdf.addImage(oCanvas.toDataURL("image/png"), "PNG", 0, 0);
 				}
-				var oDate = new Date();
-				oPdf.save("GanttChartExport-" + oDate.toISOString() + ".pdf");
+			}
+			this._downloadPdf(oPdf);
+		};
+
+		GanttPrinting.prototype._downloadPdf = function (oPdf) {
+			var oDate = new Date();
+			oPdf.save("GanttChartExport-" + oDate.toISOString() + ".pdf");
 		};
 
 		GanttPrinting.prototype._generateVerticalLines = function (oGantt, iGanttSvgHeight) {
@@ -2908,19 +2924,19 @@ sap.ui.define([
 					}),
 					new Item({
 						key: "Letter",
-						text: "Letter"
+						text: this._oRb.getText("GNT_PRNTG_PAPER_SIZE_LETTER")
 					}),
 					new Item({
 						key: "Legal",
-						text: "Legal"
+						text: this._oRb.getText("GNT_PRNTG_PAPER_SIZE_LEGAL")
 					}),
 					new Item({
 						key: "Tabloid",
-						text: "Tabloid"
+						text: this._oRb.getText("GNT_PRNTG_PAPER_SIZE_TABLOID")
 					}),
 					new Item({
 						key: "Custom",
-						text: "Custom"
+						text: this._oRb.getText("GNT_PRNTG_PAPER_SIZE_CUSTOM")
 					})
 				]
 			});
@@ -4033,13 +4049,15 @@ sap.ui.define([
 											icon: "sap-icon://close-command-field",
 											visible: "{setting>/multiplePage}",
 											press: this._onPressButtonFirst.bind(this),
-											type: "Transparent"
+											type: "Transparent",
+											tooltip: this._oRb.getText("GNT_PRNTG_FIRST_PAGE_BUTTON")
 										}).addStyleClass("sapGanttPrintingPreviewIconMarginRight"),
 										this._oButtonPrevious = new Button({
 											icon: "sap-icon://navigation-left-arrow",
 											visible: "{setting>/multiplePage}",
 											press: this._onPressButtonPrevious.bind(this),
-											type: "Transparent"
+											type: "Transparent",
+											tooltip: this._oRb.getText("GNT_PRNTG_PREVIOUS_PAGE_BUTTON")
 										}),
 										new Text({
 											textAlign: "Center",
@@ -4059,13 +4077,15 @@ sap.ui.define([
 											icon: "sap-icon://navigation-right-arrow",
 											visible: "{setting>/multiplePage}",
 											press: this._onPressButtonNext.bind(this),
-											type: "Transparent"
+											type: "Transparent",
+											tooltip: this._oRb.getText("GNT_PRNTG_NEXT_PAGE_BUTTON")
 										}).addStyleClass("sapGanttPrintingPreviewIconMarginRight"),
 										this._oButtonLast = new Button({
 											icon: "sap-icon://open-command-field",
 											visible: "{setting>/multiplePage}",
 											press: this._onPressButtonLast.bind(this),
-											type: "Transparent"
+											type: "Transparent",
+											tooltip: this._oRb.getText("GNT_PRNTG_LAST_PAGE_BUTTON")
 										})
 									]
 								}).addStyleClass("sapGanttPrintingPreviewFooter")

package/src/sap/gantt/simple/GanttResizeExtension.js

@@ -663,7 +663,7 @@ sap.ui.define([
 	GanttResizeExtension.prototype.beforeDeltaResizing = function (event) {
 		var $target = jQuery(event.target),
 			id = $target.parents("g").attr(GanttUtils.SELECT_FOR_DATASET_KEY);
-		var oElement = sap.ui.getCore().byId(id);
+		var oElement = Core.byId(id);
 		if (!oElement || (event.button !== 0)) {
 			return;
 		}
@@ -813,7 +813,7 @@ sap.ui.define([
 		canvas.height = bbox.height;
 		var $target = jQuery(this.origin.eventTarget),
 			id = $target.parents("g").attr(GanttUtils.SELECT_FOR_DATASET_KEY);
-		var oElement = sap.ui.getCore().byId(id);
+		var oElement = Core.byId(id);
 		var deltaLine = oElement.getParent(), deltaLineElms = {};
 		if (deltaLine.getVisibleDeltaStartEndLines()){
 			var oStartLine = deltaLine._getStartLine();
@@ -868,7 +868,7 @@ sap.ui.define([
 
 		var gWrapper = document.createElementNS(svgNS, "g"); // eslint-disable-line sap-no-element-creation
 		// move the dragged the shape to the original point of the new SVG
-		var deltaLine = sap.ui.getCore().byId(this.origin.shapeUid).getParent();
+		var deltaLine = Core.byId(this.origin.shapeUid).getParent();
 		if (deltaLine.getVisibleDeltaStartEndLines()){
 			var oFrame = deltaLineElms.headerEndLine.getBBox();
 			gWrapper.setAttribute("transform", "translate(" + -(oFrame.x) + ", " + -(oFrame.y) + ")");
@@ -955,13 +955,6 @@ sap.ui.define([
 				oGanttChart.pseudoShapeSpecificData = oGanttChart.pseudoShapeSpecificData ? oGanttChart.pseudoShapeSpecificData : {};
 				oGanttChart.pseudoShapeSpecificData.resizedShape = oShape;
 				oGanttChart.pseudoShapeSpecificData.resizedShapeRowIndex = rowIndex;
-				var pseudoParent = oShape.getParent().isA("sap.gantt.simple.BaseConditionalShape") ?  oShape.getParent().getParent()._parent : oShape.getParent()._parent;
-
-				if (pseudoParent){
-					var iShapeIndex = oGanttChart.oOverlapShapeIds && oGanttChart.oOverlapShapeIds[rowIndex] && oGanttChart.oOverlapShapeIds[rowIndex].indexOf(oShape.getShapeId());
-					oGanttChart.oOverlapShapeIds && oGanttChart.oOverlapShapeIds[rowIndex] && oGanttChart.oOverlapShapeIds[rowIndex].splice(iShapeIndex,1);
-
-				}
 				oGanttChart.pseudoShapeSpecificData.needUpdateForTasksInAggr = true;
 			}
 			GanttUtils.rerenderAssociatedRelationships(oGanttChart, oShape);
@@ -972,7 +965,7 @@ sap.ui.define([
 	GanttResizeExtension.prototype.onDeltaResize = function (event) {
 		var $target = jQuery(this.origin.eventTarget),
 			id = $target.parents("g").attr(GanttUtils.SELECT_FOR_DATASET_KEY);
-		var oElement = sap.ui.getCore().byId(id);
+		var oElement = Core.byId(id);
 		var deltaLine = oElement.getParent();
 		var oEventData = this._getDeltaResizeEventData(event);
 		if (oEventData) {
@@ -987,7 +980,7 @@ sap.ui.define([
 		var isRTL = Core.getConfiguration().getRTL();
 		var $target = jQuery(this.origin.eventTarget),
 			id = $target.parents("g").attr(GanttUtils.SELECT_FOR_DATASET_KEY);
-		var oElement = sap.ui.getCore().byId(id);
+		var oElement = Core.byId(id);
 		var deltaLine = oElement.getParent();
 		var mPoint = CoordinateUtils.getEventSVGPoint(this.getDomRefs().headerSvg, event);
 		var oGantt = this.getGantt();

package/src/sap/gantt/simple/GanttRowAction.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.RowAction
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @experimental

package/src/sap/gantt/simple/GanttRowSettings.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.RowSettings
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @public
@@ -100,12 +100,64 @@ sap.ui.define([
 				/**
 				 * The controls for the shapes.
 				 */
-				shapes5 : {type : "sap.gantt.simple.BaseShape", multiple : true, singularName : "shape5"}
+				shapes5 : {type : "sap.gantt.simple.BaseShape", multiple : true, singularName : "shape5"},
+				/**
+				 * The control for the pseudo shapes.
+				 * @private since 1.120
+				 */
+				pseudoShapes : {type : "sap.gantt.simple.BasePseudoShape", multiple : true, singularName : "pseudoShape", visibility: "hidden"},
+				/**
+				 * Pseudo shape template
+				 * @private since 1.120
+				 */
+				pseudoShapeTemplate : {type : "sap.gantt.simple.MultiActivityGroup", multiple : false, visibility: "hidden"},
+				/**
+				 * @since 1.120
+				 * The control for the gantt overlay.
+				 * @experimental since 1.120
+				*/
+				overlays1: {type : "sap.gantt.overlays.GanttRowOverlay", sapGanttLazy: true},
+
+				/**
+				 * @since 1.120
+			     * The control for the gantt overlay.
+				 * @experimental since 1.120
+				*/
+				overlays2: {type : "sap.gantt.overlays.GanttRowOverlay", sapGanttLazy: true},
+				/**
+				 * @since 1.120
+				 * The control for the gantt overlay.
+				 * @experimental since 1.120
+				*/
+				overlays3: {type : "sap.gantt.overlays.GanttRowOverlay", sapGanttLazy: true},
+				/**
+				 * @since 1.120
+				 * The control for the gantty overlay.
+				 * @experimental since 1.120
+				*/
+				overlays4: {type : "sap.gantt.overlays.GanttRowOverlay", sapGanttLazy: true},
+				/**
+				 * @since 1.120
+				 * The control for the gantt overlay.
+				 * @experimental since 1.120
+				*/
+				overlays5: {type : "sap.gantt.overlays.GanttRowOverlay", sapGanttLazy: true}
 			},
 			designtime: "sap/ui/dt/designtime/notAdaptable.designtime"
 		}
 	});
-
+	/**
+	 * @private
+	 */
+	GanttRowSettings.prototype.getPseudoShapes = function() {
+		return this.getAggregation("pseudoShapes") ? this.getAggregation("pseudoShapes") : [];
+	};
+	/**
+	 * @private
+	 */
+	GanttRowSettings.prototype.getPseudoShapeTemplate = function() {
+		return this.getAggregation("pseudoShapeTemplate");
+	};
 	GanttRowSettings.prototype.getAllExpandableShapes = function(oGantt) {
 		var rowIndex =  this.getParent() && this.getParent().getIndex();
 		var aAllShapes = [], bPseudoShapesDisplayed = oGantt && oGantt.oOverlapShapeIds && oGantt.oOverlapShapeIds[rowIndex] && oGantt.oOverlapShapeIds[rowIndex].length > 0;

package/src/sap/gantt/simple/GanttSearchSidePanel.js

@@ -243,10 +243,10 @@ sap.ui.define([
         });
 
         setTimeout(function() {
+            var oInputField = this._oSearchSidePanel.getItems()[1].getContent()[0];
             if (listElement) {
                 listElement.children[0].focus();
-            } else {
-                var oInputField = this._oSearchSidePanel.getItems()[1].getContent()[0];
+            } else if (oInputField.getDomRef()) {
                 var iInputLength = oInputField.getValue().length;
                 var oSearchTextDom = oInputField.getDomRef().getElementsByTagName("input")[0];
                 oInputField.focus();
@@ -270,8 +270,11 @@ sap.ui.define([
         }
         this.list.getItems()[0].setEnabled(false);
         this.list.rerender();
-        var oEmptyListItem = this.list.getItems()[0].getDomRef().querySelector(".sapTntNavLIText");
-        oEmptyListItem.style.textAlign = "center";
+        var oDomRef = this.list.getItems()[0].getDomRef();
+        if (oDomRef) {
+            var oEmptyListItem = oDomRef.querySelector(".sapTntNavLIText");
+            oEmptyListItem.style.textAlign = "center";
+        }
     };
 
     // Set dynamic height for the Side Panel container as per the window size

package/src/sap/gantt/simple/GanttUtils.js

@@ -20,8 +20,11 @@ sap.ui.define([
 	"./CoordinateUtils",
 	"./MarkerType",
 	"sap/gantt/misc/Format",
-	"sap/gantt/library"
-], function(jQuery, Log, BaseObject, Core, CalendarType, Utility, DateFormat, Locale, OverflowToolbar, Parameters, CoordinateUtils, MarkerType, Format, library) {
+	"sap/gantt/library",
+	"sap/ui/table/rowmodes/Auto",
+	"sap/ui/table/rowmodes/Fixed",
+	"sap/ui/table/rowmodes/Interactive"
+], function(jQuery, Log, BaseObject, Core, CalendarType, Utility, DateFormat, Locale, OverflowToolbar, Parameters, CoordinateUtils, MarkerType, Format, library, AutoRowMode, FixedRowMode, InteractiveRowMode) {
 	"use strict";
 	var oContextCache = {};
 	var shapesWithRowLevels = {};
@@ -55,15 +58,13 @@ sap.ui.define([
 		},
 
 		isRelationshipConnectedToPseudoShapes: function(sShapeId, sGanttSvgId) {
-			var oGantt = sap.ui.getCore().byId(sGanttSvgId);
+			var oGantt = Core.byId(sGanttSvgId);
 			var oTableRows = oGantt.getTable().getRows();
 			var bFoundShapeForRelationship = false, oPseudoShapesForRelationship;
 			oTableRows.forEach(function(oTableRow){
 				if (!bFoundShapeForRelationship) {
 					var oRowSetting = oTableRow.getAggregation("_settings");
-					oPseudoShapesForRelationship = oRowSetting.getTasks && oRowSetting.getTasks().filter(function(oTask) {
-						return oTask.isPseudoShape;
-					}).filter(function(oPseudoShape) {
+					oPseudoShapesForRelationship = oRowSetting.getPseudoShapes && oRowSetting.getPseudoShapes().filter(function(oPseudoShape) {
 						return (oPseudoShape.aShapeIds.indexOf(sShapeId) > -1);
 					})[0];
 					if (oPseudoShapesForRelationship) {
@@ -111,6 +112,26 @@ sap.ui.define([
 			}
 		},
 
+		/**
+		 * get table row mode
+		 * @private
+		 */
+		setTableRowMode: function(oTable) {
+			if (oTable) {
+				var oRowMode = oTable.getRowMode();
+				if (!oRowMode && oTable.getVisibleRowCountMode()) {
+					return;
+				}
+				if (oRowMode === null || oRowMode === "Fixed") {
+					oTable.setRowMode(new FixedRowMode());
+				} else if (oRowMode === "Auto") {
+					oTable.setRowMode(new AutoRowMode());
+				} else if (oRowMode === "Interactive") {
+					oTable.setRowMode(new InteractiveRowMode());
+				}
+			}
+		},
+
 		/**
 		 * get table row from Current Shape
 		 * @private
@@ -230,7 +251,7 @@ sap.ui.define([
 				var selector = ["[id='", sContainerId, "']", " [" + GanttUtils.SHAPE_ID_DATASET_KEY + "='", sShapeId, "']"].join("");
 				var sElm = document.querySelector(selector);
 				if (sElm) {
-					var oShape = sap.ui.getCore().byId(sElm.id);
+					var oShape = Core.byId(sElm.id);
 					fnElements.push(oShape);
 				}
 			});
@@ -248,7 +269,7 @@ sap.ui.define([
 							return shape.id !== "";
 						})
 						.reduce(function(acc,item) {
-							return acc.concat(sap.ui.getCore().byId(item.id));
+							return acc.concat(Core.byId(item.id));
 						},shapes);
 					}
 				}
@@ -291,11 +312,18 @@ sap.ui.define([
 				sFormat = "yyyyMMMdd";
 			}
 
-			return DateFormat.getDateTimeInstance({
+			var oFormatLocale = oSmallInterval.locale ? new Locale(oSmallInterval.locale) : oCoreLocale;
+			var oFormatOptions = {
 				format: sFormat,
 				style: oSmallInterval.style,
 				calendarType: oCalendarType
-			}, oSmallInterval.locale ? new Locale(oSmallInterval.locale) : oCoreLocale);
+			};
+
+			if (Format._getEnableDateTimezoneFormatter()) {
+				return DateFormat.getDateTimeInstance(oFormatOptions, oFormatLocale);
+			} else {
+				return DateFormat.getDateTimeWithTimezoneInstance(oFormatOptions, oFormatLocale);
+			}
 		},
 
 		/**
@@ -426,6 +454,10 @@ sap.ui.define([
 				if (exitRowTraversingLoop) {
 					return;
 				}
+				var ganttRowOverlay = shape.getParent().getParent();
+				if (ganttRowOverlay && ganttRowOverlay.isA("sap.gantt.overlays.GanttRowOverlay")){
+					return;
+				}
 				var currEndTime = endTime, prevEndTime = endTime, nextEndTime = endTime;
 				if (BaseObject.isA(shape, "sap.gantt.simple.AdhocLine")) {
 					currEndTime = startTime;
@@ -657,6 +689,10 @@ sap.ui.define([
 						shape._setLevel(iLevel);
 					}
 					shape._level = iLevel;
+					var oRowSettings = shape.getParentRowSettings && shape.getParentRowSettings(), shapeId = shape.getShapeId && shape.getShapeId();
+					if (oRowSettings && oRowSettings._overlayShapeIdList && shapeId && oRowSettings._overlayShapeIdList[shapeId]){
+						oRowSettings._overlayShapeIdList[shapeId] = shape._level;
+					}
 
 					if (iMaxLevel < iLevel) {
 						iMaxLevel = iLevel;

package/src/sap/gantt/simple/GanttZoomExtension.js

@@ -607,12 +607,12 @@ sap.ui.define([
 	};
 
 	GanttZoomExtension.prototype._getShapeInRow = function(oElement, aShapesInRow){
-		var mAggregations = AggregationUtils.getNonLazyAggregations(oElement);
+		var mAggregations = AggregationUtils.getAllNonLazyAggregations(oElement);
 		var that = this;
 		Object.keys(mAggregations).forEach(function(sName){ // eslint-disable-line
 			// get all binding aggregation instances and default to empty array
 			var aAggregations = oElement.getAggregation(sName);
-			if (aAggregations){
+			if (aAggregations && typeof aAggregations != "string"){
 				aAggregations = jQuery.isArray(aAggregations) ? aAggregations : [aAggregations];
 
 				if (aAggregations.length > 0) {
@@ -624,6 +624,16 @@ sap.ui.define([
 			}
 
 		}.bind(oElement));
+		//handles the overlay shape in a bird's eye view
+		if (oElement.isA("sap.gantt.simple.GanttRowSettings")){
+			var sRowUid = oElement.getRowUid(),
+			oGantt = this.getGantt(), iRowIndex = oElement.getParent().getIndex(),
+			oExpandModel    = this.getGantt()._oExpandModel,
+			bHasExpandShape = oExpandModel.isRowExpanded(sRowUid),
+			pseudoShapeExpanded = oGantt.oOverlapShapeIds && oGantt.oOverlapShapeIds[iRowIndex] && oGantt.oOverlapShapeIds[iRowIndex].length;
+			var aOverlayList =  AggregationUtils._fetchOverlayAggregation(oElement,!bHasExpandShape || pseudoShapeExpanded);
+			aShapesInRow = aShapesInRow.concat(aOverlayList);
+		}
 		return aShapesInRow;
 	};
 

package/src/sap/gantt/simple/InnerGanttChart.js

@@ -10,13 +10,17 @@ sap.ui.define([
 	"sap/ui/table/library",
 	"sap/ui/table/utils/TableUtils",
 	"sap/gantt/simple/GanttExtension",
+	"sap/ui/table/rowmodes/Fixed",
+	'./GanttUtils',
 	"sap/gantt/simple/InnerGanttChartRenderer"
 ], function (
 	Core,
 	Control,
 	tableLibrary,
 	TableUtils,
-	GanttExtension
+	GanttExtension,
+	FixedRowMode,
+	GanttUtils
 ) {
 	"use strict";
 
@@ -33,7 +37,7 @@ sap.ui.define([
 	 * @extend sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.1
 	 *
 	 * @constructor
 	 * @private
@@ -110,14 +114,20 @@ sap.ui.define([
 	InnerGanttChart.prototype.resolveWhenReady = function (bWithShapes) {
 		return new Promise(function (resolve) {
 			var fnHandleEvent = function handleEvent (oEvent) {
-				var oGantt = this.getParent();
-				if (oGantt._enableOptimisation) {
-					oGantt.getTable().setVisibleRowCountMode(sap.ui.table.VisibleRowCountMode.Fixed);
+				var oGantt = this.getParent(), oTable = oGantt.getTable();
+				GanttUtils.setTableRowMode(oTable);
+				if (oGantt._enableOptimisation && !oGantt.getTable().getRowMode().isA("sap.ui.table.rowmodes.Fixed")) {
+					oGantt.getTable().setRowMode(new FixedRowMode());
+				}
+				var bRowMode;
+				if (oTable.getRowMode()) {
+					bRowMode = oGantt.getTable().getRowMode().isA("sap.ui.table.rowmodes.Auto") && oGantt.getSyncedControl().getRowStates().length < (oGantt.getTable().getRows().length - 1 + TableUtils.getHeaderRowCount(oGantt.getTable()));
+				} else {
+					bRowMode = oGantt.getTable().getVisibleRowCountMode() === tableLibrary.VisibleRowCountMode.Auto && oGantt.getSyncedControl().getRowStates().length < (oGantt.getTable().getVisibleRowCount() + TableUtils.getHeaderRowCount(oGantt.getTable()));
 				}
 				if (bWithShapes && !oEvent.getParameter("hasRenderedShapes") ||
 					( // in Auto mode table might sync prematurely with header rows only, so wait for the sync of all visible rows
-						oGantt.getTable().getVisibleRowCountMode() === tableLibrary.VisibleRowCountMode.Auto &&
-						oGantt.getSyncedControl().getRowStates().length < (oGantt.getTable().getVisibleRowCount() + TableUtils.getHeaderRowCount(oGantt.getTable()))
+						bRowMode
 					)
 				) {
 					this.attachEventOnce("ganttReady", fnHandleEvent);