@openui5/sap.ui.rta 1.114.0 → 1.115.1

package/src/sap/ui/rta/util/changeVisualization/ChangeIndicatorRegistry.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicatorRegistry
 	 * @author SAP SE
 	 * @since 1.86.0
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 */
 	var ChangeIndicatorRegistry = ManagedObject.extend("sap.ui.rta.util.changeVisualization.ChangeIndicatorRegistry", {
@@ -113,6 +113,7 @@ sap.ui.define([
 	 */
 	ChangeIndicatorRegistry.prototype.getSelectorsWithRegisteredChanges = function () {
 		var oChangeIndicators = {};
+		var sPreviousAffectedElementId;
 
 		function addSelector (sSelectorId, sAffectedElementId, oChangeIndicatorData, bDependent) {
 			if (oChangeIndicators[sSelectorId] === undefined) {
@@ -122,11 +123,13 @@ sap.ui.define([
 				{
 					id: oChangeIndicatorData.change.getId(),
 					dependent: bDependent,
-					affectedElementId: sAffectedElementId,
+					affectedElementId: sAffectedElementId || sPreviousAffectedElementId,
+					displayElementsKey: oChangeIndicatorData.visualizationInfo.displayElementIds.toString(),
 					descriptionPayload: oChangeIndicatorData.visualizationInfo.descriptionPayload || {}
 				},
 				_omit(oChangeIndicatorData, ["visualizationInfo"])
 			));
+			sPreviousAffectedElementId = sAffectedElementId || sPreviousAffectedElementId;
 		}
 
 		values(this._oRegisteredChanges)
@@ -135,11 +138,6 @@ sap.ui.define([
 				.forEach(function (sId, iIndex) {
 					addSelector(sId, oChangeIndicatorData.visualizationInfo.affectedElementIds[iIndex], oChangeIndicatorData, false);
 				});
-
-				oChangeIndicatorData.visualizationInfo.dependentElementIds
-					.forEach(function (sId) {
-						addSelector(sId, sId, oChangeIndicatorData, true);
-					});
 			});
 
 		return oChangeIndicators;

package/src/sap/ui/rta/util/changeVisualization/ChangeVisualization.js

@@ -67,7 +67,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeVisualization
 	 * @author SAP SE
 	 * @since 1.84.0
-	 * @version 1.114.0
+	 * @version 1.115.1
 	 * @private
 	 */
 	var ChangeVisualization = Control.extend("sap.ui.rta.util.changeVisualization.ChangeVisualization", {
@@ -499,6 +499,7 @@ sap.ui.define([
 	ChangeVisualization.prototype._updateChangeIndicators = function() {
 		var oSelectors = this._oChangeIndicatorRegistry.getSelectorsWithRegisteredChanges();
 		var oIndicators = {};
+		this._mDisplayElementsKeyMap = {};
 		Object.keys(oSelectors).forEach(function(sSelectorId) {
 			var aChangesOnIndicator = oSelectors[sSelectorId];
 			var aRelevantChanges = this._filterRelevantChanges(oSelectors[sSelectorId]);
@@ -531,6 +532,14 @@ sap.ui.define([
 			var sOverlayId = oOverlay.getId();
 			if (!oChangeIndicator) {
 				this._createChangeIndicator(oOverlay, sSelectorId);
+				// Assumption: all changes on an indicator affect the same elements
+				var sDisplayElementsKey = aChangesOnIndicator[0].displayElementsKey;
+				// This map is built to collect indicators with the same display elements (e.g. OP Section & AnchorBar)
+				if (!this._mDisplayElementsKeyMap[sDisplayElementsKey]) {
+					this._mDisplayElementsKeyMap[sDisplayElementsKey] = [sSelectorId];
+				} else {
+					this._mDisplayElementsKeyMap[sDisplayElementsKey].push(sSelectorId);
+				}
 			} else if (oChangeIndicator.getOverlayId() !== sOverlayId) {
 				// Overlay id might change, e.g. during undo/redo of dirty changes
 				oChangeIndicator.setOverlayId(sOverlayId);
@@ -538,6 +547,8 @@ sap.ui.define([
 			return undefined;
 		}.bind(this));
 
+		this._registerIndicatorBrowserEvents();
+
 		if (
 			!deepEqual(
 				oIndicators,
@@ -550,6 +561,46 @@ sap.ui.define([
 		}
 	};
 
+	// Multiple indicators can refer to the same control (e.g. OP Section + AnchorBar),
+	// so when one of them is hovered/focused the other must also react to show the connection between them
+	ChangeVisualization.prototype._registerIndicatorBrowserEvents = function() {
+		Object.keys(this._mDisplayElementsKeyMap).forEach(function(sDisplayElementsKey) {
+			var aIndicators = this._mDisplayElementsKeyMap[sDisplayElementsKey].map(function(sSelectorId) {
+				return this._oChangeIndicatorRegistry.getChangeIndicator(sSelectorId);
+			}.bind(this));
+
+			function onIndicatorInteraction(bActivate, oEvent) {
+				aIndicators.forEach(function(oIndicator) {
+					if (oIndicator.getVisible()) {
+						oIndicator.onIndicatorBrowserInteraction(bActivate, oEvent);
+					}
+				});
+			}
+
+			// When the detail popover is opened all connected overlays should be selected
+			function onDetailPopoverOpened(oEvent) {
+				aIndicators.forEach(function(oIndicator) {
+					if (oIndicator.getVisible()) {
+						oIndicator.onDetailPopoverOpened(oEvent);
+					}
+				});
+			}
+
+			aIndicators.forEach(function(oIndicator) {
+				oIndicator.attachBrowserEvent("mouseover", onIndicatorInteraction.bind(this, true));
+				oIndicator.attachBrowserEvent("focusin", onIndicatorInteraction.bind(this, true));
+				oIndicator.attachBrowserEvent("mouseout", onIndicatorInteraction.bind(this, false));
+				oIndicator.attachBrowserEvent("focusout", onIndicatorInteraction.bind(this, false));
+				oIndicator.attachDetailPopoverOpened(onDetailPopoverOpened.bind(this));
+
+				var oOverlay = Core.byId(oIndicator.getOverlayId());
+				// De-selection of connected overlays must happen when the hover/focus leaves the overlay
+				oOverlay.attachBrowserEvent("mouseout", onIndicatorInteraction.bind(this, false));
+				oOverlay.attachBrowserEvent("focusout", onIndicatorInteraction.bind(this, false));
+			});
+		}.bind(this));
+	};
+
 	ChangeVisualization.prototype._filterRelevantChanges = function(aChangeVizInfo) {
 		if (!Array.isArray(aChangeVizInfo)) {
 			return aChangeVizInfo;

package/src/sap/ui/rta/view/RemoveElementDialog.fragment.xml

@@ -3,7 +3,7 @@
 	xmlns:sap.m="sap.m">
 	<sap.m:Dialog class="sapUiRtaConfirmationDialog" verticalScrolling="false" title="{/titleText}" icon="{/icon}">
 		<layout:VerticalLayout width="100%">
-			<commons:TextView class="sapUiRtaConfirmationDialogText" text="{/messageText}" />
+			<sap.m:Text class="sapUiRtaConfirmationDialogText" text="{/messageText}" />
 		</layout:VerticalLayout>
 		<sap.m:beginButton>
 			<sap.m:Button class="sapUiRtaConfirmationDialogRemoveButton" text="{/removeText}" press="removeField" />