@openui5/sap.ui.dt 1.94.0 → 1.97.0

package/.reuse/dep5

@@ -309,7 +309,7 @@ License: MIT
 Comment: these files belong to: lodash
 
 Files: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
-Copyright: 2018 Mathias Nater
+Copyright: 2021 Mathias Nater
 License: MIT
 Comment: these files belong to: Hyphenopoly
 
@@ -347,11 +347,6 @@ Copyright: 2013 Ariya Hidayat and other contributors
 License: BSD-2-Clause
 Comment: these files belong to: Esprima
 
-Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-Comment: these files belong to: google-code-prettify
-
 Files: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/highlight.js/*
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -405,6 +400,11 @@ 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
+License: MIT
+Comment: these files belong to: ajv
+
 
 # Library: sap.ui.mdc:
 
@@ -418,7 +418,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
@@ -452,11 +452,6 @@ Copyright: 2009-2014, Alexis Sellier <self@cloudhead.net>
 License: Apache-2.0
 Comment: these files belong to: LESS
 
-Files: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-Comment: these files belong to: ajv
-
 Files: lib/jsdoc/ui5/plugin.js
 Copyright:
     2009-2021 SAP SE or an SAP affiliate company and OpenUI5 contributors
@@ -464,3 +459,8 @@ Copyright:
 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)
 
+Files: src/sap.ui.core/src/sap/ui/core/themes/base/base.less src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
+License: Apache-2.0
+Comment: these files belong to: SAP Theming Base Content
+

package/THIRDPARTY.txt

@@ -6,7 +6,7 @@ The full text of all referenced licenses is appended at the end of this file.
 
 Library: sap.ui.codeeditor:
 
-Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.4
+Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.13
 Copyright: 2010, Ajax.org B.V.
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -197,7 +197,7 @@ License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/sinon-qunit.js
 
-Component: URI.js, version: 1.19.6
+Component: URI.js, version: 1.19.7
 Copyright: Rodney Rehm
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
@@ -279,8 +279,8 @@ License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/base/util/restricted/_/lodash.custom.js
 
-Component: Hyphenopoly, version: 2.4.0
-Copyright: 2018 Mathias Nater
+Component: Hyphenopoly, version: 3.4.0
+Copyright: 2021 Mathias Nater
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.core/src/sap/ui/thirdparty/hyphenopoly/*
@@ -324,12 +324,6 @@ License: BSD-2-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-2-Clause.txt
 Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/esprima.js
 
-Component: google-code-prettify, version: 20130304
-Copyright: 2006 Google Inc.
-License: Apache-2.0
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
-Contained in: src/sap.ui.documentation/src/sap/ui/documentation/sdk/thirdparty/google-code-prettify/*
-
 Component: highlight.js, version: 10.4.1
 Copyright: 2006-2020, Ivan Sagalaev
 License: BSD-3-Clause
@@ -395,6 +389,12 @@ 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
+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
+
 
 Library: sap.ui.mdc:
 
@@ -412,10 +412,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
@@ -450,18 +451,21 @@ License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/testsuite-utils/src/main/resources/META-INF/less/less.js
 
-Component: ajv, version: 6.12.3
-Copyright: 2015-2017 Evgeny Poberezkin
-License: MIT
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: ../test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/ajv/ajv.min.js
-
 Component: JSDoc 3, version: 3.6.7
 Copyright: 2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: lib/jsdoc/ui5/plugin.js
 
+Component: SAP Theming Base Content, version: 11.1.34
+Copyright: SAP SE or an SAP affiliate company and Theming Base Content contributors
+License: Apache-2.0
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
+Contained in: src/sap.ui.core/src/sap/ui/core/themes/base/base.less
+	src/themelib_sap_belize/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_fiori_3/src/sap/ui/core/themes/*/base.less
+	src/themelib_sap_horizon/src/sap/ui/core/themes/*/base.less
+
 
 ALL LICENSE TEXTS:
 ==================

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.dt",
-  "version": "1.94.0",
+  "version": "1.97.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.94.0"
+    "@openui5/sap.ui.core": "1.97.0"
   }
 }

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

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.94.0</version>
+  <version>1.97.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.94.0
+	 * @version 1.97.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.94.0
+	 * @version 1.97.0
 	 *
 	 * @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.94.0
+	 * @version 1.97.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.94.0
+	 * @version 1.97.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.94.0
+	 * @version 1.97.0
 	 *
 	 * @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} [isTemplate] - 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)
@@ -929,24 +934,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 +1001,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 +1016,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.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -9,8 +9,7 @@ sap.ui.define([
 	"sap/ui/dt/DesignTimeMetadata",
 	"sap/ui/dt/AggregationDesignTimeMetadata",
 	"sap/ui/dt/ElementUtil"
-],
-function(
+], function(
 	DesignTimeMetadata,
 	AggregationDesignTimeMetadata,
 	ElementUtil
@@ -28,7 +27,7 @@ function(
 	 * @extends sap.ui.dt.DesignTimeMetadata
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @private
@@ -252,6 +251,9 @@ function(
 	/**
 	 * Returns the scroll containers or an empty array
 	 *
+	 * @param {object} oElement - Element
+	 * @param {boolean} bInvalidate - Indicates if the scroll container should be invalidated first
+	 * @param {function} fnUpdateFunction - Function to be called for update
 	 * @return {array} scrollContainers or empty array
 	 * @public
 	 */

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

@@ -55,7 +55,7 @@ sap.ui.define([
 	 * @extends sap.ui.dt.Overlay
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @private
@@ -124,6 +124,13 @@ sap.ui.define([
 				},
 				metadataScope: {
 					type: "string"
+				},
+				/**
+				 * Whether the next KeyUp event on the overlay should be ignored (e.g. for Rename)
+				 */
+				ignoreEnterKeyUpOnce: {
+					type: "boolean",
+					defaultValue: false
 				}
 			},
 			events: {
@@ -414,6 +421,7 @@ sap.ui.define([
 
 	/**
 	 * Sorts children DOM Nodes in their visual order
+	 * @param {object} oContainer - Container object whose children should be sorted
 	 * @private
 	 */
 	ElementOverlay.prototype._sortChildren = function(oContainer) {
@@ -566,7 +574,8 @@ sap.ui.define([
 
 	/**
 	 * Gets information about scroll containers from DesignTime metadata
-	 * @returns {object[]} - returns an array with scroll containers description
+	 * @param {boolean} bInvalidate - Indicates if the scroll container should be invalidated first
+	 * @returns {object[]} Array with the scroll container's description
 	 */
 	ElementOverlay.prototype.getScrollContainers = function (bInvalidate) {
 		return this.getDesignTimeMetadata().getScrollContainers(this.getElement(), bInvalidate, this._updateScrollContainer.bind(this));

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

@@ -9,15 +9,16 @@ sap.ui.define([
 	"sap/ui/thirdparty/jquery",
 	"sap/ui/base/Object",
 	"sap/ui/dt/Util",
+	"sap/ui/dt/DOMUtil",
 	"sap/ui/core/Element",
 	"sap/ui/core/Component",
 	"sap/base/util/isPlainObject",
 	"sap/ui/core/UIArea"
-],
-function(
+], function(
 	jQuery,
 	BaseObject,
 	Util,
+	DOMUtil,
 	Element,
 	Component,
 	isPlainObject,
@@ -31,7 +32,7 @@ function(
 	 * @class Utility functionality to work with elements, e.g. iterate through aggregations, find parents, ...
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @private
 	 * @static
@@ -55,9 +56,6 @@ function(
 		}, this);
 	};
 
-	/**
-	 *
-	 */
 	ElementUtil.getElementInstance = function(vElement) {
 		if (typeof vElement === "string") {
 			var oElement = sap.ui.getCore().byId(vElement);
@@ -66,9 +64,6 @@ function(
 		return vElement;
 	};
 
-	/**
-	 *
-	 */
 	ElementUtil.hasAncestor = function(oElement, oAncestor) {
 		oAncestor = this.fixComponentContainerElement(oAncestor);
 		var oFixedParent;
@@ -86,17 +81,11 @@ function(
 		return !!oElement;
 	};
 
-	/**
-	 *
-	 */
 	ElementUtil.getClosestElementForNode = function(oNode) {
 		var $ClosestElement = jQuery(oNode).closest("[data-sap-ui]");
 		return $ClosestElement.length ? sap.ui.getCore().byId($ClosestElement.attr("data-sap-ui")) : undefined;
 	};
 
-	/**
-	 *
-	 */
 	ElementUtil.fixComponentParent = function(oElement) {
 		if (BaseObject.isA(oElement, "sap.ui.core.UIComponent")) {
 			var oComponentContainer = oElement.oContainer;
@@ -108,9 +97,6 @@ function(
 		}
 	};
 
-	/**
-	 *
-	 */
 	ElementUtil.fixComponentContainerElement = function(oElement) {
 		if (BaseObject.isA(oElement, "sap.ui.core.ComponentContainer")) {
 			// This happens when the compontentContainer has not been rendered yet
@@ -122,9 +108,6 @@ function(
 		return oElement;
 	};
 
-	/**
-	 *
-	 */
 	ElementUtil.getDomRef = function(oElement) {
 		if (oElement) {
 			var oDomRef;
@@ -138,9 +121,6 @@ function(
 		}
 	};
 
-	/**
-	 *
-	 */
 	ElementUtil.findAllSiblingsInContainer = function(oElement, oContainer) {
 		var oParent = oElement && oElement.getParent();
 		if (!oParent) {
@@ -209,9 +189,6 @@ function(
 		return this.getAggregation(oParent, sAggregationName).indexOf(oElement);
 	};
 
-	/**
-	 *
-	 */
 	ElementUtil.addAggregation = function(oParent, sAggregationName, oElement) {
 		if (this.hasAncestor(oParent, oElement)) {
 			throw new Error("Trying to add an element to itself or its successors");
@@ -224,9 +201,6 @@ function(
 		}
 	};
 
-	/**
-	 *
-	 */
 	ElementUtil.removeAggregation = function(oParent, sAggregationName, oElement, bSuppressInvalidate) {
 		var sAggregationRemoveMutator = this.getAggregationAccessors(oParent, sAggregationName).remove;
 		if (sAggregationRemoveMutator) {
@@ -236,9 +210,6 @@ function(
 		}
 	};
 
-	/**
-	 *
-	 */
 	ElementUtil.insertAggregation = function(oParent, sAggregationName, oElement, iIndex) {
 		if (this.hasAncestor(oParent, oElement)) {
 			throw new Error("Trying to add an element to itself or its successors");
@@ -263,9 +234,6 @@ function(
 		}
 	};
 
-	/**
-	 *
-	 */
 	ElementUtil.isValidForAggregation = function(oParent, sAggregationName, oElement) {
 		var oAggregationMetadata = oParent.getMetadata().getAggregation(sAggregationName);
 
@@ -327,9 +295,6 @@ function(
 			}, this);
 	};
 
-	/**
-	 *
-	 */
 	ElementUtil.hasInterface = function(oElement, sInterface) {
 		var aInterfaces = oElement.getMetadata().getInterfaces();
 		return aInterfaces.indexOf(sInterface) !== -1;
@@ -355,6 +320,27 @@ function(
 		return true;
 	};
 
+	/**
+	 * Checks whether specified Element is a direct template clone (e.g. the list items of a sap.m.ListItem)
+	 *
+	 * @param {sap.ui.base.Object} oObject - Object for validation
+	 * @returns {boolean} <code>true</code> if object is a direct clone of the template
+	 */
+	 ElementUtil.isElementDirectTemplateChild = function (oObject) {
+		var mLocationInTemplate = ElementUtil.getAggregationInformation(oObject);
+
+		if (mLocationInTemplate.templateId) {
+			var sTemplateId = ElementUtil.extractTemplateId(mLocationInTemplate);
+
+			// If the stack only has one element, this element is a direct child of the template aggregation
+			if (sTemplateId && mLocationInTemplate.stack.length === 1) {
+				return true;
+			}
+		}
+
+		return false;
+	};
+
 	/**
 	 * Checks whether specified Element is a valid ManagedObject. The allowed objects must be
 	 * descendants of sap.ui.core.Element or sap.ui.core.Component classes.
@@ -548,5 +534,54 @@ function(
 		return iTargetIndex;
 	};
 
+	/**
+	 * Checks if an aggregation is valid for an element being moved
+	 *
+	 * @param {sap.ui.dt.AggregationOverlay} oAggregationOverlay - Aggregation overlay to be checked for target zone
+	 * @param {sap.ui.dt.ElementOverlay} oMovedOverlay - Overlay being moved
+	 * @param {boolean} bOverlayNotInDom - Flag defining if overlay is not in DOM
+	 * @returns {Promise.<boolean>} Resolved promise with <code>true</code> if the aggregation overlay is a valid target zone for the overlay
+	 */
+	 ElementUtil.checkTargetZone = function(oAggregationOverlay, oMovedOverlay, bOverlayNotInDom) {
+		var oGeometry = oAggregationOverlay.getGeometry();
+		var bGeometryVisible = oGeometry && oGeometry.size.height > 0 && oGeometry.size.width > 0;
+		var oParentElement = oAggregationOverlay.getElement();
+
+		var oMovedElement = oMovedOverlay.getElement();
+		var sAggregationName = oAggregationOverlay.getAggregationName();
+		if (!oMovedElement || !ElementUtil.isValidForAggregation(oParentElement, sAggregationName, oMovedElement)) {
+			return Promise.resolve(false);
+		}
+
+		// checks related to visibility
+		function fnCheckAggregationOverlayVisibility(oAggregationOverlay, oParentElement) {
+			// this function can get called on overlay registration, when there are no overlays in dom yet. In this case, DOMUtil.isVisible is always false.
+			var oAggregationOverlayDomRef = oAggregationOverlay.getDomRef();
+			var bAggregationOverlayVisibility = DOMUtil.isVisible(oAggregationOverlayDomRef);
+
+			// if there is no aggregation overlay domRef available the further check for domRef of the corresponding element is not required
+			if (!oAggregationOverlayDomRef) {
+				return bAggregationOverlayVisibility;
+			}
+			// additional check for corresponding element DomRef visibiltiy required for target zone checks during navigation mode.
+			// during navigation mode the domRef of valid overlays is given and the offsetWidth is 0. Therefor we need to check the visibility of the corresponding element additionally
+			var oParentElementDomRef = oParentElement && oParentElement.getDomRef && oParentElement.getDomRef();
+			var bAggregationElementVisibility = oParentElementDomRef ? DOMUtil.isVisible(oParentElementDomRef) : true;
+			return bAggregationOverlayVisibility || bAggregationElementVisibility;
+		}
+
+		if (
+			(bOverlayNotInDom && !bGeometryVisible)
+			|| !bOverlayNotInDom && !fnCheckAggregationOverlayVisibility(oAggregationOverlay, oParentElement)
+			|| !(oParentElement && oParentElement.getVisible && oParentElement.getVisible())
+			// an aggregation can still have visible = true even if it has been removed from its parent
+			|| !oParentElement.getParent()
+		) {
+			return Promise.resolve(false);
+		}
+
+		return Promise.resolve(true);
+	};
+
 	return ElementUtil;
 }, /* bExport= */true);