@openui5/sap.ui.rta 1.126.1 → 1.128.0

package/src/sap/ui/rta/messagebundle_zh_CN.properties

@@ -58,8 +58,8 @@ TIT_VERSION_HISTORY_PUBLISHED=\u5DF2\u53D1\u5E03
 TIT_VERSION_HISTORY_UNPUBLISHED=\u672A\u53D1\u5E03
 MSG_DRAFT_ACTIVATION_SUCCESS=\u65B0\u7248\u672C\u5DF2\u6FC0\u6D3B
 MSG_DRAFT_ACTIVATION_FAILED=\u62B1\u6B49\uFF0C\u6B64\u523B\u65E0\u6CD5\u6FC0\u6D3B\u8349\u7A3F\u3002\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002
-MSG_SWITCH_VERSION_FAILED=\u5207\u6362\u7248\u672C\u5931\u8D25\u3002\u8BF7\u91CD\u65B0\u52A0\u8F7D\u3002
-MSG_SWITCH_ADAPTATION_FAILED=\u5207\u6362\u8C03\u6574\u5931\u8D25\u3002\u8BF7\u91CD\u65B0\u52A0\u8F7D\u3002
+MSG_SWITCH_VERSION_FAILED=\u5207\u6362\u7248\u672C\u65F6\u51FA\u9519\u3002\u8BF7\u91CD\u65B0\u52A0\u8F7D\u3002{0}
+MSG_SWITCH_ADAPTATION_FAILED=\u5207\u6362\u8C03\u6574\u65F6\u51FA\u9519\u3002\u8BF7\u91CD\u65B0\u52A0\u8F7D\u3002
 TIT_VERSION_TITLE=\u6807\u9898
 TIT_VERSION_TITLE_DIALOG=\u6FC0\u6D3B\u65B0\u7248\u672C
 TIT_REACTIVATE_VERSION_TITLE_DIALOG=\u91CD\u65B0\u6FC0\u6D3B\u7248\u672C
@@ -191,6 +191,7 @@ MSG_NO_FLEX_ENABLED_FLAG=\u672A\u542F\u7528\u5E94\u7528\u7A0B\u5E8F\u8FDB\u884C
 IFRAME_ADDIFRAME_DIALOG_TITLE=\u5B9A\u4E49\u5D4C\u5165\u5F0F\u5185\u5BB9
 IFRAME_ADDIFRAME_DIALOG_UPDATE_TITLE=\u66F4\u65B0\u5D4C\u5165\u5F0F\u5185\u5BB9
 IFRAME_ADDIFRAME_DIALOG_SIZE_TITLE=IFrame \u7684\u5927\u5C0F
+IFRAME_ADDIFRAME_DIALOG_DIMENSIONS_ERROR=\u8F93\u5165\u5927\u4E8E 0 \u7684\u6570\u5B57
 IFRAME_ADDIFRAME_DIALOG_WIDTH_LABEL=\u5BBD\u5EA6
 IFRAME_ADDIFRAME_DIALOG_WIDTH_UNITLABEL=\u5BBD\u5EA6\u7684\u5355\u4F4D
 IFRAME_ADDIFRAME_DIALOG_HEIGHT_LABEL=\u9AD8\u5EA6
@@ -223,8 +224,8 @@ IFRAME_ADDIFRAME_DIALOG_SELECT_ADDITIONAL_TEXT_REM=\u76F8\u5BF9\u4E8E\u6839 HTML
 IFRAME_ADDIFRAME_ADVANCED_SETTINGS=\u9AD8\u7EA7\u8BBE\u7F6E
 IFRAME_ADDIFRAME_ERROR_UNSAFE_PROTOCOL=\u534F\u8BAE\u4E0D\u88AB\u5141\u8BB8
 IFRAME_ADDIFRAME_ERROR_MIXED_CONTENT=\u4E0D\u5141\u8BB8\u5728 HTTPS \u4E3B\u673A\u4E2D\u5D4C\u5165 HTTP \u5185\u5BB9\u3002
-IFRAME_ADDIFRAME_ERROR_FORBIDDEN_URL=URL \u4E0D\u88AB\u5141\u8BB8\u3002
-IFRAME_ADDIFRAME_ERROR_INVALID_URL=\u8F93\u5165\u6709\u6548\u7684 URL\u3002
+IFRAME_ADDIFRAME_ERROR_FORBIDDEN_URL=URL \u4E0D\u88AB\u5141\u8BB8\u3002\u8BF7\u4E0E\u7CFB\u7EDF\u7BA1\u7406\u5458\u8054\u7CFB\u3002
+IFRAME_ADDIFRAME_ERROR_INVALID_URL=\u8F93\u5165\u6709\u6548\u7684 URL\uFF08\u4F8B\u5982 https\://www.sap.com\uFF09
 IFRAME_ADDIFRAME_ADDITIONAL_PARAMETERS_SECURITY_WARNING_TEXT=\u66F4\u6539\u53C2\u6570\u53EF\u80FD\u4F1A\u5F71\u54CD\u5E94\u7528\u7A0B\u5E8F\u7684\u5B89\u5168\u6027\u3002
 IFRAME_ADDIFRAME_ADDITIONAL_PARAMETERS_WARNING_MORE_INFO_TEXT=\u66F4\u591A\u4FE1\u606F
 IFRAME_ADDIFRAME_ADD_ADDITIONAL_SANDBOX_PARAMETERS_LABEL=\u6FC0\u6D3B\u9644\u52A0\u6C99\u76D2\u53C2\u6570\uFF1A

package/src/sap/ui/rta/messagebundle_zh_TW.properties

@@ -58,8 +58,8 @@ TIT_VERSION_HISTORY_PUBLISHED=\u5DF2\u767C\u4F48
 TIT_VERSION_HISTORY_UNPUBLISHED=\u672A\u767C\u4F48
 MSG_DRAFT_ACTIVATION_SUCCESS=\u5DF2\u555F\u7528\u65B0\u7248\u672C
 MSG_DRAFT_ACTIVATION_FAILED=\u62B1\u6B49\uFF0C\u73FE\u5728\u7121\u6CD5\u555F\u7528\u8349\u7A3F\uFF0C\u8ACB\u7A0D\u5F8C\u518D\u8A66\u4E00\u6B21\u3002
-MSG_SWITCH_VERSION_FAILED=\u7121\u6CD5\u5207\u63DB\u7248\u672C\uFF0C\u8ACB\u91CD\u65B0\u8F09\u5165\u3002
-MSG_SWITCH_ADAPTATION_FAILED=\u7121\u6CD5\u5207\u63DB\u8ABF\u6574\uFF0C\u8ACB\u91CD\u65B0\u8F09\u5165\u3002
+MSG_SWITCH_VERSION_FAILED=\u5207\u63DB\u7248\u672C\u6642\u767C\u751F\u932F\u8AA4\uFF0C\u8ACB\u91CD\u65B0\u8F09\u5165\u3002\n {0}
+MSG_SWITCH_ADAPTATION_FAILED=\u5207\u63DB\u8ABF\u6574\u5167\u5BB9\u6642\u767C\u751F\u932F\u8AA4\uFF0C\u8ACB\u91CD\u65B0\u8F09\u5165\u3002
 TIT_VERSION_TITLE=\u6A19\u984C
 TIT_VERSION_TITLE_DIALOG=\u555F\u7528\u65B0\u7248\u672C
 TIT_REACTIVATE_VERSION_TITLE_DIALOG=\u91CD\u65B0\u555F\u7528\u7248\u672C
@@ -191,6 +191,7 @@ MSG_NO_FLEX_ENABLED_FLAG=\u60A8\u7684\u61C9\u7528\u7A0B\u5F0F\u672A\u555F\u7528\
 IFRAME_ADDIFRAME_DIALOG_TITLE=\u5B9A\u7FA9\u5167\u5D4C\u5167\u5BB9
 IFRAME_ADDIFRAME_DIALOG_UPDATE_TITLE=\u66F4\u65B0\u5167\u5D4C\u5167\u5BB9
 IFRAME_ADDIFRAME_DIALOG_SIZE_TITLE=IFrame \u5927\u5C0F
+IFRAME_ADDIFRAME_DIALOG_DIMENSIONS_ERROR=\u8F38\u5165\u5927\u65BC 0 \u7684\u6578\u5B57
 IFRAME_ADDIFRAME_DIALOG_WIDTH_LABEL=\u5BEC\u5EA6
 IFRAME_ADDIFRAME_DIALOG_WIDTH_UNITLABEL=\u5BEC\u5EA6\u55AE\u4F4D
 IFRAME_ADDIFRAME_DIALOG_HEIGHT_LABEL=\u9AD8\u5EA6
@@ -223,8 +224,8 @@ IFRAME_ADDIFRAME_DIALOG_SELECT_ADDITIONAL_TEXT_REM=\u76F8\u5C0D\u65BC\u6839 HTML
 IFRAME_ADDIFRAME_ADVANCED_SETTINGS=\u9032\u968E\u8A2D\u5B9A
 IFRAME_ADDIFRAME_ERROR_UNSAFE_PROTOCOL=\u4E0D\u5141\u8A31\u901A\u8A0A\u5354\u5B9A\u3002
 IFRAME_ADDIFRAME_ERROR_MIXED_CONTENT=\u4E0D\u5141\u8A31 HTTPS \u4E3B\u6A5F\u4E2D\u7684\u5167\u5D4C HTTP \u5167\u5BB9\u3002
-IFRAME_ADDIFRAME_ERROR_FORBIDDEN_URL=\u4E0D\u5141\u8A31 URL\u3002
-IFRAME_ADDIFRAME_ERROR_INVALID_URL=\u8F38\u5165\u6709\u6548\u7684 URL\u3002
+IFRAME_ADDIFRAME_ERROR_FORBIDDEN_URL=\u4E0D\u5141\u8A31 URL\uFF0C\u8ACB\u806F\u7D61\u7CFB\u7D71\u7BA1\u7406\u54E1\u3002
+IFRAME_ADDIFRAME_ERROR_INVALID_URL=\u8F38\u5165\u6709\u6548\u7684 URL (\u4F8B\u5982 https\://www.sap.com)
 IFRAME_ADDIFRAME_ADDITIONAL_PARAMETERS_SECURITY_WARNING_TEXT=\u66F4\u6539\u53C3\u6578\u6642\u53EF\u80FD\u6703\u5F71\u97FF\u61C9\u7528\u7A0B\u5F0F\u5B89\u5168\u6027\u3002
 IFRAME_ADDIFRAME_ADDITIONAL_PARAMETERS_WARNING_MORE_INFO_TEXT=\u66F4\u591A\u8CC7\u8A0A
 IFRAME_ADDIFRAME_ADD_ADDITIONAL_SANDBOX_PARAMETERS_LABEL=\u555F\u7528\u5176\u4ED6\u6C99\u7BB1\u53C3\u6578\uFF1A

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

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.78
@@ -258,7 +258,10 @@ sap.ui.define([
 	 * @returns {object[]} Array of the items with required data
 	 */
 	AddXMLAtExtensionPoint.prototype.getMenuItems = function(aElementOverlays) {
-		return this._getMenuItems(aElementOverlays, {pluginId: "CTX_ADDXML_AT_EXTENSIONPOINT", rank: 110, icon: "sap-icon://add-equipment"});
+		return this._getMenuItems(aElementOverlays, {
+			pluginId: "CTX_ADDXML_AT_EXTENSIONPOINT",
+			icon: "sap-icon://add-equipment"
+		});
 	};
 
 	/**

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @class The BaseCreate allows trigger BaseCreate operations on the overlay.
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.75

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.46
@@ -200,7 +200,6 @@ sap.ui.define([
 			aElementOverlays,
 			{
 				pluginId: "CTX_GROUP_FIELDS",
-				rank: 90,
 				icon: "sap-icon://combine"
 			}
 		);

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

@@ -365,7 +365,7 @@ sap.ui.define([
 					text: this.getActionText(oElementOverlay, this.getAction(oElementOverlay)),
 					handler: changeContent.bind(this),
 					enabled: true,
-					rank: 250,
+					rank: this.getRank("CTX_COMP_VARIANT_CONTENT"),
 					icon: "sap-icon://key-user-settings"
 				});
 			} else {
@@ -382,7 +382,7 @@ sap.ui.define([
 						text: oLibraryBundle.getText("CTX_RENAME"),
 						handler: renameVariant.bind(this),
 						enabled: true,
-						rank: 210,
+						rank: this.getRank("CTX_COMP_VARIANT_RENAME"),
 						icon: "sap-icon://edit"
 					});
 				}
@@ -393,7 +393,7 @@ sap.ui.define([
 						text: oLibraryBundle.getText("CTX_VARIANT_SAVE"),
 						handler: saveVariant.bind(this),
 						enabled: isSaveEnabled,
-						rank: 220,
+						rank: this.getRank("CTX_COMP_VARIANT_SAVE"),
 						icon: "sap-icon://save"
 					});
 				}
@@ -403,7 +403,7 @@ sap.ui.define([
 					text: oLibraryBundle.getText("CTX_VARIANT_SAVEAS"),
 					handler: saveAsNewVariant.bind(this),
 					enabled: true,
-					rank: 230,
+					rank: this.getRank("CTX_COMP_VARIANT_SAVE_AS"),
 					icon: "sap-icon://duplicate"
 				});
 
@@ -412,7 +412,7 @@ sap.ui.define([
 					text: oLibraryBundle.getText("CTX_VARIANT_MANAGE"),
 					handler: configureVariants.bind(this),
 					enabled: true,
-					rank: 240,
+					rank: this.getRank("CTX_COMP_VARIANT_MANAGE"),
 					icon: "sap-icon://action-settings"
 				});
 
@@ -433,7 +433,7 @@ sap.ui.define([
 					handler: switchVariant.bind(this),
 					enabled: isSwitchEnabled,
 					submenu: aSubmenuItems,
-					rank: 250,
+					rank: this.getRank("CTX_COMP_VARIANT_SWITCH"),
 					icon: "sap-icon://switch-views"
 				});
 			}

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

@@ -51,7 +51,7 @@ sap.ui.define([
 	 * @class The ControlVariant allows propagation of variantManagement key
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.50
@@ -639,7 +639,7 @@ sap.ui.define([
 				text: Lib.getResourceBundleFor("sap.ui.rta").getText("CTX_RENAME"),
 				handler: this.renameVariant.bind(this),
 				enabled: this.isRenameEnabled.bind(this),
-				rank: 210,
+				rank: this.getRank("CTX_VARIANT_SET_TITLE"),
 				icon: "sap-icon://edit"
 			});
 		}
@@ -650,7 +650,7 @@ sap.ui.define([
 				text: Lib.getResourceBundleFor("sap.ui.rta").getText("CTX_VARIANT_SAVE"),
 				handler: this.createSaveCommand.bind(this),
 				enabled: this.isVariantSaveEnabled.bind(this),
-				rank: 220,
+				rank: this.getRank("CTX_VARIANT_SAVE"),
 				icon: "sap-icon://save"
 			});
 		}
@@ -661,7 +661,7 @@ sap.ui.define([
 				text: Lib.getResourceBundleFor("sap.ui.rta").getText("CTX_VARIANT_SAVEAS"),
 				handler: this.createSaveAsCommand.bind(this),
 				enabled: this.isVariantSaveAsEnabled.bind(this),
-				rank: 225,
+				rank: this.getRank("CTX_VARIANT_SAVEAS"),
 				icon: "sap-icon://duplicate"
 			});
 		}
@@ -673,7 +673,7 @@ sap.ui.define([
 				handler: this.configureVariants.bind(this),
 				enabled: this.isVariantConfigureEnabled.bind(this),
 				startSection: true,
-				rank: 230,
+				rank: this.getRank("CTX_VARIANT_MANAGE"),
 				icon: "sap-icon://action-settings"
 			});
 		}
@@ -707,7 +707,7 @@ sap.ui.define([
 				}.bind(this),
 				enabled: this.isVariantSwitchEnabled.bind(this),
 				submenu: aSubmenuItems,
-				rank: 240,
+				rank: this.getRank("CTX_VARIANT_SWITCH_SUBMENU"),
 				icon: "sap-icon://switch-views"
 			});
 		}

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

@@ -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.126.1
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.34
@@ -115,7 +115,7 @@ sap.ui.define([
 	CreateContainer.prototype.getMenuItems = function(aElementOverlays) {
 		var bOverlayIsSibling = true;
 		var sPluginId = "CTX_CREATE_SIBLING_CONTAINER";
-		var iRank = 40;
+		var iRank = this.getRank(sPluginId);
 		var aMenuItems = [];
 
 		var isMenuItemEnabled = function(bOverlayIsSibling, aOverlays) {
@@ -135,7 +135,7 @@ sap.ui.define([
 			}
 			bOverlayIsSibling = false;
 			sPluginId = "CTX_CREATE_CHILD_CONTAINER";
-			iRank = 50;
+			iRank = this.getRank(sPluginId);
 		}
 		return aMenuItems;
 	};

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.dt.plugin.CutPaste
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @private
@@ -182,7 +182,7 @@ sap.ui.define([
 			enabled: function(aElementOverlays) {
 				return this.isElementPasteable(aElementOverlays[0]);
 			}.bind(this),
-			rank: 80,
+			rank: this.getRank("CTX_PASTE"),
 			icon: "sap-icon://paste"
 		}, aElementOverlays, ["move"]);
 		var aResponsibleElementOverlays = oPasteMenuItem.responsible || aElementOverlays;
@@ -197,7 +197,7 @@ sap.ui.define([
 				enabled(aElementOverlays) {
 					return aElementOverlays.length === 1;
 				},
-				rank: 70,
+				rank: this.getRank("CTX_CUT"),
 				icon: "sap-icon://scissors"
 			}, aElementOverlays, ["move"]);
 			aMenuItems.push(oCutMenuItem, oPasteMenuItem);

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

@@ -33,7 +33,7 @@ function(
 	 * @extends sap.ui.dt.plugin.ControlDragDrop
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.90
@@ -113,7 +113,10 @@ sap.ui.define([
 	 * @return {object[]} Array of the items with required data
 	 */
 	LocalReset.prototype.getMenuItems = function(vElementOverlays) {
-		return this._getMenuItems(vElementOverlays, { pluginId: "CTX_LOCAL_RESET", rank: 61, icon: "sap-icon://reset" });
+		return this._getMenuItems(vElementOverlays, {
+			pluginId: "CTX_LOCAL_RESET",
+			icon: "sap-icon://reset"
+		});
 	};
 
 	/**

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

@@ -24,6 +24,39 @@ sap.ui.define([
 ) {
 	"use strict";
 
+	// The ranks define the order of the plugin actions in the context menu
+	const CONTEXT_MENU_RANKS = {
+		CTX_RENAME: 10,
+		CTX_ADD_ELEMENTS_AS_SIBLING: 20,
+		CTX_ADD_ELEMENTS_AS_CHILD: 25,
+		CTX_ADD_ELEMENTS_CHILD_AND_SIBLING: 30,
+		CTX_CREATE_SIBLING_CONTAINER: 40,
+		CTX_CREATE_CHILD_CONTAINER: 50,
+		CTX_REMOVE: 60,
+		CTX_LOCAL_RESET: 65,
+		CTX_CUT: 70,
+		CTX_PASTE: 80,
+		CTX_GROUP_FIELDS: 90,
+		CTX_UNGROUP_FIELDS: 100,
+		CTX_ADDXML_AT_EXTENSIONPOINT: 105,
+		// 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
+		CTX_CREATE_SIBLING_IFRAME: 130,
+		// Variant types are mutually exclusive
+		CTX_VARIANT_SET_TITLE: 140,
+		CTX_COMP_VARIANT_RENAME: 140,
+		CTX_VARIANT_SAVE: 150,
+		CTX_COMP_VARIANT_SAVE: 150,
+		CTX_VARIANT_SAVEAS: 160,
+		CTX_COMP_VARIANT_SAVE_AS: 160,
+		CTX_VARIANT_MANAGE: 170,
+		CTX_COMP_VARIANT_MANAGE: 170,
+		CTX_VARIANT_SWITCH_SUBMENU: 180,
+		CTX_COMP_VARIANT_SWITCH: 180,
+		CTX_COMP_VARIANT_CONTENT: 190
+	};
+
 	function _handleEditableByPlugin(mPropertyBag, aPromises, oSourceElementOverlay) {
 		// when a control gets destroyed it gets deregistered before it gets removed from the parent aggregation.
 		// this means that getElementInstance is undefined when we get here via removeAggregation mutation
@@ -70,7 +103,7 @@ sap.ui.define([
 	 * @extends sap.ui.dt.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @private
@@ -438,5 +471,30 @@ sap.ui.define([
 		return Promise.resolve(false);
 	};
 
+	/**
+	 * Returns the rank (order) of the plugin action in the context menu.
+	 * @param {string} sPluginId Plugin ID
+	 * @return {number} Rank of the plugin action
+	 */
+	BasePlugin.prototype.getRank = function(sPluginId) {
+		return CONTEXT_MENU_RANKS[sPluginId];
+	};
+
+	/**
+	 * Generic function to return the menu items for a context menu.
+	 * Retrieves the rank and then calls the method from the DT Plugin.
+	 * @param {sap.ui.dt.ElementOverlay[]} aElementOverlays - Target overlays
+	 * @param {object} mPropertyBag Additional properties for the menu item
+	 * @param {string} mPropertyBag.pluginId The ID of the plugin
+	 * @param {string} mPropertyBag.icon an icon for the Button inside the context menu
+	 * @param {string} mPropertyBag.group A group for buttons which should be grouped together in the MiniMenu
+	 * @param {number} [mPropertyBag.rank] The rank (order) of the plugin action in the context menu
+	 * @return {object[]} Returns an array with the object containing the required data for a context menu item
+	 */
+	BasePlugin.prototype._getMenuItems = function(aElementOverlays, mPropertyBag) {
+		mPropertyBag.rank ||= this.getRank(mPropertyBag.pluginId);
+		return Plugin.prototype._getMenuItems.apply(this, [aElementOverlays, mPropertyBag]);
+	};
+
 	return BasePlugin;
-});
+});

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

@@ -35,7 +35,7 @@ function(
 	 * The RTAElementMover is responsible for the RTA specific adaptation of element movements.
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -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.126.1
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.34
@@ -309,7 +309,7 @@ sap.ui.define([
 	 * @return {object[]} - array of the items with required data
 	 */
 	Remove.prototype.getMenuItems = function(aElementOverlays) {
-		return this._getMenuItems(aElementOverlays, {pluginId: "CTX_REMOVE", rank: 60, icon: "sap-icon://less"});
+		return this._getMenuItems(aElementOverlays, {pluginId: "CTX_REMOVE", icon: "sap-icon://less"});
 	};
 
 	/**

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.plugin.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @private
@@ -213,7 +213,7 @@ sap.ui.define([
 	 * @return {object[]} - array of the items with required data
 	 */
 	Rename.prototype.getMenuItems = function(vElementOverlays) {
-		return this._getMenuItems(vElementOverlays, { pluginId: "CTX_RENAME", rank: 10, icon: "sap-icon://edit" });
+		return this._getMenuItems(vElementOverlays, { pluginId: "CTX_RENAME", icon: "sap-icon://edit" });
 	};
 
 	/**

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

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * Provides Rename handling functionality
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @private
@@ -234,7 +234,6 @@ sap.ui.define([
 			jQuery(_oWrapperDomRef).offset({left: DOMUtil.getOffset(this._oEditableControlDomRef).left});
 			RenameHandler._setEditableFieldPosition.apply(this);
 			this._oEditableField.style.visibility = "";
-			this._oEditableField.focus();
 
 			// If scrolling happens during startEdit, the position of the editable field can be wrong
 			// To avoid this, the position is recalculated after the scrollbar synchronization is ready
@@ -243,6 +242,10 @@ sap.ui.define([
 				oOverlayWithScrollbar.attachScrollSynced(RenameHandler._setEditableFieldPosition, this);
 			}.bind(this));
 
+			// The focus can trigger an immediate blur event (e.g. when the "discard draft" pop-up is opened),
+			// therefore the entire editable field preparation has to be finalized before the focus is set.
+			this._oEditableField.focus();
+
 			// keep Overlay selected while renaming
 			mPropertyBag.overlay.setSelected(true);
 			EventBus.getInstance().publish("sap.ui.rta", mPropertyBag.pluginMethodName, {

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.101

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

@@ -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.126.1
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.34
@@ -347,7 +347,7 @@ sap.ui.define([
 			if (oOverlay !== this._oHoverTarget) {
 				this._removePreviousHover();
 				this._oHoverTarget = oOverlay;
-				oOverlay.addStyleClass("sapUiRtaOverlayHover");
+				this.getDesignTime().getSelectionManager().addHover(oOverlay);
 			}
 			preventEventDefaultAndPropagation(oEvent);
 		}
@@ -380,7 +380,7 @@ sap.ui.define([
 	 */
 	Selection.prototype._removePreviousHover = function() {
 		if (this._oHoverTarget) {
-			this._oHoverTarget.removeStyleClass("sapUiRtaOverlayHover");
+			this.getDesignTime().getSelectionManager().removeHover(this._oHoverTarget);
 		}
 		delete this._oHoverTarget;
 	};

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

@@ -5,15 +5,18 @@
  */
 
 sap.ui.define([
-	"sap/ui/rta/plugin/Plugin",
-	"sap/ui/rta/Utils",
+	"sap/base/Log",
 	"sap/ui/dt/Util",
-	"sap/base/Log"
+	"sap/ui/fl/Utils",
+	"sap/ui/rta/plugin/Plugin",
+	"sap/ui/rta/Utils"
+
 ], function(
-	Plugin,
-	Utils,
+	BaseLog,
 	DtUtil,
-	BaseLog
+	FlUtils,
+	Plugin,
+	Utils
 ) {
 	"use strict";
 
@@ -25,7 +28,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.126.1
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.44
@@ -166,6 +169,22 @@ sap.ui.define([
 		});
 	};
 
+	Settings.prototype._handleAnnotationChangeCommand = function(mChange, oElement, oCompositeCommand) {
+		var mChangeSpecificData = mChange.changeSpecificData;
+
+		return this.getCommandFactory().getCommandFor(
+			oElement,
+			"annotation",
+			{
+				content: mChangeSpecificData.content,
+				changeType: mChangeSpecificData.annotationChangeType
+			}
+		)
+		.then(function(oAnnotationCommand) {
+			return oCompositeCommand.addCommand(oAnnotationCommand);
+		});
+	};
+
 	Settings.prototype._handleCompositeCommand = function(aElementOverlays, oElement, aChanges, oSettingsAction) {
 		var oCompositeCommand;
 
@@ -180,17 +199,22 @@ sap.ui.define([
 				var mChangeSpecificData = mChange.changeSpecificData;
 				// Flex Change
 				if (mChangeSpecificData.changeType) {
-					return this._handleFlexChangeCommand(mChange, aElementOverlays, oCompositeCommand, oSettingsAction);
+					return () => this._handleFlexChangeCommand(mChange, aElementOverlays, oCompositeCommand, oSettingsAction);
 				// App Descriptor Change
 				} else if (mChangeSpecificData.appDescriptorChangeType) {
-					return this._handleAppDescriptorChangeCommand(mChange, oElement, oCompositeCommand);
+					return () => this._handleAppDescriptorChangeCommand(mChange, oElement, oCompositeCommand);
+				// Annotation Change
+				} else if (mChangeSpecificData.annotationChangeType) {
+					return () => this._handleAnnotationChangeCommand(mChange, oElement, oCompositeCommand);
 				}
 				return undefined;
 			}, this);
 		}.bind(this))
 
 		.then(function(aPromises) {
-			return Promise.all(aPromises);
+			// Since oCompositeCommand gets modified by each handler, the promise execution must be sequential
+			// to ensure the correct order of the commands
+			return FlUtils.execPromiseQueueSequentially(aPromises);
 		})
 
 		.then(function() {
@@ -255,7 +279,7 @@ sap.ui.define([
 
 		const aMenuItems = [];
 		if (vSettingsActions) {
-			const iRank = 110;
+			const iRank = this.getRank("CTX_SETTINGS");
 
 			if (vSettingsActions.handler) {
 				vSettingsActions = {

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.46
@@ -154,7 +154,7 @@ sap.ui.define([
 	 * @return {object[]} - array of the items with required data
 	 */
 	Split.prototype.getMenuItems = function(vElementOverlays) {
-		return this._getMenuItems(vElementOverlays, {pluginId: "CTX_UNGROUP_FIELDS", rank: 100, icon: "sap-icon://split"});
+		return this._getMenuItems(vElementOverlays, {pluginId: "CTX_UNGROUP_FIELDS", icon: "sap-icon://split"});
 	};
 
 	/**

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.plugin.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * handled by the AdditionalElements Plugin (Reveal, Add Via Delegate, Add Custom)
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 * @private
 	 * @since 1.94
 	 */

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @class Context - Dialog for available Fields in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.44

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

@@ -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.126.1
+	 * @version 1.128.0
 	 * @constructor
 	 * @private
 	 * @since 1.44
@@ -608,7 +608,7 @@ sap.ui.define([
 				enabled: bHasSubMenu || function(bOverlayIsSibling, aElementOverlays) {
 					return this.isEnabled(aElementOverlays, bOverlayIsSibling, sAggregationName);
 				}.bind(this, bOverlayIsSibling),
-				rank: 20,
+				rank: this.getRank(sPluginId),
 				icon: "sap-icon://add",
 				handler: vHandler
 			};

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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * Helper object containing methods for the AdditionalElements plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.126.1
+	 * @version 1.128.0
 	 * @private
 	 * @since 1.94
 	 */