@sapui5/sap.gantt 1.123.0 → 1.125.0

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

@@ -394,7 +394,7 @@
 							}
 							this._updateShapes(oElement, select, oGantt);
 							if (!select) {
-								oGantt.getSelection().clearSelectionByUid(oElement.getShapeUid());
+								oGantt.getSelection().clearSelectionByUid(oElement.getShapeUid(), true);
 							}
 						}
 					}
@@ -411,7 +411,7 @@
 					endTime: oElement.getEndTime()
 				}, true);
 			} else {
-				oGantt.getSelection().clearSelectionByUid(oElement.getShapeUid());
+				oGantt.getSelection().clearSelectionByUid(oElement.getShapeUid(), false);
 			}
 		},
 
@@ -975,13 +975,9 @@
 			var aExpandableShapes, parentRowSettings = oMainShape.getParentRowSettings();
 			oGantt.oExpandedShapesMap[rowIndex] = oGantt.oExpandedShapesMap[rowIndex] ? oGantt.oExpandedShapesMap[rowIndex] : [];
 			//fetch all overlay aggregation shapes and concat to expandable shapes list
-			if (oGanttRowOverlayorRow && oGanttRowOverlayorRow.isA("sap.gantt.overlays.GanttRowOverlay")){
-				var pseudoShapeExpanded = oGantt.oOverlapShapeIds && oGantt.oOverlapShapeIds[rowIndex] && oGantt.oOverlapShapeIds[rowIndex].length;
-				var allOverlayAggr  = AggregationUtils._fetchOverlayAggregation(parentRowSettings, pseudoShapeExpanded, false,  mOption.expandModel.aShapeSchemes);
-				aExpandableShapes = parentRowSettings.getAllExpandableShapes(oGantt).concat(allOverlayAggr);
-			} else {
-				aExpandableShapes = parentRowSettings.getAllExpandableShapes(oGantt);
-			}
+			var pseudoShapeExpanded = oGantt.oOverlapShapeIds && oGantt.oOverlapShapeIds[rowIndex] && oGantt.oOverlapShapeIds[rowIndex].length;
+			var allOverlayAggr  = AggregationUtils._fetchOverlayAggregation(parentRowSettings, pseudoShapeExpanded, false,  mOption.expandModel.aShapeSchemes);
+			aExpandableShapes = parentRowSettings.getAllExpandableShapes(oGantt).concat(allOverlayAggr);
 			aExpandableShapes.forEach(function(shape, index) {
 				if (oGantt.isShapeVisible(shape)) {
 					lastVisibleShapeIndex = index;

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

@@ -101,7 +101,7 @@ sap.ui.define([
 		} else if (!mParam.selected && this.mSelected.uid[sUid]) {
 			// click on the same shape to mark it as deselected
 			delete this.mSelected.uid[sUid];
-			this._updateShapeIdRowIdList(sUid);
+			this._updateShapeIdRowIdList(sUid, false);
 			this._fireSelectionChanged([sUid]);
 		}
 	};
@@ -110,7 +110,7 @@ sap.ui.define([
 	 * @private
 	 * Updates shapeId and rowId list when deselection done using Uid
 	 */
-	SelectionModel.prototype._updateShapeIdRowIdList = function (sUid) {
+	SelectionModel.prototype._updateShapeIdRowIdList = function (sUid, isRowDeselection) {
 		var shapeId = Utility.parseUid(sUid).shapeId,
 			rowId = Utility.parseUid(sUid).rowId;
 		if (this.mSelected.shapeId[shapeId]) {
@@ -119,11 +119,13 @@ sap.ui.define([
 				selected: false
 			};
 		}
-		if (this.mSelected.rowId[rowId]) {
-			delete this.mSelected.rowId[rowId];
-			this.mSelected.deSelectRowId[rowId] = {
-				selected: false
-			};
+		if (this.mSelected.rowId[rowId] ) {
+			if (isRowDeselection) {
+				delete this.mSelected.rowId[rowId];
+				this.mSelected.deSelectRowId[rowId] = {
+					selected: false
+				};
+			}
 		}
 	};
 
@@ -144,7 +146,7 @@ sap.ui.define([
 				this._updateSelectedShape(sUid, mParam);
 			} else if (mParam && !mParam.selected && this.mSelected.uid[sUid]) {
 				delete this.mSelected.uid[sUid];
-				this._updateShapeIdRowIdList(sUid);
+				this._updateShapeIdRowIdList(sUid, false);
 				aDeselectedShapeUids.push(sUid);
 			}
 		}
@@ -184,10 +186,12 @@ sap.ui.define([
 		}
 	};
 
-	SelectionModel.prototype.clearSelectionByUid = function (sUid) {
+	SelectionModel.prototype.clearSelectionByUid = function (sUid, isRowDeselection) {
 		if (this.existed(sUid)) {
-			this._updateShapeIdRowIdList(sUid);
+			this._updateShapeIdRowIdList(sUid, isRowDeselection);
 			delete this.mSelected.uid[sUid];
+		} else if (isRowDeselection) {
+			this._updateShapeIdRowIdList(sUid, isRowDeselection);
 		}
 	};
 
@@ -233,8 +237,9 @@ sap.ui.define([
 	 * updates selection model and fires selection change event.
 	 * @param {string[]} selectedObjectsId Array of shapeId.
 	 * @param {boolean} overrideExisting flag to override existing selection by UID.
+	 * @param {string} oGanttId Id of the Gantt.
 	 */
-	SelectionModel.prototype.updateSelectedShapes = function(selectedObjectsId, overrideExisting) {
+	SelectionModel.prototype.updateSelectedShapes = function(selectedObjectsId, overrideExisting, oGanttId) {
 		var aUid = [];
 		this.mSelected.deSelectRowId = {};
 		if (!selectedObjectsId || selectedObjectsId.length === 0) {
@@ -281,7 +286,7 @@ sap.ui.define([
 		if (selectedObjectsId.length > 0) {
 			var aUpdatedUid = [];
 			Object.keys(this.mSelected.deSelectShapeId).forEach(function(shapeId){
-				var shapeDomRef = jQuery("[data-sap-gantt-shape-id='" + shapeId + "']").get(0),
+				var shapeDomRef = document.querySelectorAll("[id='" + oGanttId + "'] [data-sap-gantt-shape-id='" + shapeId + "']")[0],
 					shapeObj = Element.getElementById(shapeDomRef && shapeDomRef.id);
 				aUpdatedUid.push(shapeObj && shapeObj.getShapeUid());
 			});

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

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/core/Element'], function (Element) {
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.125.0
 	 *
 	 * @constructor
 	 * @public

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.UtilizationChart
 	 *
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.125.0
 	 * @since 1.95
 	 *
 	 * @constructor

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

@@ -23,7 +23,7 @@ sap.ui.define([
  * @extends sap.ui.core.Element
  *
  * @author SAP SE
- * @version 1.123.0
+ * @version 1.125.0
  * @since 1.95
  *
  * @constructor

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

@@ -24,7 +24,7 @@ sap.ui.define(["sap/ui/core/Element"], function(Element){
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.125.0
 	 *
 	 * @constructor
 	 * @public

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

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

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

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

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

@@ -20,7 +20,7 @@ sap.ui.define(["sap/ui/core/Element"], function(Element){
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.125.0
 	 *
 	 * @constructor
 	 * @public

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

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

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

@@ -24,7 +24,7 @@ sap.ui.define(["sap/ui/core/Element"], function(Element){
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.125.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/gantt/simple/shapes/Shape.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.gantt.simple.BaseShape
 	 *
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.125.0
 	 *
 	 * @abstract
 	 * @constructor
@@ -62,34 +62,16 @@ sap.ui.define([
 				 * The x position of the shapes start. Auto will be converted to position based on <code>time</code>.
 				 */
 				startX: {type: "sap.gantt.SVGLength", defaultValue: "auto"},
-				/**
-				 * This property is ignored.
-				 * @deprecated Since version 1.71.2.
-				 */
-				fill: {type : "sap.gantt.ValueSVGPaintServer"},
-				/**
-				 * This property is ignored.
-				 * @deprecated Since version 1.71.2.
-				 */
-				fillOpacity: {type: "float", defaultValue: 1.0},
-				/**
-				 * This property is ignored.
-				 * @deprecated Since version 1.71.2.
-				 */
-				stroke: {type : "sap.gantt.ValueSVGPaintServer"},
-				/**
-				 * This property is ignored.
-				 * @deprecated Since version 1.71.2.
-				 */
-				opacity: {type: "float", defaultValue: 1.0},
 				/**
 				 * All standard shapes are selectable.
-				 * @deprecated Since version 1.71.2.
+				 * @deprecated Since version 1.71.2, replaced by {@link sap.gantt.simple.BaseShape}
+				 * The property and its default value, that is set to 'false', are being inherited from the parent BaseShape.
 				 */
 				selectable: {type: "boolean", defaultValue: true},
 				/**
 				 * All standard shapes are hoverable.
-				 * @deprecated Since version 1.71.2.
+				 * @deprecated Since version 1.71.2, replaced by {@link sap.gantt.simple.BaseShape}
+				 * The property and its default value, that is set to 'false', are being inherited from the parent BaseShape.
 				 */
 				hoverable: {type: "boolean", defaultValue: true}
 			}

package/src/sap/gantt/simple/shapes/Task.js

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

package/src/sap/gantt/themes/base/Gantt.less

@@ -56,7 +56,8 @@ svg {
 	fill: @sapChart_OrderedColor_11;
 	height:  0.25rem;
 }
-.sapUiGanttSearchSidePanel{
+.sapUiGanttSearchSidePanel,
+.sapUiGanttLayoutSidePanel{
 	width: 30%;
 	float: right;
 }
@@ -70,7 +71,8 @@ svg {
 		width: 80%;
 		float: left;
 	}
-	.sapUiGanttSearchSidePanel{
+	.sapUiGanttSearchSidePanel,
+	.sapUiGanttLayoutSidePanel{
 		width: 20%;
 		float: right;
 	}
@@ -85,7 +87,8 @@ svg {
 		width: 70%;
 		float: left;
 	}
-	.sapUiGanttSearchSidePanel{
+	.sapUiGanttSearchSidePanel,
+	.sapUiGanttLayoutSidePanel{
 		width: 30%;
 		float: right;
 	}
@@ -101,7 +104,8 @@ svg {
 		width: 80%;
 		float: left;
 	}
-	.sapUiGanttSearchSidePanel{
+	.sapUiGanttSearchSidePanel,
+	.sapUiGanttLayoutSidePanel{
 		width: 20%;
 		float: right;
 	}
@@ -892,4 +896,4 @@ tspan.sapGanttTooltipLine:nth-child(2n) {
 
 .sapGanttHeaderOverflowToolbar {
 	max-width: 100%;
-}
+}

package/src/sap/gantt/themes/sap_belize/library.source.less

@@ -5,6 +5,15 @@
 	
  */
 
-@import "../base/library.source.less";
+/***********************************************************************************
+/* Due to deprecation of the Belize theme family with SAPUI5 version 1.120 the
+/* inheritance of the base theme is now updated to an inheritance of a static
+/* copy of the base theme named sap_belize_base. The respective
+/* control css files of base are copied to the sap_belize_base theme folder.
+/* This decoupling of the base theme is introduced with SAPUI5 version 1.125.
+***********************************************************************************/
+
+
+@import "../sap_belize_base/library.source.less";
 @import "../../../../sap/ui/core/themes/sap_belize/base.less";
 @import "../../../../sap/ui/core/themes/sap_belize/global.less";