@openui5/sap.ui.rta 1.124.2 → 1.126.0

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

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @private
 	 * @since 1.78

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @class The BaseCreate allows trigger BaseCreate operations on the overlay.
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @private
 	 * @since 1.75

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

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

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

@@ -51,7 +51,7 @@ sap.ui.define([
 	 * @class The ControlVariant allows propagation of variantManagement key
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @private
 	 * @since 1.50
@@ -140,7 +140,21 @@ sap.ui.define([
 				var oVariantManagementTargetElement = sVariantManagementTargetElement instanceof ManagedObject
 					? sVariantManagementTargetElement : Element.getElementById(sVariantManagementTargetElement);
 				var oVariantManagementTargetOverlay = OverlayRegistry.getOverlay(oVariantManagementTargetElement);
-				this._propagateVariantManagement(oVariantManagementTargetOverlay, sVariantManagementReference);
+
+				// the control or overlay might not be available on rta start (e.g. dialog or view hidden by navigation)
+				if (!oVariantManagementTargetOverlay) {
+					const fnEventHandler = (oEvent, sVMTargetElementId) => {
+						const oCreatedOverlay = oEvent.getParameter("elementOverlay");
+						if (oCreatedOverlay.getElement().getId() === sVMTargetElementId) {
+							this._propagateVariantManagement(oCreatedOverlay, sVariantManagementReference);
+							this.getDesignTime().detachEvent("elementOverlayCreated", fnEventHandler);
+						}
+					};
+
+					this.getDesignTime().attachEvent("elementOverlayCreated", sVariantManagementTargetElement, fnEventHandler, this);
+				} else {
+					this._propagateVariantManagement(oVariantManagementTargetOverlay, sVariantManagementReference);
+				}
 			}.bind(this));
 			oOverlay.attachEvent("editableChange", RenameHandler._manageClickEvent, this);
 			destroyManageDialog(oOverlay);

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @class The CreateContainer allows trigger CreateContainer operations on the overlay
 	 * @extends sap.ui.rta.plugin.BaseCreate
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @private
 	 * @since 1.34

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

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.dt.plugin.CutPaste
 	 *
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -33,7 +33,7 @@ function(
 	 * @extends sap.ui.dt.plugin.ControlDragDrop
 	 *
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -41,7 +41,7 @@ sap.ui.define([
 	 * @class
 	 * @extends sap.ui.rta.plugin.Plugin
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @private
 	 * @since 1.90

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

@@ -70,7 +70,7 @@ sap.ui.define([
 	 * @extends sap.ui.dt.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 *
 	 * @constructor
 	 * @private

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.124.2
+	 * @version 1.126.0
 	 *
 	 * @constructor
 	 * @private

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.124.2
+	 * @version 1.126.0
 	 * @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.124.2
+	 * @version 1.126.0
 	 *
 	 * @constructor
 	 * @private
@@ -204,7 +204,6 @@ sap.ui.define([
 	Rename.prototype._emitLabelChangeEvent = function() {
 		var sText = RenameHandler._getCurrentEditableFieldText.call(this);
 		this._fnSetControlText(sText);
-
 		return this.createRenameCommand(this._oEditedOverlay, sText);
 	};
 

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

@@ -43,7 +43,7 @@ sap.ui.define([
 	 * Provides Rename handling functionality
 	 *
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 *
 	 * @constructor
 	 * @private
@@ -368,10 +368,15 @@ sap.ui.define([
 		},
 
 		_onEditableFieldBlur(oEvent) {
-			return RenameHandler._handlePostRename.call(this, false, oEvent);
+			// Destroying the overlay (or removing it from a parent) also triggers a "blur" event
+			// coming from the remove() call, but we should not react on it
+			if (!this._oEditedOverlay.isDestroyStarted() && this._oEditedOverlay.getParentElementOverlay()) {
+				RenameHandler._handlePostRename.call(this, false, oEvent);
+			}
 		},
 
-		_handlePostRename(bRestoreFocus, oEvent) {
+		async _handlePostRename(bRestoreFocus, oEvent) {
+			let fnErrorHandler;
 			if (!this._bBlurOrKeyDownStarted) {
 				this._oEditedOverlay.removeStyleClass(RenameHandler.errorStyleClass);
 				this._bBlurOrKeyDownStarted = true;
@@ -379,27 +384,24 @@ sap.ui.define([
 					RenameHandler._preventDefault.call(this, oEvent);
 					RenameHandler._stopPropagation.call(this, oEvent);
 				}
-				return Promise.resolve()
-				.then(RenameHandler._validateNewText.bind(this))
-				.then(this._emitLabelChangeEvent.bind(this))
-				.catch(function(oError) {
-					if (oError.message === "sameTextError") {
-						return;
+				try {
+					try {
+						RenameHandler._validateNewText.call(this);
+						fnErrorHandler = await this._emitLabelChangeEvent();
+					} catch (oError) {
+						if (oError.message !== "sameTextError") {
+							throw oError;
+						}
 					}
-					throw oError;
-				})
-				.then(function(fnErrorHandler) {
 					this.stopEdit(bRestoreFocus);
 					// ControlVariant rename handles the validation itself
 					if (typeof fnErrorHandler === "function") {
 						fnErrorHandler(); // contains startEdit()
 					}
-				}.bind(this))
-				.catch(function(oError) {
-					return RenameHandler._handleInvalidRename.call(this, oError.message, bRestoreFocus);
-				}.bind(this));
+				} catch (oError) {
+					await RenameHandler._handleInvalidRename.call(this, oError.message, bRestoreFocus);
+				}
 			}
-			return Promise.resolve();
 		},
 
 		_handleInvalidRename(sErrorMessage, bRestoreFocus) {
@@ -419,7 +421,6 @@ sap.ui.define([
 			var oResponsibleOverlay = this.getResponsibleElementOverlay(this._oEditedOverlay);
 			var oRenameAction = this.getAction(oResponsibleOverlay);
 			var sNewText = RenameHandler._getCurrentEditableFieldText.call(this);
-
 			validateText(sNewText, this.getOldValue(), oRenameAction);
 		},
 

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.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @private
 	 * @since 1.101

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @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.124.2
+	 * @version 1.126.0
 	 * @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.124.2
+	 * @version 1.126.0
 	 * @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.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @private
 	 * @since 1.46

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

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.plugin.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 *
 	 * @constructor
 	 * @private

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

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * handled by the AdditionalElements Plugin (Reveal, Add Via Delegate, Add Custom)
 	 *
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @private
 	 * @since 1.94
 	 */

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

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

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

@@ -119,7 +119,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.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @private
 	 * @since 1.44
@@ -508,7 +508,10 @@ sap.ui.define([
 				var bHasSiblings = aElementsWithAggregations[1].length > 0;
 				var bIsAvailableForChildren = this.isAvailable(aElementOverlays, false);
 				var bIsAvailableForSibling = this.isAvailable(aElementOverlays, true);
-				if (bIsAvailableForSibling && (!bIsAvailableForChildren || !bHasChildren)) {
+				if (
+					bIsAvailableForSibling
+					&& (!bIsAvailableForChildren || !bHasChildren)
+				) {
 					// Case 1: Only siblings -> No submenu required
 					oMenuItem = this._buildMenuItem(
 						"CTX_ADD_ELEMENTS_AS_SIBLING",
@@ -517,7 +520,11 @@ sap.ui.define([
 						aElementsWithAggregations,
 						false
 					);
-				} else if (!bIsAvailableForSibling && bIsAvailableForChildren && !bHasMultipleAggregations) {
+				} else if (
+					bIsAvailableForChildren
+					&& (!bIsAvailableForSibling || !bHasSiblings)
+					&& !bHasMultipleAggregations
+				) {
 					// Case 2: Only children, one aggregation -> No submenu required
 					oMenuItem = this._buildMenuItem(
 						"CTX_ADD_ELEMENTS_AS_CHILD",
@@ -526,7 +533,11 @@ sap.ui.define([
 						aElementsWithAggregations,
 						false
 					);
-				} else if (!bIsAvailableForSibling && bIsAvailableForChildren && bHasMultipleAggregations) {
+				} else if (
+					bIsAvailableForChildren
+					&& (!bIsAvailableForSibling || !bHasSiblings)
+					&& bHasMultipleAggregations
+				) {
 					// Case 3: Only children, multiple aggregations -> Submenu required
 					oMenuItem = this._buildMenuItem(
 						"CTX_ADD_ELEMENTS_AS_CHILD",
@@ -535,7 +546,12 @@ sap.ui.define([
 						aElementsWithAggregations,
 						true
 					);
-				} else if (bIsAvailableForChildren && bIsAvailableForSibling && bHasChildren && bHasSiblings) {
+				} else if (
+					bIsAvailableForChildren
+					&& bIsAvailableForSibling
+					&& bHasChildren
+					&& bHasSiblings
+				) {
 					// Case 4: Children and siblings -> Submenu required
 					oMenuItem = this._buildMenuItem(
 						"CTX_ADD_ELEMENTS_CHILD_AND_SIBLING",

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

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * Helper object containing methods for the AdditionalElements plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @private
 	 * @since 1.94
 	 */

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.124.2
+	 * @version 1.126.0
 	 * @private
 	 * @since 1.94
 	 */

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

@@ -119,7 +119,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.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @private
 	 * @since 1.75

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

@@ -308,37 +308,37 @@
 													customTextOff=" "
 													state="{dialogInfo>/advancedSettings/value/allowForms}" />
 											</form:FormElement>
-											<form:FormElement label="allow-popups">
+											<form:FormElement label="allow-scripts">
 												<Switch
 													change="onSwitchChange"
-													id="sapUiRtaAddIFrameDialog_allowPopupsSwitch"
+													id="sapUiRtaAddIFrameDialog_allowScriptsSwitch"
 													customTextOn=" "
 													customTextOff=" "
-													state="{dialogInfo>/advancedSettings/value/allowPopups}" />
+													state="{dialogInfo>/advancedSettings/value/allowScripts}" />
 											</form:FormElement>
-											<form:FormElement label="allow-scripts">
+											<form:FormElement label="allow-same-origin">
 												<Switch
 													change="onSwitchChange"
-													id="sapUiRtaAddIFrameDialog_allowScriptsSwitch"
+													id="sapUiRtaAddIFrameDialog_allowSameOriginSwitch"
 													customTextOn=" "
 													customTextOff=" "
-													state="{dialogInfo>/advancedSettings/value/allowScripts}" />
+													state="{dialogInfo>/advancedSettings/value/allowSameOrigin}" />
 											</form:FormElement>
-											<form:FormElement label="allow-modals">
+											<form:FormElement label="allow-popups">
 												<Switch
 													change="onSwitchChange"
-													id="sapUiRtaAddIFrameDialog_allowModalsSwitch"
+													id="sapUiRtaAddIFrameDialog_allowPopupsSwitch"
 													customTextOn=" "
 													customTextOff=" "
-													state="{dialogInfo>/advancedSettings/value/allowModals}" />
+													state="{dialogInfo>/advancedSettings/value/allowPopups}" />
 											</form:FormElement>
-											<form:FormElement label="allow-same-origin">
+											<form:FormElement label="allow-modals">
 												<Switch
 													change="onSwitchChange"
-													id="sapUiRtaAddIFrameDialog_allowSameOriginSwitch"
+													id="sapUiRtaAddIFrameDialog_allowModalsSwitch"
 													customTextOn=" "
 													customTextOff=" "
-													state="{dialogInfo>/advancedSettings/value/allowSameOrigin}" />
+													state="{dialogInfo>/advancedSettings/value/allowModals}" />
 											</form:FormElement>
 										</form:FormContainer>
 										<form:FormContainer>

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

@@ -140,9 +140,7 @@ sap.ui.define([
 			advancedSettings: {
 				value: {
 					allowForms: true,
-					allowPopups: true,
 					allowScripts: true,
-					allowModals: true,
 					allowSameOrigin: true,
 					additionalSandboxParameters: [],
 					...oAdvancedSettings
@@ -160,7 +158,7 @@ sap.ui.define([
 	 * @class Context - Dialog for IFrame settings in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.124.2
+	 * @version 1.126.0
 	 * @constructor
 	 * @private
 	 * @since 1.78

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

@@ -345,6 +345,10 @@ sap.ui.define([
 				Object.keys(mSettings).forEach(function(sFieldName) {
 					if (sFieldName === "frameWidth" || sFieldName === "frameHeight") {
 						this._importIFrameSize(sFieldName, mSettings[sFieldName]);
+					// legacy iframes do not have advancedSettings properties so we need to skip the setProperty
+					// on the json model to not overwrite the default values with undefined
+					} else if (sFieldName === "advancedSettings" && !mSettings[sFieldName]) {
+						return;
 					} else {
 						this._oJSONModel.setProperty(`/${sFieldName}/value`, mSettings[sFieldName]);
 					}

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.124.2
+	 * @version 1.126.0
 	 * @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.124.2
+	 * @version 1.126.0
 	 * @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.124.2
+	 * @version 1.126.0
 	 * @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.124.2
+	 * @version 1.126.0
 	 * @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.124.2
+	 * @version 1.126.0
 	 * @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.124.2
+	 * @version 1.126.0
 	 * @private
 	 * @ui5-restricted
 	 */