@openui5/sap.ui.layout 1.119.0 → 1.120.0

package/THIRDPARTY.txt

@@ -179,7 +179,7 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/caja-html-sanitizer.js
 
-Component: Unicode Common Locale Data Repository, version: 41
+Component: Unicode Common Locale Data Repository, version: 43
 Copyright: 1991-2014 Unicode, Inc.
 License: Unicode-DFS-2015
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Unicode-DFS-2015.txt
@@ -334,7 +334,7 @@ License: ISC
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/ISC.txt
 Contained in: src/sap.ui.core/src/sap/ui/core/cache/LRUPersistentCache.js
 
-Component: Time Zone Database, version: 2022a
+Component: Time Zone Database, version: 2023c
 Copyright: Arthur David Olson, Paul Eggert and other contributors
 License: LicenseRef-tzdata-PublicDomain
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/LicenseRef-tzdata-PublicDomain.txt
@@ -416,7 +416,7 @@ Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplore
 
 Library: sap.ui.webc.common:
 
-Component: UI5 Web Components, version: 1.5.0
+Component: UI5 Web Components, version: 1.18.0
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -436,13 +436,13 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/lit-html/
 
 Library: sap.ui.webc.fiori:
 
-Component: UI5 Web Components, version: 1.5.0
+Component: UI5 Web Components, version: 1.18.0
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.ui.webc.fiori/src/sap/ui/webc/fiori/thirdparty/*.*
 
-Component: ZXing, version: 0.19.1
+Component: ZXing, version: 0.17.1
 Copyright: 2005 Sun Microsystems, Inc.; 2010-2014 University of Manchester; 2010-2015 Stian Soiland-Reyes; 2015 Peter Hull
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -451,7 +451,7 @@ Contained in: src/sap.ui.webc.fiori/src/sap/ui/webc/fiori/lib/zxing.js
 
 Library: sap.ui.webc.main:
 
-Component: UI5 Web Components, version: 1.5.0
+Component: UI5 Web Components, version: 1.18.0
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.layout",
-  "version": "1.119.0",
+  "version": "1.120.0",
   "description": "OpenUI5 UI Library sap.ui.layout",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,6 +14,6 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.119.0"
+    "@openui5/sap.ui.core": "1.120.0"
   }
 }

package/src/sap/ui/layout/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.119.0</version>
+  <version>1.120.0</version>
 
   <documentation>SAPUI5 library with layout controls.</documentation>
 

package/src/sap/ui/layout/AlignedFlowLayout.js

@@ -40,7 +40,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.119.0
+		 * @version 1.120.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/ui/layout/AssociativeSplitter.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.layout.Splitter
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @private
@@ -120,95 +120,9 @@ sap.ui.define([
 		}
 	};
 
-	// Overriding sap.ui.layout.Splitter's calculation functions in order to make it responsive
-
 	/**
 	 * @override
-	 */
-	AssociativeSplitter.prototype._resizeContents = function (iLeftContent, iPixels, bFinal) {
-		var aContentAreas, oLd1, oLd2, sSize1,
-			sSize2, $Cnt1, $Cnt2, iNewSize1, iNewSize2,
-			iMinSize1, iMinSize2,
-			sFinalSize1, sFinalSize2, iDiff,
-			sMoveContentSize1 = parseFloat(this._move.c1Size).toFixed(5),
-			sMoveContentSize2 = parseFloat(this._move.c2Size).toFixed(5),
-			fMoveC1Size = parseFloat(sMoveContentSize1),
-			fMoveC2Size = parseFloat(sMoveContentSize2);
-
-		if (isNaN(iPixels)) {
-			Log.warning("Splitter: Received invalid resizing values - resize aborted.");
-			return;
-		}
-
-		aContentAreas = this._getContentAreas();
-		oLd1 = aContentAreas[iLeftContent].getLayoutData();
-		oLd2 = aContentAreas[iLeftContent + 1].getLayoutData();
-
-		sSize1 = oLd1.getSize();
-		sSize2 = oLd2.getSize();
-
-		$Cnt1 = this.$("content-" + iLeftContent);
-		$Cnt2 = this.$("content-" + (iLeftContent + 1));
-
-		iNewSize1 = fMoveC1Size + iPixels;
-		iNewSize2 = fMoveC2Size - iPixels;
-		iMinSize1 = parseInt(oLd1.getMinSize());
-		iMinSize2 = parseInt(oLd2.getMinSize());
-
-		// Adhere to size constraints
-		if (iNewSize1 < iMinSize1) {
-			iDiff = iMinSize1 - iNewSize1;
-			iPixels += iDiff;
-			iNewSize1 = iMinSize1;
-			iNewSize2 -= iDiff;
-		} else if (iNewSize2 < iMinSize2) {
-			iDiff = iMinSize2 - iNewSize2;
-			iPixels -= iDiff;
-			iNewSize2 = iMinSize2;
-			iNewSize1 -= iDiff;
-		}
-
-		if (bFinal) {
-			// in this case widths of the areas are % from the available content width (bars excluded)
-			var iAvailableContentSize = this._calcAvailableContentSize();
-
-			// Resize finished, set layout data in content areas
-			if (sSize1 === "auto" && sSize2 !== "auto") {
-				// First pane has auto size - only change size of second pane
-				sFinalSize2 = this._pxToPercent(iNewSize2, iAvailableContentSize);
-				oLd2.setSize(sFinalSize2);
-				oLd2._markModified();
-			} else if (sSize1 !== "auto" && sSize2 === "auto") {
-				// Second pane has auto size - only change size of first pane
-				sFinalSize1 = this._pxToPercent(iNewSize1, iAvailableContentSize);
-				oLd1.setSize(sFinalSize1);
-				oLd1._markModified();
-			} else {
-				sFinalSize1 = this._pxToPercent(iNewSize1, iAvailableContentSize);
-				sFinalSize2 = this._pxToPercent(iNewSize2, iAvailableContentSize);
-
-				oLd1.setSize(sFinalSize1);
-				oLd2.setSize(sFinalSize2);
-				oLd1._markModified();
-				oLd2._markModified();
-			}
-		} else { // Live-Resize, resize contents in Dom
-			// in this case widths of the areas are % from the total size (bars included)
-			var iTotalSplitterSize = this._getTotalSize();
-
-			sFinalSize1 = this._pxToPercent(iNewSize1, iTotalSplitterSize);
-			sFinalSize2 = this._pxToPercent(iNewSize2, iTotalSplitterSize);
-
-			$Cnt1.css(this._sizeType, sFinalSize1);
-			$Cnt2.css(this._sizeType, sFinalSize2);
-		}
-	};
-
-	/**
-	 * Upon bar resizing AssociativeSplitter sets layoutData's size to %.
-	 * This override is needed to check if such % would exceed the available space.
-	 * If so, the size is reduced.
-	 * @override
+	 * If there is single "%"-sized area after pagination, let it take the remaining size
 	 */
 	AssociativeSplitter.prototype._calcPercentBasedSizes = function (aPercentSizeIdx, iRemainingSize) {
 		var aContentAreas = this._getContentAreas(),
@@ -222,53 +136,9 @@ sap.ui.define([
 			iRemainingSize = Splitter.prototype._calcPercentBasedSizes.apply(this, arguments);
 		}
 
-		var iMinSizeOfAutoSizedAreas = aContentAreas
-			.filter(function (oArea) {
-				return oArea.getLayoutData().getSize() === "auto";
-			})
-			.reduce(function (iSum, oArea) {
-				return iSum + oArea.getLayoutData().getMinSize();
-			}, 0);
-
-		// calculated % exceed the available space - shrink areas if possible
-		if (iRemainingSize < iMinSizeOfAutoSizedAreas) {
-			var iNeededSize = Math.abs(iRemainingSize - iMinSizeOfAutoSizedAreas);
-
-			// shrink areas from right to left
-			for (var i = aPercentSizeIdx.length - 1; i >= 0; i--) {
-				var iIdx = aPercentSizeIdx[i],
-					oArea = aContentAreas[iIdx],
-					iCalculatedSize = this._calculatedSizes[iIdx],
-					oLD = oArea.getLayoutData();
-
-				if (oLD._isMarked()) {
-					var iNewSize = iCalculatedSize - iNeededSize;
-
-					if (iNewSize < oLD.getMinSize()) {
-						iNewSize = oLD.getMinSize();
-					}
-
-					this._calculatedSizes[iIdx] = iNewSize;
-
-					var iIncreasedSize = iCalculatedSize - iNewSize;
-					iNeededSize -= iIncreasedSize;
-					iRemainingSize += iIncreasedSize;
-				}
-
-				// already shrunk enough
-				if (iNeededSize <= 0) {
-					break;
-				}
-			}
-		}
-
 		return iRemainingSize;
 	};
 
-	AssociativeSplitter.prototype._pxToPercent = function (iPx, iFullSize) {
-		return (iPx * 100) / iFullSize + "%";
-	};
-
 	/**
 	 * @override
 	 */

package/src/sap/ui/layout/BlockLayout.js

@@ -63,7 +63,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.119.0
+		 * @version 1.120.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/layout/BlockLayoutCell.js

@@ -26,7 +26,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.119.0
+		 * @version 1.120.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/layout/BlockLayoutCellData.js

@@ -18,7 +18,7 @@ sap.ui.define(['sap/ui/core/LayoutData', './library'],
 	 * @class
 	 * Holds layout data for the BlockLayoutCells contents.
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 * @constructor
 	 * @public
 	 * @since 1.50.0

package/src/sap/ui/layout/BlockLayoutRow.js

@@ -32,7 +32,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.119.0
+		 * @version 1.120.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/layout/DynamicSideContent.js

@@ -94,7 +94,7 @@ sap.ui.define([
 		 * @extends sap.ui.core.Control
 		 *
 		 * @author SAP SE
-		 * @version 1.119.0
+		 * @version 1.120.0
 		 *
 		 * @constructor
 		 * @public

package/src/sap/ui/layout/FixFlex.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/Grid.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public
@@ -147,11 +147,16 @@ sap.ui.define([
 	(function() {
 
 		Grid.prototype.init = function() {
-			// Library specific class
-			var sClass = library.GridHelper.getLibrarySpecificClass();
-			if (sClass) {
-				this.addStyleClass(sClass);
-			}
+			/**
+			 * @deprecated As of version 1.120
+			 */
+			(() => {
+				// Library specific class
+				var sClass = library.GridHelper.getLibrarySpecificClass();
+				if (sClass) {
+					this.addStyleClass(sClass);
+				}
+			})();
 
 			this._iBreakPointTablet = Device.media._predefinedRangeSets[Device.media.RANGESETS.SAP_STANDARD_EXTENDED].points[0];
 			this._iBreakPointDesktop = Device.media._predefinedRangeSets[Device.media.RANGESETS.SAP_STANDARD_EXTENDED].points[1];

package/src/sap/ui/layout/GridData.js

@@ -28,7 +28,7 @@ sap.ui.define(['sap/ui/core/LayoutData', './library', "sap/base/Log"],
 	 * @extends sap.ui.core.LayoutData
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/GridRenderer.js

@@ -15,7 +15,7 @@ sap.ui.define(["sap/ui/Device", "sap/ui/layout/library"],
 	/**
 	 * @author SAP SE
 	 * @version
-	 * 1.119.0
+	 * 1.120.0
 	 * @namespace
 	 */
 	var GridRenderer = {

package/src/sap/ui/layout/HorizontalLayout.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/core/Control', './library', "./HorizontalLayoutRenderer"]
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/PaneContainer.js

@@ -24,7 +24,7 @@ sap.ui.define(['./library', 'sap/ui/core/Element', './AssociativeSplitter', 'sap
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/ResponsiveFlowLayout.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/ResponsiveFlowLayoutData.js

@@ -22,7 +22,7 @@ sap.ui.define(['sap/ui/core/LayoutData', './library', "sap/base/Log"],
 	 * @extends sap.ui.core.LayoutData
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/ResponsiveSplitter.js

@@ -70,7 +70,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/ResponsiveSplitterPage.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/layout/SplitPane.js

@@ -26,7 +26,7 @@ sap.ui.define(['./library', 'sap/ui/core/Element'],
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/layout/Splitter.js

@@ -70,7 +70,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public
@@ -575,10 +575,9 @@ sap.ui.define([
 	/**
 	 * Resizes the contents after a bar has been moved
 	 *
-	 * @param {int} [iLeftContent] Number of the first (left) content that is resized
-	 * @param {number} [iPixels] Number of pixels to increase the first and decrease the second content
-	 * @param {boolean} [bFinal] Whether this is the final position (sets the size in the layoutData of the
-	 * content areas)
+	 * @param {int} iLeftContent Index of the first (left) content that is resized
+	 * @param {number} iPixels Number of pixels to increase the first and decrease the second content
+	 * @param {boolean} bFinal Whether this is the final position (sets the size in the layoutData of the content areas)
 	 */
 	Splitter.prototype._resizeContents = function(iLeftContent, iPixels, bFinal) {
 		if (isNaN(iPixels)) {
@@ -596,10 +595,15 @@ sap.ui.define([
 		var $Cnt1 = this.$("content-" + iLeftContent);
 		var $Cnt2 = this.$("content-" + (iLeftContent + 1));
 
-		var iNewSize1 = this._move.c1Size + iPixels;
-		var iNewSize2 = this._move.c2Size - iPixels;
-		var iMinSize1 = oLd1.getMinSize();
-		var iMinSize2 = oLd2.getMinSize();
+		var sMoveContentSize1 = parseFloat(this._move.c1Size).toFixed(5);
+		var sMoveContentSize2 = parseFloat(this._move.c2Size).toFixed(5);
+
+		var iNewSize1 = parseFloat(sMoveContentSize1) + iPixels;
+		var iNewSize2 = parseFloat(sMoveContentSize2) - iPixels;
+		var iMinSize1 = parseInt(oLd1.getMinSize());
+		var iMinSize2 = parseInt(oLd2.getMinSize());
+
+		var sFinalSize1, sFinalSize2;
 
 		// Adhere to size constraints
 		var iDiff;
@@ -616,24 +620,56 @@ sap.ui.define([
 		}
 
 		if (bFinal) {
+			// in this case widths of the areas are % from the available content width (bars excluded)
+			var iAvailableContentSize = this._calcAvailableContentSize();
+
 			// Resize finished, set layout data in content areas
 			if (sSize1 === "auto" && sSize2 !== "auto") {
 				// First pane has auto size - only change size of second pane
-				oLd2.setSize(iNewSize2 + "px");
+				sFinalSize2 = this._calcAreaSizeWithUnit(iNewSize2, iAvailableContentSize, oLd2._getSizeUnit());
+				oLd2.setSize(sFinalSize2);
+				oLd2._markModified();
 			} else if (sSize1 !== "auto" && sSize2 === "auto") {
 				// Second pane has auto size - only change size of first pane
-				oLd1.setSize(iNewSize1 + "px");
+				sFinalSize1 = this._calcAreaSizeWithUnit(iNewSize1, iAvailableContentSize, oLd1._getSizeUnit());
+				oLd1.setSize(sFinalSize1);
+				oLd1._markModified();
 			} else {
-				oLd1.setSize(iNewSize1 + "px");
-				oLd2.setSize(iNewSize2 + "px");
+				sFinalSize1 = this._calcAreaSizeWithUnit(iNewSize1, iAvailableContentSize, oLd1._getSizeUnit());
+				sFinalSize2 = this._calcAreaSizeWithUnit(iNewSize2, iAvailableContentSize, oLd2._getSizeUnit());
+
+				oLd1.setSize(sFinalSize1);
+				oLd2.setSize(sFinalSize2);
+				oLd1._markModified();
+				oLd2._markModified();
 			}
-		} else {
-			// Live-Resize, resize contents in Dom
-			$Cnt1.css(this._sizeType, iNewSize1 + "px");
-			$Cnt2.css(this._sizeType, iNewSize2 + "px");
+		} else { // Live-Resize, resize contents in Dom
+			// in this case widths of the areas are % from the total size (bars included)
+			var iTotalSplitterSize = this._getTotalSize();
+
+			sFinalSize1 = this._pxToPercent(iNewSize1, iTotalSplitterSize);
+			sFinalSize2 = this._pxToPercent(iNewSize2, iTotalSplitterSize);
+
+			$Cnt1.css(this._sizeType, sFinalSize1);
+			$Cnt2.css(this._sizeType, sFinalSize2);
 		}
 	};
 
+	Splitter.prototype._calcAreaSizeWithUnit = function (iPx, iAvailable, sUnit) {
+		if (sUnit === "px") {
+			return iPx + "px";
+		}
+
+		if (sUnit === "rem") {
+			return (iPx / iRemAsPixels) + "rem"; // TODO: use Rem class
+		}
+
+		return this._pxToPercent(iPx, iAvailable);
+	};
+
+	Splitter.prototype._pxToPercent = function (iPx, iFullSize) {
+		return (iPx * 100) / iFullSize + "%";
+	};
 
 	////////////////////////////////////////// Private Methods /////////////////////////////////////////
 
@@ -890,11 +926,19 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Calculates sizes of areas sized with "%".
+	 * If some "%" area would exceed the available space, its size is reduced.
+	 * @param {int[]} aPercentSizeIdx Areas that are sized with "%"
+	 * @param {int} iRemainingSize Remaining size to distribute the "%" areas
+	 * @returns {int} How much space is left after distributing the "%" areas
+	 */
 	Splitter.prototype._calcPercentBasedSizes = function (aPercentSizeIdx, iRemainingSize) {
 		var aContentAreas = this._getContentAreas(),
 			iAvailableContentSize = this._calcAvailableContentSize();
 
-		for (var i = 0; i < aPercentSizeIdx.length; ++i) {
+		// Step1: Distribute the % in the available size
+		for (let i = 0; i < aPercentSizeIdx.length; ++i) {
 			var idx = aPercentSizeIdx[i];
 			// Percent based value - deduct it from available size
 			var iAreaSize = parseFloat(aContentAreas[idx].getLayoutData().getSize()) / 100 * iAvailableContentSize;
@@ -908,6 +952,47 @@ sap.ui.define([
 			iRemainingSize -= iAreaSize;
 		}
 
+		// Step2: Check if the distributed % would violate the minSize constrains of the remaining "auto" areas
+		var iMinSizeOfAutoSizedAreas = aContentAreas
+			.filter(function (oArea) {
+				return oArea.getLayoutData().getSize() === "auto";
+			})
+			.reduce(function (iSum, oArea) {
+				return iSum + oArea.getLayoutData().getMinSize();
+			}, 0);
+
+		// calculated % exceed the available space - shrink areas if possible
+		if (iRemainingSize < iMinSizeOfAutoSizedAreas) {
+			var iNeededSize = Math.abs(iRemainingSize - iMinSizeOfAutoSizedAreas);
+
+			// shrink areas from right to left
+			for (var i = aPercentSizeIdx.length - 1; i >= 0; i--) {
+				var iIdx = aPercentSizeIdx[i],
+					oArea = aContentAreas[iIdx],
+					iCalculatedSize = this._calculatedSizes[iIdx],
+					oLD = oArea.getLayoutData();
+
+				if (oLD._isMarked()) {
+					var iNewSize = iCalculatedSize - iNeededSize;
+
+					if (iNewSize < oLD.getMinSize()) {
+						iNewSize = oLD.getMinSize();
+					}
+
+					this._calculatedSizes[iIdx] = iNewSize;
+
+					var iIncreasedSize = iCalculatedSize - iNewSize;
+					iNeededSize -= iIncreasedSize;
+					iRemainingSize += iIncreasedSize;
+				}
+
+				// already shrunk enough
+				if (iNeededSize <= 0) {
+					break;
+				}
+			}
+		}
+
 		return iRemainingSize;
 	};
 

package/src/sap/ui/layout/SplitterLayoutData.js

@@ -19,12 +19,10 @@ sap.ui.define(['sap/ui/core/LayoutData', './library'],
 	 *
 	 * @class
 	 * Holds layout data for the splitter contents.
-	 * Allowed size values are numeric values ending in "px" and "%" and the
-	 * special case "auto".
-	 * (The CSS value "auto" is used internally to recalculate the size of the content
-	 * dynamically and is not directly set as style property.)
+	 * Allowed size values are numeric values ending in "px", "rem", "%" and "auto".
+
 	 * @extends sap.ui.core.LayoutData
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public
@@ -46,9 +44,6 @@ sap.ui.define(['sap/ui/core/LayoutData', './library'],
 			/**
 			 * The size of the splitter content.
 			 * This property is updated when the area is resized by the user.
-			 *
-			 * <b>Note:</b> Resizing areas in the sap.ui.layout.Splitter sets this property to "px" values,
-			 * while resizing areas in the sap.ui.layout.ResponsiveSplitter sets it to % values.
 			 */
 			size : {type : "sap.ui.core.CSSSize", group : "Dimension", defaultValue : 'auto'},
 
@@ -72,5 +67,23 @@ sap.ui.define(['sap/ui/core/LayoutData', './library'],
 		return this._bIsModified;
 	};
 
+	SplitterLayoutData.prototype._getSizeUnit = function () {
+		const sSize = this.getSize();
+
+		if (sSize.includes("px")) {
+			return "px";
+		}
+
+		if (sSize.includes("rem")) {
+			return "rem";
+		}
+
+		if (sSize.includes("%")) {
+			return "%";
+		}
+
+		return "auto";
+	};
+
 	return SplitterLayoutData;
 });

package/src/sap/ui/layout/VerticalLayout.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.119.0
+	 * @version 1.120.0
 	 *
 	 * @constructor
 	 * @public