@openui5/sap.ui.dt 1.96.39 → 1.96.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.dt",
-  "version": "1.96.39",
+  "version": "1.96.41",
   "description": "OpenUI5 UI Library sap.ui.dt",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,6 +14,6 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.96.39"
+    "@openui5/sap.ui.core": "1.96.41"
   }
 }

package/src/sap/ui/dt/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.96.39</version>
+  <version>1.96.41</version>
 
   <documentation>SAP UI library: sap.ui.dt (by SAP, Author)</documentation>
 

package/src/sap/ui/dt/AggregationDesignTimeMetadata.js

@@ -23,7 +23,7 @@ function (
 	 * @extends sap.ui.dt.DesignTimeMetadata
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/AggregationOverlay.js

@@ -35,7 +35,7 @@ function(
 	 * @extends sap.ui.dt.Overlay
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/ControlObserver.js

@@ -22,7 +22,7 @@ function(ManagedObjectObserver) {
 	 * @extends sap.ui.dt.ManagedObjectObserver
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/DOMUtil.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * Utility functionality for DOM
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @private
 	 * @static

package/src/sap/ui/dt/DesignTime.js

@@ -25,7 +25,9 @@ sap.ui.define([
 	"sap/ui/dt/SelectionMode",
 	"sap/base/util/includes",
 	"sap/ui/dt/DesignTimeStatus",
-	"sap/base/util/restricted/_curry"
+	"sap/base/util/restricted/_curry",
+	"sap/base/util/restricted/_difference",
+	"sap/base/util/isEmptyObject"
 ],
 function (
 	ManagedObject,
@@ -48,7 +50,9 @@ function (
 	SelectionMode,
 	includes,
 	DesignTimeStatus,
-	_curry
+	_curry,
+	_difference,
+	isEmptyObject
 ) {
 	"use strict";
 
@@ -64,7 +68,7 @@ function (
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private
@@ -702,6 +706,7 @@ function (
 	 * @property {boolean} [root="true"] - Proxy for "isRoot" property of sap.ui.dt.ElementOverlay constructor
 	 * @property {object} [parentMetadata] - Map with metadata from the parent
 	 * @property {boolean} [visible] - Proxy for "visible" property of sap.ui.dt.ElementOverlay constructor
+	 * @property {boolean} [isPartOfTemplate] - Marker that overlay is part of template
 	 * @private
 	 */
 
@@ -747,7 +752,7 @@ function (
 			.then(
 				// Fulfilled
 				function (oElementOverlay) {
-					return this._createChildren(oElementOverlay, mParams.parentMetadata)
+					return this._createChildren(oElementOverlay, mParams)
 						.then(function () {
 							// Remove overlay promise from the map only when it is "officially" available
 							// and registered everywhere (OverlayRegistry, Plugins, etc)
@@ -831,6 +836,7 @@ function (
 			aggregationName: sAggregationName,
 			element: oElement,
 			visible: !bIsTemplateAggregation,
+			isPartOfTemplate: bIsTemplateAggregation,
 			designTimeMetadata: new AggregationDesignTimeMetadata({
 				data: mAggregationMetadata
 			}),
@@ -853,6 +859,7 @@ function (
 	 * @param {sap.ui.core.Element} mParams.element - Element for which ElementOverlay should be created
 	 * @param {boolean} [mParams.root] - Proxy for "isRoot" property of sap.ui.dt.ElementOverlay constructor
 	 * @param {boolean} [mParams.visible] - Proxy for "visible" property of sap.ui.dt.ElementOverlay constructor
+	 * @param {boolean} [mParams.isPartOfTemplate] - Proxy for "isPartOfTemplate" property of sap.ui.dt.ElementOverlay constructor
 	 * @param {object} [mParams.parentMetadata] - Map with metadata from the parent
 	 * @return {Promise} returns Promise which is resolved when ElementOverlay is created and ready for use
 	 * @private
@@ -869,6 +876,7 @@ function (
 				element: oElement,
 				isRoot: mParams.root,
 				visible: typeof mParams.visible !== "boolean" || mParams.visible, // TODO: check why defaultValue doesn't work if "undefined" specified
+				isPartOfTemplate: mParams.isPartOfTemplate,
 				metadataScope: this.getScope(),
 				designTimeMetadata: (
 					// If DesignTimeMetadata is an object of ElementDesignTimeMetadata, then it will be set
@@ -929,24 +937,45 @@ function (
 	}
 
 	/**
-	 * Create children for specified ElementOverlay
+	 * Create children for specified ElementOverlay.
 	 * @param {sap.ui.dt.ElementOverlay} oElementOverlay - ElementOverlay to create children for
-	 * @param {object} [mParentAggregationMetadata] - Since children are being created for certain aggregation, this is an aggregation metadata.
-	 * @returns {Promise} - resolves when whole hierarchy of children for specified ElementOverlay is created
+	 * @param {object} mParams - Property bag
+	 * @param {object} [mParams.parentMetadata] - Parent aggregation metadata
+	 * @param {boolean} [mParams.isPartOfTemplate] - Whether the overlay is part of an aggregation binding template
+	 * @returns {Promise} Resolves when whole hierarchy of children for specified ElementOverlay is created
 	 * @private
 	 */
-	DesignTime.prototype._createChildren = function (oElementOverlay, mParentAggregationMetadata) {
+	DesignTime.prototype._createChildren = function (oElementOverlay, mParams) {
 		var aAggregationNames = oElementOverlay.getAggregationNames();
+		var mParentAggregationMetadata = mParams.parentMetadata;
 		var mAggregationBindingTemplates = getAggregationBindingTemplates(oElementOverlay, aAggregationNames);
 		var aTemplateAggregationNames = Object.keys(mAggregationBindingTemplates);
-		return Promise.all([
-			this._createChildrenOverlays(oElementOverlay, mParentAggregationMetadata, aTemplateAggregationNames, mAggregationBindingTemplates),
-			this._createChildrenOverlays(oElementOverlay, mParentAggregationMetadata, aAggregationNames)
-		]);
+
+		// Consider each aggregation binding template which is not nested inside an existing template structure as a root template
+		// Separate root templates and their children from the instances of the root template as well as all nested template instances
+		var bEncounteredTemplate = mParams.isPartOfTemplate !== undefined;
+		var bHasTemplateAggregation = !isEmptyObject(mAggregationBindingTemplates);
+		var bIsRootTemplate = bHasTemplateAggregation && !bEncounteredTemplate;
+		var bIsPartOfTemplate = bIsRootTemplate ? true : mParams.isPartOfTemplate;
+		// Whether cloned instances are nested deeply in the root template structure
+		var bIsCloneInsideTemplate = bIsRootTemplate ? false : mParams.isPartOfTemplate;
+
+		// Avoid creating aggregation overlays for cloned template instances inside the template structure
+		if (bHasTemplateAggregation && bIsPartOfTemplate && !bIsRootTemplate) {
+			aAggregationNames = _difference(aAggregationNames, aTemplateAggregationNames);
+		}
+
+		return this._createChildrenOverlays(oElementOverlay, mParentAggregationMetadata, aTemplateAggregationNames, bIsPartOfTemplate, mAggregationBindingTemplates)
+			.then(this._createChildrenOverlays.bind(this, oElementOverlay, mParentAggregationMetadata, aAggregationNames, bIsCloneInsideTemplate));
 	};
 
-	DesignTime.prototype._createChildrenOverlays = function (oElementOverlay, mParentAggregationMetadata, aAggregationNames, mAggregationBindingTemplates) {
-		var bIsTemplateAggregation = !!mAggregationBindingTemplates;
+	DesignTime.prototype._createChildrenOverlays = function (oElementOverlay, mParentAggregationMetadata, aAggregationNames, bIsPartOfTemplate, mAggregationBindingTemplates) {
+		var bIsTemplateAggregation = !isEmptyObject(mAggregationBindingTemplates);
+		// Nested template inside a clone of another template
+		if (bIsTemplateAggregation && !bIsPartOfTemplate) {
+			return Promise.resolve();
+		}
+
 		return Promise.all(
 			aAggregationNames.map(function (sAggregationName) {
 				var oElement = oElementOverlay.getElement();
@@ -975,7 +1004,8 @@ function (
 						return this.createOverlay({
 							element: oElement,
 							root: false,
-							parentMetadata: mAggregationMetadata
+							parentMetadata: mAggregationMetadata,
+							isPartOfTemplate: bIsPartOfTemplate
 						})
 							// If creation of one of the children is aborted, we still continue our execution
 							.catch(function (oError) {
@@ -989,6 +1019,7 @@ function (
 						if (
 							oChildElementOverlay instanceof ElementOverlay
 							&& !oChildElementOverlay.bIsDestroyed
+							&& !oChildElementOverlay.getParent()
 						) {
 							oAggregationOverlay.addChild(oChildElementOverlay, true);
 						}

package/src/sap/ui/dt/DesignTimeMetadata.js

@@ -46,7 +46,7 @@ function(
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/ElementDesignTimeMetadata.js

@@ -28,7 +28,7 @@ function(
 	 * @extends sap.ui.dt.DesignTimeMetadata
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/ElementOverlay.js

@@ -55,7 +55,7 @@ sap.ui.define([
 	 * @extends sap.ui.dt.Overlay
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/ElementUtil.js

@@ -33,7 +33,7 @@ function(
 	 * @class Utility functionality to work with elements, e.g. iterate through aggregations, find parents, ...
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @private
 	 * @static

package/src/sap/ui/dt/ManagedObjectObserver.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @class The ManagedObjectObserver observes changes of a ManagedObject and propagates them via events.
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 * @constructor
 	 * @private
 	 * @since 1.30

package/src/sap/ui/dt/MetadataPropagationUtil.js

@@ -22,7 +22,7 @@ function(
 	 *
 	 * @class Functionality to propagate DesignTime and RelevantContainer
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 * @private
 	 * @static
 	 * @since 1.54

package/src/sap/ui/dt/MutationObserver.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @class The MutationObserver observes changes of a ManagedObject and propagates them via events.
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 * @constructor
 	 * @private
 	 * @since 1.30

package/src/sap/ui/dt/Overlay.js

@@ -46,7 +46,7 @@ function (
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private
@@ -81,6 +81,14 @@ function (
 				isRoot: {
 					type: "boolean",
 					defaultValue: false
+				},
+
+				/**
+				 * Whether overlay is part of an aggregation binding template
+				 */
+				isPartOfTemplate: {
+					type: "boolean",
+					defaultValue: false
 				}
 			},
 			associations: {

package/src/sap/ui/dt/OverlayRegistry.js

@@ -25,7 +25,7 @@ function(
 	 * Static registry for Overlays
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @private
 	 * @static

package/src/sap/ui/dt/OverlayUtil.js

@@ -22,7 +22,7 @@ function(
 	 *
 	 * @class Utility functionality to work with overlays
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 * @private
 	 * @static
 	 * @since 1.30
@@ -420,9 +420,9 @@ function(
 					return aFlattenedArray.concat(oCurrentValue);
 				}, []);
 			} else {
-				aRelevantOverlays = oOverlay.getParentElementOverlay()
-										.getAggregationOverlay(oOverlay.getParentAggregationOverlay().getAggregationName())
-										.getChildren();
+				var sAggregationName = oOverlay.getParentAggregationOverlay().getAggregationName();
+				var oAggregationOverlay = oParentOverlay.getAggregationOverlay(sAggregationName);
+				aRelevantOverlays = (oAggregationOverlay && oAggregationOverlay.getChildren()) || [];
 			}
 		}
 

package/src/sap/ui/dt/Plugin.js

@@ -26,7 +26,7 @@ function(
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/ScrollbarSynchronizer.js

@@ -24,7 +24,7 @@ function(
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/SelectionManager.js

@@ -34,7 +34,7 @@ function (
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/SelectionMode.js

@@ -16,7 +16,7 @@ sap.ui.define(function() {
 	 * @namespace
 	 * @name sap.ui.dt.SelectionMode
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 * @experimental This class is experimental and provides only limited functionality. Also the API might be changed in future.
 	 * @private
 	 */

package/src/sap/ui/dt/TaskManager.js

@@ -21,7 +21,7 @@ function(
 	 * The TaskManager keeps list of task and allows to manage them via simple API.
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/TaskRunner.js

@@ -24,7 +24,7 @@ function(
 	 * TaskRunner run tasks defined in sap.ui.dt.TaskManager.
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/Util.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * Utilities for sap.ui.dt library
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @private
 	 * @static

package/src/sap/ui/dt/enablement/ElementEnablementTest.js

@@ -38,7 +38,7 @@ function(
 	 * @extends sap.ui.dt.test.Test
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/enablement/Test.js

@@ -23,7 +23,7 @@ function(ManagedObject) {
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/enablement/Util.js

@@ -23,7 +23,7 @@ function(
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @private
 	 * @static

package/src/sap/ui/dt/enablement/report/LibraryReport.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.dt.enablement.Test
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/enablement/report/QUnitReport.js

@@ -25,7 +25,7 @@ function(
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/enablement/report/Statistic.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/enablement/report/StatisticRenderer.js

@@ -10,7 +10,7 @@ sap.ui.define(function() {
 
 	/**
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 * @namespace
 	 */
 	var StatisticRenderer = {};

package/src/sap/ui/dt/enablement/report/Table.js

@@ -43,7 +43,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/enablement/report/TableRenderer.js

@@ -10,7 +10,7 @@ sap.ui.define(function() {
 
 	/**
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 * @namespace
 	 */
 	var TableRenderer = {};

package/src/sap/ui/dt/library.js

@@ -23,7 +23,7 @@ function (
 	 * @namespace
 	 * @name sap.ui.dt
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 * @since 1.30
 	 * @experimental This class is experimental and provides only limited functionality. Also the API might be changed in future.
 	 * @private
@@ -32,7 +32,7 @@ function (
 	// delegate further initialization of this library to the Core
 	sap.ui.getCore().initLibrary({
 		name: "sap.ui.dt",
-		version: "1.96.39",
+		version: "1.96.41",
 		dependencies: ["sap.ui.core"],
 		types: [
 			"sap.ui.dt.SelectionMode"

package/src/sap/ui/dt/plugin/ContextMenu.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @class The ContextMenu registers event handler to open the context menu. Menu entries can dynamically be added
 	 * @extends sap.ui.dt.Plugin
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 * @constructor
 	 * @private
 	 * @since 1.53

package/src/sap/ui/dt/plugin/ControlDragDrop.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @class The ControlDragDrop enables D&D functionality for the overlays based on aggregation types
 	 * @extends sap.ui.dt.plugin.DragDrop
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 * @constructor
 	 * @private
 	 * @since 1.30

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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @class The CutPaste enables Cut & Paste functionality for the overlays based on aggregation types
 	 * @extends sap.ui.dt.Plugin
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 * @constructor
 	 * @private
 	 * @since 1.34

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

@@ -37,7 +37,7 @@ function(
 	 * @extends sap.ui.dt.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/plugin/ElementMover.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @class The ElementMover enables movement of UI5 elements based on aggregation types, which can be used by drag and
 	 *        drop or cut and paste behavior.
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/dt/plugin/MouseSelection.js

@@ -22,7 +22,7 @@ function(Plugin) {
 	 * @extends sap.ui.dt.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/dt/plugin/TabHandling.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class The TabHandling plugin adjusts the tabindex for the elements.
 	 * @extends sap.ui.dt.Plugin
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 * @constructor
 	 * @private
 	 * @since 1.38

package/src/sap/ui/dt/plugin/ToolHooks.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.dt.Plugin
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 * @constructor
 	 * @private
 	 * @since 1.61

package/src/sap/ui/dt/util/ZIndexManager.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 *
 	 * @class
 	 * @author SAP SE
-	 * @version 1.96.39
+	 * @version 1.96.41
 	 *
 	 * @private
 	 * @static