@openui5/sap.ui.rta 1.108.2 → 1.110.0

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -14,10 +14,12 @@ sap.ui.define([
 	"sap/ui/dt/Util",
 	"sap/ui/fl/Utils",
 	"sap/ui/fl/Layer",
+	"sap/ui/fl/apply/api/ControlVariantApplyAPI",
 	"sap/ui/fl/variants/VariantManagement",
 	"sap/ui/fl/write/api/ContextSharingAPI",
 	"sap/ui/base/ManagedObject",
-	"sap/base/Log"
+	"sap/base/Log",
+	"sap/m/MessageBox"
 ], function(
 	Plugin,
 	RenameHandler,
@@ -28,10 +30,12 @@ sap.ui.define([
 	DtUtil,
 	flUtils,
 	Layer,
+	ControlVariantApplyAPI,
 	VariantManagement,
 	ContextSharingAPI,
 	ManagedObject,
-	Log
+	Log,
+	MessageBox
 ) {
 	"use strict";
 
@@ -43,7 +47,7 @@ sap.ui.define([
 	 * @class The ControlVariant allows propagation of variantManagement key
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.50
@@ -75,6 +79,28 @@ sap.ui.define([
 		}
 	});
 
+	function getCommandForSave(oOverlay) {
+		var oElement = oOverlay.getElement();
+		var oDesignTimeMetadata = oOverlay.getDesignTimeMetadata();
+		var oModel = this._getVariantModel(oElement);
+		var sVariantManagementReference = oOverlay.getVariantManagement();
+
+		return this.getCommandFactory().getCommandFor(oElement, "save", {
+			model: oModel
+		}, oDesignTimeMetadata, sVariantManagementReference);
+	}
+
+	function getCommandForSwitch(oOverlay, sNewVariantReference, sCurrentVariantReference, bDiscardVariantContent) {
+		var oElement = oOverlay.getElement();
+		var oDesignTimeMetadata = oOverlay.getDesignTimeMetadata();
+
+		return this.getCommandFactory().getCommandFor(oElement, "switch", {
+			targetVariantReference: sNewVariantReference,
+			sourceVariantReference: sCurrentVariantReference,
+			discardVariantContent: bDiscardVariantContent
+		}, oDesignTimeMetadata);
+	}
+
 	/**
 	 * Registers an overlay.
 	 *
@@ -123,7 +149,7 @@ sap.ui.define([
 		}
 	};
 
-	ControlVariant.prototype._isPersonalizationMode = function () {
+	ControlVariant.prototype._isPersonalizationMode = function() {
 		return this.getCommandFactory().getFlexSettings().layer === Layer.USER;
 	};
 
@@ -180,7 +206,7 @@ sap.ui.define([
 
 	ControlVariant.prototype._getVariantModel = function(oElement) {
 		var oAppComponent = flUtils.getAppComponentForControl(oElement);
-		return oAppComponent ? oAppComponent.getModel(flUtils.VARIANT_MODEL_NAME) : undefined;
+		return oAppComponent ? oAppComponent.getModel(ControlVariantApplyAPI.getVariantModelName()) : undefined;
 	};
 
 	/**
@@ -195,7 +221,7 @@ sap.ui.define([
 		return this._isVariantManagementControl(oOverlay) && this.hasStableId(oOverlay);
 	};
 
-	ControlVariant.prototype._isVariantManagementControl = function (oOverlay) {
+	ControlVariant.prototype._isVariantManagementControl = function(oOverlay) {
 		var oElement = oOverlay.getElement();
 		var vAssociationElement = oElement.getAssociation("for");
 		return !!(vAssociationElement && oElement instanceof VariantManagement);
@@ -207,7 +233,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isVariantSwitchAvailable = function (oElementOverlay) {
+	ControlVariant.prototype.isVariantSwitchAvailable = function(oElementOverlay) {
 		return this._isVariantManagementControl(oElementOverlay);
 	};
 
@@ -217,7 +243,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if enabled
 	 * @public
 	 */
-	ControlVariant.prototype.isVariantSwitchEnabled = function (aElementOverlays) {
+	ControlVariant.prototype.isVariantSwitchEnabled = function(aElementOverlays) {
 		var oElementOverlay = aElementOverlays[0];
 		var aVariants = [];
 		if (this._isVariantManagementControl(oElementOverlay)) {
@@ -244,7 +270,7 @@ sap.ui.define([
 	/**
 	 * @override
 	 */
-	ControlVariant.prototype.setDesignTime = function (oDesignTime) {
+	ControlVariant.prototype.setDesignTime = function(oDesignTime) {
 		RenameHandler._setDesignTime.call(this, oDesignTime);
 	};
 
@@ -255,7 +281,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isRenameAvailable = function (oElementOverlay) {
+	ControlVariant.prototype.isRenameAvailable = function(oElementOverlay) {
 		return this._isVariantManagementControl(oElementOverlay);
 	};
 
@@ -265,7 +291,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isRenameEnabled = function (aElementOverlays) {
+	ControlVariant.prototype.isRenameEnabled = function(aElementOverlays) {
 		return this._isVariantManagementControl(aElementOverlays[0]);
 	};
 
@@ -275,7 +301,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isVariantSaveAvailable = function (oElementOverlay) {
+	ControlVariant.prototype.isVariantSaveAvailable = function(oElementOverlay) {
 		return this._isVariantManagementControl(oElementOverlay);
 	};
 
@@ -285,7 +311,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isVariantSaveEnabled = function (aElementOverlays) {
+	ControlVariant.prototype.isVariantSaveEnabled = function(aElementOverlays) {
 		var oOverlay = aElementOverlays[0];
 		var oElement = oOverlay.getElement();
 		var oModel = this._getVariantModel(oElement);
@@ -299,7 +325,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isVariantSaveAsAvailable = function (oElementOverlay) {
+	ControlVariant.prototype.isVariantSaveAsAvailable = function(oElementOverlay) {
 		return this._isVariantManagementControl(oElementOverlay);
 	};
 
@@ -309,7 +335,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isVariantSaveAsEnabled = function (aElementOverlays) {
+	ControlVariant.prototype.isVariantSaveAsEnabled = function(aElementOverlays) {
 		return this._isVariantManagementControl(aElementOverlays[0]);
 	};
 
@@ -319,7 +345,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isVariantConfigureAvailable = function (oElementOverlay) {
+	ControlVariant.prototype.isVariantConfigureAvailable = function(oElementOverlay) {
 		return this._isVariantManagementControl(oElementOverlay);
 	};
 
@@ -329,7 +355,7 @@ sap.ui.define([
 	 * @return {boolean} <code>true</code> if available
 	 * @public
 	 */
-	ControlVariant.prototype.isVariantConfigureEnabled = function (aElementOverlays) {
+	ControlVariant.prototype.isVariantConfigureEnabled = function(aElementOverlays) {
 		return this._isVariantManagementControl(aElementOverlays[0]);
 	};
 
@@ -342,23 +368,72 @@ sap.ui.define([
 	 * @public
 	 */
 	ControlVariant.prototype.switchVariant = function(oTargetOverlay, sNewVariantReference, sCurrentVariantReference) {
-		var oDesignTimeMetadata = oTargetOverlay.getDesignTimeMetadata();
 		var oTargetElement = oTargetOverlay.getElement();
+		var oLibraryBundle = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
 
-		this.getCommandFactory().getCommandFor(oTargetElement, "switch", {
-			targetVariantReference: sNewVariantReference,
-			sourceVariantReference: sCurrentVariantReference
-		}, oDesignTimeMetadata)
+		function onDirtySwitchWarningClose(sAction) {
+			if (sAction === MessageBox.Action.CANCEL) {
+				return;
+			}
 
-		.then(function(oSwitchCommand) {
-			this.fireElementModified({
-				command: oSwitchCommand
-			});
-		}.bind(this))
+			if (sAction === oLibraryBundle.getText("BTN_MODIFIED_VARIANT_SAVE")) {
+				var oCompositeCommand;
+				this.getCommandFactory().getCommandFor(oTargetElement, "composite")
+				.then(function(_oCompositeCommand) {
+					oCompositeCommand = _oCompositeCommand;
+					return getCommandForSave.call(this, oTargetOverlay);
+				}.bind(this))
+				.then(function(oSaveCommand) {
+					oCompositeCommand.addCommand(oSaveCommand);
+					return getCommandForSwitch.call(this, oTargetOverlay, sNewVariantReference, sCurrentVariantReference);
+				}.bind(this))
+				.then(function(oSwitchCommand) {
+					oCompositeCommand.addCommand(oSwitchCommand);
+					this.fireElementModified({
+						command: oCompositeCommand
+					});
+				}.bind(this));
+			}
 
-		.catch(function(oMessage) {
-			throw DtUtil.createError("ControlVariant#switchVariant", oMessage, "sap.ui.rta");
-		});
+			if (sAction === oLibraryBundle.getText("BTN_MODIFIED_VARIANT_DISCARD")) {
+				getCommandForSwitch.call(
+					this,
+					oTargetOverlay,
+					sNewVariantReference,
+					sCurrentVariantReference,
+					true // discard variant content
+				)
+				.then(function(oSwitchCommand) {
+					this.fireElementModified({
+						command: oSwitchCommand
+					});
+				}.bind(this));
+			}
+		}
+
+		if (oTargetElement.getModified()) {
+			MessageBox.warning(oLibraryBundle.getText("MSG_CHANGE_MODIFIED_VARIANT"), {
+				onClose: onDirtySwitchWarningClose.bind(this),
+				actions: [
+					oLibraryBundle.getText("BTN_MODIFIED_VARIANT_SAVE"),
+					oLibraryBundle.getText("BTN_MODIFIED_VARIANT_DISCARD"),
+					MessageBox.Action.CANCEL
+				],
+				emphasizedAction: oLibraryBundle.getText("BTN_MODIFIED_VARIANT_SAVE"),
+				styleClass: Utils.getRtaStyleClassName()
+			});
+		} else {
+			getCommandForSwitch.call(this, oTargetOverlay, sNewVariantReference, sCurrentVariantReference)
+				.then(function(oSwitchCommand) {
+					this.fireElementModified({
+						command: oSwitchCommand
+					});
+				}.bind(this))
+
+				.catch(function(oMessage) {
+					throw DtUtil.createError("ControlVariant#switchVariant", oMessage, "sap.ui.rta");
+				});
+		}
 	};
 
 	/**
@@ -366,7 +441,7 @@ sap.ui.define([
 	 * @param {sap.ui.dt.ElementOverlay[]} aElementOverlays - Target overlays
 	 * @public
 	 */
-	ControlVariant.prototype.renameVariant = function (aElementOverlays) {
+	ControlVariant.prototype.renameVariant = function(aElementOverlays) {
 		this.startEdit(aElementOverlays[0]);
 	};
 
@@ -379,20 +454,13 @@ sap.ui.define([
 		});
 	};
 
-	ControlVariant.prototype.stopEdit = function (bRestoreFocus) {
+	ControlVariant.prototype.stopEdit = function(bRestoreFocus) {
 		RenameHandler._stopEdit.call(this, bRestoreFocus, "plugin.ControlVariant.stopEdit");
 	};
 
-	ControlVariant.prototype.createSaveCommand = function (aElementOverlays) {
+	ControlVariant.prototype.createSaveCommand = function(aElementOverlays) {
 		var oOverlay = aElementOverlays[0];
-		var oElement = oOverlay.getElement();
-		var oDesignTimeMetadata = oOverlay.getDesignTimeMetadata();
-		var oModel = this._getVariantModel(oElement);
-		var sVariantManagementReference = oOverlay.getVariantManagement();
-
-		return this.getCommandFactory().getCommandFor(oElement, "save", {
-			model: oModel
-		}, oDesignTimeMetadata, sVariantManagementReference)
+		return getCommandForSave.call(this, oOverlay)
 			.then(function(oSaveCommand) {
 				this.fireElementModified({
 					command: oSaveCommand
@@ -400,7 +468,7 @@ sap.ui.define([
 			}.bind(this));
 	};
 
-	ControlVariant.prototype.createSaveAsCommand = function (aElementOverlays) {
+	ControlVariant.prototype.createSaveAsCommand = function(aElementOverlays) {
 		var oOverlay = aElementOverlays[0];
 		var oElement = oOverlay.getElement();
 		var oDesignTimeMetadata = oOverlay.getDesignTimeMetadata();
@@ -450,7 +518,7 @@ sap.ui.define([
 	 * @returns {object} setTitle command
 	 * @private
 	 */
-	ControlVariant.prototype._createSetTitleCommand = function (mPropertyBag) {
+	ControlVariant.prototype._createSetTitleCommand = function(mPropertyBag) {
 		this._$oEditableControlDomRef.text(mPropertyBag.text);
 
 		return this.getCommandFactory().getCommandFor(mPropertyBag.element, "setTitle", {
@@ -468,15 +536,15 @@ sap.ui.define([
 	 * @param {string} sValueStateText value state text that needs to be set
 	 * @private
 	 */
-	ControlVariant.prototype._prepareOverlayForValueState = function (oOverlay, sValueStateText) {
+	ControlVariant.prototype._prepareOverlayForValueState = function(oOverlay, sValueStateText) {
 		//Prepare VariantManagement control overlay for valueStateMessage
-		oOverlay.getValueState = function () {
+		oOverlay.getValueState = function() {
 			return "Error";
 		};
-		oOverlay.getValueStateText = function () {
+		oOverlay.getValueStateText = function() {
 			return sValueStateText;
 		};
-		oOverlay.getDomRefForValueStateMessage = function () {
+		oOverlay.getDomRefForValueStateMessage = function() {
 			return this.$();
 		};
 	};
@@ -487,7 +555,7 @@ sap.ui.define([
 	 * @returns {Promise} Resolving when the dialog is closed and the command is created
 	 * @public
 	 */
-	ControlVariant.prototype.configureVariants = function (aElementOverlays) {
+	ControlVariant.prototype.configureVariants = function(aElementOverlays) {
 		var oElementOverlay = aElementOverlays[0];
 		var oVariantManagementControl = oElementOverlay.getElement();
 		var sVariantManagementReference = oElementOverlay.getVariantManagement();
@@ -536,7 +604,7 @@ sap.ui.define([
 	 * @param {sap.ui.dt.ElementOverlay[]} aElementOverlays - Target overlays
 	 * @return {object[]} - array containing the items with required data
 	 */
-	ControlVariant.prototype.getMenuItems = function (aElementOverlays) {
+	ControlVariant.prototype.getMenuItems = function(aElementOverlays) {
 		var oElementOverlay = aElementOverlays[0];
 		var aMenuItems = [];
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -31,7 +31,7 @@ function(
 	 * @extends sap.ui.dt.plugin.CutPaste
 	 *
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 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.108.2
+	 * @version 1.110.0
 	 *
 	 * @constructor
 	 * @private
@@ -121,7 +121,7 @@ function(
 			oOverlay.setSelected(false);
 		});
 
-		oOverlay.$().addClass("sapUiRtaOverlayPlaceholder");
+		oOverlay.getDomRef().classList.add("sapUiRtaOverlayPlaceholder");
 	};
 
 	/**
@@ -138,7 +138,7 @@ function(
 				command: oCommand
 			});
 
-			oOverlay.$().removeClass("sapUiRtaOverlayPlaceholder");
+			oOverlay.getDomRef().classList.remove("sapUiRtaOverlayPlaceholder");
 			oOverlay.setSelected(true);
 			oOverlay.focus();
 

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

@@ -1,19 +1,17 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 sap.ui.define([
 	"sap/ui/rta/plugin/additionalElements/AdditionalElementsPlugin",
 	"sap/ui/dt/OverlayRegistry",
-	"sap/m/Button",
-	"sap/ui/thirdparty/jquery"
+	"sap/m/Button"
 ], function(
 	AdditionalElementsPlugin,
 	OverlayRegistry,
-	Button,
-	jQuery
+	Button
 ) {
 	"use strict";
 
@@ -25,7 +23,7 @@ sap.ui.define([
 	 * @class The EasyAdd Plugin adds an Icon to an Overlay, which allows to trigger add operations directly
 	 * @extends sap.ui.rta.plugin.additionalElements.AdditionalElementsPlugin
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.48
@@ -54,7 +52,9 @@ sap.ui.define([
 			oControl.addStyleClass("sapUiRtaMarginBottom");
 		} else if (oControl.getMetadata().getName() === "sap.uxap.ObjectPageLayout" && this.hasStableId(oOverlay)) {
 			oOverlay.addStyleClass("sapUiRtaPersAddTop");
-			oControl.$("sectionsContainer").addClass("sapUiRtaPaddingTop");
+			oControl.getDomRef().querySelectorAll("[id*='sectionsContainer']").forEach(function(oNode) {
+				oNode.classList.add("sapUiRtaPaddingTop");
+			});
 		}
 
 		var onAddPressed = function(bOverlayIsSibling, oOverlay, iIndex) {
@@ -82,14 +82,16 @@ sap.ui.define([
 		}.bind(this);
 
 		if (oOverlay.hasStyleClass("sapUiRtaPersAdd")) {
-			var bAddButton = oOverlay.hasStyleClass("sapUiRtaPersAdd") && oOverlay.$().children(".sapUiRtaPersAddIconOuter").length <= 0;
+			var aChildren = Array.from(oOverlay.getDomRef().querySelectorAll(":scope > .sapUiRtaPersAddIconOuter"));
+			var bAddButton = oOverlay.hasStyleClass("sapUiRtaPersAdd") && aChildren.length === 0;
 			if (bAddButton) {
-				fnAddButton(oOverlay, oOverlay.$(), true, oOverlay.getDesignTimeMetadata().getName().singular);
+				fnAddButton(oOverlay, oOverlay.getDomRef(), true, oOverlay.getDesignTimeMetadata().getName().singular);
 			}
 		} else if (oOverlay.hasStyleClass("sapUiRtaPersAddTop")) {
-			if (oOverlay.getAggregationOverlay("sections").$().children(".sapUiRtaPersAddIconOuter").length <= 0) {
-				var $SectionsOverlay = oOverlay.getAggregationOverlay("sections").$();
-				fnAddButton(oOverlay, $SectionsOverlay, false, oOverlay.getDesignTimeMetadata().getAggregation("sections").childNames.singular, 0);
+			var aChildren = Array.from(oOverlay.getAggregationOverlay("sections").getDomRef().querySelectorAll(":scope > .sapUiRtaPersAddIconOuter"));
+			if (aChildren.length === 0) {
+				var oSectionsOverlayDOM = oOverlay.getAggregationOverlay("sections").getDomRef();
+				fnAddButton(oOverlay, oSectionsOverlayDOM, false, oOverlay.getDesignTimeMetadata().getAggregation("sections").childNames.singular, 0);
 			}
 		}
 
@@ -112,7 +114,9 @@ sap.ui.define([
 			oControl.removeStyleClass("sapUiRtaMarginBottom");
 		} else if (oControl.getMetadata().getName() === "sap.uxap.ObjectPageLayout") {
 			oOverlay.removeStyleClass("sapUiRtaPersAddTop");
-			oControl.$("sectionsContainer").removeClass("sapUiRtaPaddingTop");
+			oControl.getDomRef().querySelectorAll("[id*='sectionsContainer']").forEach(function(oNode) {
+				oNode.classList.remove("sapUiRtaPaddingTop");
+			});
 		}
 
 		AdditionalElementsPlugin.prototype.deregisterElementOverlay.apply(this, arguments);
@@ -133,7 +137,9 @@ sap.ui.define([
 				if (bIsLayout) {
 					var oLayout = oOverlay.getElement();
 					oLayout.attachEventOnce("onAfterRenderingDOMReady", function() {
-						oLayout.$("sectionsContainer").addClass("sapUiRtaPaddingTop");
+						oLayout.getDomRef().querySelectorAll("[id*='sectionsContainer']").forEach(function(oNode) {
+							oNode.classList.add("sapUiRtaPaddingTop");
+						});
 					});
 				}
 			}
@@ -154,18 +160,21 @@ sap.ui.define([
 		var oTextResources = sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta");
 
 		var sId = oOverlay.getId() + "-AddButton";
-		var oHtmlButtonOuter = jQuery("<div class='sapUiRtaPersAddIconOuter' draggable='true' tabindex='-1'> </div>");
+		var oHtmlButtonOuter = document.createElement("div");
+		oHtmlButtonOuter.classList.add("sapUiRtaPersAddIconOuter");
+		oHtmlButtonOuter.setAttribute("draggable", "true");
+		oHtmlButtonOuter.setAttribute("tabindex", -1);
 		oOverlay._oAddButton = new Button(sId, {
 			text: oTextResources.getText("CTX_ADD_ELEMENTS", sControlName),
 			icon: "sap-icon://add",
 			enabled: bIsEditable
 		})
-			.placeAt(oHtmlButtonOuter.get(0))
+			.placeAt(oHtmlButtonOuter)
 			.attachBrowserEvent('click', fnCallback)
 			.attachBrowserEvent('tap', fnCallback);
 		oOverlayDom.append(oHtmlButtonOuter);
 
-		oHtmlButtonOuter[0].addEventListener("mouseover", function(oEvent) {
+		oHtmlButtonOuter.addEventListener("mouseover", function(oEvent) {
 			oEvent.stopPropagation();
 			var oOverlay = oEvent.fromElement ? OverlayRegistry.getOverlay(oEvent.fromElement.id) : null;
 			if (oOverlay && oOverlay.getMetadata().getName() === "sap.ui.dt.ElementOverlay") {
@@ -174,7 +183,7 @@ sap.ui.define([
 			}
 		});
 
-		oHtmlButtonOuter[0].addEventListener("mouseleave", function(oEvent) {
+		oHtmlButtonOuter.addEventListener("mouseleave", function(oEvent) {
 			oEvent.stopPropagation();
 			var oOverlay = oEvent.toElement ? OverlayRegistry.getOverlay(oEvent.toElement.id) : null;
 			if (oOverlay && oOverlay.getMetadata().getName() === "sap.ui.dt.ElementOverlay") {
@@ -185,16 +194,16 @@ sap.ui.define([
 			}
 		});
 
-		oHtmlButtonOuter[0].addEventListener("click", function(oEvent) {
+		oHtmlButtonOuter.addEventListener("click", function(oEvent) {
 			oEvent.stopPropagation();
 		});
 
-		oHtmlButtonOuter[0].addEventListener("contextmenu", function(oEvent) {
+		oHtmlButtonOuter.addEventListener("contextmenu", function(oEvent) {
 			oEvent.stopPropagation();
 			oEvent.preventDefault();
 		});
 
-		oHtmlButtonOuter[0].addEventListener("dragstart", function(oEvent) {
+		oHtmlButtonOuter.addEventListener("dragstart", function(oEvent) {
 			oEvent.stopPropagation();
 			oEvent.preventDefault();
 		});

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

@@ -1,17 +1,15 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 sap.ui.define([
 	"sap/ui/rta/plugin/Remove",
-	"sap/m/Button",
-	"sap/ui/thirdparty/jquery"
+	"sap/m/Button"
 ], function(
 	Remove,
-	Button,
-	jQuery
+	Button
 ) {
 	"use strict";
 
@@ -23,7 +21,7 @@ sap.ui.define([
 	 * @class The EasyRemove Plugin adds an Icon to an Overlay, which allows to trigger remove operations directly
 	 * @extends sap.ui.rta.plugin.Remove
 	 * @author SAP SE
-	 * @version 1.108.2
+	 * @version 1.110.0
 	 * @constructor
 	 * @private
 	 * @since 1.48
@@ -51,6 +49,7 @@ sap.ui.define([
 			oOverlay.addStyleClass("sapUiRtaPersDelete");
 		}
 
+		//TODO: check this, this makes no sense; length is always 0
 		if (oOverlay.hasStyleClass("sapUiRtaPersDelete") && oOverlay.$().children(".sapUiRtaPersDeleteClick").length <= 0) {
 			var onDeletePressed = function(oOverlay) {
 				this.handler([oOverlay]);
@@ -93,18 +92,21 @@ sap.ui.define([
 	EasyRemove.prototype._addButton = function(oOverlay) {
 		var bEnabled = this.isEnabled([oOverlay]);
 		var sId = oOverlay.getId() + "-DeleteIcon";
-		var oHtmlIconWrapper = jQuery("<div class='sapUiRtaPersDeleteClick' draggable='true'> </div>");
-		var oHtmlIconOuter = jQuery("<div class='sapUiRtaPersDeleteIconOuter'> </div>");
+		var oHtmlIconWrapper = document.createElement("div");
+		oHtmlIconWrapper.classList.add("sapUiRtaPersDeleteClick");
+		oHtmlIconWrapper.setAttribute("draggable", "true");
+		var oHtmlIconOuter = document.createElement("div");
+		oHtmlIconOuter.classList.add("sapUiRtaPersDeleteIconOuter");
 
 		oOverlay._oDeleteButton = new Button(sId, {
 			icon: "sap-icon://less",
 			tooltip: sap.ui.getCore().getLibraryResourceBundle("sap.ui.rta").getText("CTX_REMOVE"),
 			enabled: bEnabled
-		}).placeAt(oHtmlIconOuter.get(0));
+		}).placeAt(oHtmlIconOuter);
 		oHtmlIconWrapper.append(oHtmlIconOuter);
-		oOverlay.$().append(oHtmlIconWrapper);
+		oOverlay.getDomRef().append(oHtmlIconWrapper);
 
-		oHtmlIconWrapper[0].addEventListener("dragstart", function(oEvent) {
+		oHtmlIconWrapper.addEventListener("dragstart", function(oEvent) {
 			oEvent.stopPropagation();
 			oEvent.preventDefault();
 		});