@openui5/sap.ui.rta 1.99.0 → 1.100.1

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

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @class The EasyRemove Plugin adds an Icon to an Overlay, which allows to trigger remove operations directly
 	 * @extends sap.ui.rta.plugin.Remove
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 * @constructor
 	 * @private
 	 * @since 1.48

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

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

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

@@ -69,7 +69,7 @@ function(
 	 * @extends sap.ui.dt.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 *
 	 * @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.99.0
+	 * @version 1.100.1
 	 *
 	 * @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.99.0
+	 * @version 1.100.1
 	 * @constructor
 	 * @private
 	 * @since 1.34
@@ -114,12 +114,25 @@ sap.ui.define([
 	/**
 	 * Checks if Overlay control has a valid parent and if it is
 	 * not the last visible control in the aggregation
+	 * The removal of the last element in the aggregation can
+	 * be defined by the parameter 'removeLastElement' in the
+	 * designtime of the aggregation
 	 *
 	 * @param  {sap.ui.dt.ElementOverlay[]} aElementOverlays - overlays to be removed
 	 * @return {boolean} Returns true if the control can be removed
 	 * @private
 	 */
 	Remove.prototype._canBeRemovedFromAggregation = function(aElementOverlays) {
+		//Check if designtime allows removing last visible element
+		var fnCheckDesignTimeSettings = function (oOverlay) {
+			var oParentOverlay = oOverlay.getParentAggregationOverlay();
+			if (oParentOverlay) {
+				var oAction = this.getAction(oParentOverlay);
+				return !!(oAction && oAction.removeLastElement);
+			}
+			return false;
+		}.bind(this);
+
 		var oOverlay = aElementOverlays[0];
 		var oElement = oOverlay.getElement();
 		var oParent = oElement.getParent();
@@ -130,17 +143,17 @@ sap.ui.define([
 		if (!Array.isArray(aElements)) {
 			return true;
 		}
-		if (aElements.length === 1) {
-			return false;
-		}
-
-		// Fallback to 1 if no overlay is selected
+		// check if selected Overlays are the last visible elements in aggregation
 		var iNumberOfSelectedOverlays = aElementOverlays.length;
 		var aInvisibleElements = aElements.filter(function(oElement) {
 			var oElementOverlay = OverlayRegistry.getOverlay(oElement);
 			return !(oElementOverlay && oElementOverlay.getElementVisibility());
 		});
-		return !(aInvisibleElements.length === (aElements.length - iNumberOfSelectedOverlays));
+		var bIsLastVisibleElement = (aInvisibleElements.length + iNumberOfSelectedOverlays === aElements.length);
+		if (bIsLastVisibleElement) {
+			return fnCheckDesignTimeSettings(oOverlay);
+		}
+		return true;
 	};
 
 	/**
@@ -323,4 +336,4 @@ sap.ui.define([
 	};
 
 	return Remove;
-});
+});

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.99.0
+	 * @version 1.100.1
 	 *
 	 * @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.99.0
+	 * @version 1.100.1
 	 *
 	 * @constructor
 	 * @private

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

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.ui.rta.plugin.Plugin
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 *
 	 * @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.99.0
+	 * @version 1.100.1
 	 * @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/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.99.0
+	 * @version 1.100.1
 	 * @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.99.0
+	 * @version 1.100.1
 	 * @constructor
 	 * @private
 	 * @since 1.44

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.99.0
+	 * @version 1.100.1
 	 * @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.99.0
+	 * @version 1.100.1
 	 * @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

@@ -110,7 +110,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.99.0
+	 * @version 1.100.1
 	 * @constructor
 	 * @private
 	 * @since 1.75

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

@@ -113,7 +113,7 @@ sap.ui.define([
 	 * @class Context - Dialog for IFrame settings in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 * @constructor
 	 * @private
 	 * @since 1.78

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

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

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @author SAP SE
 	 * @experimental Since 1.56
 	 * @since 1.56
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 * @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.99.0
+	 * @version 1.100.1
 	 * @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.99.0
+	 * @version 1.100.1
 	 * @private
 	 * @ui5-restricted
 	*/

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

@@ -53,25 +53,19 @@
 	width: auto;
 	display: block;
 	position: absolute;
-	outline: 3px solid @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark;
-	outline-offset: -3px;
-	box-shadow: @_sap_ui_rta_Overlay_BoxShadow;
+	box-shadow: inset 0 0 0 3px @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark, @_sap_ui_rta_Overlay_BoxShadow;
+	background-color: fade(@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark, 25%);
 	animation: fadeOut linear 1.5s;
 	animation-fill-mode: forwards;
 
 	@keyframes fadeOut {
-		0% {
-			outline: 3px solid @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark;
-			outline-offset: -3px;
-		}
 		66%{
-			outline: 3px solid @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark;
-			outline-offset: -3px;
+			box-shadow: inset 0 0 0 3px @_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark, @_sap_ui_rta_Overlay_BoxShadow;
+			background-color: fade(@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark, 25%);
 		}
 		100% {
-			outline: 3px solid @_sap_ui_rta_ChangeVisualization_DependentIndicatorColorTransparent;
-			outline-offset: -3px;
 			box-shadow: none;
+			background-color: fade(@_sap_ui_rta_ChangeVisualization_ChangeIndicatorColorDark, 0%);
 		}
 	}
 }

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

@@ -39,7 +39,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.m.HBox
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.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.99.0
+	 * @version 1.100.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.99.0
+	 * @version 1.100.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.99.0
+	 * @version 1.100.1
 	 *
 	 * @constructor
 	 * @private

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

@@ -22,7 +22,7 @@ function(
 	 * @extends sap.ui.rta.toolbar.Base
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.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.99.0
+	 * @version 1.100.1
 	 *
 	 * @constructor
 	 * @private

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

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

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

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

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

@@ -8,6 +8,7 @@ sap.ui.define([
 	"sap/ui/base/ManagedObject",
 	"sap/m/InstanceManager",
 	"sap/ui/dt/Overlay",
+	"sap/ui/dt/OverlayRegistry",
 	"sap/ui/fl/Utils",
 	"sap/ui/core/Component",
 	"sap/ui/core/ComponentContainer",
@@ -20,6 +21,7 @@ sap.ui.define([
 	ManagedObject,
 	InstanceManager,
 	Overlay,
+	OverlayRegistry,
 	flUtils,
 	Component,
 	ComponentContainer,
@@ -40,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.99.0
+	 * @version 1.100.1
 	 * @constructor
 	 * @private
 	 * @since 1.48
@@ -58,17 +60,17 @@ sap.ui.define([
 				 * To set the associated controls as an autoCloseArea for all Popover/Dialog open in RTA mode.
 				 * Needs to be filled before the popup is open.
 				 */
-				autoCloseAreas: {type: "sap.ui.core.Control", multiple: true, singularName: "autoCloseArea"}
+				autoCloseAreas: { type: "sap.ui.core.Control", multiple: true, singularName: "autoCloseArea" }
 			},
 			events: {
 				open: {
 					parameters: {
-						oControl: {type: "sap.ui.core.Control"}
+						oControl: { type: "sap.ui.core.Control" }
 					}
 				},
 				close: {
 					parameters: {
-						oControl: {type: "sap.ui.core.Control"}
+						oControl: { type: "sap.ui.core.Control" }
 					}
 				}
 			},
@@ -85,7 +87,7 @@ sap.ui.define([
 		// create map for modal states
 		this._oModalState = new Map();
 		this._aPopupFilters = [this._isSupportedPopup.bind(this), this._isPopupAdaptable.bind(this)];
-		this._aPopupFilters.forEach(function (fnFilter) {
+		this._aPopupFilters.forEach(function(fnFilter) {
 			ZIndexManager.addPopupFilter(fnFilter);
 		});
 	};
@@ -214,14 +216,27 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * Setting visibility hidden on the other root element overlays
+	 * keeps the focus on the current popover overlay
+	 * @param {boolean} bVisible - Overlay visibility
+	 * @param {sap.m.Popover} oPopover - Current popover
+	 */
+	PopupManager.prototype._adjustRootOverlayVisibility = function(bVisible, oPopover) {
+		this.getRta()._oDesignTime.getRootElements().forEach(function(oRootElement) {
+			if (oRootElement.getId() !== oPopover.getId()) {
+				OverlayRegistry.getOverlay(oRootElement).setVisible(bVisible);
+			}
+		});
+	};
+
 	/**
 	 * Attached to RTA mode change
 	 * @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) {
+		var fnApplyFocusAndSetModal = function(sMode, oPopover) {
 			if (sMode === 'navigation') {
 				// add focus handlers
 				oPopover.oPopup[this._getFocusEventName("add")]();
@@ -325,13 +340,19 @@ sap.ui.define([
 	 *
 	 * @private
 	 */
-	PopupManager.prototype._setModal = function (bSetModal, oPopupElement) {
+	PopupManager.prototype._setModal = function(bSetModal, oPopupElement) {
 		var bOriginalModalState = this._oModalState.get(oPopupElement.oPopup);
-		if (typeof bOriginalModalState !== "boolean" && bSetModal && this.getRta().getMode() === 'adaptation') {
+		if (typeof bOriginalModalState !== "boolean" && bSetModal && this.getRta().getMode() !== 'navigation') {
 			this._oModalState.set(oPopupElement.oPopup, oPopupElement.oPopup.getModal());
+			if (this._isPopupAdaptable(oPopupElement)) {
+				this._adjustRootOverlayVisibility(false, oPopupElement);
+			}
 			oPopupElement.oPopup.setModal(true);
 		} else if (typeof bOriginalModalState === "boolean" && bSetModal === false) {
 			oPopupElement.oPopup.setModal(bOriginalModalState);
+			if (this._isPopupAdaptable(oPopupElement)) {
+				this._adjustRootOverlayVisibility(true, oPopupElement);
+			}
 			this._oModalState.delete(oPopupElement.oPopup);
 		}
 	};
@@ -395,7 +416,7 @@ sap.ui.define([
 		if (!this.fnOriginalPopupOnAfterRendering) {
 			this.fnOriginalPopupOnAfterRendering = oPopup.onAfterRendering;
 		}
-		oPopup.onAfterRendering = function () {
+		oPopup.onAfterRendering = function() {
 			var vOriginalReturn = this.fnOriginalPopupOnAfterRendering.apply(oPopup, arguments);
 			oPopup[this._getFocusEventName("remove")]();
 			return vOriginalReturn;
@@ -433,7 +454,7 @@ sap.ui.define([
 		return function(oPopupElement) {
 			var vOriginalReturn = fnOriginalFunction.apply(InstanceManager, arguments);
 			if (this._isSupportedPopup(oPopupElement)) {
-				if (this._isPopupAdaptable(oPopupElement, false)
+				if (this._isPopupAdaptable(oPopupElement)
 					&& this.getRta()._oDesignTime) {
 					this.getRta()._oDesignTime.removeRootElement(oPopupElement);
 				}
@@ -597,7 +618,7 @@ sap.ui.define([
 	PopupManager.prototype.exit = function() {
 		this._restoreInstanceFunctions();
 		delete this._oModalState;
-		this._aPopupFilters.forEach(function (fnFilter) {
+		this._aPopupFilters.forEach(function(fnFilter) {
 			ZIndexManager.removePopupFilter(fnFilter);
 		});
 	};

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

@@ -19,7 +19,7 @@ function(
 	 *
 	 * @extends sap.ui.core.EventBus
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 * @private
 	 * @since 1.56.0
 	 * @alias sap.ui.rta.util.ServiceEventBus

package/src/sap/ui/rta/util/changeVisualization/ChangeIndicator.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicator
 	 * @author SAP SE
 	 * @since 1.84.0
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 * @private
 	 */
 	var ChangeIndicator = Control.extend("sap.ui.rta.util.changeVisualization.ChangeIndicator", {

package/src/sap/ui/rta/util/changeVisualization/ChangeIndicatorRegistry.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeIndicatorRegistry
 	 * @author SAP SE
 	 * @since 1.86.0
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 * @private
 	 */
 	var ChangeIndicatorRegistry = ManagedObject.extend("sap.ui.rta.util.changeVisualization.ChangeIndicatorRegistry", {

package/src/sap/ui/rta/util/changeVisualization/ChangeVisualization.js

@@ -12,7 +12,6 @@ sap.ui.define([
 	"sap/ui/core/Control",
 	"sap/ui/dt/OverlayRegistry",
 	"sap/ui/dt/ElementUtil",
-	"sap/ui/events/KeyCodes",
 	"sap/ui/fl/apply/_internal/changes/Utils",
 	"sap/ui/fl/write/api/ChangesWriteAPI",
 	"sap/ui/fl/write/api/PersistenceWriteAPI",
@@ -30,7 +29,6 @@ sap.ui.define([
 	Control,
 	OverlayRegistry,
 	ElementUtil,
-	KeyCodes,
 	ChangesUtils,
 	ChangesWriteAPI,
 	PersistenceWriteAPI,
@@ -92,7 +90,7 @@ sap.ui.define([
 	 * @alias sap.ui.rta.util.changeVisualization.ChangeVisualization
 	 * @author SAP SE
 	 * @since 1.84.0
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 * @private
 	 */
 	var ChangeVisualization = Control.extend("sap.ui.rta.util.changeVisualization.ChangeVisualization", {
@@ -219,7 +217,7 @@ sap.ui.define([
 	 * Sets the selected command category and visualizes all changes for the given category
 	 *
 	 * @param {event} oEvent - Event
-	 * @returns {promise} - Promise of category change
+	 * @returns {Promise} - Promise of category change
 	 */
 	ChangeVisualization.prototype.onCommandCategorySelection = function(oEvent) {
 		var sSelectedCommandCategory = oEvent.getParameter("item").getKey();
@@ -362,12 +360,12 @@ sap.ui.define([
 	ChangeVisualization.prototype._collectChanges = function() {
 		var oComponent = this._getComponent();
 		var mPropertyBag = {
-			oComponent: oComponent,
 			selector: oComponent,
 			invalidateCache: false,
 			// includeCtrlVariants: true,
 			currentLayer: Layer.CUSTOMER,
-			includeDirtyChanges: true
+			includeDirtyChanges: true,
+			onlyCurrentVariants: true
 		};
 		return PersistenceWriteAPI._getUIChanges(mPropertyBag);
 	};