@sapui5/sap.gantt 1.123.0 → 1.125.0

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

@@ -26,11 +26,17 @@ sap.ui.define([], function () {
 			});
 		}
 
+		const bShowSearchSidePanel = oContainer.getShowSearchSidePanel();
+		const oLayoutSidePanel = oContainer.getSidePanel();
+		const bShowLayoutSidePanel = oLayoutSidePanel && oLayoutSidePanel.getVisible();
+
 		oRm.openStart("div", oContainer);
 		oRm.class("sapGanttContainer");
-		if (oContainer.getShowSearchSidePanel()) {
+
+		if (bShowSearchSidePanel || bShowLayoutSidePanel) {
 			oRm.class("sapGanttContainerWithSidePanel");
 		}
+
 		oRm.style("width", oContainer.getWidth());
 		oRm.style("height", oContainer.getHeight());
 		oRm.openEnd();
@@ -40,10 +46,22 @@ sap.ui.define([], function () {
 
 		this.renderToolbar(oRm, oContainer);
 
-		this.renderGanttCharts(oRm, oContainer);
+		this.renderGanttCharts(oRm, oContainer, {
+			hasSidePanel: bShowSearchSidePanel || bShowLayoutSidePanel
+		});
 
-		if (oContainer.getShowSearchSidePanel()) {
-			this.renderSidePanel(oRm, oContainer);
+		if (bShowSearchSidePanel) {
+			this.renderSidePanel(oRm, oContainer, {
+				id: "ganttSearchSidePanel",
+				sidePanel: oContainer.getSearchSidePanel(),
+				classNames: "sapUiGanttSearchSidePanel"
+			});
+		} else if (bShowLayoutSidePanel) {
+			this.renderSidePanel(oRm, oContainer, {
+				id: "ganttLayoutSidePanel",
+				sidePanel: oLayoutSidePanel,
+				classNames: "sapUiGanttLayoutSidePanel"
+			});
 		}
 
 		if (oContainer.getEnableStatusBar()) {
@@ -87,14 +105,14 @@ sap.ui.define([], function () {
 		}
 	};
 
-	GanttChartContainerRenderer.renderGanttCharts = function (oRm, oContainer) {
+	GanttChartContainerRenderer.renderGanttCharts = function (oRm, oContainer, oOptions) {
 		oRm.openStart("div", oContainer.getId() + "-ganttContainerContent");
 		if (oContainer.getEnableStatusBar()) {
 			oRm.class("sapGanttContainerCntWithStatusBar");
 		} else {
 			oRm.class("sapGanttContainerCnt");
 		}
-		if (oContainer.getShowSearchSidePanel()) {
+		if (oOptions.hasSidePanel) {
 			oRm.class("sapGanttContainerCntWithSidePanel");
 		}
 		oRm.openEnd();
@@ -102,13 +120,12 @@ sap.ui.define([], function () {
 		oRm.close("div");
 	};
 
-	GanttChartContainerRenderer.renderSidePanel = function(oRm, oContainer) {
-		var oSidePanel = oContainer.getSearchSidePanel();
-		if (oSidePanel) {
-			oRm.openStart("div", oContainer.getId() + "-ganttSearchSidePanel");
-			oRm.class("sapUiGanttSearchSidePanel");
+	GanttChartContainerRenderer.renderSidePanel = function (oRm, oContainer, oOptions) {
+		if (oOptions.sidePanel) {
+			oRm.openStart("div", oContainer.getId() + "-" + oOptions.id);
+			oRm.class(oOptions.classNames);
 			oRm.openEnd();
-			oRm.renderControl(oSidePanel);
+			oRm.renderControl(oOptions.sidePanel);
 			oRm.close("div");
 		}
 	};

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

@@ -141,6 +141,13 @@ sap.ui.define([
 	var MARGIN_OF_ERROR = 10;
 	var MIN_AREA_WIDTH = 60;
 
+	// whenever model changed, need invalidate gantt as well
+	var aModelChangeReason = values(ChangeReason).slice();
+
+	// All reasons that need to invalidate the control which allows render manager to rerender it
+	// Each UI interaction shall only render once
+	var aInvalidateReasons = aModelChangeReason.concat(["Render", "FirstVisibleRowChange", "Resize"]);
+
 	function add(a, b) {
 		return a + b;
 	}
@@ -163,7 +170,7 @@ sap.ui.define([
 	 * @extend sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.125.0
 	 * @since 1.60
 	 *
 	 * @constructor
@@ -1386,6 +1393,9 @@ sap.ui.define([
 			if (oTable.getRowMode()) {
 				oTable.getRowMode().setRowContentHeight(80);
 			} else {
+				/**
+				 * @deprecated As of version 1.119
+				 */
 				oTable.setRowHeight(80);
 			}
 		}
@@ -1668,7 +1678,7 @@ sap.ui.define([
 			});
 		}
 		if (selectedShapeIDs.length > 0) {
-			this.oSelection.updateSelectedShapes(selectedShapeIDs, overrideExisting);
+			this.oSelection.updateSelectedShapes(selectedShapeIDs, overrideExisting, this.getId());
 		}
 	};
 
@@ -1720,7 +1730,7 @@ sap.ui.define([
 			}
 		});
 		if (deSelectedShapeIDs.length > 0) {
-			this.oSelection.updateSelectedShapes(deSelectedShapeIDs, false);
+			this.oSelection.updateSelectedShapes(deSelectedShapeIDs, false, this.getId());
 		}
 	};
 
@@ -2854,12 +2864,7 @@ sap.ui.define([
 
 		this._invalidateRowActionTemplate(oTable, sReason);
 
-		// whenever model changed, need invalidate gantt as well
-		var aModelChangeReason = values(ChangeReason).slice();
-
-		// All reasons that need to invalidate the control which allows render manager to rerender it
 		// Each UI interaction shall only render once
-		var aInvalidateReasons = aModelChangeReason.concat(["Render", "FirstVisibleRowChange", "Resize"]);
 		if (this.getEnablePseudoShapes() && this.pseudoShapeSpecificData && ((this.pseudoShapeSpecificData.oDraggedShapeDates && this.pseudoShapeSpecificData.draggedShapeTRowIndex != null) || (this.pseudoShapeSpecificData.resizedShape && this.pseudoShapeSpecificData.resizedShapeRowIndex != null))){
 			var oDraggedShapeDates = this.pseudoShapeSpecificData.oDraggedShapeDates,
 			aRows = this.getTable().getRows(), aTRowIndexArr;
@@ -2927,11 +2932,14 @@ sap.ui.define([
 			this.pseudoShapeSpecificData.isPseudoShapesEnabled = false;
 			this._addBackTasksToRows();
 		}
-		if (this._createInnerGanttRenderPromise()) {
+
+		var bIsValidReason = aInvalidateReasons.indexOf(sReason) !== -1;
+
+		if ((!bIsValidReason && sReason !== "VerticalScroll") || this._createInnerGanttRenderPromise()) {
 			this.getInnerGantt().invalidate();
 		}
-		if (aInvalidateReasons.indexOf(sReason) !== -1) {
 
+		if (bIsValidReason) {
 			// do not scrolling while invalidating control
 			this.getSyncedControl().setAllowContentScroll(false);
 			this._oInnerGanttRenderPromiseResolve();
@@ -3279,12 +3287,12 @@ sap.ui.define([
 				return;
 			}
 			//Changes to set ZoomLevel during the Initial Rendering of the GanttChart
-			var oSyncZoomStrategyResult = this.getAxisTimeStrategy().syncContext(iVisibleWidth);
-			if (this.getAxisTimeStrategy().initialSettings != null && this.getAxisTimeStrategy().initialSettings.zoomLevel != null
-				&& this.getAxisTimeStrategy().initialSettings.zoomLevel != 0 && sReasonCode == "initialRender"
-				&& !this.getAxisTimeStrategy().isA("sap.gantt.axistime.FullScreenStrategy")
+			var oAxisTimeStrategy = this.getAxisTimeStrategy();
+			var oSyncZoomStrategyResult = oAxisTimeStrategy.syncContext(iVisibleWidth);
+			if (oAxisTimeStrategy.initialSettings != null && oAxisTimeStrategy.initialSettings.zoomLevel != null
+				&& oAxisTimeStrategy.initialSettings.zoomLevel != 0 && sReasonCode == "initialRender"
+				&& !oAxisTimeStrategy.isA("sap.gantt.axistime.FullScreenStrategy")
 				&& !this.isPrint && this.getParent().isA("sap.gantt.simple.GanttChartContainer") && !this.getParent().isZoomLevelUpdated) {
-					var oAxisTimeStrategy =  this.getAxisTimeStrategy();
 					var binitialZoomLevel = oAxisTimeStrategy.initialSettings.zoomLevel;
 					oAxisTimeStrategy.setProperty("zoomLevel", binitialZoomLevel, true);
 					oSyncZoomStrategyResult.zoomLevel = binitialZoomLevel;
@@ -3292,6 +3300,12 @@ sap.ui.define([
 					oAxisTimeStrategy.updateInitialVisibleHorizon(visibleHorizon, binitialZoomLevel);
 					this.getParent().isZoomLevelUpdated = true;
 			}
+			if (sReasonCode == "initialRender" && oAxisTimeStrategy.isA("sap.gantt.axistime.StepwiseZoomStrategy")) {
+				var oHorizon = oAxisTimeStrategy._completeTimeHorizon(new TimeHorizon({
+					startTime: oAxisTimeStrategy.getVisibleHorizon().getStartTime()
+				}));
+				oAxisTimeStrategy.getVisibleHorizon().setProperty("endTime", oHorizon.getEndTime(), true);
+			}
 			this.fireEvent("_zoomInfoUpdated", oSyncZoomStrategyResult);
 			this._iLastVisibleWidth = null;
 
@@ -3557,7 +3571,12 @@ sap.ui.define([
 							})
 						);
 					}
-			} else {
+			}
+
+			/**
+			 * @deprecated As of version 1.119
+			 */
+			if (!oRowMode) {
 				oTable.setVisibleRowCountMode(sap.ui.table.VisibleRowCountMode.Auto);
 				oTable.setMinAutoRowCount(1);//Change the default value of minAutoRowCount to 1 form the default vlue of 5 for GanttChart with minimal height.
 			}
@@ -3635,7 +3654,15 @@ sap.ui.define([
 
 	GanttChartWithTable.prototype._updateRowHeightInExpandModel = function(oTable) {
 		GanttUtils.setTableRowMode(oTable);
-		var iTableRowHeight = oTable.getRowMode() ? Math.ceil(oTable.getRowMode().getRowContentHeight()) : Math.ceil(oTable.getRowHeight());
+		var oRowMode = oTable.getRowMode(), iTableRowHeight = 0;
+		if (oRowMode) {
+			iTableRowHeight = Math.ceil(oRowMode.getRowContentHeight());
+		} else {
+			/**
+			 * @deprecated As of version 1.119
+			 */
+			iTableRowHeight = Math.ceil(oTable.getRowHeight());
+		}
 		if (iTableRowHeight === 0) {
 			iTableRowHeight =  Math.ceil(oTable._getDefaultRowHeight());
 		}

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

@@ -100,7 +100,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.gantt.simple.GanttExtension
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.125.0
 	 * @constructor
 	 * @private
 	 * @alias sap.gantt.simple.GanttExtension
@@ -981,7 +981,9 @@ sap.ui.define([
 			} else {
 				this.updateCursorStyle("not-allowed", "none");
 				this.updateHeaderCursorStyle("not-allowed", "none");
-				this._stopAutoScroll();
+				if (oPointerExtension.isPointerInGanttChart() !== true){
+					this._stopAutoScroll();
+				}
 			}
 			this.showGhost(oEvent);
 			this._disableTextSelection();

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

@@ -18,7 +18,7 @@ sap.ui.define([ "sap/ui/base/Object" ],function(BaseObject) {
 		 * @abstract
 		 * @extends sap.ui.base.Object
 		 * @author SAP SE
-		 * @version 1.123.0
+		 * @version 1.125.0
 		 * @constructor
 		 * @private
 		 * @alias sap.gantt.simple.GanttExtension

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extend sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.125.0
 	 *
 	 * @constructor
 	 * @private
@@ -349,7 +349,7 @@ sap.ui.define([
 			oRm.attr("aria-label", _oRb.getText("ARIA_GANTT_INNER_HEADER"));
 			oRm.openEnd();
 			oRm.openStart("g", "inner-header-g");
-			oRm.style("height", iMarkerAreaHeight);
+			oRm.style("height", iMarkerAreaHeight + "px");
 			oRm.openEnd();
 			var oRectArea = new BaseRectangle({
 				x: 0,

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

@@ -14,7 +14,6 @@ sap.ui.define([
 	"./GanttUtils",
 	"sap/ui/core/format/DateFormat",
 	"sap/m/Text",
-	"sap/ui/core/format/TimezoneUtil",
 	"sap/gantt/utils/GanttChartConfigurationUtils"
 ], function(
 	jQuery,
@@ -26,7 +25,6 @@ sap.ui.define([
 	GanttUtils,
 	DateFormat,
 	Text,
-	TimezoneUtil,
 	GanttChartConfigurationUtils
 ) {
 	"use strict";
@@ -242,7 +240,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.gantt.simple.GanttExtension
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.125.0
 	 * @constructor
 	 * @private
 	 * @alias sap.gantt.simple.GanttPointerExtension

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

@@ -83,7 +83,7 @@ function(
 	 *
 	 * @extends sap.gantt.simple.GanttExtension
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.125.0
 	 * @constructor
 	 * @private
 	 * @alias sap.gantt.simple.GanttPopoverExtension

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

@@ -158,7 +158,7 @@ sap.ui.define([
 		 * @extend sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.123.0
+		 * @version 1.125.0
 		 * @since 1.66
 		 *
 		 * @constructor
@@ -396,9 +396,26 @@ 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().setRowMode(new FixedRowMode({
-					rowCount: that.iThreshold
-				}));
+				if (that._getOriginalGanttChart()._bExpandToggled) {
+					that._ganttChartClone.getTable().setRowMode(new FixedRowMode({
+						rowCount: that.iThreshold
+					}));
+				} else {
+					var oCloneTable = that._ganttChartClone.getTable();
+					var oRowMode = oCloneTable.getRowMode(), nRowHeight = 0;
+					if (oRowMode && oRowMode.getRowContentHeight()) {
+						nRowHeight = oRowMode.getRowContentHeight();
+					} else {
+						/**
+						 * @deprecated As of version 1.119
+						 */
+						nRowHeight = oCloneTable.getRowHeight();
+					}
+					that._ganttChartClone.getTable().setRowMode(new FixedRowMode({
+						rowCount: that.iThreshold,
+						rowContentHeight: nRowHeight ? nRowHeight : Math.ceil(that._getOriginalGanttChart().getTableRowHeights()[0])
+					}));
+				}
 				that.bFirst = (index === 0) ? true : false;
 				that._ganttChartClone.getTable().setFirstVisibleRow(rowVal);
 				if (GanttChartConfigurationUtils.getRTL()) {
@@ -483,9 +500,26 @@ 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().setRowMode(new FixedRowMode({
-					rowCount: that.iThreshold
-				}));
+				if (that._getOriginalGanttChart._bExpandToggled) {
+					that._ganttChartClone.getTable().setRowMode(new FixedRowMode({
+						rowCount: that.iThreshold
+					}));
+				} else {
+					var oCloneTable = that._ganttChartClone.getTable();
+					var oRowMode = oCloneTable.getRowMode(), nRowHeight = 0;
+					if (oRowMode && oRowMode.getRowContentHeight()) {
+						nRowHeight = oRowMode.getRowContentHeight();
+					} else {
+						/**
+						 * @deprecated As of version 1.119
+						 */
+						nRowHeight = oCloneTable.getRowHeight();
+					}
+					that._ganttChartClone.getTable().setRowMode(new FixedRowMode({
+						rowCount: that.iThreshold,
+						rowContentHeight: nRowHeight ? nRowHeight : Math.ceil(that._getOriginalGanttChart().getTableRowHeights()[0])
+					}));
+				}
 				that.bFirst = (index === 0) ? true : false;
 				that._ganttChartClone.getTable().setFirstVisibleRow(rowVal);
 				if (GanttChartConfigurationUtils.getRTL()) {
@@ -718,9 +752,26 @@ 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().setRowMode(new FixedRowMode({
-					rowCount: this.iThreshold
-				}));
+				if (this._getOriginalGanttChart._bExpandToggled) {
+					this._ganttChartClone.getTable().setRowMode(new FixedRowMode({
+						rowCount: this.iThreshold
+					}));
+				} else {
+					var oCloneTable = this._ganttChartClone.getTable();
+					var oRowMode = oCloneTable.getRowMode(), nRowHeight = 0;
+					if (oRowMode && oRowMode.getRowContentHeight()) {
+						nRowHeight = oRowMode.getRowContentHeight();
+					} else {
+						/**
+						 * @deprecated As of version 1.119
+						 */
+						nRowHeight = oCloneTable.getRowHeight();
+					}
+					this._ganttChartClone.getTable().setRowMode(new FixedRowMode({
+						rowCount: this.iThreshold,
+						rowContentHeight: nRowHeight ? nRowHeight : Math.ceil(oGanttChart.getTableRowHeights()[0])
+					}));
+				}
 				this._ganttChartClone.getTable().setThreshold(this.iThreshold);
 				this._ganttChartClone.setParent(this._getOriginalGanttChart(), "originalGanttChart", true);
 			} else {
@@ -909,11 +960,13 @@ sap.ui.define([
 		};
 
 		GanttPrinting.prototype._onResize = function () {
-			var $dialogPreviewContentDiv = this._oHTMLDialogPreview.getDomRef();
-			$dialogPreviewContentDiv.style.overflow = "hidden";
-			this._resizePrintingPreviewPage();
-			// overflow has to be set to visible because of the page shadow
-			$dialogPreviewContentDiv.style.overflow = "visible";
+			if (this._oHTMLDialogPreview) {
+				var $dialogPreviewContentDiv = this._oHTMLDialogPreview.getDomRef();
+				$dialogPreviewContentDiv.style.overflow = "hidden";
+				this._resizePrintingPreviewPage();
+				// overflow has to be set to visible because of the page shadow
+				$dialogPreviewContentDiv.style.overflow = "visible";
+			}
 		};
 
 		function mmToPx(iMm) {
@@ -1896,9 +1949,26 @@ sap.ui.define([
 				}
 			}
 			if (this._ganttChartClone._enableOptimisation) {
-				oTable.setRowMode(new FixedRowMode({
-					rowCount: this.iThreshold
-				}));
+				if (this._getOriginalGanttChart._bExpandToggled) {
+					oTable.setRowMode(new FixedRowMode({
+						rowCount: this.iThreshold
+					}));
+				} else {
+					var oCloneTable = this._ganttChartClone.getTable();
+					var oRowMode = oCloneTable.getRowMode(), nRowHeight = 0;
+					if (oRowMode && oRowMode.getRowContentHeight()) {
+						nRowHeight = oRowMode.getRowContentHeight();
+					} else {
+						/**
+						 * @deprecated As of version 1.119
+						 */
+						nRowHeight = oCloneTable.getRowHeight();
+					}
+					oTable.setRowMode(new FixedRowMode({
+						rowCount: this.iThreshold,
+						rowContentHeight: nRowHeight ? nRowHeight : Math.ceil(this._getOriginalGanttChart().getTableRowHeights()[0])
+					}));
+				}
 				oTable.setThreshold(this.iThreshold);
 			}
 			var oOriginalRowBinding = oOriginalGantt.getTable().getBinding("rows"),
@@ -3104,9 +3174,8 @@ sap.ui.define([
 		};
 
 		GanttPrinting.prototype._createDatePicker = function (bSinglePage) {
-			var oTimeStrategy = this._getOriginalGanttChart().getAxisTimeStrategy();
-			var oLocale  = this._getOriginalGanttChart().getLocale();
-			var oTotalHorizon = oTimeStrategy.getTotalHorizon();
+			var oLocale  = this._ganttChartClone.getLocale();
+			var oTotalHorizon = this._ganttChartClone.getAxisTimeStrategy().getTotalHorizon();
 			var oStartTime = Format.abapTimestampToDate(oTotalHorizon.getStartTime());
 			var oEndTime = Format.abapTimestampToDate(oTotalHorizon.getEndTime());
 
@@ -3123,9 +3192,12 @@ sap.ui.define([
 			this._oStartDateLabel.toStatic();
 			this._oEndDateLabel.toStatic();
 
+			var oOriginalTotalHorizon = this._getOriginalGanttChart().getAxisTimeStrategy().getTotalHorizon();
+			var oOriginalStartTime = Format.abapTimestampToDate(oOriginalTotalHorizon.getStartTime());
+			var oOriginalEndTime = Format.abapTimestampToDate(oOriginalTotalHorizon.getEndTime());
 			this._oDatePickerFrom = new DateTimePicker({
-				minDate: UI5Date.getInstance(oStartTime),
-				maxDate: UI5Date.getInstance(oEndTime),
+				minDate: UI5Date.getInstance(oOriginalStartTime),
+				maxDate: UI5Date.getInstance(oOriginalEndTime),
 				value: {
 					parts: [{
 						path: "setting>/startDate",
@@ -3146,8 +3218,8 @@ sap.ui.define([
 			});
 
 			this._oDatePickerTo = new DateTimePicker({
-				minDate: UI5Date.getInstance(oStartTime),
-				maxDate: UI5Date.getInstance(oEndTime),
+				minDate: UI5Date.getInstance(oOriginalStartTime),
+				maxDate: UI5Date.getInstance(oOriginalEndTime),
 				value: {
 					parts: [{
 						path: "setting>/endDate",

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.RowAction
 	 *
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.125.0
 	 *
 	 * @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.123.0
+	 * @version 1.125.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -121,9 +121,14 @@ sap.ui.define([
 		setTableRowMode: function(oTable) {
 			if (oTable) {
 				var oRowMode = oTable.getRowMode();
+
+				/**
+				 * @deprecated As of version 1.119
+				 */
 				if (!oRowMode && oTable.getVisibleRowCountMode()) {
 					return;
 				}
+
 				if (oRowMode === null || oRowMode === "Fixed") {
 					oTable.setRowMode(new FixedRowMode());
 				} else if (oRowMode === "Auto") {
@@ -231,10 +236,13 @@ sap.ui.define([
 					sShapeId = oPart.shapeId;
 
 				var selector = ["[id='", sContainerId, "']", " [" + GanttUtils.SHAPE_ID_DATASET_KEY + "='", sShapeId, "']"].join("");
-				return jQuery(selector).control().filter(function (oElement) {
-					return oElement.getShapeUid() === sShapeUid;
-				})[0];
-
+				var sElm = document.querySelector(selector);
+				if (sElm) {
+					const oElement = Element.getElementById(sElm.id);
+					if ( oElement && oElement.getShapeUid() === sShapeUid ) {
+						return oElement;
+					}
+				}
 			};
 			return aShapeUid.map(fnElementFromShapeId);
 		},

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

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @extend sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.125.0
 	 *
 	 * @constructor
 	 * @private
@@ -119,12 +119,21 @@ sap.ui.define([
 				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());
+					if (oGantt.getTable().getRowMode() && oGantt.getTable().getRowMode().getRowContentHeight()) {
+						oGantt.getTable().setRowMode(new FixedRowMode({
+							rowContentHeight: oGantt.getTable().getRowMode().getRowContentHeight()
+						}));
+					} else {
+						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 {
+					/**
+					 * @deprecated As of version 1.119
+					 */
 					bRowMode = oGantt.getTable().getVisibleRowCountMode() === tableLibrary.VisibleRowCountMode.Auto && oGantt.getSyncedControl().getRowStates().length < (oGantt.getTable().getVisibleRowCount() + TableUtils.getHeaderRowCount(oGantt.getTable()));
 				}
 				if (bWithShapes && !oEvent.getParameter("hasRenderedShapes") ||

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

@@ -652,7 +652,7 @@ sap.ui.define([
 					fnRenderFakeRls(mEntities[sEntityKey].getProperty(sRelationshipShapeIdPath), sEntityKey[0] === "/" ? sEntityKey : "/" + sEntityKey);
 				}
 			});
-		} else { // ODataModel
+		} else if (oModel.isA("sap.ui.model.odata.v2.ODataModel")) { // ODataModel v2
 			var mEntities = oModel.getProperty("/"); // OData entities are in the root (even expanded ones)
 			Object.keys(mEntities).forEach(function (sEntityKey) {
 				if (sEntityKey.startsWith(oRelationshipsBindingInfo.path)) {

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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.125.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseShape
 	 *
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.125.0
 	 * @since 1.84
 	 *
 	 * @constructor

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

@@ -19,7 +19,7 @@ sap.ui.define(["sap/gantt/simple/BaseGroup"], function (BaseGroup) {
      * @extends sap.gantt.simple.BaseGroup
      *
      * @author SAP SE
-     * @version 1.123.0
+     * @version 1.125.0
      * @since 1.85
      *
      * @constructor

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

@@ -21,7 +21,7 @@
 	 * @extends sap.gantt.simple.GanttRowSettings
 	 *
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.125.0
 	 * @since 1.85
      *
 	 * @constructor

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

@@ -50,7 +50,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BasePath
 	 *
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.125.0
 	 *
 	 * @constructor
 	 * @public