@openui5/sap.ui.rta 1.108.18 → 1.108.20

package/src/sap/ui/rta/plugin/Plugin.js

@@ -6,14 +6,15 @@
 
 // Provides class sap.ui.rta.plugin.Plugin.
 sap.ui.define([
+	"sap/base/util/restricted/_debounce",
 	"sap/ui/dt/Plugin",
 	"sap/ui/fl/write/api/ChangesWriteAPI",
 	"sap/ui/dt/OverlayRegistry",
 	"sap/ui/dt/OverlayUtil",
 	"sap/ui/fl/changeHandler/JsControlTreeModifier",
 	"sap/ui/rta/util/hasStableId"
-],
-function(
+], function(
+	debounce,
 	Plugin,
 	ChangesWriteAPI,
 	OverlayRegistry,
@@ -69,7 +70,7 @@ function(
 	 * @extends sap.ui.dt.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 *
 	 * @constructor
 	 * @private
@@ -125,7 +126,39 @@ function(
 		}
 	};
 
+	function debounceFunction(mDebounceFunctions, oOverlay, sName, fnOriginalFunction) {
+		// Create debounced function for the given parameters if it was not created before
+		var sOverlayId = oOverlay.getId();
+		if (!mDebounceFunctions[sOverlayId]) {
+			mDebounceFunctions[sOverlayId] = {};
+		}
+		if (!mDebounceFunctions[sOverlayId][sName]) {
+			// Debounce with approximately one frame to cover multiple synchronous calls
+			// without causing a huge delay
+			mDebounceFunctions[sOverlayId][sName] = debounce(fnOriginalFunction, 16);
+		}
+		// Execute the function
+		mDebounceFunctions[sOverlayId][sName]();
+	}
+
 	var _onElementModified = function (oEvent) {
+		// Initialize here because plugins may not extend the rta.Plugin and
+		// instead inherit the method via rta.Utils.extendWith
+		// Therefore the constructor/init might not be properly called
+		if (!this._mDebounceFunctions) {
+			// The _onElementModified callback might be triggered many times in a row, e.g.
+			// by SimpleForms which add all aggregation items one by one
+			// Since the resulting editable checks in the plugins can be expensive async functions
+			// the calls are debounced
+			this._mDebounceFunctions = {
+				// Make sure that all closure variables of the debounced function
+				// are part of the map key:
+				// [overlayId][oEvent.getParameters().name]: function
+				insertOrRemove: {},
+				addOrSet: {}
+			};
+		}
+
 		var oParams = oEvent.getParameters();
 		var aRelevantOverlays;
 		var oOverlay = oEvent.getSource();
@@ -150,18 +183,22 @@ function(
 			oParams.type === "insertAggregation"
 			|| oParams.type === "removeAggregation"
 		) {
-			aRelevantOverlays = this._getRelevantOverlays(oOverlay, oParams.name);
-			this.evaluateEditable(aRelevantOverlays, {onRegistration: false});
-		} else if (oParams.type === "addOrSetAggregation") {
-			if (this.getDesignTime().getStatus() === "synced") {
+			debounceFunction(this._mDebounceFunctions["insertOrRemove"], oOverlay, oParams.name, function() {
 				aRelevantOverlays = this._getRelevantOverlays(oOverlay, oParams.name);
 				this.evaluateEditable(aRelevantOverlays, {onRegistration: false});
-			} else {
-				this.getDesignTime().attachEventOnce("synced", function () {
+			}.bind(this));
+		} else if (oParams.type === "addOrSetAggregation") {
+			debounceFunction(this._mDebounceFunctions["addOrSet"], oOverlay, oParams.name, function() {
+				if (this.getDesignTime().getStatus() === "synced") {
 					aRelevantOverlays = this._getRelevantOverlays(oOverlay, oParams.name);
 					this.evaluateEditable(aRelevantOverlays, {onRegistration: false});
-				}, this);
-			}
+				} else {
+					this.getDesignTime().attachEventOnce("synced", function () {
+						aRelevantOverlays = this._getRelevantOverlays(oOverlay, oParams.name);
+						this.evaluateEditable(aRelevantOverlays, {onRegistration: false});
+					}, this);
+				}
+			}.bind(this));
 		}
 	};
 

package/src/sap/ui/rta/plugin/RTAElementMover.js

@@ -35,7 +35,7 @@ function(
 	 * The RTAElementMover is responsible for the RTA specific adaptation of element movements.
 	 *
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 *
 	 * @constructor
 	 * @private
@@ -109,7 +109,7 @@ function(
 		// Direct children of template aggregations should not be movable
 		// because their order is defined based on the underlying data
 		var oElement = oOverlay.getElement();
-		if (ElementUtil.isElementDirectTemplateChild(oElement)) {
+		if (oElement.isDestroyStarted() || ElementUtil.isElementDirectTemplateChild(oElement)) {
 			return Promise.resolve(false);
 		}
 

package/src/sap/ui/rta/plugin/Remove.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @class The Remove allows trigger remove operations on the overlay
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/plugin/Rename.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.plugin.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/plugin/RenameHandler.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * Provides Rename handling functionality
 	 *
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/plugin/Resize.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @constructor
 	 * @private
 	 * @since 1.101

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

@@ -30,7 +30,7 @@ function (
 	 * @class The Selection plugin allows you to select or focus overlays with mouse or keyboard and navigate to others.
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @constructor
 	 * @private
 	 * @since 1.34

package/src/sap/ui/rta/plugin/Settings.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @class The Settings allows trigger change of settings operations on the overlay
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @constructor
 	 * @private
 	 * @since 1.44

package/src/sap/ui/rta/plugin/Split.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @constructor
 	 * @private
 	 * @since 1.46

package/src/sap/ui/rta/plugin/Stretch.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.plugin.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/rta/plugin/additionalElements/ActionExtractor.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * handled by the AdditionalElements Plugin (Reveal, Add Via Delegate, Add Custom)
 	 *
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @private
 	 * @since 1.94
 	 * @experimental Since 1.94. This class is experimental and provides only limited functionality. Also the API might be changed in future.
@@ -333,13 +333,13 @@ sap.ui.define([
 	 *
 	 * @return {Promise} Resolving to a structure with all "add/reveal" action relevant data collected
 	 */
-	ActionExtractor.getActions = function(bSibling, oSourceElementOverlay, oPlugin, bInvalidate) {
+	ActionExtractor.getActions = function(bSibling, oSourceElementOverlay, oPlugin, bInvalidate, oDesignTime) {
 		var sSiblingOrChild = bSibling ? "asSibling" : "asChild";
 		if (!bInvalidate && oSourceElementOverlay._mAddActions) {
 			return Promise.resolve(oSourceElementOverlay._mAddActions[sSiblingOrChild]);
 		}
 
-		var oRevealActionsPromise = this._getRevealActions(bSibling, oSourceElementOverlay, oPlugin);
+		var oRevealActionsPromise = this._getRevealActions(bSibling, oSourceElementOverlay, oPlugin, oDesignTime);
 		var oAddPropertyActionsPromise = this._getAddViaDelegateActions(bSibling, oSourceElementOverlay, oPlugin);
 
 		return Promise.all([
@@ -366,6 +366,9 @@ sap.ui.define([
 		return oOverlay._mAddActions && oOverlay._mAddActions[sSiblingOrChild];
 	};
 
+	var mRevealCache = {};
+	var bIsSyncRegistered = true;
+
 	/**
 	 * Returns the Reveal actions data (parameters + elements) for an Overlay
 	 * @param {boolean} bSibling - If source element overlay should be sibling or parent to the newly added fields
@@ -374,7 +377,15 @@ sap.ui.define([
 	 *
 	 * @returns {Promise<object>} Reveal action data
 	 */
-	ActionExtractor._getRevealActions = function(bSibling, oSourceElementOverlay, oPlugin) {
+	ActionExtractor._getRevealActions = function(bSibling, oSourceElementOverlay, oPlugin, oDesignTime) {
+		if (bIsSyncRegistered) {
+			bIsSyncRegistered = false;
+			oDesignTime.attachEventOnce("synced", function() {
+				mRevealCache = {};
+				bIsSyncRegistered = true;
+			}, this);
+		}
+
 		var mParents = AdditionalElementsUtils.getParents(bSibling, oSourceElementOverlay, oPlugin);
 		var aParents = [mParents.parentOverlay];
 		if (mParents.relevantContainer !== mParents.parent) {
@@ -386,6 +397,10 @@ sap.ui.define([
 		}
 		var aAggregationNames = [];
 		if (mParents.parentOverlay) {
+			var mCachedResult = mRevealCache[mParents.parentOverlay.getId()];
+			if (mCachedResult && bSibling) {
+				return mCachedResult;
+			}
 			aAggregationNames = mParents.parentOverlay.getAggregationOverlays().filter(function(oAggregationOverlay) {
 				return !oAggregationOverlay.getDesignTimeMetadata().isIgnored(mParents.parent);
 			}).map(function(oAggregationOverlay) {
@@ -395,7 +410,13 @@ sap.ui.define([
 				return oPreviousPromise.then(function(mReveal) {
 					return getRevealActionFromAggregations(aParents, mReveal, sAggregationName, aAggregationNames, oPlugin);
 				});
-			}, Promise.resolve({}));
+			}, Promise.resolve({}))
+				.then(function(mAggregatedReveal) {
+					if (bSibling) {
+						mRevealCache[mParents.parentOverlay.getId()] = mAggregatedReveal;
+					}
+					return mAggregatedReveal;
+				});
 		}
 		return Promise.resolve({});
 	};

package/src/sap/ui/rta/plugin/additionalElements/AddElementsDialog.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @class Context - Dialog for available Fields in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @constructor
 	 * @private
 	 * @since 1.44

package/src/sap/ui/rta/plugin/additionalElements/AdditionalElementsPlugin.js

@@ -75,7 +75,7 @@ sap.ui.define([
 	 * @class The plugin allows to add additional elements that exist either hidden in the UI or in the OData service
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @constructor
 	 * @private
 	 * @since 1.44
@@ -234,7 +234,7 @@ sap.ui.define([
 			var mActions;
 			var aAllElements = [];
 
-			return ActionExtractor.getActions(bOverlayIsSibling, oResponsibleElementOverlay, this)
+			return ActionExtractor.getActions(bOverlayIsSibling, oResponsibleElementOverlay, this, undefined, this.getDesignTime())
 				.then(function(mRetrievedActions) {
 					if (sAggregationName === "$$OnlyChildCustomField$$") {
 						return [];
@@ -343,7 +343,7 @@ sap.ui.define([
 						return false;
 					}
 
-					return ActionExtractor.getActions(bOverlayIsSibling, oOverlay, this, true)
+					return ActionExtractor.getActions(bOverlayIsSibling, oOverlay, this, true, this.getDesignTime())
 						.then(function (mActions) {
 							this.clearCachedElements();
 							return Utils.doIfAllControlsAreAvailable([oOverlay, mParents.parentOverlay], function () {
@@ -397,7 +397,7 @@ sap.ui.define([
 
 			this.clearExtensibilityInfo(bOverlayIsSibling);
 
-			return ActionExtractor.getActions(bOverlayIsSibling, oElementOverlay, this)
+			return ActionExtractor.getActions(bOverlayIsSibling, oElementOverlay, this, undefined, this.getDesignTime())
 				.then(function(mAllActions) {
 					each(mAllActions, function(sAggregationName) {
 						mActions = mAllActions[sAggregationName];

package/src/sap/ui/rta/plugin/additionalElements/AdditionalElementsUtils.js

@@ -15,7 +15,7 @@ sap.ui.define([
 	 * Helper object containing methods for the AdditionalElements plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @private
 	 * @since 1.94
 	 * @experimental Since 1.94. This class is experimental and provides only limited functionality. Also the API might be changed in future.

package/src/sap/ui/rta/plugin/additionalElements/CommandBuilder.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * Helper object to build the RTA commands resulting from the AdditionalElements Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @private
 	 * @since 1.94
 	 * @experimental Since 1.94. This class is experimental and provides only limited functionality. Also the API might be changed in future.

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

@@ -48,7 +48,8 @@ sap.ui.define([
 			index: mSettings.index,
 			url: mSettings.frameUrl,
 			width: sWidth,
-			height: sHeight
+			height: sHeight,
+			useLegacyNavigation: mSettings.useLegacyNavigation
 		}, oDesignTimeMetadata, sVariantManagementKey);
 	}
 
@@ -110,7 +111,7 @@ sap.ui.define([
 	 * @class The AddIFrame allows trigger AddIFrame operations on the overlay.
 	 * @extends sap.ui.rta.plugin.BaseCreate
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @constructor
 	 * @private
 	 * @since 1.75

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

@@ -149,9 +149,12 @@
 									class="sapUiRtaAddIFrameDialogPreviewLinkTitle"
 									text="{/text/previewUrlLabel}" />
 								<ToolbarSpacer />
-								<Button id="sapUiRtaAddIFrameDialog_PreviewButton" enabled="{=${/previewUrl/value} !== ${/frameUrl/value} }"
-										text="{=${/previewUrl/value} === '' ? ${/text/showPreviewButton} : ${/text/updatePreviewButton} }" press="onShowPreview"
-										class="sapUiTinyMarginTop sapUiRtaAddIFrameDialogPreviewButton" />
+								<Button
+									id="sapUiRtaAddIFrameDialog_PreviewButton"
+									enabled="{=${/previewUrl/value} !== ${/frameUrl/value} || ${/previewUseLegacyNavigation/value} !== ${/useLegacyNavigation/value}}"
+									text="{=${/previewUrl/value} === '' ? ${/text/showPreviewButton} : ${/text/updatePreviewButton} }"
+									press="onShowPreview"
+									class="sapUiTinyMarginTop sapUiRtaAddIFrameDialogPreviewButton" />
 							</OverflowToolbar>
 						</headerToolbar>
 						<content>
@@ -182,11 +185,50 @@
 							<util:IFrame
 									id="sapUiRtaAddIFrameDialog_PreviewFrame"
 									title="{/text/previewFrameLabel}"
+									useLegacyNavigation="{/previewUseLegacyNavigation/value/}"
 									class="sapUiRtaAddIFrameDialogPreviewFrame"
 									visible="{= !!${/previewUrl/value} }"/>
 						</items>
 					</VBox>
 				</layout:Grid>
+				<layout:Grid
+					class="sapUiRtaAddIFrameDialogPreviewLinkGrid"
+					containerQuery="true"
+					defaultSpan="XL12 L12 M12 S12">
+					<Panel
+						expandable="true"
+						width="auto"
+						expanded="false"
+						class="sapUiResponsiveMargin sapUiRtaAddIFrameDialogPreviewLinkPanel">
+						<headerToolbar>
+							<OverflowToolbar
+									class="sapUiRtaAddIFrameDialogPreviewLinkToolbar" height="3rem" style="Clear">
+								<Title
+									class="sapUiRtaAddIFrameDialogPreviewLinkTitle"
+									text="{/text/advancedSettingsTitle}" />
+								<ToolbarSpacer />
+							</OverflowToolbar>
+						</headerToolbar>
+						<content>
+							<HBox
+								alignItems="Center"
+								class="sapUiRtaAddIFrameDialogLegacyNavigationContainer">
+								<Switch
+									id="sapUiRtaAddIFrameDialog_UseLegacyNavigationToggle"
+									customTextOn=" "
+									customTextOff=" "
+									state="{/useLegacyNavigation/value}" />
+								<Label
+									text="{/text/useLegacyNavigationLabel}" />
+								<Button
+									icon="sap-icon://hint"
+									type="Transparent"
+									press="onLegacyNavigationInfoPress"
+									ariaHasPopup="Dialog" />
+								</HBox>
+						</content>
+					</Panel>
+				</layout:Grid>
 			</layout:VerticalLayout>
 
 			<!-- Invisible Texts for ARIA -->

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

@@ -51,10 +51,13 @@ sap.ui.define([
 		editUrlLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_EDIT_URL_LABEL"),
 		parametersLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_PARAMETERS_LABEL"),
 		columnParameterLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_TABLE_PARAMETER_LABEL"),
-		columnUiValueLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_TABLE_UI_VALUE_LABEL")
+		columnUiValueLabel: _oTextResources.getText("IFRAME_ADDIFRAME_DIALOG_TABLE_UI_VALUE_LABEL"),
+		advancedSettingsTitle: _oTextResources.getText("IFRAME_ADDIFRAME_ADVANCED_SETTINGS"),
+		useLegacyNavigationLabel: _oTextResources.getText("IFRAME_ADDIFRAME_USE_LEGACY_NAVIGATION"),
+		useLegacyNavigationInfo: _oTextResources.getText("IFRAME_ADDIFRAME_USE_LEGACY_NAVIGATION_INFO")
 	};
 
-	function createJSONModel(bSetUpdateTitle) {
+	function createJSONModel(bSetUpdateTitle, bUseLegacyNavigation) {
 		if (bSetUpdateTitle) {
 			_mText.dialogTitle = _mText.dialogUpdateTitle;
 		} else {
@@ -103,7 +106,13 @@ sap.ui.define([
 				name: "px"
 			}, {
 				name: "rem"
-			}]
+			}],
+			useLegacyNavigation: {
+				value: !!bUseLegacyNavigation
+			},
+			previewUseLegacyNavigation: {
+				value: !!bUseLegacyNavigation
+			}
 		});
 	}
 
@@ -113,7 +122,7 @@ sap.ui.define([
 	 * @class Context - Dialog for IFrame settings in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @constructor
 	 * @private
 	 * @since 1.78
@@ -151,10 +160,12 @@ sap.ui.define([
 	AddIFrameDialog.prototype._createDialog = function(mSettings) {
 		// set the correct title
 		var bSetUpdateTitle = false;
+		var bUseLegacyNavigation = false;
 		if (mSettings) {
 			bSetUpdateTitle = mSettings.updateMode ? mSettings.updateMode : false;
+			bUseLegacyNavigation = mSettings.useLegacyNavigation;
 		}
-		this._oJSONModel = createJSONModel(bSetUpdateTitle);
+		this._oJSONModel = createJSONModel(bSetUpdateTitle, bUseLegacyNavigation);
 		this._oController = new AddIFrameDialogController(this._oJSONModel, mSettings);
 		Fragment.load({
 			name: "sap.ui.rta.plugin.iframe.AddIFrameDialog",

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

@@ -5,6 +5,8 @@
  */
 sap.ui.define([
 	"sap/base/Log",
+	"sap/m/Popover",
+	"sap/m/Text",
 	"sap/ui/core/mvc/Controller",
 	"sap/ui/core/library",
 	"sap/ui/rta/Utils",
@@ -14,6 +16,8 @@ sap.ui.define([
 	"sap/ui/rta/plugin/iframe/urlCleaner"
 ], function(
 	Log,
+	Popover,
+	Text,
 	Controller,
 	coreLibrary,
 	Utils,
@@ -29,8 +33,8 @@ sap.ui.define([
 
 	var _aTextInputFields = ["frameUrl"];
 	var _aNumericInputFields = ["frameWidth", "frameHeight"];
-	var _aSelectInputFields = ["asNewSection", "frameWidthUnit", "frameHeightUnit"];
 
+	var _aOtherInputFields = ["asNewSection", "frameWidthUnit", "frameHeightUnit", "useLegacyNavigation"];
 
 	function isValidUrl(sUrl) {
 		return IFrame.isValidUrl(encodeURI(sUrl));
@@ -100,8 +104,7 @@ sap.ui.define([
 				return;
 			}
 			var oIFrame = sap.ui.getCore().byId("sapUiRtaAddIFrameDialog_PreviewFrame");
-			oIFrame.setUrl(""); // Resets the preview first
-			//enable/disable expanding the Panel
+			// enable/disable expanding the Panel
 			var oPanel = sap.ui.getCore().byId("sapUiRtaAddIFrameDialog_PreviewLinkPanel");
 			var oPanelButton = oPanel.getDependents()[0];
 			if (sURL) {
@@ -112,6 +115,10 @@ sap.ui.define([
 			}
 			try {
 				this._oJSONModel.setProperty("/previewUrl/value", sURL);
+				this._oJSONModel.setProperty(
+					"/previewUseLegacyNavigation/value",
+					this._oJSONModel.getProperty("/useLegacyNavigation/value")
+				);
 				oIFrame.setUrl(sURL);
 			} catch (oError) {
 				Log.error("Error previewing the URL: ", oError);
@@ -138,6 +145,26 @@ sap.ui.define([
 			oBinding.filter([oFilter]);
 		},
 
+		onLegacyNavigationInfoPress: function(oEvent) {
+			var 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
 		 *
@@ -250,7 +277,7 @@ sap.ui.define([
 		_buildReturnedSettings: function() {
 			var mSettings = {};
 			var oData = this._oJSONModel.getData();
-			_aTextInputFields.concat(_aNumericInputFields, _aSelectInputFields).forEach(function(sFieldName) {
+			_aTextInputFields.concat(_aNumericInputFields, _aOtherInputFields).forEach(function(sFieldName) {
 				var sValue = oData[sFieldName].value;
 				if (sFieldName === "frameUrl") {
 					sValue = urlCleaner(sValue);

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.58
 	 * @since 1.58
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @private
 	 * @ui5-restricted
 	 *

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.58
 	 * @since 1.58
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @private
 	 * @ui5-restricted
 	*/

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

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.56
 	 * @since 1.56
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.58
 	 * @since 1.58
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @private
 	 * @ui5-restricted
 	*/

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

@@ -15,7 +15,7 @@ sap.ui.define(function () {
 	 * @author SAP SE
 	 * @experimental Since 1.58
 	 * @since 1.58
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @private
 	 * @ui5-restricted
 	*/

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.106
 	 * @since 1.106
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 * @private
 	 * @ui5-restricted
 	 */

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

@@ -107,9 +107,14 @@
 				}
 			}
 
+			.sapUiRtaAddIFrameDialogLegacyNavigationContainer > div {
+				display: flex;
+				align-items: center;
+			}
+
 			.sapUiRtaAddIFrameDialogPreviewGrid {
 				padding: 0;
-				margin: 0 1rem;
+				margin: 0 1rem 1rem;
 				background: @_sap_ui_rta_AddIFrame_PreviewBG;
 				border: 0.0625rem solid @_sap_ui_rta_AddIFrame_BorderColor; //1px
 

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 *
 	 * @constructor
 	 * @private

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.m.HBox
 	 *
 	 * @author SAP SE
-	 * @version 1.108.18
+	 * @version 1.108.20
 	 *
 	 * @constructor
 	 * @private