@openui5/sap.ui.rta 1.135.0 → 1.136.1

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

@@ -1,31 +1,31 @@
 /*!
  * 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/m/MessageBox",
 	"sap/base/util/restricted/_omit",
 	"sap/base/util/isEmptyObject",
+	"sap/m/MessageBox",
 	"sap/ui/core/Lib",
 	"sap/ui/dt/OverlayRegistry",
 	"sap/ui/dt/Util",
+	"sap/ui/fl/write/api/ContextSharingAPI",
+	"sap/ui/rta/plugin/rename/RenameDialog",
 	"sap/ui/rta/plugin/Plugin",
-	"sap/ui/rta/plugin/RenameHandler",
-	"sap/ui/rta/Utils",
-	"sap/ui/fl/write/api/ContextSharingAPI"
+	"sap/ui/rta/Utils"
 ], function(
-	MessageBox,
 	_omit,
 	isEmptyObject,
+	MessageBox,
 	Lib,
 	OverlayRegistry,
 	DtUtil,
+	ContextSharingAPI,
+	RenameDialog,
 	Plugin,
-	RenameHandler,
-	Utils,
-	ContextSharingAPI
+	Utils
 ) {
 	"use strict";
 
@@ -88,18 +88,34 @@ sap.ui.define([
 		return oOverlay.getElement().getAllVariants();
 	}
 
+	CompVariant.prototype.init = function(...aArgs) {
+		Plugin.prototype.init.apply(this, aArgs);
+		this._oDialog = new RenameDialog();
+	};
+
 	// ------ rename ------
-	function renameVariant(aOverlays) {
-		this.startEdit(aOverlays[0]);
+	async function renameVariant(aOverlays) {
+		const [oOverlay] = aOverlays;
+		const sVariantId = oOverlay.getElement().getPresentVariantId();
+		const vDomRef = oOverlay.getDesignTimeMetadata().getData().variantRenameDomRef;
+		const sNewText = await this._oDialog.openDialogAndHandleRename({
+			overlay: oOverlay,
+			domRef: vDomRef,
+			action: this.getAction(oOverlay)
+		});
+		if (!sNewText) {
+			return;
+		}
+		const mPropertyBag = {
+			newVariantProperties: {
+				[sVariantId]: {
+					name: sNewText
+				}
+			}
+		};
+		createCommandAndFireEvent.call(this, oOverlay, ["compVariantUpdate"], mPropertyBag);
 	}
 
-	/**
-	 * @override
-	 */
-	CompVariant.prototype.setDesignTime = function(oDesignTime) {
-		RenameHandler._setDesignTime.call(this, oDesignTime);
-	};
-
 	/**
 	 * Checks if variant rename is available for the overlay.
 	 *
@@ -130,32 +146,6 @@ sap.ui.define([
 		return this.isRenameAvailable(aElementOverlays[0]);
 	};
 
-	CompVariant.prototype.startEdit = function(oOverlay) {
-		var vDomRef = oOverlay.getDesignTimeMetadata().getData().variantRenameDomRef;
-		RenameHandler.startEdit.call(this, {
-			overlay: oOverlay,
-			domRef: vDomRef,
-			pluginMethodName: "plugin.CompVariant.startEdit"
-		});
-	};
-
-	CompVariant.prototype.stopEdit = function(bRestoreFocus) {
-		RenameHandler._stopEdit.call(this, bRestoreFocus, "plugin.CompVariant.stopEdit");
-	};
-
-	CompVariant.prototype._emitLabelChangeEvent = function() {
-		var oOverlay = this._oEditedOverlay;
-		var sVariantId = oOverlay.getElement().getPresentVariantId();
-		var sText = RenameHandler._getCurrentEditableFieldText.call(this);
-		var mPropertyBag = {
-			newVariantProperties: {}
-		};
-		mPropertyBag.newVariantProperties[sVariantId] = {
-			name: sText
-		};
-		createCommandAndFireEvent.call(this, oOverlay, ["compVariantUpdate"], mPropertyBag);
-	};
-
 	// ------ configure ------
 	function configureVariants(aOverlays) {
 		var oVariantManagementControl = aOverlays[0].getElement();
@@ -314,11 +304,11 @@ sap.ui.define([
 		}
 	}
 
-	function changeContent(aOverlays) {
+	function changeContent(oAction, aOverlays) {
 		var oLibraryBundle = Lib.getResourceBundleFor("sap.ui.rta");
 		var oElementOverlay = aOverlays[0];
 		var oControl = oElementOverlay.getElement();
-		var oAction = this.getAction(oElementOverlay);
+		oAction = oAction.action || oAction;
 		var oVariantManagementControl = oControl.getVariantManagement();
 		// the modified flag might be changed before the dialog is closed, so it has to be saved here already
 		var bIsModified = oVariantManagementControl.getModified();
@@ -359,85 +349,89 @@ sap.ui.define([
 	CompVariant.prototype.getMenuItems = function(aElementOverlays) {
 		var oElementOverlay = aElementOverlays[0];
 		var oVariantManagementControl = oElementOverlay.getElement();
+		const oAction = this.getAction(oElementOverlay);
 		var aMenuItems = [];
 		if (this.isAvailable([oElementOverlay])) {
-			if (this.getAction(oElementOverlay).changeType === "variantContent") {
-				aMenuItems.push({
-					id: "CTX_COMP_VARIANT_CONTENT",
-					text: this.getActionText(oElementOverlay, this.getAction(oElementOverlay)),
-					handler: changeContent.bind(this),
-					enabled: true,
-					rank: this.getRank("CTX_COMP_VARIANT_CONTENT"),
-					icon: "sap-icon://key-user-settings"
-				});
-			} else {
-				var sLayer = this.getCommandFactory().getFlexSettings().layer;
-				var oLibraryBundle = Lib.getResourceBundleFor("sap.ui.rta");
-				var aVariants = getAllVariants(oElementOverlay);
-				var oCurrentVariant = aVariants.find(function(oVariant) {
-					return oVariant.getVariantId() === oVariantManagementControl.getPresentVariantId();
-				});
-
-				if (oCurrentVariant.isRenameEnabled(sLayer)) {
+			if (oAction) {
+				if (oAction.changeType === "variantContent") {
 					aMenuItems.push({
-						id: "CTX_COMP_VARIANT_RENAME",
-						text: oLibraryBundle.getText("CTX_RENAME"),
-						handler: renameVariant.bind(this),
+						id: "CTX_COMP_VARIANT_CONTENT",
+						additionalInfo: this._getAdditionalInfo(oElementOverlay, oAction),
+						text: this.getActionText(oElementOverlay, oAction),
+						handler: changeContent.bind(this, oAction),
 						enabled: true,
-						rank: this.getRank("CTX_COMP_VARIANT_RENAME"),
-						icon: "sap-icon://edit"
+						rank: this.getRank("CTX_COMP_VARIANT_CONTENT"),
+						icon: "sap-icon://key-user-settings"
+					});
+				} else {
+					var sLayer = this.getCommandFactory().getFlexSettings().layer;
+					var oLibraryBundle = Lib.getResourceBundleFor("sap.ui.rta");
+					var aVariants = getAllVariants(oElementOverlay);
+					var oCurrentVariant = aVariants.find(function(oVariant) {
+						return oVariant.getVariantId() === oVariantManagementControl.getPresentVariantId();
 					});
-				}
 
-				if (oCurrentVariant.isEditEnabled(sLayer)) {
+					if (oCurrentVariant.isRenameEnabled(sLayer)) {
+						aMenuItems.push({
+							id: "CTX_COMP_VARIANT_RENAME",
+							text: oLibraryBundle.getText("CTX_RENAME"),
+							handler: renameVariant.bind(this),
+							enabled: true,
+							rank: this.getRank("CTX_COMP_VARIANT_RENAME"),
+							icon: "sap-icon://edit"
+						});
+					}
+
+					if (oCurrentVariant.isEditEnabled(sLayer)) {
+						aMenuItems.push({
+							id: "CTX_COMP_VARIANT_SAVE",
+							text: oLibraryBundle.getText("CTX_VARIANT_SAVE"),
+							handler: saveVariant.bind(this),
+							enabled: isSaveEnabled,
+							rank: this.getRank("CTX_COMP_VARIANT_SAVE"),
+							icon: "sap-icon://save"
+						});
+					}
+
 					aMenuItems.push({
-						id: "CTX_COMP_VARIANT_SAVE",
-						text: oLibraryBundle.getText("CTX_VARIANT_SAVE"),
-						handler: saveVariant.bind(this),
-						enabled: isSaveEnabled,
-						rank: this.getRank("CTX_COMP_VARIANT_SAVE"),
-						icon: "sap-icon://save"
+						id: "CTX_COMP_VARIANT_SAVE_AS",
+						text: oLibraryBundle.getText("CTX_VARIANT_SAVEAS"),
+						handler: saveAsNewVariant.bind(this),
+						enabled: true,
+						rank: this.getRank("CTX_COMP_VARIANT_SAVE_AS"),
+						icon: "sap-icon://duplicate"
 					});
-				}
 
-				aMenuItems.push({
-					id: "CTX_COMP_VARIANT_SAVE_AS",
-					text: oLibraryBundle.getText("CTX_VARIANT_SAVEAS"),
-					handler: saveAsNewVariant.bind(this),
-					enabled: true,
-					rank: this.getRank("CTX_COMP_VARIANT_SAVE_AS"),
-					icon: "sap-icon://duplicate"
-				});
-
-				aMenuItems.push({
-					id: "CTX_COMP_VARIANT_MANAGE",
-					text: oLibraryBundle.getText("CTX_VARIANT_MANAGE"),
-					handler: configureVariants.bind(this),
-					enabled: true,
-					rank: this.getRank("CTX_COMP_VARIANT_MANAGE"),
-					icon: "sap-icon://action-settings"
-				});
+					aMenuItems.push({
+						id: "CTX_COMP_VARIANT_MANAGE",
+						text: oLibraryBundle.getText("CTX_VARIANT_MANAGE"),
+						handler: configureVariants.bind(this),
+						enabled: true,
+						rank: this.getRank("CTX_COMP_VARIANT_MANAGE"),
+						icon: "sap-icon://action-settings"
+					});
 
-				var aSubmenuItems = aVariants.map(function(oVariant) {
-					var bCurrentItem = oVariantManagementControl.getPresentVariantId() === oVariant.getVariantId();
-					var oItem = {
-						id: oVariant.getVariantId(),
-						text: oVariant.getText("variantName"),
-						icon: bCurrentItem ? "sap-icon://accept" : "blank",
-						enabled: !bCurrentItem
-					};
-					return oItem;
-				});
+					var aSubmenuItems = aVariants.map(function(oVariant) {
+						var bCurrentItem = oVariantManagementControl.getPresentVariantId() === oVariant.getVariantId();
+						var oItem = {
+							id: oVariant.getVariantId(),
+							text: oVariant.getText("variantName"),
+							icon: bCurrentItem ? "sap-icon://accept" : "blank",
+							enabled: !bCurrentItem
+						};
+						return oItem;
+					});
 
-				aMenuItems.push({
-					id: "CTX_COMP_VARIANT_SWITCH",
-					text: oLibraryBundle.getText("CTX_VARIANT_SWITCH"),
-					handler: switchVariant.bind(this),
-					enabled: isSwitchEnabled,
-					submenu: aSubmenuItems,
-					rank: this.getRank("CTX_COMP_VARIANT_SWITCH"),
-					icon: "sap-icon://switch-views"
-				});
+					aMenuItems.push({
+						id: "CTX_COMP_VARIANT_SWITCH",
+						text: oLibraryBundle.getText("CTX_VARIANT_SWITCH"),
+						handler: switchVariant.bind(this),
+						enabled: isSwitchEnabled,
+						submenu: aSubmenuItems,
+						rank: this.getRank("CTX_COMP_VARIANT_SWITCH"),
+						icon: "sap-icon://switch-views"
+					});
+				}
 			}
 		}
 
@@ -448,5 +442,11 @@ sap.ui.define([
 		return "compVariant";
 	};
 
+	CompVariant.prototype.destroy = function(...args) {
+		Plugin.prototype.destroy.apply(this, args);
+		this._oDialog.destroy();
+		delete this._oDialog;
+	};
+
 	return CompVariant;
 });

package/src/sap/ui/rta/plugin/ControlVariant.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.
  */
 
@@ -20,8 +20,8 @@ sap.ui.define([
 	"sap/ui/fl/write/api/ContextSharingAPI",
 	"sap/ui/fl/Layer",
 	"sap/ui/fl/Utils",
+	"sap/ui/rta/plugin/rename/RenameDialog",
 	"sap/ui/rta/plugin/Plugin",
-	"sap/ui/rta/plugin/RenameHandler",
 	"sap/ui/rta/Utils"
 ], function(
 	Log,
@@ -39,8 +39,8 @@ sap.ui.define([
 	ContextSharingAPI,
 	Layer,
 	flUtils,
+	RenameDialog,
 	Plugin,
-	RenameHandler,
 	Utils
 ) {
 	"use strict";
@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @class The ControlVariant allows propagation of variantManagement key
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 * @constructor
 	 * @private
 	 * @since 1.50
@@ -106,6 +106,11 @@ sap.ui.define([
 		}, oDesignTimeMetadata);
 	}
 
+	ControlVariant.prototype.init = function(...aArgs) {
+		Plugin.prototype.init.apply(this, aArgs);
+		this._oDialog = new RenameDialog();
+	};
+
 	/**
 	 * Registers an overlay.
 	 *
@@ -158,14 +163,12 @@ sap.ui.define([
 					this._propagateVariantManagement(oVariantManagementTargetOverlay, sVariantManagementReference);
 				}
 			}.bind(this));
-			oOverlay.attachEvent("editableChange", RenameHandler._manageClickEvent, this);
 			destroyManageDialog(oOverlay);
 		} else if (!oOverlay.getVariantManagement()) {
 			// Case where overlay is dynamically created - variant management reference should be identified from parent
 			sVariantManagementReference = this._getVariantManagementFromParent(oOverlay);
 			if (sVariantManagementReference) {
 				oOverlay.setVariantManagement(sVariantManagementReference);
-				oOverlay.attachEvent("editableChange", RenameHandler._manageClickEvent, this);
 			}
 		}
 	};
@@ -222,8 +225,6 @@ sap.ui.define([
 		if (this._isVariantManagementControl(oOverlay)) {
 			destroyManageDialog(oOverlay);
 		}
-		oOverlay.detachEvent("editableChange", RenameHandler._manageClickEvent, this);
-		oOverlay.detachBrowserEvent("click", RenameHandler._onClick, this);
 		this.removeFromPluginsList(oOverlay);
 		Plugin.prototype.deregisterElementOverlay.apply(this, aArgs);
 	};
@@ -291,13 +292,6 @@ sap.ui.define([
 		return false;
 	};
 
-	/**
-	 * @override
-	 */
-	ControlVariant.prototype.setDesignTime = function(oDesignTime) {
-		RenameHandler._setDesignTime.call(this, oDesignTime);
-	};
-
 	/**
 	 * Checks if variant rename is available for the overlay.
 	 *
@@ -466,21 +460,31 @@ sap.ui.define([
 	 * @param {sap.ui.dt.ElementOverlay[]} aElementOverlays - Target overlays
 	 * @public
 	 */
-	ControlVariant.prototype.renameVariant = function(aElementOverlays) {
-		this.startEdit(aElementOverlays[0]);
-	};
-
-	ControlVariant.prototype.startEdit = function(oVariantManagementOverlay) {
-		var vDomRef = oVariantManagementOverlay.getDesignTimeMetadata().getData().variantRenameDomRef;
-		RenameHandler.startEdit.call(this, {
-			overlay: oVariantManagementOverlay,
+	ControlVariant.prototype.renameVariant = async function(aElementOverlays) {
+		const [oOverlay] = aElementOverlays;
+		const sVariantManagementReference = oOverlay.getVariantManagement();
+		const oDesignTimeMetadata = oOverlay.getDesignTimeMetadata();
+		const oRenamedElement = oOverlay.getElement();
+		const vDomRef = oDesignTimeMetadata.getData().variantRenameDomRef;
+		const sNewText = await this._oDialog.openDialogAndHandleRename({
+			overlay: oOverlay,
 			domRef: vDomRef,
-			pluginMethodName: "plugin.ControlVariant.startEdit"
+			action: this.getAction(oOverlay)
 		});
-	};
+		if (!sNewText) {
+			return;
+		}
 
-	ControlVariant.prototype.stopEdit = function(bRestoreFocus) {
-		RenameHandler._stopEdit.call(this, bRestoreFocus, "plugin.ControlVariant.stopEdit");
+		const oSetTitleCommand = await this._createSetTitleCommand({
+			text: sNewText,
+			element: oRenamedElement,
+			designTimeMetadata: oDesignTimeMetadata,
+			variantManagementReference: sVariantManagementReference
+		});
+
+		this.fireElementModified({
+			command: oSetTitleCommand
+		});
 	};
 
 	ControlVariant.prototype.createSaveCommand = function(aElementOverlays) {
@@ -512,31 +516,6 @@ sap.ui.define([
 		}.bind(this));
 	};
 
-	/**
-	 * @returns {Promise} empty promise
-	 * @private
-	 */
-	ControlVariant.prototype._emitLabelChangeEvent = function() {
-		var sText = RenameHandler._getCurrentEditableFieldText.call(this);
-		var oOverlay = this._oEditedOverlay;
-		var oDesignTimeMetadata = oOverlay.getDesignTimeMetadata();
-		var oRenamedElement = oOverlay.getElement();
-		var sVariantManagementReference = oOverlay.getVariantManagement();
-
-		return this._createSetTitleCommand({
-			text: sText,
-			element: oRenamedElement,
-			designTimeMetadata: oDesignTimeMetadata,
-			variantManagementReference: sVariantManagementReference
-		})
-
-		.then(function(oSetTitleCommand) {
-			this.fireElementModified({
-				command: oSetTitleCommand
-			});
-		}.bind(this));
-	};
-
 	/**
 	 * Sets the domref text, creates a setTitle command and fires element modified.
 	 * @param {map} mPropertyBag - (required) contains required properties to create the command
@@ -544,8 +523,6 @@ sap.ui.define([
 	 * @private
 	 */
 	ControlVariant.prototype._createSetTitleCommand = function(mPropertyBag) {
-		this._oEditableControlDomRef.textContent = mPropertyBag.text;
-
 		return this.getCommandFactory().getCommandFor(mPropertyBag.element, "setTitle", {
 			newText: mPropertyBag.text
 		}, mPropertyBag.designTimeMetadata, mPropertyBag.variantManagementReference)
@@ -702,5 +679,11 @@ sap.ui.define([
 		return "controlVariant";
 	};
 
+	ControlVariant.prototype.destroy = function(...args) {
+		Plugin.prototype.destroy.apply(this, args);
+		this._oDialog.destroy();
+		delete this._oDialog;
+	};
+
 	return ControlVariant;
 });

package/src/sap/ui/rta/plugin/CreateContainer.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([
 	 * @class The CreateContainer allows trigger CreateContainer operations on the overlay
 	 * @extends sap.ui.rta.plugin.BaseCreate
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/plugin/CutPaste.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([
 	 * @extends sap.ui.dt.plugin.CutPaste
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/plugin/DragDrop.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.
  */
 
@@ -33,7 +33,7 @@ function(
 	 * @extends sap.ui.dt.plugin.ControlDragDrop
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -1,21 +1,19 @@
 /*!
  * 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/ui/core/Lib",
 	"sap/ui/dt/Util",
 	"sap/ui/fl/Utils",
-	"sap/ui/rta/plugin/Plugin",
-	"sap/ui/rta/util/isReuseComponent",
-	"sap/ui/rta/Utils"
+	"sap/ui/rta/plugin/Plugin"
 ], function(
+	Lib,
 	DtUtil,
-	FlUtils,
-	Plugin,
-	isReuseComponent,
-	RtaUtils
+	Utils,
+	Plugin
 ) {
 	"use strict";
 
@@ -34,7 +32,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 * @constructor
 	 * @private
 	 * @since 1.134
@@ -56,6 +54,11 @@ sap.ui.define([
 
 	const FLEX_CHANGE_TYPE = "codeExt";
 
+	function isControlInAsyncView(oOverlay) {
+		// Currently there is no better way to get this information. When this changes, this code must be adapted.
+		return !!Utils.getViewForControl(oOverlay.getElement())?.oAsyncState;
+	}
+
 	/**
 	 * Check if the given overlay should be editable.
 	 *
@@ -63,17 +66,8 @@ sap.ui.define([
 	 * @returns {Promise<boolean>} <code>true</code> when editable wrapped in a promise
 	 * @private
 	 */
-	ExtendControllerPlugin.prototype._isEditable = async function(oOverlay) {
-		const oComponent = FlUtils.getComponentForControl(oOverlay.getElement());
-		const bIsS4HanaCloud = RtaUtils.isS4HanaCloud();
-		if (
-			bIsS4HanaCloud ||
-			isReuseComponent(oComponent)
-		) {
-			return false;
-		}
-		const bHasChangeHandler = await this.hasChangeHandler(FLEX_CHANGE_TYPE, oOverlay.getElement());
-		return bHasChangeHandler;
+	ExtendControllerPlugin.prototype._isEditable = function() {
+		return Promise.resolve(true);
 	};
 
 	/**
@@ -83,22 +77,42 @@ sap.ui.define([
 	 * @public
 	 */
 	ExtendControllerPlugin.prototype.isEnabled = function(aElementOverlays) {
-		const bEnabled = aElementOverlays.length === 1;
-		return bEnabled;
+		return aElementOverlays.length === 1
+			&& !this.isInReuseComponentOnS4HanaCloud(aElementOverlays[0])
+			&& isControlInAsyncView(aElementOverlays[0]);
 	};
 
-	function handleExtendControllerCommand(mExtendControllerData, oElement) {
-		const mExtendControllerSettings = {
-			codeRef: mExtendControllerData.codeRef,
-			viewId: mExtendControllerData.viewId
-		};
-
-		return this.getCommandFactory().getCommandFor(
-			oElement,
-			FLEX_CHANGE_TYPE,
-			mExtendControllerSettings
-		);
-	}
+	/**
+	 * Redefinition of getActionText to add special texts for the context menu
+	 * @param  {sap.ui.dt.ElementOverlay} oOverlay Overlay containing the Designtime Metadata
+	 * @param  {object} mAction The action data from the Designtime Metadata
+	 * @param  {string} sPluginId The ID of the plugin
+	 * @returns {string} Returns the text for the menu item
+	 */
+	ExtendControllerPlugin.prototype.getActionText = function(oOverlay, mAction, sPluginId) {
+		const vName = mAction.name;
+		const oElement = oOverlay.getElement();
+		let sText;
+		if (vName) {
+			if (typeof vName === "function") {
+				return vName(oElement);
+			}
+			sText = oOverlay.getDesignTimeMetadata() ? oOverlay.getDesignTimeMetadata().getLibraryText(oElement, vName) : "";
+		} else {
+			sText = Lib.getResourceBundleFor("sap.ui.rta").getText(sPluginId);
+		}
+		// The case where the control is in a reuse component on S4HanaCloud
+		// is not enabled and has a special text in parenthesis on the context menu
+		if (this.isInReuseComponentOnS4HanaCloud(oOverlay)) {
+			sText += ` (${Lib.getResourceBundleFor("sap.ui.rta").getText("CTX_DISABLED_REUSE")})`;
+		}
+		// The case where the control is not in an async view
+		// is not enabled and has a special text in parenthesis on the context menu
+		if (!isControlInAsyncView(oOverlay)) {
+			sText += ` (${Lib.getResourceBundleFor("sap.ui.rta").getText("CTX_DISABLED_NOT_ASYNC")})`;
+		}
+		return sText;
+	};
 
 	/**
 	 * Triggers the plugin execution.
@@ -118,10 +132,10 @@ sap.ui.define([
 
 			const mExtendControllerData = await fnControllerHandler(oElementOverlay);
 
-			const oExtendControllerCommand = await handleExtendControllerCommand.call(
-				this,
-				mExtendControllerData,
-				oElementOverlay.getElement()
+			const oExtendControllerCommand = await this.getCommandFactory().getCommandFor(
+				oElementOverlay.getElement(),
+				FLEX_CHANGE_TYPE,
+				mExtendControllerData
 			);
 
 			this.fireElementModified({
@@ -157,5 +171,15 @@ sap.ui.define([
 		return "extendController";
 	};
 
+	/**
+	 * Returns the action information when defined in the designtime metadata or an object with only the changeType.
+	 * @param {sap.ui.dt.ElementOverlay} oOverlay - Overlay containing the Designtime Metadata
+	 * @returns {object} Action information
+	 */
+	ExtendControllerPlugin.prototype.getAction = function(oOverlay) {
+		const oAction = Plugin.prototype.getAction.apply(this, [oOverlay]);
+		return oAction || { changeType: FLEX_CHANGE_TYPE };
+	};
+
 	return ExtendControllerPlugin;
 });