@sapui5/sap.suite.ui.commons 1.150.0 → 1.152.0

package/src/sap/suite/ui/commons/networkgraph/util/DependencyLayoutHelper.js

@@ -95,7 +95,8 @@ sap.ui.define(["sap/suite/ui/commons/library", "sap/base/Log"], function (librar
 					horizontalSpacing: DEFAULT_HORIZONTAL_SPACING,
 					verticalSpacing: DEFAULT_VERTICAL_SPACING,
 					componentArrangement: oComponentArrangement.Horizontal,
-					clearCache: false
+					clearCache: false,
+					bEnhancedLineRouting: oGraph.getEnableEnhancedLineRouting ? oGraph.getEnableEnhancedLineRouting() : false
 				},
 				mConfig || {}
 			);
@@ -113,9 +114,11 @@ sap.ui.define(["sap/suite/ui/commons/library", "sap/base/Log"], function (librar
 				this._calculateCoordinates(oGraph, config);
 				this._adjustHorizontalSpacingForNodeWidths(oGraph, config);
 				this._adjustVerticalSpacingForNodeHeights(oGraph, config);
+
 				if (oGraph._bIsRtl) {
 					this._horizontalMirror(oGraph, config.horizontalSpacing);
 				}
+
 				this._storeFinalPositions(oGraph, config.horizontalSpacing);
 			} catch (e) {
 				Log.error("DependencyLayoutHelper error: " + e.message, e);
@@ -309,7 +312,7 @@ sap.ui.define(["sap/suite/ui/commons/library", "sap/base/Log"], function (librar
 		 * @param {object} config - Configuration object
 		 * @private
 		 */
-		_processComponents: function (aComponents, { componentArrangement }) {
+		_processComponents: function (aComponents, { componentArrangement, bEnhancedLineRouting }) {
 			const aIsolatedNodes = [];
 			const aConnectedComponents = [];
 
@@ -330,7 +333,7 @@ sap.ui.define(["sap/suite/ui/commons/library", "sap/base/Log"], function (librar
 			let iMaxLayerAcrossAll = 0;
 
 			aConnectedComponents.forEach((aComponentNodes, iCompIndex) => {
-				this._assignLayersForComponent(aComponentNodes, iCompIndex);
+				this._assignLayersForComponent(aComponentNodes, iCompIndex, bEnhancedLineRouting);
 				this._adjustParallelLayersForComponent(aComponentNodes);
 				this._assignVerticalPositionsForComponent(aComponentNodes);
 
@@ -394,7 +397,7 @@ sap.ui.define(["sap/suite/ui/commons/library", "sap/base/Log"], function (librar
 		 * @param {number} iComponentId - Component identifier
 		 * @private
 		 */
-		_assignLayersForComponent: function (aComponentNodes, iComponentId) {
+		_assignLayersForComponent: function (aComponentNodes, iComponentId, bEnhancedLineRouting) {
 			const aQueue = [];
 			const mInDegree = {};
 
@@ -464,18 +467,30 @@ sap.ui.define(["sap/suite/ui/commons/library", "sap/base/Log"], function (librar
 				) {
 					const iCurrentLayer = oNode._layoutData.layer;
 					let iMaxTargetLayer = -1;
+					let iMinTargetLayer = Infinity;
 					oNode._layoutData.outgoing.forEach((t) => {
 						if (t._layoutData.layer > iMaxTargetLayer) {
 							iMaxTargetLayer = t._layoutData.layer;
 						}
+						if (t._layoutData.layer < iMinTargetLayer) {
+							iMinTargetLayer = t._layoutData.layer;
+						}
 					});
 
 					const bTargetHasOtherIncoming = oNode._layoutData.outgoing.some(
 						(t) => t._layoutData.incoming.filter((n) => n !== oNode).length > 0
 					);
 
-					if (iMaxTargetLayer > iCurrentLayer && bTargetHasOtherIncoming) {
-						oNode._layoutData.layer = Math.max(0, iMaxTargetLayer - 1);
+					// Guard: skip if any target is at or below the proposed layer that would create same-layer edges.
+					const iProposedLayer = Math.max(0, iMaxTargetLayer - 1);
+					if (bEnhancedLineRouting) {
+						if (iMaxTargetLayer > iCurrentLayer && bTargetHasOtherIncoming && iMinTargetLayer > iProposedLayer) {
+							oNode._layoutData.layer = iProposedLayer;
+						}
+					} else {
+						if (iMaxTargetLayer > iCurrentLayer && bTargetHasOtherIncoming) {
+							oNode._layoutData.layer = iProposedLayer;
+						}
 					}
 				}
 			});

package/src/sap/suite/ui/commons/statusindicator/Circle.js

@@ -30,7 +30,7 @@ sap.ui.define([
 		 * @extends sap.suite.ui.commons.statusindicator.SimpleShape
 		 *
 		 * @author SAP SE
-		 * @version 1.150.0
+		 * @version 1.152.0
 		 * @since 1.50
 		 *
 		 * @constructor

package/src/sap/suite/ui/commons/statusindicator/CustomShape.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @extends sap.suite.ui.commons.statusindicator.Shape
 	 *
 	 * @author SAP SE
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 * @since 1.50
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/statusindicator/DiscreteThreshold.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 * @since 1.50
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/statusindicator/FillingOption.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 * @since 1.50
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/statusindicator/LibraryShape.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.suite.ui.commons.statusindicator.CustomShape
 	 *
 	 * @author SAP SE
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 * @since 1.60.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/statusindicator/Path.js

@@ -29,7 +29,7 @@ sap.ui.define([
 		 * @extends sap.suite.ui.commons.statusindicator.SimpleShape
 		 *
 		 * @author SAP SE
-		 * @version 1.150.0
+		 * @version 1.152.0
 		 * @since 1.50
 		 *
 		 * @constructor

package/src/sap/suite/ui/commons/statusindicator/PropertyThreshold.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 * @since 1.50
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/statusindicator/Rectangle.js

@@ -29,7 +29,7 @@ sap.ui.define(
 		 * @extends sap.suite.ui.commons.statusindicator.SimpleShape
 		 *
 		 * @author SAP SE
-		 * @version 1.150.0
+		 * @version 1.152.0
 		 * @since 1.50
 		 *
 		 * @constructor

package/src/sap/suite/ui/commons/statusindicator/Shape.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 * @since 1.50
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/statusindicator/ShapeGroup.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 * @since 1.50
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/statusindicator/SimpleShape.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.suite.ui.commons.statusindicator.Shape
 	 *
 	 * @author SAP SE
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 * @since 1.50
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/statusindicator/StatusIndicator.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 * @since 1.50
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/taccount/TAccount.js

@@ -56,7 +56,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 * @since 1.58.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/taccount/TAccountGroup.js

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 * @since 1.58.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/taccount/TAccountItem.js

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 * @since 1.58.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/taccount/TAccountItemProperty.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 * @since 1.58.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/taccount/TAccountPanel.js

@@ -65,7 +65,7 @@ sap.ui.define([
 	 * @extends sap.m.Panel
 	 *
 	 * @author SAP SE
-	 * @version 1.150.0
+	 * @version 1.152.0
 	 * @since 1.58.0
 	 *
 	 * @constructor

package/src/sap/suite/ui/commons/themes/base/MicroProcessFlow.less

@@ -22,7 +22,8 @@
 .sapSuiteUiCommonsMicroProcessFlowScrolling {
 	display: flex;
 	flex-direction: row;
-	margin: 2px;
+	margin: 4px;
+
 	width: 100%;
 }
 

package/src/sap/suite/ui/commons/themes/base/NetworkGraph.less

@@ -13,6 +13,7 @@
 	min-width: 150px;
 	min-height: 150px;
 	flex-direction: column;
+	position: relative;
 }
 
 .sapSuiteUiCommonsNetworkGraphFullScreen {
@@ -20,8 +21,16 @@
 }
 
 .sapSuiteUiCommonsNetworkGraph:focus {
-	outline: var(--sapContent_FocusWidth) var(--sapContent_FocusStyle) var(--sapContent_FocusColor);
-	outline-offset: 0;
+	outline: none;
+}
+
+.sapSuiteUiCommonsNetworkGraph:focus::after {
+	content: "";
+	position: absolute;
+	inset: 0;
+	border: var(--sapContent_FocusWidth) var(--sapContent_FocusStyle) var(--sapContent_FocusColor);
+	pointer-events: none;
+	z-index: 9999;
 }
 
 .sapSuiteUiCommonsNetworkGraphPanning {
@@ -136,12 +145,20 @@ html[dir=rtl] .sapSuiteUiCommonsNetworkGraphIcon {
 }
 
 .sapSuiteUiCommonsNetworkGraphContentWrapper:focus {
-	outline: var(--sapContent_FocusWidth) var(--sapContent_FocusStyle) var(--sapContent_FocusColor);
-	outline-offset: 1px;
+	outline: none;
 }
 
-.sapSuiteUiCommonsNetworkGraphContentFocusHidden:focus {
-	outline: none;
+.sapSuiteUiCommonsNetworkGraphContentWrapper:focus::after {
+	content: "";
+	position: absolute;
+	inset: 0;
+	border: var(--sapContent_FocusWidth) var(--sapContent_FocusStyle) var(--sapContent_FocusColor);
+	pointer-events: none;
+	z-index: 9999;
+}
+
+.sapSuiteUiCommonsNetworkGraphContentFocusHidden:focus::after {
+	display: none;
 }
 
 /** Legend **/

package/src/sap/suite/ui/commons/themes/base/Timeline.less

@@ -325,13 +325,13 @@
 .sapSuiteUiCommonsTimelineRangeDatePicker {
 	margin-left: 15px;
 	margin-right: 25px;
-	min-width: 10rem;
+	min-width: 15rem;
 }
 
 .sapUiSizeCompact .sapMInputBaseHeightMargin.sapSuiteUiCommonsTimelineRangeDatePicker {
 	margin-left: 15px;
 	margin-right: 25px;
-	min-width: 10rem;
+	min-width: 15rem;
 }
 
 .sapSuiteUiCommonsTimelineRangeLabelNow {

package/src/sap/suite/ui/commons/themes/sap_belize_base/NetworkGraph.less

@@ -11,6 +11,7 @@
 	min-width: 150px;
 	min-height: 150px;
 	flex-direction: column;
+	position: relative;
 }
 
 .sapSuiteUiCommonsNetworkGraphFullScreen {
@@ -18,8 +19,16 @@
 }
 
 .sapSuiteUiCommonsNetworkGraph:focus {
-	outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
-	outline-offset: 0px;
+	outline: none;
+}
+
+.sapSuiteUiCommonsNetworkGraph:focus::after {
+	content: "";
+	position: absolute;
+	inset: 0;
+	border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
+	pointer-events: none;
+	z-index: 9999;
 }
 
 .sapSuiteUiCommonsNetworkGraphPanning {
@@ -126,12 +135,20 @@
 }
 
 .sapSuiteUiCommonsNetworkGraphContentWrapper:focus {
-	outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
-	outline-offset: 1px;
+	outline: none;
 }
 
-.sapSuiteUiCommonsNetworkGraphContentFocusHidden:focus {
-	outline: none;
+.sapSuiteUiCommonsNetworkGraphContentWrapper:focus::after {
+	content: "";
+	position: absolute;
+	inset: 0;
+	border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
+	pointer-events: none;
+	z-index: 9999;
+}
+
+.sapSuiteUiCommonsNetworkGraphContentFocusHidden:focus::after {
+	display: none;
 }
 
 //** Legend **//

package/src/sap/suite/ui/commons/themes/sap_belize_base/Timeline.less

@@ -328,13 +328,13 @@
 .sapSuiteUiCommonsTimelineRangeDatePicker {
 	margin-left: 15px;
 	margin-right: 25px;
-	min-width: 10rem;
+	min-width: 15rem;
 }
 
 .sapUiSizeCompact .sapMInputBaseHeightMargin.sapSuiteUiCommonsTimelineRangeDatePicker {
 	margin-left: 15px;
 	margin-right: 25px;
-	min-width: 10rem;
+	min-width: 15rem;
 }
 
 .sapSuiteUiCommonsTimelineRangeLabelNow {

package/src/sap/suite/ui/commons/themes/sap_belize_hcb/NetworkGraph.less

@@ -3,7 +3,28 @@
 /* Belize HCB Theme                                                           */
 /* ===========================================================================*/
 
-.sapSuiteUiCommonsNetworkGraph:focus,
+.sapSuiteUiCommonsNetworkGraph:focus {
+  	outline: none;
+}
+
+.sapSuiteUiCommonsNetworkGraph:focus::after {
+  	content: "";
+  	position: absolute;
+  	inset: 0;
+  	border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentContrastFocusColor;
+  	pointer-events: none;
+  	z-index: 9999;
+}
+
 .sapSuiteUiCommonsNetworkGraphContentWrapper:focus {
-  	outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentContrastFocusColor;
+  	outline: none;
+}
+
+.sapSuiteUiCommonsNetworkGraphContentWrapper:focus::after {
+  	content: "";
+  	position: absolute;
+  	inset: 0;
+  	border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentContrastFocusColor;
+  	pointer-events: none;
+  	z-index: 9999;
 }

package/src/sap/suite/ui/commons/themes/sap_belize_hcw/NetworkGraph.less

@@ -3,7 +3,28 @@
 /* Belize HCW Theme                                                           */
 /* ===========================================================================*/
 
-.sapSuiteUiCommonsNetworkGraph:focus,
+.sapSuiteUiCommonsNetworkGraph:focus {
+  	outline: none;
+}
+
+.sapSuiteUiCommonsNetworkGraph:focus::after {
+  	content: "";
+  	position: absolute;
+  	inset: 0;
+  	border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentContrastFocusColor;
+  	pointer-events: none;
+  	z-index: 9999;
+}
+
 .sapSuiteUiCommonsNetworkGraphContentWrapper:focus {
-  	outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentContrastFocusColor;
+  	outline: none;
+}
+
+.sapSuiteUiCommonsNetworkGraphContentWrapper:focus::after {
+  	content: "";
+  	position: absolute;
+  	inset: 0;
+  	border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentContrastFocusColor;
+  	pointer-events: none;
+  	z-index: 9999;
 }

package/src/sap/suite/ui/commons/themes/sap_hcb/base_NetworkGraph.less

@@ -11,6 +11,7 @@
 	min-width: 150px;
 	min-height: 150px;
 	flex-direction: column;
+	position: relative;
 }
 
 .sapSuiteUiCommonsNetworkGraphFullScreen {
@@ -18,8 +19,16 @@
 }
 
 .sapSuiteUiCommonsNetworkGraph:focus {
-	outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentContrastFocusColor;
-	outline-offset: 0px;
+	outline: none;
+}
+
+.sapSuiteUiCommonsNetworkGraph:focus::after {
+	content: "";
+	position: absolute;
+	inset: 0;
+	border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
+	pointer-events: none;
+	z-index: 9999;
 }
 
 .sapSuiteUiCommonsNetworkGraphPanning {
@@ -126,12 +135,20 @@
 }
 
 .sapSuiteUiCommonsNetworkGraphContentWrapper:focus {
-	outline: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
-	outline-offset: 1px;
+	outline: none;
 }
 
-.sapSuiteUiCommonsNetworkGraphContentFocusHidden:focus {
-	outline: none;
+.sapSuiteUiCommonsNetworkGraphContentWrapper:focus::after {
+	content: "";
+	position: absolute;
+	inset: 0;
+	border: @sapUiContentFocusWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
+	pointer-events: none;
+	z-index: 9999;
+}
+
+.sapSuiteUiCommonsNetworkGraphContentFocusHidden:focus::after {
+	display: none;
 }
 
 //** Legend **//