@openui5/sap.ui.rta 1.123.1 → 1.124.1

package/src/sap/ui/rta/plugin/iframe/AddIFrameDialog.fragment.xml

@@ -17,9 +17,9 @@
 		contentWidth="50rem"
 		contentHeight="44rem"
 		core:require="{ FloatType: 'sap/ui/model/type/Float' }"
+		afterOpen="configureMultiInput"
 	>
 		<content>
-
 			<layout:VerticalLayout
 					id="sapUiRtaAddIFrameDialog_VL"
 					width="100%"
@@ -72,7 +72,7 @@
 										ariaLabelledBy="sapUiRtaAddIFrameDialog_WidthUnitLabel"
 										selectedKey="{dialogInfo>/frameWidthUnit/value}"
 										items="{dialogInfo>/unitsOfWidthMeasure}"
-										showSecondaryValues= "true"
+										showSecondaryValues="true"
 										columnRatio="1:5"
 										width="auto"
 										maxWidth="400px">
@@ -99,7 +99,7 @@
 										selectedKey="{dialogInfo>/frameHeightUnit/value}"
 										forceSelection="false"
 										items="{dialogInfo>/unitsOfHeightMeasure}"
-										showSecondaryValues= "true"
+										showSecondaryValues="true"
 										columnRatio="1:5"
 										width="auto"
 										maxWidth="400px">
@@ -208,7 +208,7 @@
 								<ToolbarSpacer />
 								<Button
 									id="sapUiRtaAddIFrameDialog_PreviewButton"
-									enabled="{= !${dialogInfo>/frameUrlError/value} &amp;&amp; ${dialogInfo>/previousFrameUrl/value} !== ${dialogInfo>/frameUrl/value} || ${dialogInfo>/previewUseLegacyNavigation/value} !== ${dialogInfo>/useLegacyNavigation/value}}"
+									enabled="{= !${dialogInfo>/frameUrlError/value} &amp;&amp; (${dialogInfo>/previousFrameUrl/value} !== ${dialogInfo>/frameUrl/value} || ${dialogInfo>/settingsUpdate/value})}"
 									text="{=${dialogInfo>/previewUrl/value} === '' ? ${dialogInfo>/text/showPreviewButton} : ${dialogInfo>/text/updatePreviewButton} }"
 									press="onShowPreview"
 									class="sapUiTinyMarginTop sapUiRtaAddIFrameDialogPreviewButton" />
@@ -219,7 +219,12 @@
 							<Link
 								id="sapUiRtaAddIFrameDialog_PreviewLink"
 								class="sapUiRtaAddIFrameDialogPreviewLink"
-								href="{dialogInfo>/previewUrl/value}" text="{dialogInfo>/previewUrl/value}" wrapping="true" visible="{= !!${dialogInfo>/previewUrl/value} }" />
+								href="{dialogInfo>/previewUrl/value}"
+								text="{dialogInfo>/previewUrl/value}"
+								wrapping="true"
+								visible="{= !!${dialogInfo>/previewUrl/value} }"
+								target="_blank"
+							/>
 						</content>
 					</Panel>
 				</layout:Grid>
@@ -244,8 +249,8 @@
 									id="sapUiRtaAddIFrameDialog_PreviewFrame"
 									height="100%"
 									title="{dialogInfo>/text/previewFrameLabel}"
-									useLegacyNavigation="{dialogInfo>/previewUseLegacyNavigation/value/}"
 									class="sapUiRtaAddIFrameDialogPreviewFrame"
+									advancedSettings="{dialogInfo>/advancedSettings/value}"
 									visible="{= !!${dialogInfo>/previewUrl/value} }"/>
 						</items>
 					</VBox>
@@ -255,13 +260,17 @@
 					containerQuery="true"
 					defaultSpan="XL12 L12 M12 S12">
 					<Panel
+						id="sapUiRtaAddIFrameDialog_AdvancedSettingsPanel"
 						expandable="true"
 						width="auto"
 						expanded="false"
 						class="sapUiResponsiveMargin sapUiRtaAddIFrameDialogPreviewLinkPanel">
 						<headerToolbar>
 							<OverflowToolbar
-									class="sapUiRtaAddIFrameDialogPreviewLinkToolbar" height="3rem" style="Clear">
+									id="sapUiRtaAddIFrameDialog_AdvancedSettingsToolbar"
+									class="sapUiRtaAddIFrameDialogPreviewLinkToolbar"
+									height="3rem"
+									style="Clear">
 								<Title
 									class="sapUiRtaAddIFrameDialogPreviewLinkTitle"
 									text="{dialogInfo>/text/advancedSettingsTitle}" />
@@ -269,22 +278,116 @@
 							</OverflowToolbar>
 						</headerToolbar>
 						<content>
-							<HBox
-								alignItems="Center"
-								class="sapUiRtaAddIFrameDialogLegacyNavigationContainer">
-								<Switch
-									id="sapUiRtaAddIFrameDialog_UseLegacyNavigationToggle"
-									customTextOn=" "
-									customTextOff=" "
-									state="{dialogInfo>/useLegacyNavigation/value}" />
-								<Label
-									text="{dialogInfo>/text/useLegacyNavigationLabel}" />
-								<Button
-									icon="sap-icon://hint"
-									type="Transparent"
-									press="onLegacyNavigationInfoPress"
-									ariaHasPopup="Dialog" />
-								</HBox>
+							<MessageStrip
+								id="sapUiRtaAddIFrameDialog_SecurityWarningMessage"
+								text="{dialogInfo>/text/additionalParametersSecurityWarningText}"
+								type="Warning"
+								showIcon="true"
+								showCloseButton="true"
+								class="sapUiSmallMarginBottom">
+								<link>
+									<Link text="{dialogInfo>/text/additionalParametersWarningMoreInfoText}"
+										target="_blank"
+										href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe#sandbox"/>
+								</link>
+							</MessageStrip>
+							<form:Form editable="true">
+								<form:layout>
+									<form:ResponsiveGridLayout
+										id="sapUiRtaAddIFrameDialog_SanboxPropertiesForm"
+										adjustLabelSpan="false" singleContainerFullSize="false"
+										labelSpanXL="6" labelSpanL="6" labelSpanM="6" labelSpanS="12"
+										columnsXL="2" columnsL="2" columnsM="2"/>
+									</form:layout>
+										<form:FormContainer>
+											<form:FormElement label="allow-forms">
+												<Switch
+													change="onSwitchChange"
+													id="sapUiRtaAddIFrameDialog_allowFormsSwitch"
+													customTextOn=" "
+													customTextOff=" "
+													state="{dialogInfo>/advancedSettings/value/allowForms}" />
+											</form:FormElement>
+											<form:FormElement label="allow-popups">
+												<Switch
+													change="onSwitchChange"
+													id="sapUiRtaAddIFrameDialog_allowPopupsSwitch"
+													customTextOn=" "
+													customTextOff=" "
+													state="{dialogInfo>/advancedSettings/value/allowPopups}" />
+											</form:FormElement>
+											<form:FormElement label="allow-scripts">
+												<Switch
+													change="onSwitchChange"
+													id="sapUiRtaAddIFrameDialog_allowScriptsSwitch"
+													customTextOn=" "
+													customTextOff=" "
+													state="{dialogInfo>/advancedSettings/value/allowScripts}" />
+											</form:FormElement>
+											<form:FormElement label="allow-modals">
+												<Switch
+													change="onSwitchChange"
+													id="sapUiRtaAddIFrameDialog_allowModalsSwitch"
+													customTextOn=" "
+													customTextOff=" "
+													state="{dialogInfo>/advancedSettings/value/allowModals}" />
+											</form:FormElement>
+											<form:FormElement label="allow-same-origin">
+												<Switch
+													change="onSwitchChange"
+													id="sapUiRtaAddIFrameDialog_allowSameOriginSwitch"
+													customTextOn=" "
+													customTextOff=" "
+													state="{dialogInfo>/advancedSettings/value/allowSameOrigin}" />
+											</form:FormElement>
+										</form:FormContainer>
+										<form:FormContainer>
+											<form:FormElement label="allow-top-navigation">
+												<Switch
+													change="onSwitchChange"
+													id="sapUiRtaAddIFrameDialog_allowTopNavigationSwitch"
+													customTextOn=" "
+													customTextOff=" "
+													state="{dialogInfo>/advancedSettings/value/allowTopNavigation}" />
+											</form:FormElement>
+											<form:FormElement label="allow-downloads">
+												<Switch
+													change="onSwitchChange"
+													id="sapUiRtaAddIFrameDialog_allowDownloadsSwitch"
+													customTextOn=" "
+													customTextOff=" "
+													state="{dialogInfo>/advancedSettings/value/allowDownloads}" />
+											</form:FormElement>
+											<form:FormElement label="allow-downloads-without-user-activation">
+												<Switch
+													change="onSwitchChange"
+													id="sapUiRtaAddIFrameDialog_allowDownloadsWithoutUserActivationSwitch"
+													customTextOn=" "
+													customTextOff=" "
+													state="{dialogInfo>/advancedSettings/value/allowDownloadsWithoutUserActivation}" />
+											</form:FormElement>
+											<form:FormElement>
+												<Label
+													id="sapUiRtaAddIFrameDialog_AddAdditionalParametersLabel"
+													class="sapUiSmallMarginTop"
+													text="{dialogInfo>/text/additionalSandboxParametersLabel}"
+													labelFor="sapUiRtaAddIFrameDialog_AddAdditionalParametersInput" />
+											</form:FormElement>
+											<form:FormElement>
+												<MultiInput
+													id="sapUiRtaAddIFrameDialog_AddAdditionalParametersInput"
+													placeholder="{dialogInfo>/text/additionalSandboxParametersPlaceholder}"
+													showValueHelp="false"
+													tokenUpdate="onTokenUpdate"
+													tokens="{dialogInfo>/advancedSettings/value/additionalSandboxParameters}"
+													ariaLabelledBy="sapUiRtaAddIFrameDialog_AddAdditionalParametersLabel">
+													<tokens>
+														<Token text="{dialogInfo>}" key="{dialogInfo>}"/>
+													</tokens>
+												</MultiInput>
+									</form:FormElement>
+								</form:FormContainer>
+							</form:Form>
 						</content>
 					</Panel>
 				</layout:Grid>
@@ -295,7 +398,6 @@
 			<core:InvisibleText id="sapUiRtaAddIFrameDialog_HeightUnitLabel" text="{dialogInfo>/text/heightUnitLabel}"/>
 			<core:InvisibleText id="sapUiRtaAddIFrameDialog_ParameterSearchLabel" text="{dialogInfo>/text/parameterSearchLabel}"/>
 		</content>
-
 		<beginButton>
 			<Button
 				id="sapUiRtaAddIFrameDialogSaveButton"

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

@@ -63,11 +63,13 @@ sap.ui.define([
 		selectAdditionalTextPx: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_SELECT_ADDITIONAL_TEXT_PX"),
 		selectAdditionalTextRem: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_SELECT_ADDITIONAL_TEXT_REM"),
 		advancedSettingsTitle: _oTextResources.getText("IFRAME_ADDIFRAME_ADVANCED_SETTINGS"),
-		useLegacyNavigationLabel: _oTextResources.getText("IFRAME_ADDIFRAME_USE_LEGACY_NAVIGATION"),
-		useLegacyNavigationInfo: _oTextResources.getText("IFRAME_ADDIFRAME_USE_LEGACY_NAVIGATION_INFO")
+		additionalParametersSecurityWarningText: _oTextResources.getText("IFRAME_ADDIFRAME_ADDITIONAL_PARAMETERS_SECURITY_WARNING_TEXT"),
+		additionalParametersWarningMoreInfoText: _oTextResources.getText("IFRAME_ADDIFRAME_ADDITIONAL_PARAMETERS_WARNING_MORE_INFO_TEXT"),
+		additionalSandboxParametersLabel: _oTextResources.getText("IFRAME_ADDIFRAME_ADD_ADDITIONAL_SANDBOX_PARAMETERS_LABEL"),
+		additionalSandboxParametersPlaceholder: _oTextResources.getText("IFRAME_ADDIFRAME_ADD_ADDITIONAL_SANDBOX_PARAMETERS_PLACEHOLDER")
 	};
 
-	function createJSONModel(bSetUpdateTitle, bAsContainer, sFrameWidthValue, sFrameHeightValue, bUseLegacyNavigation) {
+	function createJSONModel(bSetUpdateTitle, bAsContainer, sFrameWidthValue, sFrameHeightValue, oAdvancedSettings) {
 		_mText.dialogTitle = bSetUpdateTitle ? _mText.dialogUpdateTitle : _mText.dialogCreateTitle;
 
 		var sSelectAdditionalTextPercent = bAsContainer
@@ -135,11 +137,19 @@ sap.ui.define([
 				unit: "rem",
 				descriptionText: _mText.selectAdditionalTextRem
 			}],
-			useLegacyNavigation: {
-				value: !!bUseLegacyNavigation
+			advancedSettings: {
+				value: {
+					allowForms: true,
+					allowPopups: true,
+					allowScripts: true,
+					allowModals: true,
+					allowSameOrigin: true,
+					additionalSandboxParameters: [],
+					...oAdvancedSettings
+				}
 			},
-			previewUseLegacyNavigation: {
-				value: !!bUseLegacyNavigation
+			settingsUpdate: {
+				value: false
 			}
 		});
 	}
@@ -150,7 +160,7 @@ sap.ui.define([
 	 * @class Context - Dialog for IFrame settings in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @constructor
 	 * @private
 	 * @since 1.78
@@ -193,7 +203,7 @@ sap.ui.define([
 			!!mSettings?.asContainer,
 			mSettings?.frameWidth,
 			mSettings?.frameHeight,
-			mSettings?.useLegacyNavigation
+			mSettings?.advancedSettings
 		);
 		this._oController = new AddIFrameDialogController(this._oJSONModel, mSettings);
 		Fragment.load({

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

@@ -5,8 +5,7 @@
  */
 sap.ui.define([
 	"sap/base/Log",
-	"sap/m/Popover",
-	"sap/m/Text",
+	"sap/m/Token",
 	"sap/ui/core/mvc/Controller",
 	"sap/ui/core/Element",
 	"sap/ui/core/Lib",
@@ -18,8 +17,7 @@ sap.ui.define([
 	"sap/ui/rta/plugin/iframe/urlCleaner"
 ], function(
 	Log,
-	Popover,
-	Text,
+	Token,
 	Controller,
 	Element,
 	Lib,
@@ -39,7 +37,7 @@ sap.ui.define([
 
 	var _aTextInputFields = ["frameUrl", "title"];
 	var _aNumericInputFields = ["frameWidth", "frameHeight"];
-	var _aOtherInputFields = ["frameWidthUnit", "frameHeightUnit", "useLegacyNavigation"];
+	var _aOtherInputFields = ["frameWidthUnit", "frameHeightUnit", "advancedSettings"];
 
 	function isValidUrl(sUrl) {
 		if (
@@ -54,6 +52,11 @@ sap.ui.define([
 		return IFrame.isValidUrl(encodeURI(sUrl));
 	}
 
+	function multiInputValidator(oValue) {
+		const sText = oValue.text;
+		return new Token({key: sText, text: sText});
+	}
+
 	return Controller.extend("sap.ui.rta.plugin.iframe.AddIFrameDialogController", {
 		// eslint-disable-next-line object-shorthand
 		constructor: function(oJSONModel, mSettings) {
@@ -61,6 +64,39 @@ sap.ui.define([
 			this._importSettings(mSettings);
 		},
 
+		configureMultiInput() {
+			// This syntax is the suggested way by the UI5 documentation to trigger a submit on the input field on focus loss
+			const oMultiInput = Element.getElementById("sapUiRtaAddIFrameDialog_AddAdditionalParametersInput");
+			oMultiInput.addValidator(multiInputValidator);
+		},
+
+		onSwitchChange() {
+			this._oJSONModel.setProperty("/settingsUpdate/value", true);
+		},
+
+		/**
+		 * Event handler for token update
+		 * @param {sap.ui.base.Event} oEvent - Event
+		 */
+		onTokenUpdate(oEvent) {
+			let aSandboxParameters = this._oJSONModel.getProperty("/advancedSettings/value/additionalSandboxParameters");
+
+			if (oEvent.getParameter("type") === "added") {
+				oEvent.getParameter("addedTokens").forEach(function(oToken) {
+					aSandboxParameters = [...aSandboxParameters, oToken.getText()];
+				});
+			} else if (oEvent.getParameter("type") === "removed") {
+				oEvent.getParameter("removedTokens").forEach(function(oToken) {
+					aSandboxParameters = aSandboxParameters.filter(function(sText) {
+						return sText !== oToken.getText();
+					});
+				});
+			}
+
+			this._oJSONModel.setProperty("/advancedSettings/value/additionalSandboxParameters", aSandboxParameters);
+			this._oJSONModel.setProperty("/settingsUpdate/value", true);
+		},
+
 		/**
 		 * Event handler for validation success
 		 * @param {sap.ui.base.Event} oEvent - Event
@@ -116,11 +152,9 @@ sap.ui.define([
 			try {
 				this._oJSONModel.setProperty("/previewUrl/value", sURL);
 				this._oJSONModel.setProperty("/previousFrameUrl/value", sReturnedURL);
-				this._oJSONModel.setProperty(
-					"/previewUseLegacyNavigation/value",
-					this._oJSONModel.getProperty("/useLegacyNavigation/value")
-				);
-				oIFrame.applySettings({ url: sURL });
+				this._oJSONModel.setProperty("/settingsUpdate/value", false);
+
+				oIFrame.applySettings({ url: sURL, advancedSettings: {...this._oJSONModel.getProperty("/advancedSettings/value")} });
 			} catch (oError) {
 				Log.error("Error previewing the URL: ", oError);
 			}
@@ -146,26 +180,6 @@ sap.ui.define([
 			oBinding.filter([oFilter]);
 		},
 
-		onLegacyNavigationInfoPress(oEvent) {
-			const oButton = oEvent.getSource();
-			if (!this._oPopover) {
-				this._oPopover = new Popover(
-					`${oButton.getId()}-popover`,
-					{
-						showHeader: false,
-						contentWidth: "400px",
-						content: [
-							new Text({
-								text: "{/text/useLegacyNavigationInfo}"
-							}).addStyleClass("sapUiSmallMargin")
-						]
-					}
-				);
-				oButton.addDependent(this._oPopover);
-			}
-			this._oPopover.openBy(oButton);
-		},
-
 		/**
 		 * Build preview URL
 		 * @returns {string} URL with resolved bindings

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

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.Action
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted
 	 *

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.ControllerExtension
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted
 	*/

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

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.Outline
 	 * @author SAP SE
 	 * @since 1.56
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.Property
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted
 	*/

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

@@ -14,7 +14,7 @@ sap.ui.define(function() {
 	 * @name sap.ui.rta.service.Selection
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted
 	*/

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.SupportTools
 	 * @author SAP SE
 	 * @since 1.106
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @private
 	 * @ui5-restricted
 	 */

package/src/sap/ui/rta/themes/base/AddIFrame.less

@@ -116,11 +116,6 @@
 				}
 			}
 
-			.sapUiRtaAddIFrameDialogLegacyNavigationContainer > div {
-				display: flex;
-				align-items: center;
-			}
-
 			.sapUiRtaAddIFrameDialogPreviewGrid {
 				padding: 0;
 				margin: 0 1rem 1rem;

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

@@ -55,7 +55,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.m.HBox
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @constructor
 	 * @private

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

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

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

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

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.m.OverflowToolbarButton
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @constructor
 	 * @private

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

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

package/src/sap/ui/rta/toolbar/contextBased/SaveAsAdaptation.js

@@ -45,7 +45,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @constructor
 	 * @private

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

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

package/src/sap/ui/rta/toolbar/versioning/Versioning.js

@@ -38,7 +38,7 @@ sap.ui.define([
 	 * @class
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -28,11 +28,12 @@ function(
 	 * @param {sap.ui.core.Control} oElement - Starting point of the search
 	 * @param {sap.ui.model.Model} oModel - Model for filtering irrelevant binding paths
 	 * @param {sap.ui.core.Control} [oRelevantContainerElement] - if this element is given then only bindings from element related to the relevant container are considered
+	 * @param {number} iDepth - If provided only bindings from children up to the given depth are considered
 	 * @returns {{bindingPaths: Array, bindingContextPaths: Array}} - returns with all relevant bindingPaths and all bindingContextPaths for all properties of the element
 	 *
 	 * @private
 	 */
-	BindingsExtractor.collectBindingPaths = function(oElement, oModel, oRelevantContainerElement) {
+	BindingsExtractor.collectBindingPaths = function(oElement, oModel, oRelevantContainerElement, iDepth) {
 		var mBindingsCollection = {
 			bindingPaths: [],
 			bindingContextPaths: []
@@ -43,7 +44,8 @@ function(
 			element: oElement,
 			model: oModel,
 			relevantContainerElement: oRelevantContainerElement,
-			parent: oParent
+			parent: oParent,
+			depth: iDepth
 		});
 
 		if (oParent) {
@@ -60,13 +62,16 @@ function(
 
 					if (oTemplateDefaultAggregation) {
 						var sTemplateDefaultAggregationName = oTemplateDefaultAggregation.name;
-						var oTemplateElement = ElementUtil.getAggregation(oTemplate, sTemplateDefaultAggregationName)[iPositionOfInvisibleElement];
+						var oTemplateElement = ElementUtil.getAggregation(
+							oTemplate, sTemplateDefaultAggregationName
+						)[iPositionOfInvisibleElement];
 						aBindings = aBindings.concat(BindingsExtractor.getBindings({
 							model: oModel,
 							element: oTemplateElement,
 							template: true,
 							relevantContainerElement: oRelevantContainerElement,
-							parent: oParent
+							parent: oParent,
+							depth: iDepth
 						}));
 					}
 				}
@@ -137,15 +142,24 @@ function(
 		}
 		var aAggregationNames = sAggregationName ? [sAggregationName] : Object.keys(oElement.getMetadata().getAllAggregations());
 
-		aAggregationNames.forEach(function(sAggregationNameInLoop) {
-			aBindings = aBindings.concat(getBindingsForAggregation(oElement, oModel, mPropertyBag.template, sAggregationNameInLoop, oRelevantContainerElement));
-		});
+		if (!Number.isInteger(mPropertyBag.depth) || mPropertyBag.depth > 0) {
+			aAggregationNames.forEach(function(sAggregationNameInLoop) {
+				aBindings = aBindings.concat(getBindingsForAggregation(
+					oElement,
+					oModel,
+					mPropertyBag.template,
+					sAggregationNameInLoop,
+					oRelevantContainerElement,
+					mPropertyBag.depth && mPropertyBag.depth - 1
+				));
+			});
+		}
 
 		// Remove duplicates
 		return _uniqWith(aBindings, deepEqual);
 	};
 
-	function getBindingsForAggregation(oElement, oModel, bTemplate, sAggregationName, oRelevantContainerElement) {
+	function getBindingsForAggregation(oElement, oModel, bTemplate, sAggregationName, oRelevantContainerElement, iDepth) {
 		var aBindings = [];
 		var aElements = [];
 		var oTemplate;
@@ -185,7 +199,8 @@ function(
 						model: oModel,
 						template: bIsInTemplate,
 						relevantContainerElement: oRelevantContainerElement,
-						parent: oElement
+						parent: oElement,
+						depth: iDepth
 					})
 				);
 			}

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

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

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

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