@openui5/sap.m 1.108.1 → 1.109.0

package/src/sap/m/p13n/Container.js

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.AbstractContainer
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @private
 	 * @ui5-restricted
@@ -185,8 +185,8 @@ sap.ui.define([
 	Container.prototype._getTabBar = function () {
 		if (!this._oTabBar) {
 			this._oTabBar = new IconTabBar({
-				expandable: false,
-				expanded: true,
+				headerBackgroundDesign: "Transparent",
+				applyContentPadding: false,
 				select: function (oEvt) {
 					this.switchView(oEvt.getParameter("key"));
 				}.bind(this)

package/src/sap/m/p13n/Engine.js

@@ -15,8 +15,9 @@ sap.ui.define([
 	"sap/m/p13n/modules/DefaultProviderRegistry",
 	"sap/m/p13n/modules/UIManager",
 	"sap/m/p13n/modules/StateHandlerRegistry",
-	"sap/m/p13n/modules/xConfigAPI"
-], function (AdaptationProvider, merge, Log, FlexModificationHandler, MessageStrip, coreLibrary, Element, DefaultProviderRegistry, UIManager, StateHandlerRegistry, xConfigAPI) {
+	"sap/m/p13n/modules/xConfigAPI",
+	"sap/m/p13n/enum/ProcessingStrategy"
+], function (AdaptationProvider, merge, Log, FlexModificationHandler, MessageStrip, coreLibrary, Element, DefaultProviderRegistry, UIManager, StateHandlerRegistry, xConfigAPI, ProcessingStrategy) {
 	"use strict";
 
 	var ERROR_INSTANCING = "Engine: This class is a singleton. Please use the getInstance() method instead.";
@@ -61,7 +62,7 @@ sap.ui.define([
 	 * @alias sap.m.p13n.Engine
 	 * @extends sap.m.p13n.AdaptationProvider
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @public
 	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 * @since 1.104
@@ -129,14 +130,10 @@ sap.ui.define([
 	 */
 	 Engine.prototype.register = function(oControl, oConfig) {
 
-		if (!oConfig.hasOwnProperty("controller") || Object.keys(oConfig.controller).length < 1) {
+		if (!oConfig.hasOwnProperty("controller")/* || Object.keys(oConfig.controller).length < 1*/) {
 			throw new Error("Please provide at least a configuration 'controller' containing a map of key-value pairs (key + Controller class) in order to register adaptation.");
 		}
 
-		if (!oConfig.hasOwnProperty("helper") || !(oConfig.helper.getProperties instanceof Function)) {
-			throw new Error("Please provide at least a configuration 'helper' containing a metadata helper instance implementing a #getProperties function.");
-		}
-
 		var oRegistryEntry = this._getRegistryEntry(oControl);
 
 		if (oRegistryEntry){
@@ -161,7 +158,9 @@ sap.ui.define([
 
 		}.bind(this));
 
-		this.getModificationHandler(oControl).initialize(oControl);
+		if (oRegistryEntry && oRegistryEntry.modification) {
+			this.getModificationHandler(oControl).initialize(oControl);
+		}
 
 	};
 
@@ -273,6 +272,7 @@ sap.ui.define([
 
 		var oModificationSetting = this._determineModification(oControl);
 		return oModificationSetting.handler.reset(oResetConfig, oModificationSetting.payload).then(function(){
+			this.stateHandlerRegistry.fireChange(oControl);
 			//Re-Init housekeeping after update
 			return this.initAdaptation(oControl, aKeys).then(function(oPropertyHelper){
 				aKeys.forEach(function(sKey){
@@ -405,19 +405,22 @@ sap.ui.define([
 		this._getRegistryEntry(vControl).modification = oModificationSetting;
 	};
 
-	var fnQueue = function(oControl, fTask) {
+	Engine.prototype._addToQueue = function(oControl, fTask) {
+		var oRegistryEntry = this._getRegistryEntry(oControl);
+
 		var fCleanupPromiseQueue = function(pOriginalPromise) {
-			if (oControl._pModificationQueue === pOriginalPromise){
-				delete oControl._pModificationQueue;
+			if (oRegistryEntry.pendingModification === pOriginalPromise){
+				oRegistryEntry.pendingModification = null;
 			}
 		};
 
-		oControl._pModificationQueue = oControl._pModificationQueue instanceof Promise ? oControl._pModificationQueue.then(fTask) : fTask();
-		oControl._pModificationQueue.then(fCleanupPromiseQueue.bind(null, oControl._pModificationQueue));
+		oRegistryEntry.pendingModification = oRegistryEntry.pendingModification instanceof Promise ? oRegistryEntry.pendingModification.then(fTask) : fTask();
+		oRegistryEntry.pendingModification.then(fCleanupPromiseQueue.bind(null, oRegistryEntry.pendingModification));
 
-		return oControl._pModificationQueue;
+		return oRegistryEntry.pendingModification;
 	};
 
+
 	/**
 	 * <code>Engine#createChanges</code> can be used to programmatically trigger the creation
 	 * of a set of changes based on the current control state and the provided state.
@@ -428,7 +431,7 @@ sap.ui.define([
 	 * @param {sap.ui.core.Control} mDiffParameters.control The control instance that should be adapted
 	 * @param {string} mDiffParameters.key The key used to retrieve the related controller
 	 * @param {object} mDiffParameters.state The state that is applied to the provided control instance
-	 * @param {boolean} [mDiffParameters.applyAbsolute] Determines whether unmentioned entries are affected
+	 * @param {sap.ui.mdc.p13n.ProcessingStrategy} [mDiffParameters.applyAbsolute] Determines about the comparison algorithm between two states
 	 * @param {boolean} [mDiffParameters.stateBefore] If the state should be diffed manually;
 	 * for example, if "A" exists in the control state, but is not mentioned in the new state provided in the
 	 * mDiffParameters.state then the absolute appliance decides whether to remove "A" or to keep it.
@@ -440,20 +443,20 @@ sap.ui.define([
 	 */
 	Engine.prototype.createChanges = function(mDiffParameters) {
 
+		var oControl = Engine.getControlInstance(mDiffParameters.control);
 		var sKey = mDiffParameters.key;
-		var aNewState = mDiffParameters.state;
-		var bApplyAbsolute = !!mDiffParameters.applyAbsolute;
+		var vNewState = mDiffParameters.state;
 		var bSuppressCallback = !!mDiffParameters.suppressAppliance;
-		var bApplySequentially = !!mDiffParameters.applySequentially;
 
-		if (!sKey || !mDiffParameters.control || !aNewState) {
+		if (!sKey || !mDiffParameters.control || !vNewState) {
 			throw new Error("To create changes via Engine, atleast a 1)Control 2)Key and 3)State needs to be provided.");
 		}
 
-		var oControl = Engine.getControlInstance(mDiffParameters.control);
-
 		var fDeltaHandling = function() {
 			return this.initAdaptation(oControl, sKey).then(function(){
+				return vNewState;
+			})
+			.then(function(aNewState){
 
 				var oController = this.getController(oControl, sKey);
 				var mChangeOperations = oController.getChangeOperations();
@@ -464,12 +467,17 @@ sap.ui.define([
 
 				var mDeltaConfig = {
 					existingState: mDiffParameters.stateBefore || oPriorState,
-					applyAbsolute: bApplyAbsolute,
+					applyAbsolute: mDiffParameters.applyAbsolute,
 					changedState: aNewState,
 					control: oController.getAdaptationControl(),
 					changeOperations: mChangeOperations,
 					deltaAttributes: ["key"],
-					propertyInfo: oRegistryEntry.helper.getProperties().map(function(a){return {key: a.key};})
+					propertyInfo: oRegistryEntry.helper.getProperties().map(function(a){
+						return {
+							key: a.key,
+							name: a.name
+						};
+					})
 				};
 
 				//Only execute change calculation in case there is a difference (--> example: press 'Ok' without a difference)
@@ -478,7 +486,10 @@ sap.ui.define([
 				if (!bSuppressCallback) {
 					var mChangeMap = {};
 					mChangeMap[sKey] = aChanges;
-					return this._processChanges(oControl, mChangeMap);
+					return this._processChanges(oControl, mChangeMap)
+					.then(function(){
+						return aChanges;
+					});
 				}
 
 				return aChanges || [];
@@ -487,11 +498,7 @@ sap.ui.define([
 
 		}.bind(this);
 
-		if (bApplySequentially) {
-			return fnQueue(oControl, fDeltaHandling);
-		} else {
-			return fDeltaHandling.apply(this);
-		}
+		return this._addToQueue(oControl, fDeltaHandling);
 	};
 
 	/**
@@ -502,13 +509,16 @@ sap.ui.define([
 	 * @param {sap.ui.core.Control} oControl The related control instance
 	 * @returns {Promise} A Promise resolving after all pending modifications have been applied
 	 */
-	Engine.prototype.waitForChanges = function(oControl) {
+	 Engine.prototype.waitForChanges = function(oControl) {
 		var oModificationSetting = this._determineModification(oControl);
-		return oModificationSetting.handler.waitForChanges({
-			element: oControl
-		}, oModificationSetting.payload);
+		var oRegistryEntry = this._getRegistryEntry(oControl);
+		return oRegistryEntry && oRegistryEntry.pendingModification ? oRegistryEntry.pendingModification : Promise.resolve()
+		.then(function(){
+			return oModificationSetting.handler.waitForChanges({
+				element: oControl
+			}, oModificationSetting.payload);
+		});
 	};
-
 	/**
 	 * Determines whether the environment is suitable for the desired modification of the provided control instance.
 	 *
@@ -550,8 +560,10 @@ sap.ui.define([
 			var oModificationSetting = this._determineModification(vControl);
 			return oModificationSetting.handler.processChanges(aChanges, oModificationSetting.payload)
 			.then(function(aChanges){
+				var oControl = Engine.getControlInstance(vControl);
+				this.stateHandlerRegistry.fireChange(oControl);
 				return aChanges;
-			});
+			}.bind(this));
 		} else {
 			return Promise.resolve([]);
 		}
@@ -577,7 +589,7 @@ sap.ui.define([
 		// TODO: clarify if we need this error handling / what to do with the Link if we want to keep it
 		var aPVs = this.hasForReference(oControl, "sap.m.p13n.PersistenceProvider");
 
-		if (aPVs.length > 0 && !oControl.isA("sap.m.link.Panel")) {
+		if (aPVs.length > 0 && !oControl.isA("sap.ui.mdc.link.Panel")) {
 			return Promise.reject("Please do not use a PeristenceProvider in RTA.");
 		}
 
@@ -595,12 +607,14 @@ sap.ui.define([
 
 		this._setModificationHandler(oControl, oTemporaryRTAHandler);
 
-		this.uimanager.show(oControl, aKeys).then(function(oContainer){
-			var oCustomHeader = oContainer._oPopup.getCustomHeader();
+		this.uimanager.show(oControl, aKeys, {
+			showReset: false
+		}).then(function(oContainer){
+			var oCustomHeader = oContainer.getCustomHeader();
 			if (oCustomHeader) {
 				oCustomHeader.getContentRight()[0].setVisible(false);
 			}
-			oContainer._oPopup.addStyleClass(mPropertyBag.styleClass);
+			oContainer.addStyleClass(mPropertyBag.styleClass);
 			if (mPropertyBag.fnAfterClose instanceof Function) {
 				oContainer.attachAfterClose(mPropertyBag.fnAfterClose);
 			}
@@ -709,26 +723,24 @@ sap.ui.define([
 		oOld = merge({}, oOld);
 		oNew = merge({}, oNew);
 
-		this.getRegisteredControllers(oControl).forEach(function(sKey){
-
+		Object.keys(oNew).forEach(function(sKey){
 			aDiffCreation.push(this.createChanges({
 				control: oControl,
 				stateBefore: oOld[sKey],
 				state: oNew[sKey],
-				applyAbsolute: true,
+				applyAbsolute: ProcessingStrategy.FullReplace,
 				key: sKey,
 				suppressAppliance: true
 			}));
-
 		}.bind(this));
-
 		return Promise.all(aDiffCreation)
 		.then(function(aChanges){
-			this.getRegisteredControllers(oControl).forEach(function(sKey, i){
-
-				var aState = this.getController(oControl, sKey).changesToState(aChanges[i], oOld[sKey], oNew[sKey]);
-				oDiffState[sKey] = aState;
+			Object.keys(oNew).forEach(function(sKey, i){
 
+				if (oNew[sKey]) {
+					var aState = this.getController(oControl, sKey).changesToState(aChanges[i], oOld[sKey], oNew[sKey]);
+					oDiffState[sKey] = aState;
+				}
 			}.bind(this));
 
 			return oDiffState;
@@ -884,9 +896,8 @@ sap.ui.define([
 	 */
 	Engine.prototype.getRegisteredControllers = function(vControl){
 		var oRegistryEntry = this._getRegistryEntry(vControl);
-		return Object.keys(oRegistryEntry.controller);
+		return oRegistryEntry ? Object.keys(oRegistryEntry.controller) : [];
 	};
-
 	/**
 	 * This method can be used to get the registry entry for a control instance
 	 *
@@ -935,9 +946,9 @@ sap.ui.define([
 
 			_mRegistry.set(oControl, {
 				modification: oPreConfig && oPreConfig.modification ? {
-					handler: oPreConfig.modification,//TBD
+					handler: oPreConfig.modification,
 					payload: {
-						mode: "Auto",//TBD,
+						mode: "Auto",
 						hasVM: true,
 						hasPP: false
 					}
@@ -945,7 +956,8 @@ sap.ui.define([
 				controller: {},
 				activeP13n: null,
 				helper: oPreConfig && oPreConfig.helper ? oPreConfig.helper : null,
-				xConfig: null
+				xConfig: null,
+				pendingAppliance: {}
 			});
 
 		}
@@ -953,6 +965,29 @@ sap.ui.define([
 		return _mRegistry.get(oControl);
 	};
 
+	Engine.prototype.trace = function(vControl, oChange) {
+		var oRegistryEntry = this._getRegistryEntry(vControl);
+		this.getRegisteredControllers(vControl).forEach(function(sKey){
+			var oController = this.getController(vControl, sKey);
+			var mChangeOperations = oController.getChangeOperations();
+			Object.keys(mChangeOperations).forEach(function(sType){
+				if (mChangeOperations[sType] === oChange.changeSpecificData.changeType) {
+					oRegistryEntry.pendingAppliance[sKey] = [].concat(oRegistryEntry.pendingAppliance[sKey]).concat(oChange);
+				}
+			});
+		}.bind(this));
+	};
+
+	Engine.prototype.getTrace = function(vControl, oChange) {
+		var oRegistryEntry = this._getRegistryEntry(vControl);
+		return Object.keys(oRegistryEntry.pendingAppliance);
+	};
+
+	Engine.prototype.clearTrace = function(vControl, oChange) {
+		var oRegistryEntry = this._getRegistryEntry(vControl);
+		oRegistryEntry.pendingAppliance = {};
+	};
+
 	/**
 	 * Determines and registers the ModificationHandler per control instance
 	 *
@@ -969,7 +1004,7 @@ sap.ui.define([
 			return oRegistryEntry.modification;
 		}
 
-		var aPPResults = this.hasForReference(vControl, "sap.m.p13n.PersistenceProvider");
+		var aPPResults = this.hasForReference(vControl, "sap.m.p13n.PersistenceProvider").concat(this.hasForReference(vControl, "sap.ui.mdc.p13n.PersistenceProvider"));
 		var aVMResults = this.hasForReference(vControl, "sap.ui.fl.variants.VariantManagement");
 
 		var aPersistenceProvider = aPPResults.length ? aPPResults : undefined;
@@ -1015,7 +1050,7 @@ sap.ui.define([
 			}
 			var aFor = oElement.getFor instanceof Function ? oElement.getFor() : [];
 			for (var n = 0; n < aFor.length; n++) {
-				if (aFor[n] === sControlId || this.hasControlAncestorWithId(sControlId, aFor[n])) {
+				if (aFor[n] === sControlId || oEngine.hasControlAncestorWithId(sControlId, aFor[n])) {
 					return true;
 				}
 			}
@@ -1255,5 +1290,5 @@ sap.ui.define([
 		this.uimanager = null;
 	};
 
-	return Engine.getInstance();
+	return Engine;
 });

package/src/sap/m/p13n/GroupController.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @public
 	 * @experimental
 	 * @since 1.104

package/src/sap/m/p13n/GroupPanel.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.QueryPanel
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @public
 	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!

package/src/sap/m/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/m/p13n/enum/PersistenceMode", "sap/ui/layout/VerticalLayout"
-], function(CoreControl, VariantManagement, Utils, mode, VerticalLayout) {
+	"sap/ui/core/Control", 	"sap/ui/fl/variants/VariantManagement", "sap/ui/fl/apply/api/ControlVariantApplyAPI", "sap/m/p13n/enum/PersistenceMode", "sap/ui/layout/VerticalLayout"
+], function(CoreControl, VariantManagement, ControlVariantApplyAPI, mode, VerticalLayout) {
 	"use strict";
 
 	/**
@@ -65,7 +65,7 @@ sap.ui.define([
 
 	PersistenceProvider.prototype._setModel = function () {
 
-		var oModel = this.getModel(Utils.VARIANT_MODEL_NAME);
+		var oModel = this.getModel(ControlVariantApplyAPI.getVariantModelName());
 		if (oModel) {
 			this._fnResolveModel(oModel);
 		}
@@ -78,7 +78,7 @@ sap.ui.define([
 		if (this.getMode() === mode.Transient) {
 			var oVM = new VariantManagement(this.getId() + "--vm", {"for": this.getAssociation("for")});
 			this._oModelPromise.then(function (oModel) {
-				oVM.setModel(oModel, Utils.VARIANT_MODEL_NAME);
+				oVM.setModel(oModel, ControlVariantApplyAPI.getVariantModelName());
 			});
 			this._oWrapper = new VerticalLayout(this.getId() + "--accWrapper", {
 				visible: true,

package/src/sap/m/p13n/Popup.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @public
 	 * @experimental Since 1.97.
@@ -176,7 +176,7 @@ sap.ui.define([
 	 */
 	Popup.prototype.open = function(oSource, mSettings) {
 
-		if (!oSource) {
+		if (!oSource && this.getMode() === "Popover") {
 			throw new Error("Please provide a source control!");
 		}
 
@@ -242,7 +242,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Removes the current panels in the <code>panels</code> aggregation.
+	 * Returns the current panels in the <code>panels</code> aggregation.
 	 * @public
 	 * @returns {sap.m.p13n.IContent[]} An array of panel instances
 	 */
@@ -261,16 +261,17 @@ sap.ui.define([
 	};
 
 	Popup.prototype._createResponsivePopover = function(mDialogSettings) {
-
+		var aPanels = this.getPanels();
+		var bUseContainer = aPanels.length > 1;
 		var oPopover = new ResponsivePopover(this.getId() + "-responsivePopover", {
 			title: this.getTitle(),
 			horizontalScrolling: mDialogSettings.hasOwnProperty("horizontalScrolling") ? mDialogSettings.horizontalScrolling : false,
-			verticalScrolling: false,
+			verticalScrolling: !bUseContainer,
 			contentWidth: mDialogSettings.contentWidth ? mDialogSettings.contentWidth : "30rem",
 			resizable: mDialogSettings.hasOwnProperty("resizable") ? mDialogSettings.resizable : true,
 			contentHeight: mDialogSettings.contentHeight ? mDialogSettings.contentHeight : "35rem",
 			placement: mDialogSettings.placement ? mDialogSettings.placement : "Bottom",
-			content: this.getPanels().length > 1 ? this._getContainer() : this.getPanels()[0],
+			content: bUseContainer ? this._getContainer() : aPanels[0],
 			afterClose: function() {
 				this._onClose(oPopover, "AutoClose");
 			}.bind(this)
@@ -283,21 +284,22 @@ sap.ui.define([
 	};
 
 	Popup.prototype._createDialog = function(mDialogSettings) {
-
+		var aPanels = this.getPanels();
+		var bUseContainer = aPanels.length > 1;
 		var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
 		var oContainer = new Dialog(this.getId() + "-dialog", {
 			title: this.getTitle(),
 			horizontalScrolling: mDialogSettings.hasOwnProperty("horizontalScrolling") ? mDialogSettings.horizontalScrolling : false,
-			verticalScrolling: false,
+			verticalScrolling: !bUseContainer,
 			contentWidth: mDialogSettings.contentWidth ? mDialogSettings.contentWidth : "40rem",
 			contentHeight: mDialogSettings.contentHeight ? mDialogSettings.contentHeight : "55rem",
 			draggable: true,
 			resizable: true,
 			stretch: Device.system.phone,
-			content: this.getPanels().length > 1 ? this._getContainer() : this.getPanels()[0],
+			content: bUseContainer ? this._getContainer() : aPanels[0],
 			escapeHandler: function() {
 				this._onClose(oContainer, "Escape");
-			},
+			}.bind(this),
 			buttons: [
 				new Button(this.getId() + "-confirmBtn", {
 					text:  mDialogSettings.confirm && mDialogSettings.confirm.text ?  mDialogSettings.confirm.text : oResourceBundle.getText("p13n.POPUP_OK"),

package/src/sap/m/p13n/QueryPanel.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @private
 	 * @ui5-restricted

package/src/sap/m/p13n/SelectionController.js

@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @public
 	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
@@ -153,7 +153,6 @@ sap.ui.define([
                 aState.splice(iCurrentIndex, 1);
             }
 
-
         }
         return aState;
     };
@@ -263,10 +262,10 @@ sap.ui.define([
                     oExistingProp = oExistingProp ? oExistingProp.changeSpecificData.content : undefined;
                 }
                 // Matching property exists with a different index --> then this is a move operation
-                if (oExistingProp && oExistingProp.key === oProp.key && oResult.index != oExistingProp.index) {
+                if (oExistingProp && (oExistingProp.key || oExistingProp.name) === oProp.key && oResult.index != oExistingProp.index) {
                     // remove the last insert/delete operation
                     aChanges.pop();
-                    aChanges = aChanges.concat(this._createMoveChange(oExistingProp.id, oExistingProp.key, oResult.index, sMoveOperation, oControl, sMoveOperation !== "moveSort", sGenerator));
+                    aChanges = aChanges.concat(this._createMoveChange(oExistingProp.id, (oExistingProp.key || oExistingProp.name), oResult.index, sMoveOperation, oControl, sMoveOperation !== "moveSort", sGenerator));
                     return;
                 }
             }
@@ -360,7 +359,7 @@ sap.ui.define([
         var mItemState = this.arrayToMap(aItemState);
 
         var oP13nData = this.prepareAdaptationData(oPropertyHelper, function(mItem, oProperty){
-            var oExisting = mItemState[oProperty.key];
+            var oExisting = mItemState[oProperty.name || oProperty.key];
             mItem.visible = this._fSelector ? this._fSelector(oProperty) : (!!oExisting);
             mItem.position =  oExisting ? oExisting.position : -1;
             return !(oProperty.visible === false);
@@ -380,7 +379,7 @@ sap.ui.define([
      *
      */
     SelectionController.prototype.getP13nData = function() {
-        return this._oPanel ? this._oPanel.getP13nData() : this._oAdaptationModel.getProperty("/items");
+        return this._oPanel ? this._oPanel.getP13nData() : this._oAdaptationModel && this._oAdaptationModel.getProperty("/items");
     };
 
     SelectionController.prototype.model2State = false;
@@ -465,6 +464,8 @@ sap.ui.define([
         oPropertyHelper.getProperties().forEach(function(oProperty) {
 
             var mItem = {};
+            mItem.key = oProperty.name || oProperty.key;
+            mItem.name = oProperty.name || oProperty.key;
 
             if (bEnhance) {
                 var bIsValid = fnEnhace(mItem, oProperty);
@@ -473,9 +474,7 @@ sap.ui.define([
                 }
             }
 
-            mItem.key = oProperty.key;
-            mItem.name = oProperty.key;
-            mItem.label = oProperty.label || oProperty.key;
+            mItem.label = oProperty.label || mItem.key;
             mItem.tooltip = oProperty.tooltip;
 
             if (mItemsGrouped) {
@@ -501,7 +500,22 @@ sap.ui.define([
 
     };
 
-    //TODO: generify
+
+    SelectionController.prototype._buildGroupStructure = function(mItemsGrouped) {
+        var aGroupedItems = [];
+        Object.keys(mItemsGrouped).forEach(function(sGroupKey){
+            this.sortP13nData("generic", mItemsGrouped[sGroupKey]);
+            aGroupedItems.push({
+                group: sGroupKey,
+                groupLabel: mItemsGrouped[sGroupKey][0].groupLabel || sap.ui.getCore().getLibraryResourceBundle("sap.m").getText("p13n.BASIC_DEFAULT_GROUP"),//Grouplabel might not be necessarily be propagated to every item
+                groupVisible: true,
+                items: mItemsGrouped[sGroupKey]
+            });
+        }.bind(this));
+        return aGroupedItems;
+
+    };
+
     SelectionController.prototype.sortP13nData = function (oSorting, aItems) {
 
         var mP13nTypeSorting = oSorting;

package/src/sap/m/p13n/SelectionPanel.js

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @public
 	 * @experimental Since 1.96.

package/src/sap/m/p13n/SortController.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 * @public
 	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 * @alias sap.m.p13n.SortController

package/src/sap/m/p13n/SortPanel.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.QueryPanel
 	 *
 	 * @author SAP SE
-	 * @version 1.108.1
+	 * @version 1.109.0
 	 *
 	 * @public
 	 * @experimental Since 1.96.

package/src/sap/m/p13n/enum/ProcessingStrategy.js

@@ -0,0 +1,39 @@
+/*!
+ * OpenUI5
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+ */
+
+// Provides enumeration sap.m.p13n.ProcessingStrategy
+sap.ui.define(function() {
+	"use strict";
+
+   /**
+	 * Defines the delta types of the <code>sap.m.p13n.p13n.Engine</code>.
+	 *
+	 * @enum {string}
+     * @private
+	 * @since 1.108
+	 * @alias sap.m.p13n.ProcessingStrategy
+	 */
+	var ProcessingStrategy = {
+		/**
+		 * The delta will only calculate changes that will be added in addition to the existing state
+		 */
+		Add: false,
+		/**
+		 * The delta will calculate changes and include state that has been added and removed
+		 * <b>Note</b>: For example for array based state, entries added/removed will be respected.
+		 * For example for object/path based state, the diff will not include paths that have not been explicitly provided.
+		 */
+		PartialReplace: true,
+		/**
+		 * The delta will be calculated as complete/absolute state difference, in case the new state does not
+		 * provide a path to an existing state, this is going to be removed in addition to the PartialReplace processing strategy.
+		 */
+		FullReplace: "FullReplace"
+	};
+
+	return ProcessingStrategy;
+
+});

package/src/sap/m/p13n/modification/FlexModificationHandler.js

@@ -19,7 +19,7 @@ sap.ui.define([
      * It should be used as the persistence layer in the {@link sap.m.p13n.Engine#register Engine#register} process.
 	 *
 	 * @author SAP SE
-	 * @public
+	 * @private
      * @experimental Since 1.104.
 	 * @alias sap.m.p13n.modification.FlexModificationHandler
 	 */