@openui5/sap.ui.rta 1.96.39 → 1.96.40

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

@@ -69,7 +69,7 @@ function(
 	 * @extends sap.ui.dt.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 *
 	 * @constructor
 	 * @private
@@ -168,16 +168,20 @@ function(
 	BasePlugin.prototype._getRelevantOverlays = function(oOverlay, sAggregationName) {
 		var aAlreadyDefinedRelevantOverlays = oOverlay.getRelevantOverlays();
 		if (aAlreadyDefinedRelevantOverlays.length === 0) {
-			var aRelevantOverlays = OverlayUtil.findAllOverlaysInContainer(oOverlay);
-
-			// if an aggregation name is given, those overlays are added without checking the relevant container
-			if (sAggregationName) {
-				var oAggregationOverlay = oOverlay.getAggregationOverlay(sAggregationName);
-				var aAggregationChildren = oAggregationOverlay ? oAggregationOverlay.getChildren() : [];
-				aAggregationChildren = aAggregationChildren.filter(function(oChildOverlay) {
-					return aRelevantOverlays.indexOf(oChildOverlay) === -1;
-				});
-				aRelevantOverlays = aRelevantOverlays.concat(aAggregationChildren);
+			var aRelevantOverlays = [];
+			// Overlays in aggregation binding templates are not relevant
+			if (!oOverlay.getIsPartOfTemplate()) {
+				aRelevantOverlays = OverlayUtil.findAllOverlaysInContainer(oOverlay);
+
+				// if an aggregation name is given, those overlays are added without checking the relevant container
+				if (sAggregationName) {
+					var oAggregationOverlay = oOverlay.getAggregationOverlay(sAggregationName);
+					var aAggregationChildren = oAggregationOverlay ? oAggregationOverlay.getChildren() : [];
+					aAggregationChildren = aAggregationChildren.filter(function(oChildOverlay) {
+						return aRelevantOverlays.indexOf(oChildOverlay) === -1;
+					});
+					aRelevantOverlays = aRelevantOverlays.concat(aAggregationChildren);
+				}
 			}
 
 			oOverlay.setRelevantOverlays(aRelevantOverlays);

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.96.39
+	 * @version 1.96.40
 	 *
 	 * @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.96.39
+	 * @version 1.96.40
 	 * @constructor
 	 * @private
 	 * @since 1.34

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.96.39
+	 * @version 1.96.40
 	 *
 	 * @constructor
 	 * @private

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

@@ -55,7 +55,7 @@ sap.ui.define([
 	 * Provides Rename handling functionality
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 *
 	 * @constructor
 	 * @private

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

@@ -34,7 +34,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.39
+	 * @version 1.96.40
 	 * @constructor
 	 * @private
 	 * @since 1.34

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

@@ -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.39
+	 * @version 1.96.40
 	 * @constructor
 	 * @private
 	 * @since 1.44

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.96.39
+	 * @version 1.96.40
 	 * @constructor
 	 * @private
 	 * @since 1.46

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.plugin.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 *
 	 * @constructor
 	 * @private

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * handled by the AdditionalElements Plugin (Reveal, Add Via Delegate, Add Custom)
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 * @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.

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

@@ -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.39
+	 * @version 1.96.40
 	 * @constructor
 	 * @private
 	 * @since 1.44

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

@@ -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.39
+	 * @version 1.96.40
 	 * @constructor
 	 * @private
 	 * @since 1.44

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

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * Helper object containing methods for the AdditionalElements plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 * @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.

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * Helper object to build the RTA commands resulting from the AdditionalElements Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 * @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.

package/src/sap/ui/rta/plugin/iframe/AddIFrame.js

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

package/src/sap/ui/rta/plugin/iframe/AddIFrameDialog.js

@@ -113,7 +113,7 @@ sap.ui.define([
 	 * @class Context - Dialog for IFrame settings in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 * @constructor
 	 * @private
 	 * @since 1.78

package/src/sap/ui/rta/service/Action.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.58
 	 * @since 1.58
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 * @private
 	 * @ui5-restricted
 	 *

package/src/sap/ui/rta/service/ControllerExtension.js

@@ -30,7 +30,7 @@ function (
 	 * @author SAP SE
 	 * @experimental Since 1.58
 	 * @since 1.58
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 * @private
 	 * @ui5-restricted
 	*/

package/src/sap/ui/rta/service/Outline.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.56
 	 * @since 1.56
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 * @private
 	 * @ui5-restricted
 	*/
@@ -67,8 +67,9 @@ sap.ui.define([
 	 * @property {string} id - ID of the control
 	 * @property {string} [instanceName] - Text retrieved from node's design time metadata <code>getLabel()</code>
 	 * @property {string} [name] - Singular name from node's design time metadata
-	 * @property {string} technicalName - Class type for element nodes/aggregation name for aggregation nodes.
+	 * @property {string} technicalName - Class type for element nodes/aggregation name for aggregation nodes
 	 * @property {boolean} editable - Indicates whether the node is editable
+	 * @property {string} [templateReference] - Element ID referncing corresponding template
 	 * @property {string} [icon] - Icon path for the node
 	 * @property {string} type - Type of node
 	 * @property {boolean} [visible] - Visibility of node of type <code>element</code>
@@ -197,6 +198,55 @@ sap.ui.define([
 			}
 		};
 
+		function getTemplateData(oChildOverlay, mTemplateData, mInnerTemplateData) {
+			var sAggregationName = oChildOverlay.getAggregationName && oChildOverlay.getAggregationName();
+			if (sAggregationName) {
+				var sAggregationOverlayId = oChildOverlay.getParent().getId();
+				// Aggregation with root template
+				if (mInnerTemplateData[sAggregationName]) {
+					return Object.assign({
+						templateFor: sAggregationOverlayId
+					}, mInnerTemplateData[sAggregationName]);
+				}
+				return ((mTemplateData && mTemplateData.elements) || [])
+					.map(function(oElement) {
+						// Template
+						if (
+							oElement.type === "aggregationBindingTemplate"
+							|| oElement.parentAggregationName === sAggregationName
+						) {
+							return Object.assign({
+								templateFor: sAggregationOverlayId
+							}, oElement);
+						}
+						// Regular aggregation
+						return oElement.technicalName === sAggregationName && oElement;
+					})
+					.filter(Boolean)[0];
+			}
+			// Template root element
+			var aAggregationTemplateOverlays = (
+				oChildOverlay.getParentElementOverlay().getAggregationBindingTemplateOverlays
+				&& oChildOverlay.getParentElementOverlay().getAggregationBindingTemplateOverlays()
+					.reduce(function (aAllRootElementOverlaysInsideTemplates, oAggregationOverlay) {
+						return aAllRootElementOverlaysInsideTemplates.concat(oAggregationOverlay.getChildren());
+					}, [])
+			) || [];
+			if (aAggregationTemplateOverlays.includes(oChildOverlay)) {
+				return undefined;
+			}
+			if (!mTemplateData) {
+				return undefined;
+			}
+			// Element inside clone
+			var oParent = oChildOverlay.getParentElementOverlay();
+			if (oParent.getId() === mTemplateData.templateFor) {
+				return mTemplateData;
+			}
+			var iIndex = oChildOverlay.getParent().getChildren().indexOf(oChildOverlay);
+			return mTemplateData.elements[iIndex];
+		}
+
 		/**
 		 * Returns outline model data including the children until max depth (<code>this.iDepth</code> or last child is reached).
 		 * During execution, the <code>fnFilter</code> is used to determine whether node data should be added.
@@ -205,17 +255,19 @@ sap.ui.define([
 		 * @param {sap.ui.dt.Overlay} oOverlay - Overlay for this node
 		 * @param {int} [iDepth] - Level of children to traverse
 		 * @param {sap.ui.dt.Overlay} [oParentOverlay] - Parent overlay (if present) for the passed overlay
+		 * @param {object} [mTemplateData] - Propagates template data to the aggregation template clones
 		 * @returns {OutlineObject} Outline model data
 		 */
-		oOutline._getChildrenNodes = function (oOverlay, iDepth, oParentOverlay) {
+		oOutline._getChildrenNodes = function (oOverlay, iDepth, oParentOverlay, mTemplateData) {
 			var bValidDepth = DtUtil.isInteger(iDepth);
+			var mAggregationTemplates = {};
 
 			if (oOverlay.getShouldBeDestroyed()) {
 				return {};
 			}
 
 			//get necessary properties from overlay
-			var oData = this._getNodeProperties(oOverlay, oParentOverlay) || {};
+			var oData = this._getNodeProperties(oOverlay, oParentOverlay, mTemplateData) || {};
 
 			var aChildren = oOverlay.getChildren();
 			//find aggregation binding template overlays
@@ -224,20 +276,12 @@ sap.ui.define([
 				&& oOverlay.getAggregationBindingTemplateOverlays()
 			) || [];
 
-			//for binding template overlays, do not include children of the
-			//corresponding aggregations on the outline (e.g. items)
 			if (aAggregationTemplateOverlays.length > 0) {
-				var aExcludedAggregations = [];
 				aChildren = aAggregationTemplateOverlays.reduce(function(aCollectedChildren, oAggregationTemplateOverlay) {
-					aExcludedAggregations.push(oAggregationTemplateOverlay.getAggregationName());
-					return oAggregationTemplateOverlay.getChildren().concat(aCollectedChildren);
-				}, aChildren)
-				.filter(function(oChild) {
-					if (oChild.getAggregationName && aExcludedAggregations.indexOf(oChild.getAggregationName()) > -1) {
-						return false;
-					}
-					return true;
-				});
+					var oTemplateOverlay = oAggregationTemplateOverlay.getChildren()[0];
+					mAggregationTemplates[oTemplateOverlay.getId()] = oAggregationTemplateOverlay.getAggregationName();
+					return [oTemplateOverlay].concat(aCollectedChildren);
+				}, aChildren);
 			}
 
 			//check if the tree should be traversed deeper and children overlays are present
@@ -248,9 +292,16 @@ sap.ui.define([
 				//decrement depth for children nodes
 				iDepth = bValidDepth ? iDepth - 1 : iDepth;
 
+				var mInnerTemplateData = {};
 				oData.elements = aChildren
 					.map(function (oChildOverlay) {
-						return this._getChildrenNodes(oChildOverlay, iDepth, oChildOverlay.getParent());
+						var mNextTemplateData = getTemplateData(oChildOverlay, mTemplateData, mInnerTemplateData);
+						var oNextData = this._getChildrenNodes(oChildOverlay, iDepth, oChildOverlay.getParent(), mNextTemplateData);
+						if (oNextData.type === "aggregationBindingTemplate") {
+							var sAggregationName = mAggregationTemplates[oChildOverlay.getId()];
+							mInnerTemplateData[sAggregationName] = merge({}, oNextData);
+						}
+						return oNextData;
 					}, this)
 					.filter(function (oChildNode) {
 						return !isEmptyObject(oChildNode);
@@ -270,10 +321,6 @@ sap.ui.define([
 				&& oParentElementOverlay.getAggregationOverlay(sParentAggregationName, "AggregationBindingTemplateOverlays") === oParentAggregationOverlay;
 		}
 
-		function getNumberOfTemplateChildrenOverlays(oParentAggregationOverlay, sParentAggregationName) {
-			return oParentAggregationOverlay.getParent().getAggregationOverlay(sParentAggregationName).getChildren().length;
-		}
-
 		function getElementOverlayData(oOverlay, oElement, oDtMetadata) {
 			var oData = {
 				editable: oOverlay.getEditable(),
@@ -284,20 +331,18 @@ sap.ui.define([
 			}
 			var oParentAggregationOverlay = oOverlay.getParent() && oOverlay.getParentAggregationOverlay();
 			var sParentAggregationName = (oParentAggregationOverlay && oParentAggregationOverlay.getAggregationName()) || "";
-			var sDtNameSuffix = "";
 			// Aggregation Binding Template
 			if (isAggregationBindingTemplate(oOverlay, oParentAggregationOverlay, sParentAggregationName)) {
-				var iNoOfChildren = getNumberOfTemplateChildrenOverlays(oParentAggregationOverlay, sParentAggregationName);
-				sDtNameSuffix = " [" + iNoOfChildren + "]";
 				oData.type = "aggregationBindingTemplate";
 				oData.icon = "sap-icon://attachment-text-file";
+				oData.parentAggregationName = sParentAggregationName;
 			} else {
 				oData.type = "element";
 			}
 
 			var oDtName = oDtMetadata.getName(oElement);
 			if (oDtName && oDtName.singular) {
-				oData.name = (oDtName && oDtName.singular) + sDtNameSuffix;
+				oData.name = oDtName && oDtName.singular;
 			}
 			return oData;
 		}
@@ -322,7 +367,7 @@ sap.ui.define([
 			return oData;
 		}
 
-		function getDefaultData(oElement, oDtMetadata) {
+		function getDefaultData(oElement, oDtMetadata, mTemplateData) {
 			var oData = {
 				id: oElement.getId(),
 				technicalName: oElement.getMetadata().getName(),
@@ -330,6 +375,10 @@ sap.ui.define([
 				type: null
 			};
 
+			if (mTemplateData) {
+				oData.templateReference = mTemplateData.id;
+			}
+
 			var sDefaultIcon = getDefaultIcon(oDtMetadata);
 			if (sDefaultIcon) {
 				oData.icon = sDefaultIcon;
@@ -354,12 +403,13 @@ sap.ui.define([
 		 *
 		 * @param {sap.ui.dt.Overlay} oOverlay - Overlay of the node for which properties are calculated
 		 * @param {sap.ui.dt.Overlay} [oParentOverlay] - Parent overlay (if present) for the passed overlay
+		 * @param {object} [mTemplateData] - Template data
 		 * @returns {object} Data containing applicable properties
 		 */
-		 oOutline._getNodeProperties = function (oOverlay, oParentOverlay) {
+		 oOutline._getNodeProperties = function (oOverlay, oParentOverlay, mTemplateData) {
 			var oElement = oOverlay.getElement();
 			var oDtMetadata = oOverlay.getDesignTimeMetadata();
-			var oData = getDefaultData(oElement, oDtMetadata);
+			var oData = getDefaultData(oElement, oDtMetadata, mTemplateData);
 
 			if (oOverlay instanceof ElementOverlay) {
 				return Object.assign(oData, getElementOverlayData(oOverlay, oElement, oDtMetadata));

package/src/sap/ui/rta/service/Property.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.58
 	 * @since 1.58
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 * @private
 	 * @ui5-restricted
 	*/

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

@@ -15,7 +15,7 @@ sap.ui.define(function () {
 	 * @author SAP SE
 	 * @experimental Since 1.58
 	 * @since 1.58
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 * @private
 	 * @ui5-restricted
 	*/

package/src/sap/ui/rta/toolbar/Adaptation.js

@@ -39,7 +39,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/Base.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.m.HBox
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/Fiori.js

@@ -32,7 +32,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/FioriLike.js

@@ -20,7 +20,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/OverflowToolbarButton.js

@@ -24,7 +24,7 @@ function(
 	 * @extends sap.m.OverflowToolbarButton
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/Personalization.js

@@ -22,7 +22,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/Standalone.js

@@ -20,7 +20,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Adaptation
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/toolbar/translation/Translation.js

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/util/PluginManager.js

@@ -66,7 +66,7 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PluginManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 * @constructor
 	 * @private
 	 * @since 1.86

package/src/sap/ui/rta/util/PopupManager.js

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PopupManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 * @constructor
 	 * @private
 	 * @since 1.48

package/src/sap/ui/rta/util/ServiceEventBus.js

@@ -19,7 +19,7 @@ function(
 	 *
 	 * @extends sap.ui.core.EventBus
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 * @private
 	 * @since 1.56.0
 	 * @alias sap.ui.rta.util.ServiceEventBus

package/src/sap/ui/rta/util/changeVisualization/ChangeIndicator.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicator
 	 * @author SAP SE
 	 * @since 1.84.0
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/rta/util/changeVisualization/ChangeIndicatorRegistry.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicatorRegistry
 	 * @author SAP SE
 	 * @since 1.86.0
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/rta/util/changeVisualization/ChangeVisualization.js

@@ -81,7 +81,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeVisualization
 	 * @author SAP SE
 	 * @since 1.84.0
-	 * @version 1.96.39
+	 * @version 1.96.40
 	 * @private
 	 * @ui5-restricted
 	 */