@openui5/sap.ui.rta 1.135.0 → 1.136.0

package/src/sap/ui/rta/plugin/LocalReset.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @private
 	 * @since 1.90
@@ -115,7 +115,8 @@ sap.ui.define([
 	LocalReset.prototype.getMenuItems = function(vElementOverlays) {
 		return this._getMenuItems(vElementOverlays, {
 			pluginId: "CTX_LOCAL_RESET",
-			icon: "sap-icon://reset"
+			icon: "sap-icon://reset",
+			additionalInfoKey: "LOCALRESET_RTA_CONTEXT_MENU_INFO"
 		});
 	};
 

package/src/sap/ui/rta/plugin/Plugin.js

@@ -1,31 +1,39 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 // Provides class sap.ui.rta.plugin.Plugin.
 sap.ui.define([
 	"sap/base/util/restricted/_debounce",
-	"sap/ui/dt/Plugin",
-	"sap/ui/fl/write/api/ChangesWriteAPI",
+	"sap/ui/core/util/reflection/JsControlTreeModifier",
 	"sap/ui/dt/OverlayRegistry",
 	"sap/ui/dt/OverlayUtil",
-	"sap/ui/core/util/reflection/JsControlTreeModifier",
-	"sap/ui/rta/util/hasStableId"
+	"sap/ui/dt/Plugin",
+	"sap/ui/fl/write/api/ChangesWriteAPI",
+	"sap/ui/fl/Utils",
+	"sap/ui/rta/util/hasStableId",
+	"sap/ui/rta/util/isReuseComponent",
+	"sap/ui/rta/Utils"
 ], function(
 	debounce,
-	Plugin,
-	ChangesWriteAPI,
+	JsControlTreeModifier,
 	OverlayRegistry,
 	OverlayUtil,
-	JsControlTreeModifier,
-	hasStableId
+	Plugin,
+	ChangesWriteAPI,
+	Utils,
+	hasStableId,
+	isReuseComponent,
+	RtaUtils
 ) {
 	"use strict";
 
 	// The ranks define the order of the plugin actions in the context menu
 	const CONTEXT_MENU_RANKS = {
+		CTX_ADDXML: 3,
+		CTX_EXTEND_CONTROLLER: 5,
 		CTX_RENAME: 10,
 		CTX_ANNOTATION_CHANGE_SINGLE_LABEL: 12,
 		CTX_ADD_ELEMENTS_AS_SIBLING: 20,
@@ -40,8 +48,6 @@ sap.ui.define([
 		CTX_GROUP_FIELDS: 90,
 		CTX_UNGROUP_FIELDS: 100,
 		CTX_ADDXML_AT_EXTENSIONPOINT: 105,
-		CTX_ADDXML: 106,
-		CTX_EXTEND_CONTROLLER: 107,
 		// Settings ranks go up 1 by 1 for each setting
 		CTX_SETTINGS: 110,
 		// IFrame ranks go up 1 by 1 for each possible child target
@@ -108,7 +114,7 @@ sap.ui.define([
 	 * @extends sap.ui.dt.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @private
@@ -508,5 +514,17 @@ sap.ui.define([
 		return Plugin.prototype._getMenuItems.apply(this, [aElementOverlays, mPropertyBag]);
 	};
 
+	/**
+	 * Checks if the control is a reuse component on S4HanaCloud. This is used to disable
+	 * certain plugins under these circumstancces, e.g. AddXMLPlugin.
+	 * @param {sap.ui.dt.ElementOverlay} oOverlay Overlay for the control to be checked
+	 * @return {boolean} Whether the control is in a reuse component on S4HanaCloud
+	 */
+	BasePlugin.prototype.isInReuseComponentOnS4HanaCloud = function(oOverlay) {
+		const oComponent = Utils.getComponentForControl(oOverlay.getElement());
+		const bIsS4HanaCloud = RtaUtils.isS4HanaCloud();
+		return isReuseComponent(oComponent) && bIsS4HanaCloud;
+	};
+
 	return BasePlugin;
 });

package/src/sap/ui/rta/plugin/RTAElementMover.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -35,7 +35,7 @@ function(
 	 * The RTAElementMover is responsible for the RTA specific adaptation of element movements.
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/plugin/Remove.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @class The Remove allows trigger remove operations on the overlay
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/plugin/Resize.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @private
 	 * @since 1.101

package/src/sap/ui/rta/plugin/Selection.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @class The Selection plugin allows you to select or focus overlays with mouse or keyboard and navigate to others.
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/plugin/Settings.js

@@ -1,11 +1,12 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 sap.ui.define([
 	"sap/base/Log",
+	"sap/ui/dt/OverlayRegistry",
 	"sap/ui/dt/Util",
 	"sap/ui/fl/Utils",
 	"sap/ui/rta/plugin/Plugin",
@@ -13,6 +14,7 @@ sap.ui.define([
 
 ], function(
 	BaseLog,
+	OverlayRegistry,
 	DtUtil,
 	FlUtils,
 	Plugin,
@@ -28,7 +30,7 @@ sap.ui.define([
 	 * @class The Settings allows trigger change of settings operations on the overlay
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @private
 	 * @since 1.44
@@ -289,6 +291,7 @@ sap.ui.define([
 
 					aMenuItems.push({
 						id: bSingleAction ? sPluginId : sPluginId + iIndex,
+						additionalInfo: this._getAdditionalInfo(oResponsibleElementOverlay, oSettingsAction),
 						rank: bSingleAction ? iRank : iRank + iIndex,
 						text: this.getActionText(oResponsibleElementOverlay, oSettingsAction, sPluginId),
 						icon: getActionIcon(oSettingsAction),

package/src/sap/ui/rta/plugin/Split.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @private
 	 * @since 1.46

package/src/sap/ui/rta/plugin/Stretch.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.plugin.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/plugin/additionalElements/ActionExtractor.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -32,7 +32,7 @@ sap.ui.define([
 	 * handled by the AdditionalElements Plugin (Reveal, Add Via Delegate, Add Custom)
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.0
 	 * @private
 	 * @since 1.94
 	 */

package/src/sap/ui/rta/plugin/additionalElements/AddElementsDialog.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @class Context - Dialog for available Fields in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @private
 	 * @since 1.44

package/src/sap/ui/rta/plugin/additionalElements/AdditionalElementsAnalyzer.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

package/src/sap/ui/rta/plugin/additionalElements/AdditionalElementsPlugin.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -119,7 +119,7 @@ sap.ui.define([
 	 * @class The plugin allows to add additional elements that exist either hidden in the UI or in the OData service
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @private
 	 * @since 1.44

package/src/sap/ui/rta/plugin/additionalElements/AdditionalElementsUtils.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -17,7 +17,7 @@ sap.ui.define([
 	 * Helper object containing methods for the AdditionalElements plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.0
 	 * @private
 	 * @since 1.94
 	 */

package/src/sap/ui/rta/plugin/additionalElements/CommandBuilder.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -25,7 +25,7 @@ sap.ui.define([
 	 * Helper object to build the RTA commands resulting from the AdditionalElements Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.0
 	 * @private
 	 * @since 1.94
 	 */

package/src/sap/ui/rta/plugin/annotations/AnnotationChangeDialog.fragment.xml

@@ -12,6 +12,7 @@
 		contentHeight="{= ${/singleRename} === true ? 'auto' : '25rem'}"
 		title="{/title}"
 		class="sapUiContentPadding"
+		escapeHandler=".onCancel"
 	>
 		<content>
 			<VBox>
@@ -81,10 +82,9 @@
 		<beginButton>
 			<Button
 				id="sapUiRtaChangeAnnotationDialog_saveButton"
-				enabled="{= ${path: '/properties', formatter: '.hasChangesFormatter'}}"
 				type="Emphasized"
-				text="{i18n>ANNOTATION_CHANGE_DIALOG_SAVE}"
-				press="onSavePress"
+				text="{i18n>ANNOTATION_CHANGE_DIALOG_CONFIRM}"
+				press="onSave"
 			/>
 		</beginButton>
 		<endButton>
@@ -92,7 +92,7 @@
 				id="sapUiRtaChangeAnnotationDialog_cancelButton"
 				type="Transparent"
 				text="{i18n>ANNOTATION_CHANGE_DIALOG_CANCEL}"
-				press="onCancelPress"
+				press="onCancel"
 			/>
 		</endButton>
 	</Dialog>

package/src/sap/ui/rta/plugin/annotations/AnnotationChangeDialog.js

@@ -1,7 +1,7 @@
 
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -12,7 +12,6 @@ sap.ui.define([
 	"sap/ui/model/json/JSONModel",
 	"sap/ui/model/resource/ResourceModel",
 	"sap/ui/rta/plugin/annotations/AnnotationChangeDialogController",
-	"sap/ui/rta/plugin/annotations/AnnotationTypes",
 	"sap/ui/rta/Utils"
 ], function(
 	ManagedObject,
@@ -22,7 +21,6 @@ sap.ui.define([
 	JSONModel,
 	ResourceModel,
 	AnnotationChangeDialogController,
-	AnnotationTypes,
 	RtaUtils
 ) {
 	"use strict";
@@ -31,7 +29,7 @@ sap.ui.define([
 	 * @class Constructor for a new sap.ui.rta.plugin.annotations.AnnotationChangeDialog.
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @since 1.132
 	 * @private
@@ -39,13 +37,24 @@ sap.ui.define([
 	 */
 	const AnnotationChangeDialog = ManagedObject.extend("sap.ui.rta.plugin.annotations.AnnotationChangeDialog");
 
+	function replaceValue(aProperties, sAnnotationPath, sValue) {
+		const oProperty = aProperties.find((oProperty) => oProperty.annotationPath === sAnnotationPath);
+		if (oProperty) {
+			oProperty.currentValue = sValue;
+			oProperty.originalValue = sValue;
+		}
+	}
+
 	function replaceCurrentValueWithTextFromControl(aProperties, sPreSelectedProperty, oControl) {
-		const oProperty = aProperties.find((oProperty) => oProperty.annotationPath === sPreSelectedProperty);
 		const aNewLabel = ElementUtil.getLabelForElement(oControl);
-		if (oProperty && aNewLabel) {
-			oProperty.currentValue = aNewLabel;
-			oProperty.originalValue = aNewLabel;
-		}
+		replaceValue(aProperties, sPreSelectedProperty, aNewLabel);
+	}
+
+	function replaceValuesWithValuesFromPendingChanges(aAnnotationChanges, aProperties, bObjectAsKey) {
+		aAnnotationChanges.forEach((oChange) => {
+			const sAnnotationPath = oChange.getContent().annotationPath;
+			replaceValue(aProperties, sAnnotationPath, bObjectAsKey ? JSON.stringify(oChange.getValue()) : oChange.getValue());
+		});
 	}
 
 	AnnotationChangeDialog.prototype._createDialog = async function() {
@@ -166,9 +175,10 @@ sap.ui.define([
 
 		this._oDialog ||= await this._createDialog();
 
-		const sFilterText = sPreSelectedPropertyKey
-			? aProperties.find((oProperty) => oProperty.annotationPath === sPreSelectedPropertyKey).label
-			: "";
+		const sFilterText = (
+			sPreSelectedPropertyKey && aProperties.find((oProperty) => oProperty.annotationPath === sPreSelectedPropertyKey)?.label
+		) || "";
+
 		// default size limit is 100, but we need to display all properties.
 		// As the list size is not dynamic, we can set the size limit to the number of properties
 		// the size influences all binding sizes, so we only set it if the number of properties is greater than 100
@@ -180,6 +190,9 @@ sap.ui.define([
 			replaceCurrentValueWithTextFromControl(aProperties, sPreSelectedPropertyKey, oControl);
 		}
 
+		// Once a change gets passed to the model during initialization, the property _appliedOnModel is set to true
+		replaceValuesWithValuesFromPendingChanges(aExistingChanges.filter((oChange) => !oChange._appliedOnModel), aProperties, bObjectAsKey);
+
 		this.oChangeAnnotationModel.setData({
 			objectAsKey: bObjectAsKey,
 			control: oControl,
@@ -196,7 +209,7 @@ sap.ui.define([
 			serviceUrl: sServiceUrl
 		});
 		if (sFilterText) {
-			this._oController.filterProperties(sFilterText);
+			this._oController.filterProperties(sFilterText, !!bSingleRename);
 		}
 		// Ensure that the model is fully refreshed before opening the dialog
 		this.oChangeAnnotationModel.refresh(true);

package/src/sap/ui/rta/plugin/annotations/AnnotationChangeDialogController.js

@@ -1,7 +1,7 @@
 
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @class Controller for the AnnotationChangeDialog.
 	 * @extends sap.ui.core.mvc.Controller
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @since 1.132
 	 * @private
@@ -49,10 +49,10 @@ sap.ui.define([
 		});
 	};
 
-	AnnotationChangeDialogController.prototype.filterProperties = function(sQuery) {
+	AnnotationChangeDialogController.prototype.filterProperties = function(sQuery, bEquals) {
 		const aFilters = [];
 		if (sQuery && sQuery.length > 0) {
-			const filter = new Filter("label", FilterOperator.Contains, sQuery);
+			const filter = new Filter("label", bEquals ? FilterOperator.EQ : FilterOperator.Contains, sQuery);
 			aFilters.push(filter);
 		}
 
@@ -69,16 +69,24 @@ sap.ui.define([
 	AnnotationChangeDialogController.prototype.switchDisplayMode = function(oEvent) {
 		const bShowChangedPropertiesOnly = oEvent.getParameter("state");
 		const oList = Element.getElementById("sapUiRtaChangeAnnotationDialog_propertyList");
-		oList.getModel().setProperty("/showChangedPropertiesOnly", bShowChangedPropertiesOnly);
-		oList.getModel().setProperty(
-			"/propertiesToDisplay",
-			bShowChangedPropertiesOnly
-				? oList.getModel().getProperty("/changedProperties")
-				: oList.getModel().getProperty("/properties")
-		);
+		const oModel = oList.getModel();
+		oModel.setProperty("/showChangedPropertiesOnly", bShowChangedPropertiesOnly);
+
+		if (bShowChangedPropertiesOnly) {
+			const aOriginallyChangedProperties = oModel.getProperty("/changedProperties");
+			const aAllChangedProperties = oModel.getProperty("/properties").filter((oProperty) => (
+				aOriginallyChangedProperties.some((oOriginallyChangedProperty) => (
+					oOriginallyChangedProperty.annotationPath === oProperty.annotationPath
+				))
+				|| oProperty.originalValue !== oProperty.currentValue
+			));
+			oModel.setProperty("/propertiesToDisplay", aAllChangedProperties);
+		} else {
+			oModel.setProperty("/propertiesToDisplay", oModel.getProperty("/properties"));
+		}
 	};
 
-	AnnotationChangeDialogController.prototype.onSavePress = function(oEvent) {
+	AnnotationChangeDialogController.prototype.onSave = function(oEvent) {
 		const oModelData = oEvent.getSource().getModel().getData();
 		const aChanges = oModelData.properties
 		.map((oProperty) => {
@@ -100,23 +108,14 @@ sap.ui.define([
 		this._fnResolveAfterClose(aChanges);
 	};
 
-	AnnotationChangeDialogController.prototype.onCancelPress = function() {
+	AnnotationChangeDialogController.prototype.onCancel = function() {
 		this._fnResolveAfterClose([]);
 	};
 
 	function createEditorField(sValueType) {
-		const onChange = () => {
-			// Property updates are handled via two-way binding
-			// However, the binding of the save button doesn't detect changes
-			// within nested object properties, so it has to be refreshed explicitly
-			const oSaveButton = Element.getElementById("sapUiRtaChangeAnnotationDialog_saveButton");
-			oSaveButton.getBinding("enabled").refresh(true);
-		};
-
 		if (sValueType === AnnotationTypes.ValueListType) {
 			const oSelect = new Select({
-				selectedKey: "{currentValue}",
-				change: onChange
+				selectedKey: "{currentValue}"
 			});
 
 			const oItemTemplate = new Item({
@@ -136,14 +135,17 @@ sap.ui.define([
 		if (sValueType === AnnotationTypes.StringType) {
 			return new Input({
 				value: "{currentValue}",
-				change: onChange
+				liveChange: (oEvent) => {
+					const sValue = oEvent.getParameter("newValue");
+					const oContext = oEvent.getSource().getBindingContext();
+					oEvent.getSource().getModel().setProperty("currentValue", sValue, oContext);
+				}
 			});
 		}
 
 		if (sValueType === AnnotationTypes.BooleanType) {
 			return new Switch({
-				state: "{currentValue}",
-				change: onChange
+				state: "{currentValue}"
 			});
 		}
 
@@ -152,11 +154,12 @@ sap.ui.define([
 
 	AnnotationChangeDialogController.prototype.editorFactory = function(sId, oContext) {
 		const sValueType = oContext.getProperty("/valueType");
+		const bSingleRename = oContext.getProperty("/singleRename");
 
 		return new FormElement({
 			id: sId,
 			label: new Label({
-				text: "{= ${label} || ${propertyName}}",
+				text: bSingleRename ? "{i18n>ANNOTATION_CHANGE_DIALOG_SINGLE_RENAME_LABEL}" : "{= ${label} || ${propertyName}}",
 				tooltip: "{tooltip}"
 			}),
 			fields: [
@@ -165,9 +168,5 @@ sap.ui.define([
 		});
 	};
 
-	AnnotationChangeDialogController.prototype.hasChangesFormatter = function(aProperties) {
-		return aProperties?.some((oProperty) => oProperty.originalValue !== oProperty.currentValue);
-	};
-
 	return AnnotationChangeDialogController;
 });

package/src/sap/ui/rta/plugin/annotations/AnnotationPlugin.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -8,6 +8,7 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/ui/base/DesignTime",
 	"sap/ui/core/util/reflection/JsControlTreeModifier",
+	"sap/ui/dt/OverlayRegistry",
 	"sap/ui/dt/Util",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
 	"sap/ui/fl/Utils",
@@ -18,6 +19,7 @@ sap.ui.define([
 	BaseLog,
 	DesignTime,
 	JsControlTreeModifier,
+	OverlayRegistry,
 	DtUtil,
 	PersistenceWriteAPI,
 	Utils,
@@ -52,9 +54,9 @@ sap.ui.define([
 		}
 	}
 
-	function getActionText(oElementOverlay, oAction) {
+	function getActionText(oElementOverlay, oAction, oPropagatingControl) {
 		const vName = oAction.title;
-		const oElement = oElementOverlay.getElement();
+		const oElement = oPropagatingControl || oElementOverlay.getElement();
 		if (vName) {
 			if (typeof vName === "function") {
 				return vName(oElement);
@@ -100,7 +102,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.0
 	 * @constructor
 	 * @private
 	 * @since 1.132
@@ -267,7 +269,8 @@ sap.ui.define([
 							typeof oAction.isEnabled === "function" && oAction.isEnabled(aElementOverlays[0].getElement())
 							|| (oAction.isEnabled !== false) && this.isEnabled(aElementOverlays)
 						),
-						handler: this.handler.bind(this, aElementOverlays, oAction)
+						handler: this.handler.bind(this, aElementOverlays, oAction),
+						additionalInfo: this._getAdditionalInfo(oResponsibleElementOverlay, oAction)
 					});
 				}
 			}, this);

package/src/sap/ui/rta/plugin/annotations/AnnotationTypes.js

@@ -1,7 +1,7 @@
 
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([], function() {