@openui5/sap.ui.rta 1.96.2 → 1.98.0

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -55,7 +55,7 @@ sap.ui.define([
 	 * Provides Rename handling functionality
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @private
@@ -311,19 +311,10 @@ sap.ui.define([
 			});
 		},
 
-		/**
-		 * @param {sap.ui.base.Event} oEvent - event object
-		 * @private
-		 */
 		_onEditableFieldBlur: function () {
 			return RenameHandler._handlePostRename.call(this, false);
 		},
 
-		/**
-		 * Handles events after rename has been performed
-		 * @param {boolean} bRestoreFocus - to restore focus to overlay after rename completes
-		 * @private
-		 */
 		_handlePostRename: function (bRestoreFocus, oEvent) {
 			if (!this._bBlurOrKeyDownStarted) {
 				this._oEditedOverlay.removeStyleClass(RenameHandler.errorStyleClass);
@@ -399,10 +390,6 @@ sap.ui.define([
 			}
 		},
 
-		/**
-		 * @param {sap.ui.base.Event} oEvent - event object
-		 * @private
-		 */
 		_onEditableFieldKeydown: function (oEvent) {
 			switch (oEvent.keyCode) {
 				case KeyCodes.ENTER:

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -9,20 +9,16 @@ sap.ui.define([
 	"sap/ui/rta/Utils",
 	"sap/ui/dt/OverlayRegistry",
 	"sap/ui/events/KeyCodes",
-	"sap/ui/dt/Overlay",
 	"sap/base/util/restricted/_intersection",
-	"sap/m/InstanceManager",
-	"sap/ui/Device"
+	"sap/m/InstanceManager"
 ],
 function (
 	Plugin,
 	Utils,
 	OverlayRegistry,
 	KeyCodes,
-	Overlay,
 	_intersection,
-	InstanceManager,
-	Device
+	InstanceManager
 ) {
 	"use strict";
 
@@ -34,7 +30,7 @@ function (
 	 * @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.96.2
+	 * @version 1.98.0
 	 * @constructor
 	 * @private
 	 * @since 1.34
@@ -125,6 +121,18 @@ function (
 		return false;
 	};
 
+	/**
+	 * Sets the value of the isActive property.
+	 * When set to false, de-select all overlays.
+	 * @param {boolean} bValue - Value to be set
+	 */
+	Selection.prototype.setIsActive = function(bValue) {
+		this.setProperty("isActive", bValue);
+		if (bValue === false) {
+			this._deselectOverlays();
+		}
+	};
+
 	/**
 	 * Register an overlay
 	 *
@@ -289,25 +297,6 @@ function (
 			});
 			return;
 		}
-		// set focus after clicking, needed only for internet explorer
-		if (Device.browser.name === "ie") {
-			// when the EasyAdd Button is clicked, we don't want to focus/stopPropagation.
-			// but when the OverlayScrollContainer is the target, we want it to behave like a click on an overlay
-			var oTarget = OverlayRegistry.getOverlay(oEvent.target.id);
-			var bTargetIsScrollContainer = jQuery(oEvent.target).hasClass("sapUiDtOverlayScrollContainer");
-			var oOverlay = OverlayRegistry.getOverlay(oEvent.currentTarget.id);
-			if (
-				oOverlay
-				&& (bTargetIsScrollContainer || oTarget instanceof Overlay)
-			) {
-				if (oOverlay.getSelectable()) {
-					oOverlay.focus();
-					oEvent.stopPropagation();
-				} else {
-					oOverlay.getDomRef().blur();
-				}
-			}
-		}
 	};
 
 	/**

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 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 Settings allows trigger change of settings operations on the overlay
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @constructor
 	 * @private
 	 * @since 1.44

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 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.96.2
+	 * @version 1.98.0
 	 * @constructor
 	 * @private
 	 * @since 1.46
@@ -115,6 +115,7 @@ sap.ui.define([
 
 	/**
 	 * @param {sap.ui.dt.ElementOverlay} oElementOverlay - element overlay to split
+	 * @returns {Promise<sap.ui.rta.command.Split>} Resolves with a split command
 	 */
 	Split.prototype.handleSplit = function (oElementOverlay) {
 		var oSplitElement = oElementOverlay.getElement();

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 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([
 	 * @extends sap.ui.rta.plugin.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 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.96.2
+	 * @version 1.98.0
 	 * @private
 	 * @since 1.94
 	 * @experimental Since 1.94. This class is experimental and provides only limited functionality. Also the API might be changed in future.
@@ -82,12 +82,20 @@ sap.ui.define([
 	function checkInvalidAddActions(bSibling, oSourceElementOverlay, oPlugin) {
 		var mParents = AdditionalElementsUtils.getParents(bSibling, oSourceElementOverlay, oPlugin);
 		var oDesignTimeMetadata = mParents.parentOverlay && mParents.parentOverlay.getDesignTimeMetadata();
-		var aActions = oDesignTimeMetadata ? oDesignTimeMetadata.getActionDataFromAggregations("addODataProperty", mParents.parent) : [];
-		if (aActions.length > 0) {
+		var aAddODataPropertyActions = oDesignTimeMetadata ? oDesignTimeMetadata.getActionDataFromAggregations("addODataProperty", mParents.parent) : [];
+		if (aAddODataPropertyActions.length > 0) {
 			Log.error("Outdated addODataProperty action in designtime metadata in "
 				+ oDesignTimeMetadata.getData().designtimeModule
 				+ " or propagated or via instance specific designtime metadata.");
 		}
+		var aAddActions = oDesignTimeMetadata ? oDesignTimeMetadata.getActionDataFromAggregations("add", mParents.parent) : [];
+		aAddActions.forEach(function(mAddAction) {
+			if (mAddAction["custom"]) {
+				Log.error("Outdated custom add action in designtime metadata in "
+					+ oDesignTimeMetadata.getData().designtimeModule
+					+ " or propagated or via instance specific designtime metadata.");
+			}
+		});
 	}
 
 	function getInvisibleElements (oParentOverlay, sAggregationName, oPlugin) {
@@ -288,7 +296,7 @@ sap.ui.define([
 	}
 
 	/**
-	 * Calculate a structure with all "add/reveal/custom" action relevant data collected per aggregation:
+	 * Calculate a structure with all "add/reveal" action relevant data collected per aggregation:
 	 * <pre>
 	 * {
 	 *	<aggregationName> : {
@@ -304,11 +312,6 @@ sap.ui.define([
 	 *				sourceAggregation: <aggregation where this element is currently located>
 	 *			}],
 	 *			controlTypeNames : string[] <all controlTypeNames collected via designTimeMetadata>
-	 *		},
-	 *		addViaCustom : {
-	 *			designTimeMetadata : <sap.ui.dt.ElementDesignTimeMetadata of parent>,
-	 *			action : <add.custom action section from designTimeMetadata>
-	 *			items : <add.custom action's array of items from the getItems() function>
 	 *		}
 	 *	},
 	 *	<aggregationName2> : ...
@@ -320,7 +323,7 @@ sap.ui.define([
 	 * @param {sap.ui.rta.plugin.additionalElements.AdditionalElementsPlugin} oPlugin - Instance of the AdditionalElementsPlugin
 	 * @param {boolean} [bInvalidate] - Option to prevent cached actions to be returned
 	 *
-	 * @return {Promise} Resolving to a structure with all "add/reveal/custom" action relevant data collected
+	 * @return {Promise} Resolving to a structure with all "add/reveal" action relevant data collected
 	 */
 	ActionExtractor.getActions = function(bSibling, oSourceElementOverlay, oPlugin, bInvalidate) {
 		var sSiblingOrChild = bSibling ? "asSibling" : "asChild";
@@ -330,16 +333,14 @@ sap.ui.define([
 
 		var oRevealActionsPromise = this._getRevealActions(bSibling, oSourceElementOverlay, oPlugin);
 		var oAddPropertyActionsPromise = this._getAddViaDelegateActions(bSibling, oSourceElementOverlay, oPlugin);
-		var oCustomAddActionsPromise = this._getCustomAddActions(bSibling, oSourceElementOverlay, oPlugin);
 
 		return Promise.all([
 			oRevealActionsPromise,
 			oAddPropertyActionsPromise,
-			oCustomAddActionsPromise,
 			checkInvalidAddActions(bSibling, oSourceElementOverlay, oPlugin)
 		]).then(function(aAllActions) {
 			//join and condense all action data
-			var mAllActions = merge(aAllActions[0], aAllActions[1], aAllActions[2]);
+			var mAllActions = merge(aAllActions[0], aAllActions[1]);
 			oSourceElementOverlay._mAddActions = oSourceElementOverlay._mAddActions || {asSibling: {}, asChild: {}};
 			oSourceElementOverlay._mAddActions[sSiblingOrChild] = mAllActions;
 			return mAllActions;
@@ -350,7 +351,7 @@ sap.ui.define([
 	 * Returns the already calculated actions of an Overlay, or undefined if no actions available
 	 * @param {boolean} bSibling - Indicates if the elements should be added as sibling (true) or child (false) to the overlay
 	 * @param {sap.ui.dt.ElementOverlay} oOverlay - Elements will be added in relation (sibling/parent) to this overlay
-	 * @returns {object/undefined} - Object with all "add/reveal/custom" action relevant data collected or undefined if no actions available
+	 * @returns {object/undefined} - Object with all "add/reveal" action relevant data collected or undefined if no actions available
 	 */
 	ActionExtractor.getActionsOrUndef = function(bSibling, oOverlay) {
 		var sSiblingOrChild = bSibling ? "asSibling" : "asChild";
@@ -431,75 +432,5 @@ sap.ui.define([
 			}.bind(this));
 	};
 
-	/**
-	 * Return the CustomAdd action data (parameters + elements) for an Overlay.
-	 * @param {boolean} bSibling - If source element overlay should be sibling or parent to the newly added fields
-	 * @param {sap.ui.dt.ElementOverlay} oOverlay - Overlay where the action is triggered
-	 * @param {sap.ui.rta.plugin.additionalElements.AdditionalElementsPlugin} oPlugin - Instance of the AdditionalElementsPlugin
-	 *
-	 * @returns {Promise<object>} CustomAdd action data
-	 */
-	ActionExtractor._getCustomAddActions = function(bSibling, oOverlay, oPlugin) {
-		var mParents = AdditionalElementsUtils.getParents(bSibling, oOverlay, oPlugin);
-		var oDesignTimeMetadata = mParents.parentOverlay && mParents.parentOverlay.getDesignTimeMetadata();
-		var aActions = oDesignTimeMetadata && oDesignTimeMetadata.getActionDataFromAggregations("add", mParents.parent, undefined, "custom") || [];
-
-		function getAction(mAction, oCheckElement) {
-			var aItems = [];
-			return Promise.resolve()
-				.then(function () {
-					if (mAction && typeof mAction.getItems === "function") {
-						var oCheckElementOverlay = OverlayRegistry.getOverlay(oCheckElement);
-						if (oPlugin.hasStableId(oCheckElementOverlay)) {
-							return mAction.getItems(oCheckElement);
-						}
-					}
-					return aItems;
-				})
-				.then(function (aItemsFromAction) {
-					aItems = aItemsFromAction || [];
-					var aChangeHandlerPromises = aItems.reduce(function (aPromises, oItem) {
-						// adjust relevant container
-						if (oItem.changeSpecificData.changeOnRelevantContainer) {
-							oCheckElement = mParents.relevantContainer;
-						}
-						if (oItem.changeSpecificData.changeType) {
-							aPromises.push(oPlugin.hasChangeHandler(oItem.changeSpecificData.changeType, oCheckElement));
-						}
-						return aPromises;
-					}, []);
-
-					return Promise.all(aChangeHandlerPromises);
-				})
-				.then(function (aHasChangeHandlerForCustomItems) {
-					if (aHasChangeHandlerForCustomItems.indexOf(false) === -1) {
-						return {
-							aggregationName: mAction.aggregation,
-							addViaCustom: {
-								designTimeMetadata: oDesignTimeMetadata,
-								action: mAction,
-								items: aItems
-							}
-						};
-					}
-					return undefined;
-				});
-		}
-
-		var oCheckElement = mParents.parent;
-		return aActions.reduce(function(oPreviousPromise, oAction) {
-			return oPreviousPromise.then(function(oReturn) {
-				return getAction.call(this, oAction, oCheckElement).then(function(mAction) {
-					if (mAction) {
-						oReturn[mAction.aggregationName] = {
-							addViaCustom: mAction.addViaCustom
-						};
-					}
-					return oReturn;
-				});
-			}.bind(this));
-		}.bind(this), Promise.resolve({}));
-	};
-
 	return ActionExtractor;
 });

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

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

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -126,15 +126,6 @@ sap.ui.define([
 		});
 	}
 
-	function _assignCustomItemIds(sParentId, oCustomItem) {
-		oCustomItem.type = "custom";
-		if (oCustomItem.id) {
-			oCustomItem.itemId = sParentId + "-" + oCustomItem.id;
-			oCustomItem.key = oCustomItem.itemId;
-		}
-		return oCustomItem;
-	}
-
 	function _oPropertyToAdditionalElementInfo (oProperty) {
 		return {
 			selected: false,
@@ -409,18 +400,6 @@ sap.ui.define([
 		return bIncludeElement;
 	}
 
-	function _enhanceByCustomItems(oInvisibleElement, mActions, bIncludeElement, oElement) {
-		var mCustom = mActions.addViaCustom;
-		if (mCustom && bIncludeElement) {
-			mCustom.items.forEach(function(oCustomItem) {
-				_assignCustomItemIds(oElement.getParent().getId(), oCustomItem);
-				if (oCustomItem.itemId === oInvisibleElement.getId()) {
-					_enhanceInvisibleElement(oInvisibleElement, oCustomItem);
-				}
-			});
-		}
-	}
-
 	function _getModelName(mAddViaDelegate) {
 		//ManagedObject jsdoc tells to use undefined for default model, therefore it
 		//is necessary to return undefined if modelName or whole delegateInfo is missing
@@ -462,8 +441,6 @@ sap.ui.define([
 
 						var bIncludeElement = _enhanceByMetadata(oElement, sAggregationName, oInvisibleElement, mActions, aRepresentedProperties, aProperties);
 
-						_enhanceByCustomItems(oInvisibleElement, mActions, bIncludeElement, oElement);
-
 						if (bIncludeElement) {
 							aAllElementData.push({
 								element: oInvisibleElement,
@@ -518,50 +495,6 @@ sap.ui.define([
 				}).then(function(aUnrepresentedProperties) {
 					return aUnrepresentedProperties.map(_oPropertyToAdditionalElementInfo);
 				});
-		},
-
-		getCustomAddItems: function(oElement, mAction) {
-			return new Promise(function(fnResolve) {
-				if (Array.isArray(mAction.items)) {
-					// remove items already rendered
-					fnResolve(
-						mAction.items
-							.map(_assignCustomItemIds.bind(null, oElement.getParent().getId()))
-							.filter(function(oCustomItem) {
-								if (!oCustomItem.id) {
-									Log.error("CustomAdd item with label " + oCustomItem.label + " does not contain an 'id' property", "sap.ui.rta.plugin.AdditionalElementsAnalyzer#showAvailableElements");
-									return false;
-								}
-								return !ElementUtil.getElementInstance(oCustomItem.itemId);
-							})
-					);
-				} else {
-					fnResolve();
-				}
-			});
-		},
-
-		getFilteredItemsList: function(aAnalyzerValues) {
-			// promise index 0: invisible, 1: addViaOData/addViaDelegate, 2: custom
-			var aInvisibleElements = aAnalyzerValues[0];
-			var iCustomItemsIndex = 2;
-			var aCustomItems = aAnalyzerValues[iCustomItemsIndex];
-			if (aCustomItems) {
-				var aInvisibleElementIds = aInvisibleElements.map(
-					function (oInvisibleItem) {
-						return oInvisibleItem.elementId;
-					}
-				);
-				// filter for hidden custom items in the array
-				aAnalyzerValues[iCustomItemsIndex] = aCustomItems
-					.filter(function(oCustomItem) {
-						return !oCustomItem.itemId || aInvisibleElementIds.indexOf(oCustomItem.itemId) === -1;
-					});
-			}
-			return aAnalyzerValues
-				.reduce(function (aAllElements, aAnalyzerValue) {
-					return aAllElements.concat(aAnalyzerValue);
-				}, []);
 		}
 	};
 	return oAnalyzer;

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -75,7 +75,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.96.2
+	 * @version 1.98.0
 	 * @constructor
 	 * @private
 	 * @since 1.44
@@ -173,7 +173,6 @@ sap.ui.define([
 				if (
 					mActions &&
 					((mActions.reveal && mActions.reveal.elements.length > 0)
-					|| mActions.addViaCustom
 					|| mActions.addViaDelegate)
 				) {
 					bIsEnabled = true;
@@ -357,7 +356,7 @@ sap.ui.define([
 										if (mActions[sAggregationName].addViaDelegate) {
 											bEditable = this.checkAggregationsOnSelf(mParents.parentOverlay, "add", undefined, "delegate");
 										}
-										if (!bEditable && (mActions[sAggregationName].reveal || mActions[sAggregationName].addViaCustom)) {
+										if (!bEditable && mActions[sAggregationName].reveal) {
 											return true;
 										}
 										return bEditable;
@@ -410,8 +409,7 @@ sap.ui.define([
 							aggregation: sAggregationName,
 							elementPromises: [
 								mActions.reveal ? AdditionalElementsAnalyzer.enhanceInvisibleElements(mParents.parent, mActions) : Promise.resolve([]),
-								mActions.addViaDelegate ? AdditionalElementsAnalyzer.getUnrepresentedDelegateProperties(mParents.parent, mActions.addViaDelegate) : Promise.resolve([]),
-								mActions.addViaCustom ? AdditionalElementsAnalyzer.getCustomAddItems(mParents.parent, mActions.addViaCustom, mActions.aggregation) : Promise.resolve([])
+								mActions.addViaDelegate ? AdditionalElementsAnalyzer.getUnrepresentedDelegateProperties(mParents.parent, mActions.addViaDelegate) : Promise.resolve([])
 							]
 						});
 					});
@@ -567,16 +565,14 @@ sap.ui.define([
 		// 		aggregation: "aggregation1",
 		// 		elementPromises: [
 		// 			revealPromise,
-		// 			addViaDelegatePromise,
-		// 			addViaCustomPromise
+		// 			addViaDelegatePromise
 		// 		]
 		// 	},
 		// 	{
 		// 		aggregation: "aggregation2",
 		// 		elementPromises: [
 		// 			revealPromise,
-		// 			addViaDelegatePromise,
-		// 			addViaCustomPromise
+		// 			addViaDelegatePromise
 		// 		]
 		// 	}
 		// 	...
@@ -599,9 +595,12 @@ sap.ui.define([
 			aAllPromises.forEach(function(aPromisesByAggregation) {
 				aCollectedPromises.push(
 					Promise.all(aPromisesByAggregation.elementPromises).then(function(aAnalyzerValues) {
+						var aRevealElements = aAnalyzerValues[0];
+						var aAddViaDelegateElements = aAnalyzerValues[1];
+						var aAllElements = aRevealElements.concat(aAddViaDelegateElements);
 						return {
 							aggregation: aPromisesByAggregation.aggregation,
-							elements: AdditionalElementsAnalyzer.getFilteredItemsList(aAnalyzerValues)
+							elements: aAllElements
 						};
 					})
 				);

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -15,7 +15,7 @@ sap.ui.define([
 	 * Helper object containing methods for the AdditionalElements plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.96.2
+	 * @version 1.98.0
 	 * @private
 	 * @since 1.94
 	 * @experimental Since 1.94. This class is experimental and provides only limited functionality. Also the API might be changed in future.
@@ -28,8 +28,7 @@ sap.ui.define([
 	* @returns {sap.ui.dt.ElementDesignTimeMetadata} Design time metadata
 	*/
 	function getDTMetadataFromActions(mActions) {
-		return (mActions["addViaDelegate"] && mActions["addViaDelegate"].designTimeMetadata)
-			|| (mActions["addViaCustom"] && mActions["addViaCustom"].designTimeMetadata);
+		return mActions["addViaDelegate"] && mActions["addViaDelegate"].designTimeMetadata;
 	}
 
 	/**
@@ -42,7 +41,7 @@ sap.ui.define([
 	AdditionalElementsUtils.getParents = function(bSibling, oOverlay, oPlugin) {
 		var oParentOverlay;
 		var oResponsibleElementOverlay = oOverlay;
-		var bResponsibleElementAvailable = ["add.delegate", "reveal", "add.custom"].some(function(vActionName) {
+		var bResponsibleElementAvailable = ["add.delegate", "reveal"].some(function(vActionName) {
 			return oPlugin.isResponsibleElementActionAvailable(oOverlay, vActionName);
 		});
 		if (bResponsibleElementAvailable) {