@openui5/sap.ui.dt 1.96.5 → 1.99.0

package/.reuse/dep5

@@ -28,7 +28,7 @@ Disclaimer: The code in this project may include calls to APIs (“API Calls”)
 # OpenUI5 code
 
 Files: *
-Copyright: 2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+Copyright: 2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
 License: Apache-2.0
 
 
@@ -60,7 +60,7 @@ Comment: these files belong to: jQuery UI
 
 Files: src/sap.ui.commons/src/sap/ui/commons/Carousel.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Spencer Tipping
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jquery.fix.clone: Carousel.js is authored by SAP, but contains an improved implementation of the clone function which is taken from jquery-fix-clone
@@ -75,35 +75,35 @@ Comment: these files belong to: jQuery 3
 
 Files: src/sap.ui.core/src/sap/base/util/isPlainObject.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: isPlainObject.js is overall written by SAP, but contains a modified implementation of jQuery.isPlainObject taken from jQuery
 
 Files: src/sap.ui.core/src/sap/base/util/_merge.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: _merge.js is overall written by SAP, but contains a modified implementation of jQuery.extend taken from jQuery
 
 Files: src/sap.ui.core/src/jquery.sap.script.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     OpenJS Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 3: jquery.sap.script.js is overall written by SAP, but contains a modified implementation of jQuery.extend taken from jQuery
 
 Files: src/sap.ui.core/src/sap/ui/Device.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2011, John Resig
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery 1: Device.js is overall written by SAP, but contains code taken from jQuery 1.7.1 (see the respective comment)
 
 Files: src/sap.ui.core/src/sap/ui/dom/jquery/Selectors.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.8: Selectors.js is overall written by SAP, but contains code taken from jQuery UI (see the respective comments)
@@ -115,14 +115,14 @@ Comment: these files belong to: jQuery UI 1.10
 
 Files: src/sap.ui.core/src/jquery.sap.dom.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.10: jquery.sap.dom.js is overall written by SAP, but contains code taken from jQuery UI Core (see the respective comment)
 
 Files: src/sap.ui.core/src/sap/ui/dom/jquery/zIndex.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2014 jQuery Foundation and other contributors
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.11: zIndex.js is overall written by SAP, but contains an implementation of the function 'fnzIndex' which is taken from jQuery UI Datepicker 1.11.1
@@ -149,7 +149,7 @@ Comment: these files belong to: jQuery Mobile
 
 Files: src/sap.ui.core/src/sap/ui/util/_FeatureDetection.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2012 Wei-Ko Kao
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery.rtl-scroll-type: _FeatureDetection.js is overall written by SAP, but contains code which is inspired by jQuery.rtl-scroll-type
@@ -281,14 +281,14 @@ Comment: these files belong to: blanket.js
 
 Files: src/sap.ui.core/src/sap/base/util/JSTokenizer.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Douglas Crockford
 License: Apache-2.0 and LicenseRef-JSONinJSPublicDomain
 Comment: these files contain content from SAP and JSON in JS: JSTokenizer.js is overall written by SAP, but contains code has been taken from the component JSON in JavaScript (https://github.com/douglascrockford/JSON-js/blob/master/json2.js) from Douglas Crockford which is licensed under Public Domain
 
 Files: src/sap.ui.core/src/sap/ui/base/ExpressionParser.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2010 Douglas Crockford
 License: Apache-2.0
 Comment: these files contain content from SAP and Top Down Operator Precedence: ExpressionParser.js is overall written by SAP, but contains code taken from or inspired by TDOP by Douglas Crockford (see the respective comment)
@@ -322,7 +322,7 @@ Comment: these files contain content from p-cancelable and @babel/helpers: _Canc
 
 Files: src/sap.ui.core/src/sap/ui/core/date/Persian.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Behrang Norouzinia
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and Jalaali JS: Persian.js is overall written by SAP, but the calculation is taken from jalaali-js
@@ -334,7 +334,7 @@ Comment: these files belong to: vkBeautify
 
 Files: src/sap.ui.core/src/sap/ui/core/cache/LRUPersistentCache.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     Isaac Z. Schlueter and Contributors
 License: Apache-2.0 and ISC
 Comment: these files contain content from SAP and node-lru-cache: LRUPersistentCache.js is overall written by SAP, but portions ('Least Recently Used' logic) are taken from the node-lru-cache project (see https://github.com/isaacs/node-lru-cache/blob/v2.7.3/README.md) and modified.
@@ -370,21 +370,11 @@ Comment: these files belong to: Buttons extension for DataTables
 
 # Library: sap.ui.integration:
 
-Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/*.*.json src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/bundle*
+Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/*
 Copyright: SAP
 License: Apache-2.0
 Comment: these files belong to: UI5 Web Components
 
-Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/webcomponentsjs/*
-Copyright: 2015 The Polymer Authors
-License: BSD-3-Clause
-Comment: these files belong to: Webcomponentsjs
-
-Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/Unicode-Data-Files-LICENSE.txt
-Copyright: 1991-2014 Unicode, Inc.
-License: Unicode-DFS-2015
-Comment: these files belong to: Unicode Common Locale Data Repository
-
 Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptivecards.js src/sap.ui.integration/src/sap/ui/integration/schemas/adaptive-card.json
 Copyright: 2017 Microsoft
 License: MIT
@@ -395,22 +385,27 @@ Copyright: 2017 Microsoft
 License: MIT
 Comment: these files belong to: Adaptive Cards Templating
 
+Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptive-expressions.js
+Copyright: Microsoft
+License: MIT
+Comment: these files belong to: Adaptive Expressions
+
 Files: src/sap.ui.integration/src/sap/ui/integration/thirdparty/markdown-it.js
 Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 Comment: these files belong to: Markdown-it
 
-Files: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-Copyright: 2015-2017 Evgeny Poberezkin
+Files: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/CfWorkerJsonSchemaValidator.js
+Copyright: 2020 Jeremy Danyow
 License: MIT
-Comment: these files belong to: ajv
+Comment: these files belong to: @cfworker/json-schema
 
 
 # Library: sap.ui.mdc:
 
 Files: src/sap.ui.mdc/test/sap/ui/mdc/sample/field/filterfieldwithoperators/BoolExprTool.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2015 unnikked
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and BooleanExpressionEvaluator: BoolExprTool.js is authored by SAP, but partly inspired by BooleanExpressionEvaluator
@@ -418,7 +413,7 @@ Comment: these files contain content from SAP and BooleanExpressionEvaluator: Bo
 
 # Library: sap.ui.webc.common:
 
-Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theme-base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
+Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 Copyright: SAP
 License: Apache-2.0
 Comment: these files belong to: UI5 Web Components
@@ -454,7 +449,7 @@ Comment: these files belong to: LESS
 
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
-    2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
+    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
     2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc
 License: Apache-2.0
 Comment: these files contain content from SAP and JSDoc 3: plugin.js is overall written by SAP, but contains code taken from JSDoc 3.6.7 (see the respective comments)

package/THIRDPARTY.txt

@@ -351,24 +351,11 @@ Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/D
 
 Library: sap.ui.integration:
 
-Component: UI5 Web Components, version: 1.0.0-rc.8
+Component: UI5 Web Components, version: 1.0.1
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
-Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/*.*.json
-	src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/bundle*
-
-Component: Webcomponentsjs, version: 1.0.2
-Copyright: 2015 The Polymer Authors
-License: BSD-3-Clause
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
-Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/webcomponentsjs/*
-
-Component: Unicode Common Locale Data Repository
-Copyright: 1991-2014 Unicode, Inc.
-License: Unicode-DFS-2015
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Unicode-DFS-2015.txt
-Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/Unicode-Data-Files-LICENSE.txt
+Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/webcomponents/*
 
 Component: Adaptive Cards, version: 2.9.0
 Copyright: 2017 Microsoft
@@ -377,23 +364,29 @@ License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptivecards.js
 	src/sap.ui.integration/src/sap/ui/integration/schemas/adaptive-card.json
 
-Component: Adaptive Cards Templating, version: 0.1.1-alpha.0
+Component: Adaptive Cards Templating, version: 2.2.0
 Copyright: 2017 Microsoft
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptivecards-templating.js
 
-Component: Markdown-it, version: 10.0.0
+Component: Adaptive Expressions, version: 4.15.0
+Copyright: Microsoft
+License: MIT
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
+Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/adaptive-expressions.js
+
+Component: Markdown-it, version: 12.2.0
 Copyright: 2014 Vitaly Puzrin, Alex Kocharin
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/src/sap/ui/integration/thirdparty/markdown-it.js
 
-Component: ajv, version: 6.12.3
-Copyright: 2015-2017 Evgeny Poberezkin
+Component: @cfworker/json-schema, version: 1.6.8
+Copyright: 2020 Jeremy Danyow
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
+Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/CfWorkerJsonSchemaValidator.js
 
 
 Library: sap.ui.mdc:
@@ -412,10 +405,11 @@ Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.*
-	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theme-base/*.*
+	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
+	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 
 Component: lit-html, version: 1.4.1
 Copyright: Google LLC

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.dt",
-  "version": "1.96.5",
+  "version": "1.99.0",
   "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.5"
+    "@openui5/sap.ui.core": "1.99.0"
   }
 }

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

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.96.5</version>
+  <version>1.99.0</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.5
+	 * @version 1.99.0
 	 *
 	 * @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.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @private
@@ -192,6 +192,7 @@ function(
 			this.addStyleClass('sapUiDtAggregationOverlay');
 			return Overlay.prototype.render.apply(this, arguments);
 		}
+		return undefined;
 	};
 
 	/**

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

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

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * Utility functionality for DOM
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @private
 	 * @static
@@ -173,8 +173,8 @@ sap.ui.define([
 
 	/**
 	 * Checks whether DOM Element has vertical or horizontal scrollbar
-	 * @param oDomRef {HTMLElement} - DOM Element
-	 * @returns {boolean}
+	 * @param {HTMLElement} oDomRef - DOM element
+	 * @returns {boolean} <code>true</code> if the DOM element has a scrollbar
 	 */
 	DOMUtil.hasScrollBar = function(oDomRef) {
 		return DOMUtil.hasVerticalScrollBar(oDomRef) || DOMUtil.hasHorizontalScrollBar(oDomRef);
@@ -217,7 +217,8 @@ sap.ui.define([
 
 
 	/**
-	 * @param {HTMLElement} oDomRef
+	 * @param {HTMLElement} oDomRef - DOM element
+	 * @returns {object} Object with overflowX and overflowY
 	 */
 	DOMUtil.getOverflows = function(oDomRef) {
 		var $DomRef = jQuery(oDomRef);
@@ -438,8 +439,8 @@ sap.ui.define([
 	/**
 	 * Check whether the target node is a descendant of a node referenced by id
 	 * @param {string} sId - ID of a potential parent node
-	 * @param oTargetNode - Node to look for in a potential parent node
-	 * @returns {boolean} - true if a potential parent contains the target node
+	 * @param {HTMLElement} oTargetNode - Node to look for in a potential parent node
+	 * @returns {boolean} <code>true</code> if a potential parent contains the target node
 	 */
 	DOMUtil.contains = function (sId, oTargetNode) {
 		var oNode = document.getElementById(sId);

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.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @private
@@ -352,11 +356,11 @@ function (
 
 	DesignTime.prototype._onApplyStylesRequired = function (oEvent) {
 		var mParameters = oEvent.getParameters();
-		var oElementOverlay = oEvent.getSource();
+		var oOverlay = oEvent.getSource();
 		this._oTaskManager.add({
 			type: "applyStyles",
-			callbackFn: oElementOverlay.applyStyles.bind(oElementOverlay, mParameters.bForceScrollbarSync),
-			overlayId: oElementOverlay.getId()
+			callbackFn: oOverlay.applyStyles.bind(oOverlay, mParameters.bForceScrollbarSync),
+			overlayId: oOverlay.getId()
 		}, "overlayId");
 	};
 
@@ -503,6 +507,17 @@ function (
 		});
 	};
 
+	/**
+	 * Resolves when all the currently busy plugins are not busy anymore
+	 * @returns {Promise} Resolves with undefined when no plugin is busy anymore
+	 */
+	DesignTime.prototype.waitForBusyPlugins = function() {
+		var aBusyPlugins = this.getBusyPlugins();
+		return Promise.all(aBusyPlugins.map(function(oPlugin) {
+			return oPlugin.waitForBusyAction();
+		}));
+	};
+
 	/**
 	 * Adds new plugin to use with the DesignTime
 	 * @param {sap.ui.dt.Plugin} oPlugin to add
@@ -696,12 +711,19 @@ function (
 		return aElementOverlays;
 	};
 
+	function ensureRoot(bIsRoot, oElementOverlay) {
+		if (bIsRoot) {
+			oElementOverlay.setIsRoot(true);
+		}
+	}
+
 	/**
 	 * @typedef {object} sap.ui.dt.DesignTime.CreateOverlayParameters
 	 * @property {sap.ui.base.ManagedObject} element - Control instance for which overlay is being created
 	 * @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} [isTemplate] - Marker that overlay is part of template
 	 * @private
 	 */
 
@@ -731,6 +753,7 @@ function (
 
 		// 2. ElementOverlay is already created
 		if (oElementOverlay) {
+			ensureRoot(mParams.root, oElementOverlay);
 			this._oTaskManager.complete(iTaskId);
 			return Promise.resolve(oElementOverlay);
 		// 3. ElementOverlay is in creation phase
@@ -747,7 +770,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)
@@ -929,24 +952,45 @@ function (
 	}
 
 	/**
-	 * Create children for specified ElementOverlay
+	 * Creates 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.isTemplate] - 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.isTemplate !== undefined;
+		var bHasTemplateAggregation = !isEmptyObject(mAggregationBindingTemplates);
+		var bIsRootTemplate = bHasTemplateAggregation && !bEncounteredTemplate;
+		var bIsTemplate = bIsRootTemplate ? true : mParams.isTemplate;
+		// Whether cloned instances are nested deeply in the root template structure
+		var bIsCloneInsideTemplate = bIsRootTemplate ? false : mParams.isTemplate;
+
+		// Avoid creating aggregation overlays for cloned template instances inside the template structure
+		if (bHasTemplateAggregation && bIsTemplate && !bIsRootTemplate) {
+			aAggregationNames = _difference(aAggregationNames, aTemplateAggregationNames);
+		}
+
+		return this._createChildrenOverlays(oElementOverlay, mParentAggregationMetadata, aTemplateAggregationNames, bIsTemplate, 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, bIsTemplate, mAggregationBindingTemplates) {
+		var bIsTemplateAggregation = !isEmptyObject(mAggregationBindingTemplates);
+		// Nested template inside a clone of another template
+		if (bIsTemplateAggregation && !bIsTemplate) {
+			return Promise.resolve();
+		}
+
 		return Promise.all(
 			aAggregationNames.map(function (sAggregationName) {
 				var oElement = oElementOverlay.getElement();
@@ -975,7 +1019,8 @@ function (
 						return this.createOverlay({
 							element: oElement,
 							root: false,
-							parentMetadata: mAggregationMetadata
+							parentMetadata: mAggregationMetadata,
+							isTemplate: bIsTemplate
 						})
 							// If creation of one of the children is aborted, we still continue our execution
 							.catch(function (oError) {
@@ -989,6 +1034,7 @@ function (
 						if (
 							oChildElementOverlay instanceof ElementOverlay
 							&& !oChildElementOverlay.bIsDestroyed
+							&& !oChildElementOverlay.getParent()
 						) {
 							oAggregationOverlay.addChild(oChildElementOverlay, true);
 						}
@@ -1084,6 +1130,12 @@ function (
 
 		var oElementOverlay = oEvent.getSource();
 
+		// cancel open applyStyles tasks for the destroyed overlays in the task manager
+		this._oTaskManager.cancelBy({
+			type: "applyStyles",
+			overlayId: oElementOverlay.getId()
+		}, "overlayId");
+
 		// FIXME: workaround. Overlays should not kill themselves (see ElementOverlay@_onElementDestroyed).
 		var sElementId = oElementOverlay.getAssociation("element");
 		if (sElementId in this._mPendingOverlays) { // means that the overlay was destroyed during initialization process
@@ -1117,7 +1169,13 @@ function (
 	 * @param {sap.ui.baseEvent} oEvent event object
 	 * @private
 	 */
-	DesignTime.prototype._onAggregationOverlayDestroyed = function () {
+	DesignTime.prototype._onAggregationOverlayDestroyed = function (oEvent) {
+		// cancel open applyStyles tasks for the destroyed overlays in the task manager
+		this._oTaskManager.cancelBy({
+			type: "applyStyles",
+			overlayId: oEvent.getSource().getId()
+		}, "overlayId");
+
 		if (!OverlayRegistry.hasOverlays()) {
 			Overlay.removeOverlayContainer();
 		}
@@ -1183,6 +1241,8 @@ function (
 					this.fireElementPropertyChanged(oParams);
 				}
 				break;
+			default:
+				break;
 		}
 	};
 
@@ -1217,25 +1277,15 @@ function (
 			var oParentOverlay = OverlayRegistry.getOverlay(oParent);
 			var oParentAggregationOverlay = oParentOverlay && oParentOverlay.getAggregationOverlay(sAggregationName);
 			if (!oParentAggregationOverlay) {
-				var onSynced;
 				var onElementOverlayCreated = function (oEvent) {
 					var oElementOverlay = oEvent.getParameter("elementOverlay");
 					if (oElementOverlay.getElement().getId() === oParent.getId()) {
 						var oParentAggregationOverlay = oElementOverlay.getAggregationOverlay(sAggregationName);
-						this.detachSynced(onSynced, this);
 						this.detachElementOverlayCreated(onElementOverlayCreated, this);
 						this._addAggregation(oElement, oParentAggregationOverlay);
 					}
 				};
-				onSynced = function () {
-					var oParentOverlay = OverlayRegistry.getOverlay(oParent);
-					var oParentAggregationOverlay = oParentOverlay && oParentOverlay.getAggregationOverlay(sAggregationName);
-					this.detachSynced(onSynced, this);
-					this.detachElementOverlayCreated(onElementOverlayCreated, this);
-					this._addAggregation(oElement, oParentAggregationOverlay);
-				};
 				this.attachElementOverlayCreated(onElementOverlayCreated, this);
-				this.attachSynced(onSynced, this);
 			} else {
 				this._addAggregation(oElement, oParentAggregationOverlay);
 			}
@@ -1373,6 +1423,7 @@ function (
 				bFoundAncestor = true;
 				return false;
 			}
+			return undefined;
 		});
 
 		return bFoundAncestor;

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

@@ -46,7 +46,7 @@ function(
 	 * @extends sap.ui.base.ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @constructor
 	 * @private
@@ -108,7 +108,6 @@ function(
 
 	/**
 	 * Returns 'not-adaptable' flag as boolean
-	 * @param {Object} oElement Element instance
 	 * @return {boolean} Returns 'true' if not adaptable
 	 * @public
 	 */
@@ -127,10 +126,10 @@ function(
 	};
 
 	/**
-	 * Returns a DOM representation for an Element or aggregation, if it can be found or undefined
-	 * @param {Object} oElement Element we need DomRef for
-	 * @param {String|Function} vDomRef Selector or Function for fetchting DomRef
-	 * @param {String} [sAggregationName] Aggregation Name
+	 * Returns a DOM representation for an Element or aggregation, if it can be found or undefined.
+	 * @param {sap.ui.core.Element} oElement Element we need DomRef for
+	 * @param {string|function} vDomRef Selector or Function for fetchting DomRef
+	 * @param {string} [sAggregationName] Aggregation Name
 	 * @return {jQuery} Returns associated DOM references wrapped by jQuery object
 	 * @public
 	 */
@@ -223,7 +222,7 @@ function(
 	 * If text parameters are given, then any occurrences of the pattern "{<i>n</i>}" with <i>n</i> being an integer
 	 * are replaced by the parameter value with index <i>n</i>.  Note: This replacement is also applied if no text had been found (key).
 	 * For more details on this replacement mechanism refer also:
-	 * @see jQuery.sap.formatMessage
+	 * @see {@link module:sap/base/strings/formatMessage formatMessage}
 	 *
 	 * @param {sap.ui.core.Element} oElement Element for which the text is being retrieved
 	 * @param {string} sKey Key