@openui5/sap.ui.rta 1.136.1 → 1.138.0

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

@@ -10,8 +10,7 @@ sap.ui.define([
 	"sap/base/util/isPlainObject",
 	"sap/base/util/restricted/_uniqWith",
 	"sap/base/util/deepEqual"
-],
-function(
+], function(
 	ElementUtil,
 	OverlayRegistry,
 	isPlainObject,
@@ -20,7 +19,7 @@ function(
 ) {
 	"use strict";
 
-	var BindingsExtractor = {};
+	const BindingsExtractor = {};
 
 	/**
 	 * Get all relevant binding paths and binding context paths for the element (from all properties)
@@ -34,13 +33,13 @@ function(
 	 * @private
 	 */
 	BindingsExtractor.collectBindingPaths = function(oElement, oModel, oRelevantContainerElement, iDepth) {
-		var mBindingsCollection = {
+		const mBindingsCollection = {
 			bindingPaths: [],
 			bindingContextPaths: []
 		};
-		var sAggregationName = oElement.sParentAggregationName;
-		var oParent = oElement.getParent();
-		var aBindings = BindingsExtractor.getBindings({
+		const sAggregationName = oElement.sParentAggregationName;
+		const oParent = oElement.getParent();
+		let aBindings = BindingsExtractor.getBindings({
 			element: oElement,
 			model: oModel,
 			relevantContainerElement: oRelevantContainerElement,
@@ -49,20 +48,20 @@ function(
 		});
 
 		if (oParent) {
-			var oDefaultAggregation = oParent.getMetadata().getAggregation();
+			const oDefaultAggregation = oParent.getMetadata().getAggregation();
 
 			if (oDefaultAggregation) {
-				var iPositionOfInvisibleElement = ElementUtil.getAggregation(oParent, sAggregationName).indexOf(oElement);
-				var sParentDefaultAggregationName = oDefaultAggregation.name;
-				var oBinding = oParent.getBindingInfo(sParentDefaultAggregationName);
-				var oTemplate = oBinding && oBinding.template;
+				const iPositionOfInvisibleElement = ElementUtil.getAggregation(oParent, sAggregationName).indexOf(oElement);
+				const sParentDefaultAggregationName = oDefaultAggregation.name;
+				const oBinding = oParent.getBindingInfo(sParentDefaultAggregationName);
+				const oTemplate = oBinding && oBinding.template;
 
 				if (oTemplate) {
-					var oTemplateDefaultAggregation = oTemplate.getMetadata().getAggregation();
+					const oTemplateDefaultAggregation = oTemplate.getMetadata().getAggregation();
 
 					if (oTemplateDefaultAggregation) {
-						var sTemplateDefaultAggregationName = oTemplateDefaultAggregation.name;
-						var oTemplateElement = ElementUtil.getAggregation(
+						const sTemplateDefaultAggregationName = oTemplateDefaultAggregation.name;
+						const oTemplateElement = ElementUtil.getAggregation(
 							oTemplate, sTemplateDefaultAggregationName
 						)[iPositionOfInvisibleElement];
 						aBindings = aBindings.concat(BindingsExtractor.getBindings({
@@ -78,21 +77,21 @@ function(
 			}
 		}
 
-		for (var i = 0, l = aBindings.length; i < l; i++) {
+		for (let i = 0, l = aBindings.length; i < l; i++) {
 			if (aBindings[i].getPath) {
-				var sBindingPath = aBindings[i].getPath();
+				const sBindingPath = aBindings[i].getPath();
 				if (sBindingPath &&	mBindingsCollection.bindingPaths.indexOf(sBindingPath) === -1) {
 					mBindingsCollection.bindingPaths.push(sBindingPath);
 				}
 			}
 			if (aBindings[i].getContext && aBindings[i].getContext() && aBindings[i].getContext().getPath) {
-				var sBindingContextPath = aBindings[i].getContext().getPath();
+				const sBindingContextPath = aBindings[i].getContext().getPath();
 				if (sBindingContextPath && mBindingsCollection.bindingContextPaths.indexOf(sBindingContextPath) === -1) {
 					mBindingsCollection.bindingContextPaths.push(sBindingContextPath);
 				}
 			}
 			if (isPlainObject(aBindings[i])) {
-				var sCurrentPath = aBindings[i].parts[0] && aBindings[i].parts[0].path;
+				const sCurrentPath = aBindings[i].parts[0] && aBindings[i].parts[0].path;
 				// Sometimes the binding does not contain a path
 				if (sCurrentPath && mBindingsCollection.bindingPaths.indexOf(sCurrentPath) === -1) {
 					mBindingsCollection.bindingPaths.push(sCurrentPath);
@@ -104,8 +103,8 @@ function(
 
 	function isElementRelatedToRelevantContainer(oElement, oRelevantContainerElement) {
 		if (oRelevantContainerElement && oElement !== oRelevantContainerElement) {
-			var oOverlay = OverlayRegistry.getOverlay(oElement);
-			var oRelevantContainer = oOverlay && (oOverlay.getRelevantContainer() || oOverlay.getElement());
+			const oOverlay = OverlayRegistry.getOverlay(oElement);
+			const oRelevantContainer = oOverlay && (oOverlay.getRelevantContainer() || oOverlay.getElement());
 			return oRelevantContainer ? oRelevantContainer.getId() === oRelevantContainerElement.getId() : true;
 		}
 		return true;
@@ -127,12 +126,12 @@ function(
 	 * @private
 	 */
 	BindingsExtractor.getBindings = function(mPropertyBag) {
-		var oElement = mPropertyBag.element;
-		var oModel = mPropertyBag.model;
-		var oParent = mPropertyBag.parent;
-		var sAggregationName = mPropertyBag.aggregationName;
-		var oRelevantContainerElement = mPropertyBag.relevantContainerElement;
-		var aBindings = [];
+		const oElement = mPropertyBag.element;
+		const oModel = mPropertyBag.model;
+		const oParent = mPropertyBag.parent;
+		const sAggregationName = mPropertyBag.aggregationName;
+		const oRelevantContainerElement = mPropertyBag.relevantContainerElement;
+		let aBindings = [];
 		if (isElementRelatedToRelevantContainer(oElement, oRelevantContainerElement)) {
 			aBindings = (
 				mPropertyBag.template
@@ -140,7 +139,7 @@ function(
 					: BindingsExtractor.getBindingsFromProperties(oElement, oModel)
 			);
 		}
-		var aAggregationNames = sAggregationName ? [sAggregationName] : Object.keys(oElement.getMetadata().getAllAggregations());
+		const aAggregationNames = sAggregationName ? [sAggregationName] : Object.keys(oElement.getMetadata().getAllAggregations());
 
 		if (!Number.isInteger(mPropertyBag.depth) || mPropertyBag.depth > 0) {
 			aAggregationNames.forEach(function(sAggregationNameInLoop) {
@@ -160,14 +159,10 @@ function(
 	};
 
 	function getBindingsForAggregation(oElement, oModel, bTemplate, sAggregationName, oRelevantContainerElement, iDepth) {
-		var aBindings = [];
-		var aElements = [];
-		var oTemplate;
-		var bIsInTemplate = bTemplate;
-		var oElementModel = oElement.getModel();
+		const oElementModel = oElement.getModel();
 
-		var oBinding = oElement.getBindingInfo(sAggregationName);
-		oTemplate = oBinding && oBinding.template;
+		const oBinding = oElement.getBindingInfo(sAggregationName);
+		const oTemplate = oBinding && oBinding.template;
 
 		// If a template is found for a different model, we don't look inside the template
 		// e.g. a Select control whose entries are defined in an own JSON model
@@ -177,13 +172,10 @@ function(
 
 		// If a template is bound to the current element on the given model,
 		// we continue the evaluation on the template (as it has no direct parent)
-		if (oTemplate) {
-			bIsInTemplate = true;
-			aElements = [oTemplate];
-		} else {
-			aElements = ElementUtil.getAggregation(oElement, sAggregationName);
-		}
+		const bIsInTemplate = oTemplate ? true : bTemplate;
+		const aElements = oTemplate ? [oTemplate] : ElementUtil.getAggregation(oElement, sAggregationName);
 
+		let aBindings = [];
 		// Getting children of the current aggregation and iterating through all of them
 		aElements.forEach(function(oChildElement) {
 			if (oChildElement.getMetadata) {
@@ -220,8 +212,8 @@ function(
 	 * @private
 	 */
 	BindingsExtractor.filterAndFlattenBindings = function(oBinding, oParentDefaultModel) {
-		var aBindings = [];
-		var sModelName = oBinding.getMetadata().getName();
+		let aBindings = [];
+		const sModelName = oBinding.getMetadata().getName();
 
 		if (sModelName === "sap.ui.model.CompositeBinding") {
 			oBinding.getBindings().forEach(function(oBinding) {
@@ -255,8 +247,8 @@ function(
 	 * @private
 	 */
 	function flattenBindingsFromTemplate(mBinding) {
-		var aBindings = [];
-		var aParts = mBinding.parts;
+		const aBindings = [];
+		const aParts = mBinding.parts;
 
 		// TODO: check if we need to filter bindings by modelName, relative indicator ("/")
 		aParts.forEach(function(mPart) {
@@ -279,7 +271,7 @@ function(
 	 * @private
 	 */
 	BindingsExtractor.getBindingsFromProperties = function(oElement, oModel) {
-		var aPropertiesKeys = Object.keys(oElement.getMetadata().getAllProperties());
+		const aPropertiesKeys = Object.keys(oElement.getMetadata().getAllProperties());
 
 		return aPropertiesKeys
 		// filter properties which are not bound
@@ -305,17 +297,16 @@ function(
 	 * @private
 	 */
 	function getBindingsFromTemplateProperties(oTemplate, oTemplateParent, oModel) {
-		var aPropertiesKeys = Object.keys(oTemplate.getMetadata().getAllProperties());
-		var bIsSameModel;
+		const aPropertiesKeys = Object.keys(oTemplate.getMetadata().getAllProperties());
 
 		return aPropertiesKeys
 		.filter(function(sPropertyName) {
-			var mBindingInfo = oTemplate.mBindingInfos[sPropertyName];
-			var sModelName = mBindingInfo && mBindingInfo.parts[0] && mBindingInfo.parts[0].model;
-			bIsSameModel = oModel === oTemplateParent.getModel(sModelName);
+			const mBindingInfo = oTemplate.mBindingInfos[sPropertyName];
+			const sModelName = mBindingInfo && mBindingInfo.parts[0] && mBindingInfo.parts[0].model;
+			let bIsSameModel = oModel === oTemplateParent.getModel(sModelName);
 			if (!sModelName) {
-				var oParentDefaultModel = oTemplateParent.getDefaultModel ? oTemplateParent.getDefaultModel() : null;
-				var oTemplateDefaultModel = oTemplate.getDefaultModel ? oTemplate.getDefaultModel() : null;
+				const oParentDefaultModel = oTemplateParent.getDefaultModel ? oTemplateParent.getDefaultModel() : null;
+				const oTemplateDefaultModel = oTemplate.getDefaultModel ? oTemplate.getDefaultModel() : null;
 				bIsSameModel = oParentDefaultModel === oTemplateDefaultModel;
 			} else {
 				bIsSameModel = oModel === oTemplateParent.getModel(sModelName);

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

@@ -64,13 +64,13 @@ sap.ui.define([
 	 * Constructor for a new sap.ui.rta.util.PluginManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 * @constructor
 	 * @private
 	 * @since 1.86
 	 * @alias sap.ui.rta.util.PluginManager
 	 */
-	var PluginManager = ManagedObject.extend("sap.ui.rta.util.PluginManager", {
+	const PluginManager = ManagedObject.extend("sap.ui.rta.util.PluginManager", {
 		metadata: {
 			properties: {
 				/**
@@ -280,7 +280,7 @@ sap.ui.define([
 	 * @private
 	 */
 	PluginManager.prototype.onElementEditableChange = function(oEvent) {
-		var bEditable = oEvent.getParameter("editable");
+		const bEditable = oEvent.getParameter("editable");
 		if (bEditable) {
 			this.iEditableOverlaysCount += 1;
 		} else {
@@ -292,15 +292,15 @@ sap.ui.define([
 	 * Handler for the stop cut and paste function.
 	 */
 	PluginManager.prototype.handleStopCutPaste = function() {
-		var oCutPastePlugin = this.getPlugin("cutPaste");
+		const oCutPastePlugin = this.getPlugin("cutPaste");
 		if (oCutPastePlugin) {
 			oCutPastePlugin.stopCutAndPaste();
 		}
 	};
 
 	PluginManager.prototype._destroyDefaultPlugins = function(mPluginsToKeep) {
-		for (var sDefaultPluginName in this._mDefaultPlugins) {
-			var oDefaultPlugin = this._mDefaultPlugins[sDefaultPluginName];
+		for (const sDefaultPluginName in this._mDefaultPlugins) {
+			const oDefaultPlugin = this._mDefaultPlugins[sDefaultPluginName];
 
 			if (oDefaultPlugin && !oDefaultPlugin.bIsDestroyed) {
 				if (!mPluginsToKeep || mPluginsToKeep[sDefaultPluginName] !== oDefaultPlugin) {

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

@@ -5,50 +5,83 @@
  */
 
 sap.ui.define([
-	"sap/ui/base/ManagedObject",
+	"sap/base/util/restricted/_curry",
 	"sap/m/InstanceManager",
-	"sap/ui/dt/Overlay",
-	"sap/ui/dt/OverlayRegistry",
-	"sap/ui/fl/Utils",
+	"sap/ui/base/ManagedObject",
 	"sap/ui/core/Component",
-	"sap/ui/core/ComponentContainer",
-	"sap/ui/core/Element",
 	"sap/ui/dt/util/ZIndexManager",
-	"sap/m/Dialog",
-	"sap/m/Popover",
-	"sap/base/util/restricted/_curry"
+	"sap/ui/dt/Overlay",
+	"sap/ui/dt/OverlayRegistry",
+	"sap/ui/fl/Utils"
 ], function(
-	ManagedObject,
+	_curry,
 	InstanceManager,
-	Overlay,
-	OverlayRegistry,
-	flUtils,
+	ManagedObject,
 	Component,
-	ComponentContainer,
-	Element,
 	ZIndexManager,
-	Dialog,
-	Popover,
-	_curry
+	Overlay,
+	OverlayRegistry,
+	FlUtils
 ) {
 	"use strict";
 
-	var FOCUS_EVENT_NAMES = {
+	const FOCUS_EVENT_NAMES = {
 		add: "_activateFocusHandle",
 		remove: "_deactivateFocusHandle"
 	};
 
+	// TODO harmonize with FlUtils.getAppComponentForControl, todos#9
+	function getAppComponentForControl(oControl) {
+		let oComponent;
+		let oAppComponent;
+
+		if (oControl.isA("sap.ui.core.Component")) {
+			oComponent = oControl;
+		} else {
+			oComponent = getComponentForControl(oControl);
+		}
+
+		if (oComponent) {
+			oAppComponent = FlUtils.getAppComponentForControl(oComponent);
+		}
+		return oAppComponent;
+	}
+
+	function getComponentForControl(oControl) {
+		let oComponent;
+		let oRootComponent;
+		let oParentControl;
+		if (oControl) {
+			oComponent = Component.getOwnerComponentFor(oControl);
+			if (
+				!oComponent
+				&& typeof oControl.getParent === "function"
+				&& oControl.getParent()?.isA("sap.ui.core.Element")
+			) {
+				oParentControl = oControl.getParent();
+			} else if (oComponent) {
+				oParentControl = oComponent;
+			}
+
+			if (oParentControl) {
+				oRootComponent = getComponentForControl(oParentControl);
+			}
+		}
+
+		return oRootComponent || oComponent;
+	}
+
 	/**
 	 * Constructor for a new sap.ui.rta.util.PopupManager
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.136.1
+	 * @version 1.138.0
 	 * @constructor
 	 * @private
 	 * @since 1.48
 	 * @alias sap.ui.rta.util.PopupManager
 	 */
-	var PopupManager = ManagedObject.extend("sap.ui.rta.util.PopupManager", {
+	const PopupManager = ManagedObject.extend("sap.ui.rta.util.PopupManager", {
 		metadata: {
 			properties: {
 				rta: "any"
@@ -120,20 +153,17 @@ sap.ui.define([
 	 * @public
 	 */
 	PopupManager.prototype.getCategorizedOpenPopups = function() {
-		var aOpenDialogs;
-		var aOpenPopovers;
-
 		// check if dialogs are already open when RTA is started
-		aOpenDialogs = InstanceManager.getOpenDialogs();
+		const aOpenDialogs = InstanceManager.getOpenDialogs();
 		// separate adaptable dialogs from all supported dialogs
-		var oCategorizedDialogs = this._getValidatedPopups(aOpenDialogs);
+		const oCategorizedDialogs = this._getValidatedPopups(aOpenDialogs);
 
 		// check if popovers are already open when RTA is started
-		aOpenPopovers = InstanceManager.getOpenPopovers();
+		const aOpenPopovers = InstanceManager.getOpenPopovers();
 		// separate adaptable popovers from all supported popovers
-		var oCategorizedPopovers = this._getValidatedPopups(aOpenPopovers);
+		const oCategorizedPopovers = this._getValidatedPopups(aOpenPopovers);
 
-		var oOpenPopups = {
+		const oOpenPopups = {
 			aDialogs: oCategorizedDialogs.relevant,
 			aPopovers: oCategorizedPopovers.relevant,
 			aAllSupportedPopups: oCategorizedDialogs.allSupported.concat(oCategorizedPopovers.allSupported)
@@ -150,12 +180,12 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._getValidatedPopups = function(aOpenPopups) {
-		var aAllSupportedPopups = [];
+		const aAllSupportedPopups = [];
 		aOpenPopups = aOpenPopups.filter(function(oPopupElement) {
 			if (this._isPopupAdaptable(oPopupElement)) {
 				aAllSupportedPopups.push(oPopupElement);
 				return true;
-			} else if (oPopupElement instanceof Dialog) {
+			} else if (oPopupElement.isA("sap.m.Dialog")) {
 				// all modal type popups are supported for which modal property is later turned true, when in Adaptation mode
 				aAllSupportedPopups.push(oPopupElement);
 			}
@@ -180,8 +210,8 @@ sap.ui.define([
 		return Array.isArray(oPopup.getContent())
 			? oPopup.getContent().some(
 				function(oContent) {
-					if (oContent instanceof ComponentContainer) {
-						return this.oRtaRootAppComponent === this._getAppComponentForControl(Component.getComponentById(oContent.getComponent()));
+					if (oContent.isA("sap.ui.core.ComponentContainer")) {
+						return this.oRtaRootAppComponent === getAppComponentForControl(Component.getComponentById(oContent.getComponent()));
 					}
 					return undefined;
 				}.bind(this))
@@ -196,7 +226,7 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._isSupportedPopup = function(oPopup) {
-		return (oPopup instanceof Dialog || oPopup instanceof Popover);
+		return (oPopup.isA("sap.m.Dialog") || oPopup.isA("sap.m.Popover"));
 	};
 
 	/**
@@ -208,10 +238,10 @@ sap.ui.define([
 	PopupManager.prototype.setRta = function(oRta) {
 		if (oRta && oRta._oDesignTime) {
 			this.setProperty("rta", oRta);
-			var oRootControl = oRta.getRootControlInstance();
-			this.oRtaRootAppComponent = this._getAppComponentForControl(oRootControl);
+			const oRootControl = oRta.getRootControlInstance();
+			this.oRtaRootAppComponent = getAppComponentForControl(oRootControl);
 			// listener for RTA mode change
-			var fnModeChange = this._onModeChange.bind(this);
+			const fnModeChange = this._onModeChange.bind(this);
 			oRta.attachModeChanged(fnModeChange);
 			this._overrideInstanceFunctions();
 		}
@@ -236,8 +266,8 @@ sap.ui.define([
 	 * @param  {sap.ui.base.Event} oEvent The Event triggered by the mode change
 	 */
 	PopupManager.prototype._onModeChange = function(oEvent) {
-		var sNewMode = oEvent.getParameters().mode;
-		var fnApplyFocusAndSetModal = function(sMode, oPopover) {
+		const sNewMode = oEvent.getParameters().mode;
+		const fnApplyFocusAndSetModal = function(sMode, oPopover) {
 			if (sMode === "navigation") {
 				// add focus handlers
 				oPopover.oPopup[this._getFocusEventName("add")]();
@@ -319,7 +349,7 @@ sap.ui.define([
 	PopupManager.prototype._overrideAddFunctions = function(fnOriginalFunction) {
 		return function(...aArgs) {
 			const [oPopupElement] = aArgs;
-			var vOriginalReturn = fnOriginalFunction.apply(InstanceManager, aArgs);
+			const vOriginalReturn = fnOriginalFunction.apply(InstanceManager, aArgs);
 			if (this._isSupportedPopup(oPopupElement)) {
 				if (this._isPopupAdaptable(oPopupElement)
 					&& this.getRta()._oDesignTime) {
@@ -327,7 +357,7 @@ sap.ui.define([
 					// PopupManager internal method
 					oPopupElement.attachEventOnce("afterOpen", this.fireOpen, this);
 					this._setModal(true, oPopupElement);
-				} else if (!(oPopupElement instanceof Popover)) {
+				} else if (!(oPopupElement.isA("sap.m.Popover"))) {
 					// for all popups which are non-adaptable and non-popovers
 					this._setModal(true, oPopupElement);
 				}
@@ -345,7 +375,7 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._setModal = function(bSetModal, oPopupElement) {
-		var bOriginalModalState = this._oModalState.get(oPopupElement.oPopup);
+		const bOriginalModalState = this._oModalState.get(oPopupElement.oPopup);
 		if (typeof bOriginalModalState !== "boolean" && bSetModal && this.getRta().getMode() !== "navigation") {
 			this._oModalState.set(oPopupElement.oPopup, oPopupElement.oPopup.getModal());
 			if (this._isPopupAdaptable(oPopupElement)) {
@@ -363,7 +393,7 @@ sap.ui.define([
 
 	PopupManager.prototype._applyPopupAttributes = function(mPropertyBag) {
 		// check if popups are open
-		var oRelevantPopups = this.getCategorizedOpenPopups();
+		const oRelevantPopups = this.getCategorizedOpenPopups();
 
 		["aDialogs", "aPopovers"].forEach(function(sKey) {
 			if (oRelevantPopups[sKey].length > 0) {
@@ -392,9 +422,9 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._applyPopupPatch = function(oPopupElement) {
-		var oOverlayContainer = Overlay.getOverlayContainer();
-		var {oPopup} = oPopupElement;
-		var aAutoCloseAreas = [
+		const oOverlayContainer = Overlay.getOverlayContainer();
+		const {oPopup} = oPopupElement;
+		const aAutoCloseAreas = [
 			oPopup.oContent.getDomRef(),
 			oOverlayContainer
 		].concat(
@@ -402,8 +432,8 @@ sap.ui.define([
 		);
 
 		if (this.getRta().getShowToolbars()) {
-			var oRtaToolbar = this.getRta().getToolbar();
-			var bVisible = !!oRtaToolbar.getVisible();
+			const oRtaToolbar = this.getRta().getToolbar();
+			const bVisible = !!oRtaToolbar.getVisible();
 			// Check if  RTA is not started -> toolbar is not visible
 			if (!bVisible) {
 				this.getRta().attachEventOnce("start", function() {
@@ -419,7 +449,7 @@ sap.ui.define([
 		// cases when onAfterRendering is called after this function - app inside popup
 		this.fnOriginalPopupOnAfterRendering ||= oPopup.onAfterRendering;
 		oPopup.onAfterRendering = function(...aArgs) {
-			var vOriginalReturn = this.fnOriginalPopupOnAfterRendering.apply(oPopup, aArgs);
+			const vOriginalReturn = this.fnOriginalPopupOnAfterRendering.apply(oPopup, aArgs);
 			oPopup[this._getFocusEventName("remove")]();
 			return vOriginalReturn;
 		}.bind(this);
@@ -455,7 +485,7 @@ sap.ui.define([
 	PopupManager.prototype._overrideRemoveFunctions = function(fnOriginalFunction) {
 		return function(...aArgs) {
 			const [oPopupElement] = aArgs;
-			var vOriginalReturn = fnOriginalFunction.apply(InstanceManager, aArgs);
+			const vOriginalReturn = fnOriginalFunction.apply(InstanceManager, aArgs);
 			if (this._isSupportedPopup(oPopupElement)) {
 				if (this._isPopupAdaptable(oPopupElement)
 					&& this.getRta()._oDesignTime) {
@@ -470,60 +500,6 @@ sap.ui.define([
 		}.bind(this);
 	};
 
-	/**
-	 * Returns the app component of the passed control is exists
-	 *
-	 * @param {sap.ui.core.Control} oControl Control object
-	 * @returns {object|undefined} component object if exists
-	 * @private
-	 */
-	PopupManager.prototype._getAppComponentForControl = function(oControl) {
-		var oComponent;
-		var oAppComponent;
-
-		if (oControl instanceof Component) {
-			oComponent = oControl;
-		} else {
-			oComponent = this._getComponentForControl(oControl);
-		}
-
-		if (oComponent) {
-			oAppComponent = flUtils.getAppComponentForControl(oComponent);
-		}
-		return oAppComponent;
-	};
-
-	/**
-	 * Returns the component of the passed control, navigating through control tree, except if parent is sap.ui.core.UIArea
-	 *
-	 * @param {sap.ui.core.Control} oControl Control object
-	 * @returns {object|undefined} component object if exists
-	 * @private
-	 */
-	PopupManager.prototype._getComponentForControl = function(oControl) {
-		var oComponent;
-		var oRootComponent;
-		var oParentControl;
-		if (oControl) {
-			oComponent = Component.getOwnerComponentFor(oControl);
-			if (
-				!oComponent
-				&& typeof oControl.getParent === "function"
-				&& oControl.getParent() instanceof Element
-			) {
-				oParentControl = oControl.getParent();
-			} else if (oComponent) {
-				oParentControl = oComponent;
-			}
-
-			if (oParentControl) {
-				oRootComponent = this._getComponentForControl(oParentControl);
-			}
-		}
-
-		return oRootComponent || oComponent;
-	};
-
 	/**
 	 * Create popup overlays
 	 *
@@ -534,7 +510,7 @@ sap.ui.define([
 		if (!oEvent) {
 			return;
 		}
-		var oPopupElement = (oEvent instanceof Element) ? oEvent : oEvent.getSource();
+		const oPopupElement = oEvent.isA("sap.ui.base.Event") ? oEvent.getSource() : oEvent;
 
 		// when application is opened in a popup, rootElement should not be added more than once
 		if (
@@ -583,7 +559,7 @@ sap.ui.define([
 	 * @private
 	 */
 	PopupManager.prototype._removePopupPatch = function(oPopupElement) {
-		var {oPopup} = oPopupElement;
+		const {oPopup} = oPopupElement;
 		oPopup[this._getFocusEventName("add")]();
 		if (this.fnOriginalPopupOnAfterRendering) {
 			oPopup.onAfterRendering = this.fnOriginalPopupOnAfterRendering;
@@ -591,7 +567,7 @@ sap.ui.define([
 	};
 
 	function checkPopupAncestorsAdaptation(oPopupElement) {
-		if (!oPopupElement || oPopupElement instanceof Component) {
+		if (!oPopupElement || oPopupElement.isA("sap.ui.core.Component")) {
 			return true;
 		}
 		if (!oPopupElement.isPopupAdaptationAllowed || oPopupElement.isPopupAdaptationAllowed()) {
@@ -601,10 +577,15 @@ sap.ui.define([
 	}
 
 	PopupManager.prototype._isPopupAdaptable = function(oPopupElement) {
-		if (oPopupElement.isPopupAdaptationAllowed && !oPopupElement.isPopupAdaptationAllowed()) {
+		if (oPopupElement.isPopupAdaptationAllowed) {
+			return oPopupElement.isPopupAdaptationAllowed();
+		}
+		// the event is needed for the RTA integration
+		if (!oPopupElement.getMetadata().getEvents().afterOpen) {
 			return false;
 		}
-		var oPopupAppComponent = this._getAppComponentForControl(oPopupElement);
+
+		const oPopupAppComponent = getAppComponentForControl(oPopupElement);
 		if (
 			(oPopupAppComponent && this.oRtaRootAppComponent === oPopupAppComponent)
 			|| this._isComponentInsidePopup(oPopupElement)