@openui5/sap.ui.rta 1.93.3 → 1.96.2

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

@@ -8,20 +8,20 @@
 sap.ui.define([
 	"sap/ui/dt/plugin/ElementMover",
 	"sap/ui/dt/OverlayUtil",
+	"sap/ui/dt/ElementUtil",
 	"sap/ui/rta/Utils",
 	"sap/ui/rta/command/CommandFactory",
 	"sap/ui/rta/plugin/Plugin",
-	"sap/ui/dt/OverlayRegistry",
-	"sap/ui/dt/MetadataPropagationUtil"
+	"sap/ui/dt/OverlayRegistry"
 ],
 function(
 	ElementMover,
 	OverlayUtil,
+	ElementUtil,
 	Utils,
 	CommandFactory,
 	Plugin,
-	OverlayRegistry,
-	MetadataPropagationUtil
+	OverlayRegistry
 ) {
 	"use strict";
 
@@ -35,7 +35,7 @@ function(
 	 * The RTAElementMover is responsible for the RTA specific adaptation of element movements.
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private
@@ -106,6 +106,13 @@ function(
 			return Promise.resolve(false);
 		}
 
+		// 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)) {
+			return Promise.resolve(false);
+		}
+
 		var oRelevantContainer = oOverlay.getRelevantContainer();
 		var oRelevantContainerOverlay = OverlayRegistry.getOverlay(oRelevantContainer);
 		if (!oRelevantContainerOverlay) {
@@ -160,18 +167,8 @@ function(
 			});
 	}
 
-	function fnHasMoveAction(oAggregationOverlay, oElement, oRelevantContainer) {
-		var oAggregationDTMetadata = oAggregationOverlay.getDesignTimeMetadata();
-		var oMoveAction = oAggregationDTMetadata.getAction("move", oElement);
-		if (!oMoveAction) {
-			return Promise.resolve(false);
-		}
-		// moveChangeHandler information is always located on the relevant container
-		return this.oBasePlugin.hasChangeHandler(oMoveAction.changeType, oRelevantContainer);
-	}
-
 	/**
-	 * @param	{sap.ui.dt.Overlay} oOverlay overlay object
+	 * @param {sap.ui.dt.Overlay} oOverlay overlay object
 	 * @return {sap.ui.dt.DesignTimeMetadata} oDesignTimeMetadata
 	 * @private
 	 */
@@ -206,55 +203,15 @@ function(
 
 	/**
 	 * Checks drop ability for aggregation overlays
-	 * @param  {sap.ui.dt.Overlay} oAggregationOverlay aggregation overlay object
-	 * @return {Promise.<boolean>} Promise with true value if aggregation overlay is droppable or false value if not.
+	 * @param {sap.ui.dt.Overlay} oAggregationOverlay Aggregation overlay object
+	 * @param {sap.ui.dt.ElementOverlay} [oOverlay] Overlay being moved/added
+	 * @param {boolean} [bOverlayNotInDom] Flag defining if overlay is not in DOM
+	 * @return {Promise.<boolean>} Promise with true value if overlay can be added to the aggregation overlay or false value if not.
 	 * @override
 	 */
 	RTAElementMover.prototype.checkTargetZone = function(oAggregationOverlay, oOverlay, bOverlayNotInDom) {
 		var oMovedOverlay = oOverlay || this.getMovedOverlay();
-		return ElementMover.prototype.checkTargetZone.call(this, oAggregationOverlay, oMovedOverlay, bOverlayNotInDom)
-			.then(function(bTargetZone) {
-				if (!bTargetZone) {
-					return false;
-				}
-
-				var oMovedElement = oMovedOverlay.getElement();
-				var oTargetOverlay = oAggregationOverlay.getParent();
-				var oMovedRelevantContainer = oMovedOverlay.getRelevantContainer();
-
-				// the element or the parent overlay might be destroyed or not available
-				if (!oMovedElement || !oTargetOverlay) {
-					return false;
-				}
-
-				var oTargetElement = oTargetOverlay.getElement();
-				var oAggregationDtMetadata = oAggregationOverlay.getDesignTimeMetadata();
-
-				// determine target relevantContainer
-				var vTargetRelevantContainerAfterMove = MetadataPropagationUtil.getRelevantContainerForPropagation(oAggregationDtMetadata.getData(), oMovedElement);
-				vTargetRelevantContainerAfterMove = vTargetRelevantContainerAfterMove || oTargetElement;
-
-				// check for same relevantContainer
-				if (
-					!oMovedRelevantContainer
-					|| !vTargetRelevantContainerAfterMove
-					|| !this.oBasePlugin.hasStableId(oTargetOverlay)
-					|| oMovedRelevantContainer !== vTargetRelevantContainerAfterMove
-				) {
-					return false;
-				}
-
-				// Binding context is not relevant if the element is being moved inside its parent
-				if (oMovedOverlay.getParent().getElement() !== oTargetElement) {
-					// check if binding context is the same
-					if (!Utils.checkSourceTargetBindingCompatibility(oMovedElement, oTargetElement)) {
-						return false;
-					}
-				}
-
-				// check if movedOverlay is movable into the target aggregation
-				return fnHasMoveAction.call(this, oAggregationOverlay, oMovedElement, vTargetRelevantContainerAfterMove);
-			}.bind(this));
+		return Utils.checkTargetZone(oAggregationOverlay, oMovedOverlay, this.oBasePlugin, bOverlayNotInDom);
 	};
 
 	/**

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.93.3
+	 * @version 1.96.2
 	 * @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.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private

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

@@ -55,7 +55,7 @@ sap.ui.define([
 	 * Provides Rename handling functionality
 	 *
 	 * @author SAP SE
-	 * @version 1.93.3
+	 * @version 1.96.2
 	 *
 	 * @constructor
 	 * @private
@@ -361,6 +361,7 @@ sap.ui.define([
 			})
 			.then(function() {
 				var oOverlay = this._oEditedOverlay;
+				oOverlay.setIgnoreEnterKeyUpOnce(false);
 				oOverlay.addStyleClass(RenameHandler.errorStyleClass);
 				this.stopEdit(bRestoreFocus);
 				this.startEdit(oOverlay);
@@ -405,6 +406,8 @@ sap.ui.define([
 		_onEditableFieldKeydown: function (oEvent) {
 			switch (oEvent.keyCode) {
 				case KeyCodes.ENTER:
+					// to prevent context menu from opening when rename is finished
+					this._oEditedOverlay.setIgnoreEnterKeyUpOnce(true);
 					return RenameHandler._handlePostRename.call(this, true, oEvent);
 				case KeyCodes.ESCAPE:
 					this._oEditedOverlay.removeStyleClass(RenameHandler.errorStyleClass);

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

@@ -11,6 +11,7 @@ sap.ui.define([
 	"sap/ui/events/KeyCodes",
 	"sap/ui/dt/Overlay",
 	"sap/base/util/restricted/_intersection",
+	"sap/m/InstanceManager",
 	"sap/ui/Device"
 ],
 function (
@@ -20,6 +21,7 @@ function (
 	KeyCodes,
 	Overlay,
 	_intersection,
+	InstanceManager,
 	Device
 ) {
 	"use strict";
@@ -32,7 +34,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.93.3
+	 * @version 1.96.2
 	 * @constructor
 	 * @private
 	 * @since 1.34
@@ -45,6 +47,10 @@ function (
 			properties: {
 				multiSelectionRequiredPlugins: {
 					type: "string[]"
+				},
+				isActive: {
+					type: "boolean",
+					defaultValue: true
 				}
 			},
 			associations: {},
@@ -100,6 +106,7 @@ function (
 
 	/**
 	 * @param {sap.ui.dt.ElementOverlay} oOverlay - Overlay to be checked for developer mode
+	 * @param {sap.ui.dt.DesignTimeMetadata} oDesignTimeMetadata - Design Time Metadata of the element
 	 * @returns {boolean} true if it's in developer mode
 	 * @private
 	 */
@@ -190,6 +197,9 @@ function (
 	 * @private
 	 */
 	Selection.prototype._onKeyDown = function(oEvent) {
+		if (!this.getIsActive()) {
+			return;
+		}
 		var oOverlay = Utils.getFocusedOverlay();
 		if (oEvent.keyCode === KeyCodes.ENTER) {
 			this._selectOverlay(oEvent);
@@ -234,6 +244,10 @@ function (
 	};
 
 	Selection.prototype._selectOverlay = function (oEvent) {
+		if (!this.getIsActive()) {
+			preventEventDefaultAndPropagation(oEvent);
+			return;
+		}
 		var oOverlay = OverlayRegistry.getOverlay(oEvent.currentTarget.id);
 		var bMultiSelection = oEvent.metaKey || oEvent.ctrlKey;
 		var bContextMenu = oEvent.type === "contextmenu";
@@ -263,6 +277,18 @@ function (
 	 * @private
 	 */
 	Selection.prototype._onMouseDown = function(oEvent) {
+		if (!this.getIsActive()) {
+			// In Visualization Mode we must prevent MouseDown-Event for Overlays
+			// We have to close open PopOvers from the ChangeVisualization because they
+			// should close on MouseDown
+			preventEventDefaultAndPropagation(oEvent);
+			InstanceManager.getOpenPopovers().forEach(function(oPopOver) {
+				if (oPopOver._bOpenedByChangeIndicator) {
+					oPopOver.close();
+				}
+			});
+			return;
+		}
 		// set focus after clicking, needed only for internet explorer
 		if (Device.browser.name === "ie") {
 			// when the EasyAdd Button is clicked, we don't want to focus/stopPropagation.
@@ -290,6 +316,10 @@ function (
 	 * @private
 	 */
 	Selection.prototype._onMouseover = function(oEvent) {
+		if (!this.getIsActive()) {
+			preventEventDefaultAndPropagation(oEvent);
+			return;
+		}
 		var oOverlay = OverlayRegistry.getOverlay(oEvent.currentTarget.id);
 		if (oOverlay.isSelectable()) {
 			if (oOverlay !== this._oHoverTarget) {
@@ -307,6 +337,10 @@ function (
 	 * @private
 	 */
 	Selection.prototype._onMouseleave = function(oEvent) {
+		if (!this.getIsActive()) {
+			preventEventDefaultAndPropagation(oEvent);
+			return;
+		}
 		var oOverlay = OverlayRegistry.getOverlay(oEvent.currentTarget.id);
 		if (oOverlay.isSelectable()) {
 			this._removePreviousHover();

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.93.3
+	 * @version 1.96.2
 	 * @constructor
 	 * @private
 	 * @since 1.44
@@ -100,9 +100,7 @@ sap.ui.define([
 
 		var aUnsavedChanges = this.getCommandStack().getAllExecutedCommands().filter(function(oCommand) {
 			sElementId = oCommand.getElementId && oCommand.getElementId() || oCommand.getElement && oCommand.getElement().getId();
-			if (sElementId === sId && aChangeTypes.indexOf(oCommand.getChangeType()) >= 0) {
-				return true;
-			}
+			return sElementId === sId && aChangeTypes.indexOf(oCommand.getChangeType()) >= 0;
 		}).map(function(oCommand) {
 			return oCommand.getPreparedChange();
 		});
@@ -110,7 +108,7 @@ sap.ui.define([
 		return aUnsavedChanges;
 	};
 
-	Settings.prototype._handleFlexChangeCommand = function(mChange, aSelectedOverlays, oCompositeCommand, bRuntimeOnly) {
+	Settings.prototype._handleFlexChangeCommand = function(mChange, aSelectedOverlays, oCompositeCommand, oSettingsAction) {
 		var mChangeSpecificData = mChange.changeSpecificData;
 		var sVariantManagementReference;
 		// temporarily support both
@@ -126,7 +124,7 @@ sap.ui.define([
 
 		return this.hasChangeHandler(mChangeSpecificData.changeType, oControl, sControlType)
 			.then(function(bHasChangeHandler) {
-				if (aSelectedOverlays[0].getVariantManagement && bHasChangeHandler) {
+				if (aSelectedOverlays[0].getVariantManagement && bHasChangeHandler && !oSettingsAction.CAUTION_variantIndependent) {
 					sVariantManagementReference = aSelectedOverlays[0].getVariantManagement();
 				}
 				return this.getCommandFactory().getCommandFor(
@@ -134,9 +132,11 @@ sap.ui.define([
 					"settings",
 					mChangeSpecificData,
 					undefined,
-					sVariantManagementReference);
+					sVariantManagementReference
+				);
 			}.bind(this))
 			.then(function(oSettingsCommand) {
+				var bRuntimeOnly = oSettingsAction.runtimeOnly;
 				if (oSettingsCommand && bRuntimeOnly) {
 					oSettingsCommand.setRuntimeOnly(bRuntimeOnly);
 				}
@@ -166,7 +166,7 @@ sap.ui.define([
 		});
 	};
 
-	Settings.prototype._handleCompositeCommand = function(aElementOverlays, oElement, aChanges, bRuntimeOnly) {
+	Settings.prototype._handleCompositeCommand = function(aElementOverlays, oElement, aChanges, oSettingsAction) {
 		var oCompositeCommand;
 
 		return this.getCommandFactory().getCommandFor(oElement, "composite")
@@ -180,7 +180,7 @@ sap.ui.define([
 				var mChangeSpecificData = mChange.changeSpecificData;
 				// Flex Change
 				if (mChangeSpecificData.changeType) {
-					return this._handleFlexChangeCommand(mChange, aElementOverlays, oCompositeCommand, bRuntimeOnly);
+					return this._handleFlexChangeCommand(mChange, aElementOverlays, oCompositeCommand, oSettingsAction);
 				// App Descriptor Change
 				} else if (mChangeSpecificData.appDescriptorChangeType) {
 					return this._handleAppDescriptorChangeCommand(mChange, oElement, oCompositeCommand);
@@ -205,11 +205,12 @@ sap.ui.define([
 	 * Retrieves the available actions from the DesignTime Metadata and creates
 	 * the corresponding commands for them.
 	 * @param {sap.ui.dt.ElementOverlay[]} aElementOverlays - Target Overlays of the action
-	 * @param {object} mPropertyBag Property bag
-	 * @param {function} [mPropertyBag.fnHandler] Handler function for the case of multiple settings actions
+	 * @param {object} mPropertyBag - Property bag
+	 * @param {function} [mPropertyBag.fnHandler] - Handler function for the case of multiple settings actions
+	 * @param {object} [oSettingsAction] - The action object defined in the designtime
 	 * @return {Promise} Returns promise resolving with the creation of the commands
 	 */
-	Settings.prototype.handler = function(aElementOverlays, mPropertyBag, bRuntimeOnly) {
+	Settings.prototype.handler = function(aElementOverlays, mPropertyBag, oSettingsAction) {
 		mPropertyBag = mPropertyBag || {};
 		var oElement = aElementOverlays[0].getElement();
 		var fnHandler = mPropertyBag.fnHandler;
@@ -227,7 +228,7 @@ sap.ui.define([
 
 		.then(function(aChanges) {
 			if (aChanges.length > 0) {
-				return this._handleCompositeCommand(aElementOverlays, oElement, aChanges, bRuntimeOnly);
+				return this._handleCompositeCommand(aElementOverlays, oElement, aChanges, oSettingsAction);
 			}
 		}.bind(this))
 
@@ -286,7 +287,7 @@ sap.ui.define([
 						handler: function(fnHandler, aElementOverlays, mPropertyBag) {
 							mPropertyBag = mPropertyBag || {};
 							mPropertyBag.fnHandler = fnHandler;
-							return this.handler(aElementOverlays, mPropertyBag, oSettingsAction.runtimeOnly);
+							return this.handler(aElementOverlays, mPropertyBag, oSettingsAction);
 						}.bind(this, oSettingsAction.handler),
 						submenu: formatSubMenuItems(oSettingsAction.submenu)
 					});

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.93.3
+	 * @version 1.96.2
 	 * @constructor
 	 * @private
 	 * @since 1.46