@openui5/sap.ui.mdc 1.96.5 → 1.99.0

package/src/sap/ui/mdc/p13n/Engine.js

@@ -14,9 +14,10 @@ sap.ui.define([
 	"sap/ui/core/library",
 	"sap/ui/mdc/p13n/StateUtil",
 	"sap/ui/core/Element",
-	"sap/ui/mdc/p13n/DefaultProviderRegistry",
-	"sap/ui/mdc/p13n/UIManager"
-], function (AdaptationProvider, merge, Log, PropertyHelper, FlexModificationHandler, MessageStrip, coreLibrary, StateUtil, Element, DefaultProviderRegistry, UIManager) {
+	"sap/ui/mdc/p13n/modules/DefaultProviderRegistry",
+	"sap/ui/mdc/p13n/UIManager",
+	"sap/ui/mdc/p13n/modules/StateHandlerRegistry"
+], function (AdaptationProvider, merge, Log, PropertyHelper, FlexModificationHandler, MessageStrip, coreLibrary, StateUtil, Element, DefaultProviderRegistry, UIManager, StateHandlerRegistry) {
 	"use strict";
 
 	var ERROR_INSTANCING = "Engine: This class is a singleton. Please use the getInstance() method instead.";
@@ -39,7 +40,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -56,12 +57,16 @@ sap.ui.define([
 			}
 
 			this._aRegistry = [];
+			this._aStateHandlers = [];
 
 			//Default Provider Registry to be used for internal PersistenceProvider functionality access
 			this.defaultProviderRegistry = DefaultProviderRegistry.getInstance();
 
 			//UIManager to be used for p13n UI creation
 			this.uimanager = UIManager.getInstance(this);
+
+			//Default state Handler Registry to be used for state event handling
+			this.stateHandlerRegistry = StateHandlerRegistry.getInstance();
 		}
 	});
 
@@ -187,7 +192,7 @@ sap.ui.define([
 		return this.initAdaptation(vControl, sKey).then(function(){
 
 			var oController = this.getController(vControl, sKey);
-			var mchangeOperations = oController.getChangeOperations();
+			var mChangeOperations = oController.getChangeOperations();
 
 			var oRegistryEntry = this._getRegistryEntry(vControl);
 			var oCurrentState = oController.getCurrentState();
@@ -198,9 +203,9 @@ sap.ui.define([
 				applyAbsolute: bApplyAbsolute,
 				changedState: aNewState,
 				control: oController.getAdaptationControl(),
-				changeOperations: mchangeOperations,
+				changeOperations: mChangeOperations,
 				deltaAttributes: ["name"],
-				propertyInfo: oRegistryEntry.helper.getProperties().map(function(a){return {name: a.getName()};})
+				propertyInfo: oRegistryEntry.helper.getProperties().map(function(a){return {name: a.name};})
 			};
 
 			//Only execute change calculation in case there is a difference (--> example: press 'Ok' without a difference)
@@ -230,12 +235,22 @@ sap.ui.define([
 
 		aKeys = aKeys instanceof Array ? aKeys : [aKeys];
 
+		var aSelectors = [];
+
+		aKeys.forEach(function(sKey) {
+			aSelectors = aSelectors.concat(this.getController(oControl, sKey).getSelectorForReset());
+		}.bind(this));
+
 		var oResetConfig = {
+			selectors: aSelectors,
 			selector: oControl
 		};
 
 		var oModificationSetting = this._determineModification(oControl);
 		return oModificationSetting.handler.reset(oResetConfig, oModificationSetting.payload).then(function(){
+			//trigger statehandlerregistry notification
+			this.stateHandlerRegistry.fireChange(oControl);
+
 			//Re-Init housekeeping after update
 			return this.initAdaptation(oControl, aKeys).then(function(oPropertyHelper){
 				aKeys.forEach(function(sKey){
@@ -283,7 +298,15 @@ sap.ui.define([
 	Engine.prototype._processChanges = function(vControl, aChanges) {
 		if (aChanges instanceof Array && aChanges.length > 0) {
 			var oModificationSetting = this._determineModification(vControl);
-			return oModificationSetting.handler.processChanges(aChanges, oModificationSetting.payload);
+			return oModificationSetting.handler.processChanges(aChanges, oModificationSetting.payload)
+			.then(function(aChanges){
+				var oControl = Engine.getControlInstance(vControl);
+				this.stateHandlerRegistry.fireChange(oControl);
+				if (oControl._onChangeAppliance instanceof Function) {
+					oControl._onChangeAppliance.call(oControl);
+				}
+				return aChanges;
+			}.bind(this));
 		} else {
 			return Promise.resolve([]);
 		}
@@ -306,9 +329,10 @@ sap.ui.define([
 		var fResolveRTA;
 
 		//var aVMs = Engine.hasForReference(oControl, "sap.ui.fl.variants.VariantManagement");
+		// TODO: clarify if we need this error handling / what to do with the Link if we want to keep it
 		var aPVs = Engine.hasForReference(oControl, "sap.ui.mdc.p13n.PersistenceProvider");
 
-		if (aPVs.length > 0) {
+		if (aPVs.length > 0 && !oControl.isA("sap.ui.mdc.link.Panel")) {
 			return Promise.reject("Please do not use a PeristenceProvider in RTA.");
 		}
 
@@ -319,7 +343,10 @@ sap.ui.define([
 			fResolveRTA = resolve;
 		});
 
-		oModificationHandler.processChanges = fResolveRTA;
+		oModificationHandler.processChanges = function(aChanges) {
+			fResolveRTA(aChanges);
+			return Promise.resolve(aChanges);
+		};
 
 		this._setModificationHandler(oControl, oModificationHandler);
 
@@ -329,6 +356,9 @@ sap.ui.define([
 				oCustomHeader.getContentRight()[0].setVisible(false);
 			}
 			oContainer.addStyleClass(mPropertyBag.styleClass);
+			if (mPropertyBag.fnAfterClose instanceof Function) {
+				oContainer.attachAfterClose(mPropertyBag.fnAfterClose);
+			}
 		});
 
 		oRTAPromise.then(function(){
@@ -598,7 +628,8 @@ sap.ui.define([
 	 *
 	 * @returns {object} The requested UI settings of the control instance and provided keys
 	 */
-	Engine.prototype.getUISettings = function(vControl, aKeys) {
+	Engine.prototype.getUISettings = function(vControl, vKeys) {
+		var aKeys = Array.isArray(vKeys) ? vKeys : [vKeys];
 		this.verifyController(vControl, aKeys);
 		var oPropertyHelper = this._getRegistryEntry(vControl).helper;
 		var mUiSettings = {};
@@ -607,6 +638,8 @@ sap.ui.define([
 			var oController = this.getController(vControl, sKey);
 			var pAdaptationUI = oController.getAdaptationUI(oPropertyHelper);
 			//Check faceless controller implementations and skip them
+
+			//TODO: error handling for non promises
 			if (pAdaptationUI instanceof Promise){
 				mUiSettings[sKey] = {};
 				mUiSettings[sKey] = {
@@ -777,8 +810,8 @@ sap.ui.define([
 	 * Determines and registeres the ModificationHandler per control instance
 	 *
 	 * @private
-	 * @param {String} sControlId The control id
-	 * @param {String} sAncestorControlId The control ancestor id
+	 * @param {string} sControlId The control id
+	 * @param {string} sAncestorControlId The control ancestor id
 	 *
 	 * @returns {boolean} Returns whether an according ancestor could be found.
 	 */
@@ -954,27 +987,27 @@ sap.ui.define([
 	 * @param {object[]} [aCustomPropertyInfo] A custom set of propertyinfo.
 	 *
 	 */
-	Engine.prototype._retrievePropertyHelper = function(vControl, aCustomPropertyInfo){
+	Engine.prototype._retrievePropertyHelper = function (vControl, aCustomPropertyInfo) {
 
 		var oRegistryEntry = this._getRegistryEntry(vControl);
 		var oControl = Engine.getControlInstance(vControl);
 
 		if (aCustomPropertyInfo) {
-			if (oRegistryEntry.helper){
+			if (oRegistryEntry.helper) {
 				oRegistryEntry.helper.destroy();
 			}
 			oRegistryEntry.helper = new PropertyHelper(aCustomPropertyInfo);
 			return Promise.resolve(oRegistryEntry.helper);
-        }
+		}
 
 		if (oRegistryEntry.helper) {
 			return Promise.resolve(oRegistryEntry.helper);
 		}
 
-		return oControl.initPropertyHelper().then(function(oPropertyHelper){
+		return oControl.initPropertyHelper().then(function (oPropertyHelper) {
 			oRegistryEntry.helper = oPropertyHelper;
 			return oPropertyHelper;
-		}, function(sHelperError){
+		}, function (sHelperError) {
 			throw new Error(sHelperError);
 		});
 	};
@@ -998,11 +1031,17 @@ sap.ui.define([
 	 * This method can be used for debugging to retrieve the complete registry.
 	 */
 	Engine.prototype._getRegistry = function() {
-		var oRegistry = {};
+		var oRegistry = {
+			stateHandlerRegistry: this.stateHandlerRegistry,
+			defaultProviderRegistry: this.defaultProviderRegistry,
+			controlRegistry: {}
+		};
+
 		this._aRegistry.forEach(function(sKey){
 			var oControl = sap.ui.getCore().byId(sKey);
-			oRegistry[sKey] = _mRegistry.get(oControl);
+			oRegistry.controlRegistry[sKey] = _mRegistry.get(oControl);
 		});
+
 		return oRegistry;
 	};
 
@@ -1017,6 +1056,8 @@ sap.ui.define([
 		_mRegistry.delete(this);
 		this.defaultProviderRegistry.destroy();
 		this.defaultProviderRegistry = null;
+		this.stateHandlerRegistry.destroy();
+		this.stateHandlerRegistry = null;
 		this.uimanager.destroy();
 		this.uimanager = null;
 	};

package/src/sap/ui/mdc/p13n/FlexUtil.js

@@ -10,101 +10,6 @@ sap.ui.define([
 
 	var FlexUtil = {
 
-		/**
-		* Generates a set of changes based on the given arrays for a specified control
-		*
-		* @public
-		*
-		* @param {object} mDeltaInfo Map containing the necessary information to calculate the diff as change objects
-		* @param {array} mDeltaInfo.existingState An array describing the control state before a adaptation
-		* @param {array} mDeltaInfo.changedState An array describing the control state after a certain adaptation
-		* @param {object} mDeltaInfo.control Control instance which is being used to generate the changes
-		* @param {object} mDeltaInfo.changeOperations Map containing the changeOperations for the given Control instance
-		* @param {string} mDeltaInfo.changeOperations.add Name of the control specific 'add' changehandler
-		* @param {string} mDeltaInfo.changeOperations.remove Name of the control specific 'remove' changehandler
-		* @param {string} [mDeltaInfo.changeOperations.move] Name of the control specific 'move' changehandler
-		* @param {string} [mDeltaInfo.generator] Name of the change generator (E.g. the namespace of the UI creating the change object)
-		*
-		* @returns {array} Array containing the delta based created changes
-		*/
-		getArrayDeltaChanges: function (mDeltaInfo) {
-
-			var aExistingArray = mDeltaInfo.existingState;
-			var aChangedArray = mDeltaInfo.changedState;
-			var oControl = mDeltaInfo.control;
-			var sInsertOperation = mDeltaInfo.changeOperations.add;
-			var sRemoveOperation = mDeltaInfo.changeOperations.remove;
-			var sMoveOperation = mDeltaInfo.changeOperations.move;
-			var sGenerator = mDeltaInfo.generator;
-
-			var aDeltaAttributes = mDeltaInfo.deltaAttributes || [];
-
-			var fnSymbol = function(o) {
-				var sDiff = "";
-				aDeltaAttributes.forEach(function(sAttribute){
-					sDiff = sDiff + o[sAttribute];
-				});
-				return sDiff;
-			};
-
-			var aResults = diff(aExistingArray, aChangedArray, fnSymbol);
-			// Function to match field with exising field in the given array
-			var fMatch = function (oField, aArray) {
-				return aArray.filter(function (oExistingField) {
-					return oExistingField && (oExistingField.name === oField.name);
-				})[0];
-			};
-
-			var aChanges = [];
-			var aProcessedArray = aExistingArray.slice(0);
-
-			aResults.forEach(function (oResult) {
-				// Begin --> hack for handling result returned by diff
-				if (oResult.type === "delete" && aProcessedArray[oResult.index] === undefined) {
-					aProcessedArray.splice(oResult.index, 1);
-					return;
-				}
-
-				var oProp, oExistingProp, iLength;
-				if (oResult.type === "insert") {
-					oExistingProp = fMatch(aChangedArray[oResult.index], aProcessedArray);
-					if (oExistingProp) {
-						oExistingProp.index = aProcessedArray.indexOf(oExistingProp);
-						aProcessedArray.splice(oExistingProp.index, 1, undefined);
-						aChanges.push(FlexUtil.createAddRemoveChange(oControl, sRemoveOperation, FlexUtil._getChangeContent(oExistingProp, aDeltaAttributes), sGenerator));
-					}
-				}
-				// End hack
-				oProp = oResult.type === "delete" ? aProcessedArray[oResult.index] : aChangedArray[oResult.index];
-				oProp.index = oResult.index;
-				if (oResult.type === "delete") {
-					aProcessedArray.splice(oProp.index, 1);
-				} else {
-					aProcessedArray.splice(oProp.index, 0, oProp);
-				}
-				// Move operation shows up as insert followed by delete OR delete followed by insert
-				if (sMoveOperation) {
-					iLength = aChanges.length;
-					// Get the last added change
-					if (iLength) {
-						oExistingProp = aChanges[iLength - 1];
-						oExistingProp = oExistingProp ? oExistingProp.changeSpecificData.content : undefined;
-					}
-					// Matching property exists with a different index --> then this is a move operation
-					if (oExistingProp && oExistingProp.name === oProp.name && oResult.index != oExistingProp.index) {
-						// remove the last insert/delete operation
-						aChanges.pop();
-						aChanges.push(FlexUtil.createMoveChange(oExistingProp.id, oExistingProp.name, oResult.index, sMoveOperation, oControl, sMoveOperation !== "moveSort", sGenerator));
-						return;
-					}
-				}
-
-				aChanges.push(FlexUtil.createAddRemoveChange(oControl, oResult.type === "delete" ? sRemoveOperation : sInsertOperation, FlexUtil._getChangeContent(oProp, aDeltaAttributes), sGenerator));
-
-			});
-			return aChanges;
-		},
-
 		getPropertySetterChanges: function(mDeltaInfo) {
 			var oControl = mDeltaInfo.control;
 			var aExistingState = mDeltaInfo.existingState;
@@ -124,7 +29,7 @@ sap.ui.define([
 					var vNewValue = oItem[sSetAttribute];
 					var bValueChanged = vOldValue !== vNewValue;
 					if (bValueChanged) {
-						aSetterChanges.push(this.createAddRemoveChange(oControl, sOperation, {
+						aSetterChanges.push(this.createChange(oControl, sOperation, {
 							name: oItem.name,
 							value: oItem[sSetAttribute]
 						}));
@@ -193,7 +98,14 @@ sap.ui.define([
 					Log.warning("property '" + sFieldPath + "' not supported");
 					continue;
 				}
-				aConditionChanges = aConditionChanges.concat(FlexUtil._diffConditionPath(sFieldPath, mNewConditionState[sFieldPath], mPreviousConditionState[sFieldPath], oAdaptationControl));
+
+				var aFilterConditionChanges = FlexUtil._diffConditionPath(sFieldPath, mNewConditionState[sFieldPath], mPreviousConditionState[sFieldPath], oAdaptationControl);
+
+				if (oAdaptationControl && oAdaptationControl.createPropertyInfoChanges && (aFilterConditionChanges.length > 0)) {
+					aFilterConditionChanges = oAdaptationControl.createPropertyInfoChanges(sFieldPath).concat(aFilterConditionChanges);
+				}
+
+				aConditionChanges = aConditionChanges.concat(aFilterConditionChanges);
 			}
 
 			return aConditionChanges;
@@ -274,7 +186,8 @@ sap.ui.define([
 
 			return aChanges;
 		},
-		createAddRemoveChange: function(oControl, sOperation, oContent){
+
+		createChange: function(oControl, sOperation, oContent){
 			var oAddRemoveChange = {
 				selectorElement: oControl,
 				changeSpecificData: {
@@ -285,26 +198,6 @@ sap.ui.define([
 			return oAddRemoveChange;
 		},
 
-		createMoveChange: function (sId, sPropertyName, iNewIndex, sMoveOperation, oControl, bPersistId) {
-			var oMoveChange =  {
-				selectorElement: oControl,
-				changeSpecificData: {
-					changeType: sMoveOperation,
-					content: {
-						id: sId,
-						name: sPropertyName,
-						index: iNewIndex
-					}
-				}
-			};
-
-			if (!bPersistId) {
-				delete oMoveChange.changeSpecificData.content.id;
-			}
-
-			return oMoveChange;
-		},
-
 		createConditionChange: function(sChangeType, oControl, sFieldPath, oCondition) {
 			var oConditionChange = {
 				selectorElement: oControl,

package/src/sap/ui/mdc/p13n/P13nBuilder.js

@@ -31,8 +31,8 @@ sap.ui.define([
          * @param {object} oP13nUI Control displayed in the content area
          * @param {object} mDialogSettings Settings to overwrite popover default properties, such as: <code>contentHeight</code>
          * @param {object} [mDialogSettings.reset] Reset settings for the custom header creation
-         * @param {Function} [mDialogSettings.reset.onExecute] Callback executed upon triggering a reset
-         * @param {String} [mDialogSettings.reset.warningText] Warning which is displyed prior to executing the reset
+         * @param {function} [mDialogSettings.reset.onExecute] Callback executed upon triggering a reset
+         * @param {string} [mDialogSettings.reset.warningText] Warning which is displyed prior to executing the reset
          *
          * @returns {Promise} promise resolving in the Popover instance
          */
@@ -76,8 +76,8 @@ sap.ui.define([
          * @param {object} oP13nUI Control displayed in the content area
          * @param {object} mDialogSettings Settings to overwrite dialog default properties, such as: <code>contentHeight</code>
          * @param {object} [mDialogSettings.reset] Reset settings for the custom header creation
-         * @param {Function} [mDialogSettings.reset.onExecute] Callback executed upon triggering a reset
-         * @param {String} [mDialogSettings.reset.warningText] Warning which is displyed prior to executing the reset
+         * @param {function} [mDialogSettings.reset.onExecute] Callback executed upon triggering a reset
+         * @param {string} [mDialogSettings.reset.warningText] Warning which is displyed prior to executing the reset
          *
          * @returns {Promise} Promise resolving in the Dialog instance
          */
@@ -149,9 +149,9 @@ sap.ui.define([
         /**
          *
          * @param {object} mSettings Settings object to create a customHeader including a reset Button
-         * @param {String} mSettings.title Title for the custom reset header
+         * @param {string} mSettings.title Title for the custom reset header
          * @param {function} mSettings.reset Control specific reset handling
-         * @param {String} [mSettings.warningText] Text which is displayed prior to executing to reset execution
+         * @param {string} [mSettings.warningText] Text which is displayed prior to executing to reset execution
          *
          * @returns {sap.m.Bar} The created custom header Bar
          */
@@ -196,7 +196,7 @@ sap.ui.define([
         prepareAdaptationData: function(vProperties, fnEnhace, bGroupData) {
 
 			var oPropertyHelper =
-				vProperties && vProperties.getProperties instanceof Function ?
+                vProperties && vProperties.getProperties instanceof Function ?
 				vProperties : new P13nPropertyHelper(vProperties);
 
             var aItems = [];
@@ -216,7 +216,7 @@ sap.ui.define([
                 }
 
                 mItem.name = oProperty.name;
-                mItem.label = oProperty.getLabel() || oProperty.name;
+                mItem.label = oProperty.label || oProperty.name;
                 mItem.tooltip = oProperty.tooltip;
 
                 if (mItemsGrouped) {

package/src/sap/ui/mdc/p13n/PersistenceProvider.js

@@ -4,8 +4,8 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-	"sap/ui/core/Control", 	"sap/ui/fl/variants/VariantManagement", "sap/ui/fl/Utils", "sap/ui/mdc/enum/PersistenceMode"
-], function(CoreControl, VariantManagement, Utils, mode) {
+	"sap/ui/core/Control", 	"sap/ui/fl/variants/VariantManagement", "sap/ui/fl/Utils", "sap/ui/mdc/enum/PersistenceMode", "sap/ui/layout/VerticalLayout"
+], function(CoreControl, VariantManagement, Utils, mode, VerticalLayout) {
 	"use strict";
 
 	/**
@@ -78,12 +78,23 @@ sap.ui.define([
 		this._bmodeLocked = true;
 
 		if (this.getMode() === mode.Transient) {
-			this._oVM = new VariantManagement(this.getId() + "--vm", {"for": this.getAssociation("for")});
+			var oVM = new VariantManagement(this.getId() + "--vm", {"for": this.getAssociation("for")});
 			this._oModelPromise.then(function (oModel) {
-				this._oVM.setModel(oModel, Utils.VARIANT_MODEL_NAME);
-			}.bind(this));
+				oVM.setModel(oModel, Utils.VARIANT_MODEL_NAME);
+			});
+			this._oWrapper = new VerticalLayout(this.getId() + "--accWrapper", {
+				content: [
+					oVM
+				]
+			});
+
+			this._oWrapper.onAfterRendering = function() {
+				VerticalLayout.prototype.onAfterRendering.apply(this, arguments);
+				this.getDomRef().setAttribute("aria-hidden", true);
+			};
+
 			var oStatic = sap.ui.getCore().getUIArea(sap.ui.getCore().getStaticAreaRef());
-			oStatic.addContent(this._oVM);
+			oStatic.addContent(this._oWrapper);
 		}
 
 		return this;
@@ -109,12 +120,12 @@ sap.ui.define([
 	};
 
 	PersistenceProvider.prototype.exit = function () {
-		if (this._oVM) {
+		if (this._oWrapper) {
 			var oStatic = sap.ui.getCore().getUIArea(sap.ui.getCore().getStaticAreaRef());
-			oStatic.removeContent(this._oVM);
+			oStatic.removeContent(this._oWrapper);
 
-			this._oVM.destroy();
-			this._oVM = null;
+			this._oWrapper.destroy();
+			this._oWrapper = null;
 		}
 
 		this._oModelPromise = null;

package/src/sap/ui/mdc/p13n/PropertyHelper.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/p13n/StateUtil.js

@@ -79,6 +79,16 @@ sap.ui.define([
 		*			Country: {
 		*				aggregated: false
 		*			}
+		*		},
+		*		//The supplementaryConfig can be used to modify control specific attributes, for example the column width in the Table
+		*		supplementaryConfig: {
+		*			aggregations: {
+		*				columns: {
+		*					Category: {
+		*						width: "150px"
+		*					}
+		*				}
+		*			}
 		*		}
 		* }
 		*
@@ -108,6 +118,32 @@ sap.ui.define([
 			});
 		},
 
+		/**
+		 * Attaches an event handler to the <code>StateUtil</code>.
+		 * The event handler may be fired every time a user triggers a personalization change for a control instance during runtime.
+		 *
+		 * @private
+		 * @ui5-restricted sap.fe
+		 * @MDC_PUBLIC_CANDIDATE
+		 * @param {function} fnListener fnFunction The handler function to call when the event occurs
+		 */
+		attachStateChange: function(fnListener) {
+			sap.ui.mdc.p13n.Engine.getInstance().stateHandlerRegistry.attachChange(fnListener);
+		},
+
+		/**
+		 * Removes a previously attached state change event handler from the <code>StateUtil</code> class.
+		 * The passed parameters must match those used for registration with {@link StateUtil#attachChange} beforehand.
+		 *
+		 * @private
+		 * @ui5-restricted sap.fe
+		 * @MDC_PUBLIC_CANDIDATE
+		 * @param {function} fnListener fnFunction The handler function to detach from the event
+		 */
+		detachStateChange: function(fnListener) {
+			sap.ui.mdc.p13n.Engine.getInstance().stateHandlerRegistry.detachChange(fnListener);
+		},
+
 		_externalizeKeys: function(oInternalState) {
 			var mKeysForState = {
 				Sort: "sorters",
@@ -115,7 +151,8 @@ sap.ui.define([
 				Aggregate: "aggregations",
 				Filter: "filter",
 				Item: "items",
-				Column: "items"
+				Column: "items",
+				ColumnWidth: "supplementaryConfig"
 			};
 			var oTransformedState = {};
 
@@ -124,10 +161,6 @@ sap.ui.define([
 				var sTransformedKey = sExternalKey || sProvidedEngineKey;//no external key --> provide internal key
 				oTransformedState[sTransformedKey] = oInternalState[sProvidedEngineKey];
 			});
-			//TODO: Remove once the stateUtil for columnWidth is introduced
-			if (oTransformedState.ColumnWidth) {
-				delete oTransformedState.ColumnWidth;
-			}
 			return oTransformedState;
 		},
 
@@ -137,7 +170,8 @@ sap.ui.define([
 				groupLevels: ["Group"],
 				aggregations: ["Aggregate"],
 				filter: ["Filter"],
-				items: ["Item", "Column"]
+				items: ["Item", "Column"],
+				supplementaryConfig: ["ColumnWidth"]
 			};
 
 			var oTransformedState = {};

package/src/sap/ui/mdc/p13n/UIManager.js

@@ -7,10 +7,11 @@
 sap.ui.define([
 	"sap/ui/base/Object",
 	"sap/ui/mdc/p13n/P13nBuilder",
-	"sap/ui/mdc/p13n/panels/Wrapper",
+	"sap/m/p13n/Container",
+	"sap/m/p13n/AbstractContainerItem",
 	"sap/base/util/UriParameters",
 	"sap/base/Log"
-], function (BaseObject, P13nBuilder, Wrapper, SAPUriParameters, Log) {
+], function (BaseObject, P13nBuilder, P13nContainer, AbstractContainerItem, SAPUriParameters, Log) {
 	"use strict";
 
 	var ERROR_INSTANCING = "UIManager: This class is a singleton and should not be used without an AdaptationProvider. Please use 'sap.ui.mdc.p13n.Engine.getInstance().uimanager' instead";
@@ -31,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.96.5
+	 * @version 1.99.0
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -141,7 +142,7 @@ sap.ui.define([
 				var bWrapperUsed = aKeys.length > 1;
 				var oAdaptationUI;
 				var oContent = oP13nControl.getContent()[0];
-				if (bWrapperUsed && oContent.isA("sap.ui.mdc.p13n.panels.Wrapper") && oContent.getView(sKey)) {
+				if (bWrapperUsed && oContent.isA("sap.m.p13n.Container") && oContent.getView(sKey)) {
 					oAdaptationUI = oContent.getView(sKey).getContent();
 				} else {
 					oAdaptationUI = oContent;
@@ -206,11 +207,15 @@ sap.ui.define([
 		}.bind(this));
 
 		return Promise.all(aPAdaptationUI).then(function(aUIs){
-			var oPopupContent = bUseP13nContainer ? new Wrapper() : aUIs[0].panel;
+			var oPopupContent = bUseP13nContainer ? new P13nContainer() : aUIs[0].panel;
 			if (bUseP13nContainer) {
 				aUIs.forEach(function(mUI){
 					if (mUI.panel) {
-						oPopupContent.addPanel(mUI.panel, mUI.key, mUI.tab);
+						oPopupContent.addView(new AbstractContainerItem({
+							key: mUI.key,
+							text: mUI.tab,
+							content: mUI.panel
+						}));
 					}
 				});
 				oPopupContent.switchView(aUIs[0].key);
@@ -359,7 +364,7 @@ sap.ui.define([
 
 		var mSettings = Object.assign({
 			verticalScrolling: true,
-			reset: mUISettings.reset,
+			reset: mUISettings.reset || {},
 			afterClose: function(oEvt) {
 				var oDialog = oEvt.getSource();
 				if (oDialog) {
@@ -370,11 +375,9 @@ sap.ui.define([
 		}, mUISettings.containerSettings);
 
 		if (mUISettings.resetEnabled){
-			mSettings.reset = {
-				onExecute: function() {
-					this.oAdaptationProvider.reset(oControl, aKeys);
-				}.bind(this)
-			};
+			mSettings.reset.onExecute = function() {
+				this.oAdaptationProvider.reset(oControl, aKeys);
+			}.bind(this);
 		}
 
 		mSettings.confirm = {

package/src/sap/ui/mdc/p13n/modification/FlexModificationHandler.js

@@ -54,8 +54,11 @@ sap.ui.define([
 
     FlexModificationHandler.prototype.reset = function(mPropertyBag, oModificationPayload){
         var sPersistenceMode = oModificationPayload.mode;
+
         var bIsGlobal = sPersistenceMode === mode.Global;
-        return bIsGlobal ? FlexUtil.reset.call(this, mPropertyBag) : FlexUtil.restore.call(this, mPropertyBag);
+        var bIsAutoGlobal = !oModificationPayload.hasVM && oModificationPayload.hasPP && sPersistenceMode === mode.Auto;
+
+        return (bIsGlobal || bIsAutoGlobal) ? FlexUtil.reset.call(this, mPropertyBag) : FlexUtil.restore.call(this, mPropertyBag);
     };
 
     FlexModificationHandler.prototype.isModificationSupported = function(mPropertyBag, oModificationPayload){