@openui5/sap.m 1.112.2 → 1.113.0

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

@@ -56,12 +56,12 @@ sap.ui.define([
 	 * @alias sap.m.p13n.Engine
 	 * @extends sap.m.p13n.modules.AdaptationProvider
 	 * @author SAP SE
-	 * @version 1.112.2
+	 * @version 1.113.0
 	 * @public
 	 * @since 1.104
 	 */
 	var Engine = AdaptationProvider.extend("sap.m.p13n.Engine", {
-		constructor: function() {
+		constructor: function () {
 			AdaptationProvider.call(this);
 
 			if (oEngine) {
@@ -121,7 +121,7 @@ sap.ui.define([
 	 * 		}
 	 *	}
 	 */
-	 Engine.prototype.register = function(oControl, oConfig) {
+	Engine.prototype.register = function (oControl, oConfig) {
 
 		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.");
@@ -129,7 +129,7 @@ sap.ui.define([
 
 		var oRegistryEntry = this._getRegistryEntry(oControl);
 
-		if (oRegistryEntry){
+		if (oRegistryEntry) {
 			this.deregister(oControl);
 		}
 
@@ -137,12 +137,12 @@ sap.ui.define([
 
 		var aControllerKeys = Object.keys(oConfig.controller);
 
-		aControllerKeys.forEach(function(sKey){
+		aControllerKeys.forEach(function (sKey) {
 
 			var oSubController = oConfig.controller[sKey];
 
 			if (!this.getController(oControl, sKey)) {
-				if (this._aRegistry.indexOf(oControl.getId()) < 0){
+				if (this._aRegistry.indexOf(oControl.getId()) < 0) {
 					this._aRegistry.push(oControl.getId());
 				}
 
@@ -150,11 +150,6 @@ sap.ui.define([
 			}
 
 		}.bind(this));
-
-		if (oRegistryEntry && oRegistryEntry.modification) {
-			this.getModificationHandler(oControl).initialize(oControl);
-		}
-
 	};
 
 
@@ -167,11 +162,11 @@ sap.ui.define([
 	 *
 	 * @param {sap.ui.core.Control} oControl The registered control instance
 	 */
-	Engine.prototype.deregister = function(oControl) {
+	Engine.prototype.deregister = function (oControl) {
 		var oRegistryEntry = this._getRegistryEntry(oControl);
 
 		//destroy subcontroller
-		Object.keys(oRegistryEntry.controller).forEach(function(sKey){
+		Object.keys(oRegistryEntry.controller).forEach(function (sKey) {
 			var oController = oRegistryEntry.controller[sKey];
 			oController.destroy();
 
@@ -203,7 +198,7 @@ sap.ui.define([
 	 *
 	 * @returns {Promise<sap.m.p13n.Popup>} Promise resolving in the <code>sap.m.p13n.Popup</code> instance
 	 */
-	Engine.prototype.show = function(oControl, vPanelKeys, mSettings) {
+	Engine.prototype.show = function (oControl, vPanelKeys, mSettings) {
 		return this.uimanager.show(oControl, vPanelKeys, mSettings);
 	};
 
@@ -216,7 +211,7 @@ sap.ui.define([
 	 * @param {function(sap.ui.base.Event):void} fnStateEventHandler The handler function to call when the event occurs
 	 * @returns {this} Returns <code>this</code> to allow method chaining
 	 */
-	Engine.prototype.attachStateChange = function(fnStateEventHandler) {
+	Engine.prototype.attachStateChange = function (fnStateEventHandler) {
 		return this.stateHandlerRegistry.attachChange(fnStateEventHandler);
 	};
 
@@ -229,7 +224,7 @@ sap.ui.define([
 	 * @param {function(sap.ui.base.Event):void} fnStateEventHandler The handler function to detach from the event
 	 * @returns {this} Returns <code>this</code> to allow method chaining
 	 */
-	Engine.prototype.detachStateChange = function(fnStateEventHandler) {
+	Engine.prototype.detachStateChange = function (fnStateEventHandler) {
 		return this.stateHandlerRegistry.detachChange(fnStateEventHandler);
 	};
 
@@ -243,13 +238,13 @@ sap.ui.define([
 	 *
 	 * @returns {Promise<null>} A Promise resolving once the reset is completed
 	 */
-	Engine.prototype.reset = function(oControl, aKeys) {
+	Engine.prototype.reset = function (oControl, aKeys) {
 
 		aKeys = aKeys instanceof Array ? aKeys : [aKeys];
 
 		var aSelectors = [];
 
-		aKeys.forEach(function(sKey) {
+		aKeys.forEach(function (sKey) {
 			aSelectors = aSelectors.concat(this.getController(oControl, sKey).getSelectorForReset());
 		}.bind(this));
 
@@ -260,18 +255,18 @@ sap.ui.define([
 
 		if (aKeys) {
 			var aChangeTypes = [];
-			aKeys.forEach(function(sKey){
+			aKeys.forEach(function (sKey) {
 				aChangeTypes = aChangeTypes.concat(Object.values(this.getController(oControl, sKey).getChangeOperations()));
 			}.bind(this));
 			oResetConfig.changeTypes = [].concat.apply([], aChangeTypes);
 		}
 
 		var oModificationSetting = this._determineModification(oControl);
-		return oModificationSetting.handler.reset(oResetConfig, oModificationSetting.payload).then(function(){
+		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){
+			return this.initAdaptation(oControl, aKeys).then(function (oPropertyHelper) {
+				aKeys.forEach(function (sKey) {
 					var oController = this.getController(oControl, sKey);
 					oController.update(oPropertyHelper);
 				}.bind(this));
@@ -294,18 +289,47 @@ sap.ui.define([
 	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 *
 	 * @example {
-	 * 		ControllerKey: [{<someState>}, {...}]
-	 * }
+	 *		<RegisteredSortControllerKey>: [{
+	 *			key: "key1" //Adds key1 to the existing sorting
+	 *		},
+	 *		{
+	 *			key: "key2",
+	 *			sorted: false //Removes sorting for key2
+	 *		},{
+	 *			key: "key3",
+	 *			position: 2 //Reorders current sorter position in the array
+	 *		}],
+	 *		<RegisteredSelectionControllerKey>: [{
+	 *			key: "key1" //Adds key1 to the existing selection status
+	 *		},
+	 *		{
+	 *			key: "key2",
+	 *			visible: false //Removes selection status for key2
+	 *		},{
+	 *			key: "key3",
+	 *			position: 2 //Reorders current item position in the array
+	 *		}],
+	 *		<RegisteredGroupControllerKey>: [{
+	 *			key: "key1" //Adds key1 to the existing grouping status
+	 *		},
+	 *		{
+	 *			key: "key2",
+	 *			grouped: false //Removes selection status for key2
+	 *		},{
+	 *			key: "key3",
+	 *			position: 2 //Reorders current grouping position in the array
+	 *		}
+	 *	}
 	 *
 	 * @param {sap.ui.core.Control} oControl The registered control instance
 	 * @param {sap.m.p13n.State} oState The state object
 	 *
 	 * @returns {Promise<sap.m.p13n.State>} A Promise resolving after the state has been applied
 	 */
-	 Engine.prototype.applyState = function(oControl, oState) {
+	Engine.prototype.applyState = function (oControl, oState) {
 
 		//Call retrieve only to ensure that the control is initialized and enabled for modification
-		return this.retrieveState(oControl).then(function(oCurrentState){
+		return this.retrieveState(oControl).then(function (oCurrentState) {
 
 			var aStatePromise = [], aChanges = [], mInfoState = {};
 
@@ -313,16 +337,16 @@ sap.ui.define([
 				mInfoState = oControl.validateState(this.externalizeKeys(oControl, oState));
 			}
 
-			if (mInfoState.validation === MessageType.Error){
+			if (mInfoState.validation === MessageType.Error) {
 				Log.error(mInfoState.message);
 			}
 
 			var aKeys = Object.keys(oState);
-			aKeys.forEach(function(sControllerKey){
+			aKeys.forEach(function (sControllerKey) {
 
 				var oController = this.getController(oControl, sControllerKey);
 
-				if (!oController){
+				if (!oController) {
 					//In case no controller can be found, skip change creation & appliance
 					//to avoid errors and react gracefully
 					return;
@@ -339,12 +363,12 @@ sap.ui.define([
 				aStatePromise.push(oStatePromise);
 			}.bind(this));
 
-			return Promise.all(aStatePromise).then(function(aRawChanges){
+			return Promise.all(aStatePromise).then(function (aRawChanges) {
 				var mChangeMap = {};
 
-				aRawChanges.forEach(function(aSpecificChanges, iIndex){
+				aRawChanges.forEach(function (aSpecificChanges, iIndex) {
 
-					if (aSpecificChanges && aSpecificChanges.length > 0){
+					if (aSpecificChanges && aSpecificChanges.length > 0) {
 						aChanges = aChanges.concat(aSpecificChanges);
 						var sKey = aKeys[iIndex];
 						mChangeMap[sKey] = aSpecificChanges;
@@ -370,16 +394,16 @@ sap.ui.define([
 	 *
 	 * @returns {Promise<sap.m.p13n.State>} A Promise resolving in the current control state
 	 */
-	Engine.prototype.retrieveState = function(oControl) {
+	Engine.prototype.retrieveState = function (oControl) {
 
 		//ensure that the control has been initialized
-		return this.checkControlInitialized(oControl).then(function() {
+		return this.checkControlInitialized(oControl).then(function () {
 
 			//ensure that all changes have been applied
-			return Engine.getInstance().waitForChanges(oControl).then(function() {
+			return Engine.getInstance().waitForChanges(oControl).then(function () {
 
 				var oRetrievedState = {};
-				Engine.getInstance().getRegisteredControllers(oControl).forEach(function(sKey){
+				Engine.getInstance().getRegisteredControllers(oControl).forEach(function (sKey) {
 					oRetrievedState[sKey] = Engine.getInstance().getController(oControl, sKey).getCurrentState(true);
 				});
 
@@ -398,7 +422,7 @@ sap.ui.define([
 	 * @param {sap.ui.core.Control} vControl The registered control instance
 	 * @param {sap.m.p13n.modification.ModificationHandler} oModificationHandler The modification handler object
 	 */
-	Engine.prototype._setModificationHandler = function(vControl, oModificationHandler) {
+	Engine.prototype._setModificationHandler = function (vControl, oModificationHandler) {
 		if (!oModificationHandler.isA("sap.m.p13n.modification.ModificationHandler")) {
 			throw new Error("Only sap.m.p13n.modification.ModificationHandler derivations are allowed for modification");
 		}
@@ -407,11 +431,11 @@ sap.ui.define([
 		this._getRegistryEntry(vControl).modification = oModificationSetting;
 	};
 
-	Engine.prototype._addToQueue = function(oControl, fTask) {
+	Engine.prototype._addToQueue = function (oControl, fTask) {
 		var oRegistryEntry = this._getRegistryEntry(oControl);
 
-		var fCleanupPromiseQueue = function(pOriginalPromise) {
-			if (oRegistryEntry.pendingModification === pOriginalPromise){
+		var fCleanupPromiseQueue = function (pOriginalPromise) {
+			if (oRegistryEntry.pendingModification === pOriginalPromise) {
 				oRegistryEntry.pendingModification = null;
 			}
 		};
@@ -428,7 +452,7 @@ sap.ui.define([
 	 * of a set of changes based on the current control state and the provided state.
 	 *
 	 * @private
-	 * @ui5-restricted
+	 * @ui5-restricted sap.m, sap.ui.mdc
 	 *
 	 * @param {object} mDiffParameters A map defining the configuration to create the changes
 	 * @param {sap.ui.core.Control} mDiffParameters.control The control instance that should be adapted
@@ -444,7 +468,7 @@ sap.ui.define([
 	 *
 	 * @returns {Promise} A Promise resolving in the related delta changes
 	 */
-	Engine.prototype.createChanges = function(mDiffParameters) {
+	Engine.prototype.createChanges = function (mDiffParameters) {
 
 		var oControl = Engine.getControlInstance(mDiffParameters.control);
 		var sKey = mDiffParameters.key;
@@ -455,49 +479,49 @@ sap.ui.define([
 			return Promise.resolve([]);
 		}
 
-		var fDeltaHandling = function() {
-			return this.initAdaptation(oControl, sKey).then(function(){
+		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();
-
-				var oRegistryEntry = this._getRegistryEntry(oControl);
-				var oCurrentState = oController.getCurrentState();
-				var oPriorState = merge(oCurrentState instanceof Array ? [] : {}, oCurrentState);
-
-				var mDeltaConfig = {
-					existingState: mDiffParameters.stateBefore || oPriorState,
-					applyAbsolute: mDiffParameters.applyAbsolute,
-					changedState: aNewState,
-					control: oController.getAdaptationControl(),
-					changeOperations: mChangeOperations,
-					deltaAttributes: ["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)
-				var aChanges = oController.getDelta(mDeltaConfig);
-
-				if (!bSuppressCallback) {
-					var mChangeMap = {};
-					mChangeMap[sKey] = aChanges;
-					return this._processChanges(oControl, mChangeMap)
-					.then(function(){
-						return aChanges;
-					});
-				}
+				.then(function (aNewState) {
+
+					var oController = this.getController(oControl, sKey);
+					var mChangeOperations = oController.getChangeOperations();
+
+					var oRegistryEntry = this._getRegistryEntry(oControl);
+					var oCurrentState = oController.getCurrentState();
+					var oPriorState = merge(oCurrentState instanceof Array ? [] : {}, oCurrentState);
+
+					var mDeltaConfig = {
+						existingState: mDiffParameters.stateBefore || oPriorState,
+						applyAbsolute: mDiffParameters.applyAbsolute,
+						changedState: aNewState,
+						control: oController.getAdaptationControl(),
+						changeOperations: mChangeOperations,
+						deltaAttributes: ["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)
+					var aChanges = oController.getDelta(mDeltaConfig);
+
+					if (!bSuppressCallback) {
+						var mChangeMap = {};
+						mChangeMap[sKey] = aChanges;
+						return this._processChanges(oControl, mChangeMap)
+							.then(function () {
+								return aChanges;
+							});
+					}
 
-				return aChanges || [];
+					return aChanges || [];
 
-			}.bind(this));
+				}.bind(this));
 
 		}.bind(this);
 
@@ -507,76 +531,82 @@ sap.ui.define([
 	/**
 	 * Returns a promise resolving after all currently pending modifications have been applied.
 	 *
-	 * @ui5-restricted
+	 * @private
+	 * @ui5-restricted sap.m, sap.ui.mdc
 	 *
 	 * @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);
 		var oRegistryEntry = this._getRegistryEntry(oControl);
 		return oRegistryEntry && oRegistryEntry.pendingModification ? oRegistryEntry.pendingModification : Promise.resolve()
-		.then(function(){
-			return oModificationSetting.handler.waitForChanges({
-				element: oControl
-			}, oModificationSetting.payload);
-		});
+			.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.
 	 *
-	 * @ui5-restricted
+	 * @private
+	 * @ui5-restricted sap.m, sap.ui.mdc
 	 * @param {sap.ui.core.Control} oControl The related control instance
 	 *
 	 * @returns {Promise} A Promise resolving in a Boolean that determines whether the requirements for the persistence layer are met
 	 */
-	Engine.prototype.isModificationSupported = function(oControl) {
+	Engine.prototype.isModificationSupported = function (oControl) {
 		var oModificationSetting = this._determineModification(oControl);
 		return oModificationSetting.handler.isModificationSupported({
 			element: oControl
 		}, oModificationSetting.payload);
 	};
 
-	Engine.prototype.fireStateChange = function(oControl) {
-		return this.retrieveState(oControl).then(function(oState){
+	Engine.prototype.fireStateChange = function (oControl) {
+		return this.retrieveState(oControl).then(function (oState) {
 			this.stateHandlerRegistry.fireChange(oControl, oState);
 		}.bind(this));
 	};
 
 	/**
 	 * This method can be used to process an array of changes.
-	 * @ui5-restricted
+	 * @private
 	 *
 	 * @param {sap.ui.core.Control} vControl The registered control instance
 	 * @param {object} mChanges A map of keys and arrays, every controller will provide an array of changes
 	 * @returns {Promise} The change appliance <code>Promise</code>
 	 */
-	Engine.prototype._processChanges = function(vControl, mChanges) {
+	Engine.prototype._processChanges = function (vControl, mChanges) {
 		var aChanges = [];
 		var aKeys = Object.keys(mChanges);
+		var oDiff = {};
 
-		aKeys.forEach(function(sKey){
+		aKeys.forEach(function (sKey) {
+			oDiff[sKey] = this.getController(vControl, sKey).changesToState(mChanges[sKey]);
 			aChanges = aChanges.concat(mChanges[sKey]);
-		});
+		}.bind(this));
 
 		if (aChanges instanceof Array && aChanges.length > 0) {
 			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));
+				.then(function (aChanges) {
+					var oControl = Engine.getControlInstance(vControl);
+					this.fireStateChange(oControl);
+					return aChanges;
+				}.bind(this));
 		} else {
 			return Promise.resolve([]);
 		}
 	};
 
+
 	/**
 	 * This method can be used in the designtime metadata of the control
 	 * for key user personalization.
 	 *
-	 * @ui5-restricted sap.ui.mdc
+	 * @private
+	 * @ui5-restricted sap.m, sap.ui.mdc
 	 *
 	 * @param {sap.ui.core.Control} oControl The registered control instance
 	 * @param {object} mPropertyBag The property bag provided in the settings action
@@ -599,11 +629,11 @@ sap.ui.define([
 		var oOriginalModifHandler = this.getModificationHandler(oControl);
 		var oTemporaryRTAHandler = new FlexModificationHandler();
 
-		var oRTAPromise = new Promise(function(resolve, reject){
+		var oRTAPromise = new Promise(function (resolve, reject) {
 			fResolveRTA = resolve;
 		});
 
-		oTemporaryRTAHandler.processChanges = function(aChanges) {
+		oTemporaryRTAHandler.processChanges = function (aChanges) {
 			fResolveRTA(aChanges);
 			return Promise.resolve(aChanges);
 		};
@@ -612,7 +642,7 @@ sap.ui.define([
 
 		this.uimanager.show(oControl, aKeys, {
 			showReset: false
-		}).then(function(oContainer){
+		}).then(function (oContainer) {
 			var oCustomHeader = oContainer.getCustomHeader();
 			if (oCustomHeader) {
 				oCustomHeader.getContentRight()[0].setVisible(false);
@@ -623,7 +653,7 @@ sap.ui.define([
 			}
 		});
 
-		oRTAPromise.then(function(){
+		oRTAPromise.then(function () {
 			this._setModificationHandler(oControl, oOriginalModifHandler);
 			oTemporaryRTAHandler.destroy();
 		}.bind(this));
@@ -635,7 +665,8 @@ sap.ui.define([
 	/**
 	 * Enhances the <code>xConfig</code> object by using the <code>ModificationHandler</code>.
 	 *
-	 * @ui5-restricted
+	 * @private
+	 * @ui5-restricted sap.m, sap.ui.mdc
 	 *
 	 * @param {sap.ui.core.Control} vControl The registered control instance
 	 * @param {object} mEnhanceConfig An object providing the information about the xConfig enhancement
@@ -647,24 +678,25 @@ sap.ui.define([
 	 * @param {object} [mEnhanceConfig.propertyBag] Optional property bag for the <code>ModificationHandler</code>
 	 * @returns {Promise} Promise resolving when the xConfig is successfully enhanced
 	 */
-	Engine.prototype.enhanceXConfig = function(vControl, mEnhanceConfig) {
+	Engine.prototype.enhanceXConfig = function (vControl, mEnhanceConfig) {
 
 		var oControl = Engine.getControlInstance(vControl);
 		var oRegistryEntry = this._getRegistryEntry(vControl);
 
 		return xConfigAPI.enhanceConfig(oControl, mEnhanceConfig)
-		.then(function(oConfig){
-			if (oRegistryEntry) {
-				//to simplify debugging
-				oRegistryEntry.xConfig = oConfig;
-			}
-		});
+			.then(function (oConfig) {
+				if (oRegistryEntry) {
+					//to simplify debugging
+					oRegistryEntry.xConfig = oConfig;
+				}
+			});
 	};
 
 	/**
 	 * Returns a copy of the <code>xConfig</code> object.
 	 *
-	 * @ui5-restricted sap.m
+	 * @private
+	 * @ui5-restricted sap.m, sap.ui.mdc
 	 * @param {sap.ui.core.Element} vControl The related element that should be checked
 	 * @param {object} [mEnhanceConfig] An object providing a modification-handler-specific payload
 	 * @param {object} [mEnhanceConfig.propertyBag] Optional property bag for different modification handler derivations
@@ -672,7 +704,7 @@ sap.ui.define([
 	 * @returns {Promise<object>|object}
 	 * A <code>Promise</code> that resolves with the configuration. The xConfig itself if it is already available, or <code>null</code> if there is no xConfig
 	 */
-	Engine.prototype.readXConfig = function(vControl, mEnhanceConfig) {
+	Engine.prototype.readXConfig = function (vControl, mEnhanceConfig) {
 
 		var oControl = Engine.getControlInstance(vControl);
 		return xConfigAPI.readConfig(oControl, mEnhanceConfig) || {};
@@ -688,9 +720,9 @@ sap.ui.define([
 	 * @param {object} oInternalState The internal state
 	 * @returns {object} The externalized state
 	 */
-	Engine.prototype.externalizeKeys = function(vControl, oInternalState) {
+	Engine.prototype.externalizeKeys = function (vControl, oInternalState) {
 		var oExternalState = {};
-		Object.keys(oInternalState).forEach(function(sInternalKey){
+		Object.keys(oInternalState).forEach(function (sInternalKey) {
 			var oController = this.getController(Engine.getControlInstance(vControl), sInternalKey);
 			if (oController) {
 				oExternalState[oController.getStateKey()] = oInternalState[sInternalKey];
@@ -711,7 +743,7 @@ sap.ui.define([
 	 */
 	Engine.prototype.internalizeKeys = function (vControl, oExternalState) {
 		var aControllerKeys = this.getRegisteredControllers(vControl), oInternalState = {};
-		aControllerKeys.forEach(function(sInternalRegistryKey){
+		aControllerKeys.forEach(function (sInternalRegistryKey) {
 			var sExternalStateKey = this.getController(vControl, sInternalRegistryKey).getStateKey();
 			if (oExternalState.hasOwnProperty(sExternalStateKey)) {
 				oInternalState[sInternalRegistryKey] = oExternalState[sExternalStateKey];
@@ -720,13 +752,13 @@ sap.ui.define([
 		return oInternalState;
 	};
 
-	Engine.prototype.diffState = function(oControl, oOld, oNew) {
+	Engine.prototype.diffState = function (oControl, oOld, oNew) {
 
 		var aDiffCreation = [], oDiffState = {};
 		oOld = merge({}, oOld);
 		oNew = merge({}, oNew);
 
-		Object.keys(oNew).forEach(function(sKey){
+		Object.keys(oNew).forEach(function (sKey) {
 			aDiffCreation.push(this.createChanges({
 				control: oControl,
 				stateBefore: oOld[sKey],
@@ -737,26 +769,26 @@ sap.ui.define([
 			}));
 		}.bind(this));
 		return Promise.all(aDiffCreation)
-		.then(function(aChanges){
-			Object.keys(oNew).forEach(function(sKey, i){
+			.then(function (aChanges) {
+				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));
+					if (oNew[sKey]) {
+						var aState = this.getController(oControl, sKey).changesToState(aChanges[i], oOld[sKey], oNew[sKey]);
+						oDiffState[sKey] = aState;
+					}
+				}.bind(this));
 
-			return oDiffState;
+				return oDiffState;
 
-		}.bind(this));
+			}.bind(this));
 	};
 
-	Engine.prototype.checkControlInitialized = function(vControl) {
+	Engine.prototype.checkControlInitialized = function (vControl) {
 		var oControl = Engine.getControlInstance(vControl);
 		return oControl.initialized instanceof Function ? oControl.initialized() : Promise.resolve();
 	};
 
-	Engine.prototype.checkPropertyHelperInitialized = function(vControl) {
+	Engine.prototype.checkPropertyHelperInitialized = function (vControl) {
 		var oControl = Engine.getControlInstance(vControl);
 		return oControl.initPropertyHelper instanceof Function ? oControl.initPropertyHelper() : Promise.resolve();
 	};
@@ -772,7 +804,7 @@ sap.ui.define([
 	 *
 	 * @returns {Promise} A Promise resolving after the adaptation housekeeping has been initialized
 	 */
-	Engine.prototype.initAdaptation = function(vControl, aKeys) {
+	Engine.prototype.initAdaptation = function (vControl, aKeys) {
 		this.verifyController(vControl, aKeys);
 
 		//1) Cache property helper
@@ -801,7 +833,7 @@ sap.ui.define([
 	 * @param {string} sKey The key that defines the later access to the controller instance.
 	 * @param {object} oPreConfig A predefined configuration
 	 */
-	Engine.prototype.addController = function(oController, sKey, oPreConfig) {
+	Engine.prototype.addController = function (oController, sKey, oPreConfig) {
 		var oRegistryEntry = this._getRegistryEntry(oController.getAdaptationControl(), oPreConfig);
 		oRegistryEntry.controller[sKey] = oController;
 	};
@@ -811,16 +843,29 @@ sap.ui.define([
 	 * @private
 	 *
 	 * @param {sap.ui.core.Control} vControl The registered Control instance.
-	 * @param {string} sKey The key for which the controller has been registered.
+	 * @param {string} sKey The key/changeType for which the controller has been registered.
 	 *
 	 * @returns {sap.m.p13n.SelectionController} The controller instance
 	 */
-	Engine.prototype.getController = function(vControl, sKey) {
-		var oRegistryEntry = this._getRegistryEntry(vControl);
-
+	Engine.prototype.getController = function (vControl, sKey) {
+		var oRegistryEntry = this._getRegistryEntry(vControl), oController;
 		if (oRegistryEntry && oRegistryEntry.controller.hasOwnProperty(sKey)) {
-			return oRegistryEntry.controller[sKey];
+			oController = oRegistryEntry.controller[sKey];
 		}
+
+		if (!oController) {
+			this.getRegisteredControllers(vControl).forEach(function (sController) {
+				var oRegisteredController = this.getController(vControl, sController);
+				if (oRegisteredController) {
+					Object.keys(oRegisteredController.getChangeOperations()).forEach(function (sOperationType) {
+						if (oRegisteredController.getChangeOperations()[sOperationType] === sKey) {
+							oController = oRegisteredController;
+						}
+					});
+				}
+			}.bind(this));
+		}
+		return oController;
 	};
 
 	/**
@@ -829,10 +874,10 @@ sap.ui.define([
 	 * @param {sap.ui.core.Control} vControl The registered Control instance.
 	 * @param {string|array} vKey A key as string or an array of keys
 	 */
-	Engine.prototype.verifyController = function(vControl, vKey) {
+	Engine.prototype.verifyController = function (vControl, vKey) {
 		var aKeys = vKey instanceof Array ? vKey : [vKey];
 
-		aKeys.forEach(function(sKey){
+		aKeys.forEach(function (sKey) {
 			if (!this.getController(vControl, sKey)) {
 				var oControl = Engine.getControlInstance(vControl);
 				throw new Error("No controller registered yet for " + oControl.getId() + " and key: " + sKey);
@@ -850,32 +895,32 @@ sap.ui.define([
 	 *
 	 * @returns {object} The requested UI settings of the control instance and provided keys
 	 */
-	Engine.prototype.getUISettings = function(vControl, vKeys) {
+	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 = {}, aPanelCreation = [];
 
-		aKeys.forEach(function(sKey){
+		aKeys.forEach(function (sKey) {
 			var oController = this.getController(vControl, sKey);
 			var pAdaptationUI = oController.initAdaptationUI(oPropertyHelper);
 
 			//Check faceless controller implementations and skip them
-			if (pAdaptationUI instanceof Promise){
+			if (pAdaptationUI instanceof Promise) {
 				aPanelCreation.push(pAdaptationUI);
 			}
 		}.bind(this));
 
 		return Promise.all(aPanelCreation)
-		.then(function(aPanels){
-			aPanels.forEach(function(oPanel, iIndex){
-				var sKey = aKeys[iIndex];
-				mUiSettings[sKey] = {
-					panel: oPanel
-				};
+			.then(function (aPanels) {
+				aPanels.forEach(function (oPanel, iIndex) {
+					var sKey = aKeys[iIndex];
+					mUiSettings[sKey] = {
+						panel: oPanel
+					};
+				});
+				return mUiSettings;
 			});
-			return mUiSettings;
-		});
 	};
 
 	/**
@@ -884,9 +929,9 @@ sap.ui.define([
 	 * @private
 	 *
 	 * @param {sap.ui.core.Control} vControl The registered Control instance
- 	 * @returns {boolean} true if modification settings were already determined
+	   * @returns {boolean} true if modification settings were already determined
 	 */
-	Engine.prototype.isRegisteredForModification = function(vControl) {
+	Engine.prototype.isRegisteredForModification = function (vControl) {
 		var oRegistryEntry = this._getRegistryEntry(vControl);
 		return oRegistryEntry && !!oRegistryEntry.modification;
 	};
@@ -897,7 +942,7 @@ sap.ui.define([
 	 * @param {string|sap.ui.core.Control} vControl The control ID or instance
 	 * @returns {array} An array of all registered controller instances
 	 */
-	Engine.prototype.getRegisteredControllers = function(vControl){
+	Engine.prototype.getRegisteredControllers = function (vControl) {
 		var oRegistryEntry = this._getRegistryEntry(vControl);
 		return oRegistryEntry ? Object.keys(oRegistryEntry.controller) : [];
 	};
@@ -909,7 +954,7 @@ sap.ui.define([
 	 *
 	 * @returns {object} The related registry entry
 	 */
-	Engine.prototype._getRegistryEntry = function(vControl) {
+	Engine.prototype._getRegistryEntry = function (vControl) {
 
 		var oControl = Engine.getControlInstance(vControl);
 		return _mRegistry.get(oControl);
@@ -920,12 +965,12 @@ sap.ui.define([
 	 * This method can be used to get the modification handling for a control instance
 	 *
 	 * @private
-	 * @ui5-restricted sap.m
+	 * @ui5-restricted sap.m, sap.ui.mdc
 	 *
 	 * @param {string|sap.ui.core.Control} vControl The control id or instance
 	 * @returns {object} The related ModificationHandler.
 	 */
-	Engine.prototype.getModificationHandler = function(vControl) {
+	Engine.prototype.getModificationHandler = function (vControl) {
 		var oModificationSetting = this._determineModification(vControl);
 
 		//This method might also be retrieved by non-registered Controls (such as FilterBarBase) - the default should always be Flex.
@@ -941,7 +986,7 @@ sap.ui.define([
 	 * @param {object} oPreConfig A predefined configuration
 	 * @returns {object} The related registry entry
 	 */
-	Engine.prototype._createRegistryEntry = function(vControl, oPreConfig) {
+	Engine.prototype._createRegistryEntry = function (vControl, oPreConfig) {
 
 		var oControl = Engine.getControlInstance(vControl);
 
@@ -968,25 +1013,25 @@ sap.ui.define([
 		return _mRegistry.get(oControl);
 	};
 
-	Engine.prototype.trace = function(vControl, oChange) {
+	Engine.prototype.trace = function (vControl, oChange) {
 		var oRegistryEntry = this._getRegistryEntry(vControl);
-		this.getRegisteredControllers(vControl).forEach(function(sKey){
+		this.getRegisteredControllers(vControl).forEach(function (sKey) {
 			var oController = this.getController(vControl, sKey);
 			var mChangeOperations = oController.getChangeOperations();
-			Object.keys(mChangeOperations).forEach(function(sType){
+			Object.keys(mChangeOperations).forEach(function (sType) {
 				if (mChangeOperations[sType] === oChange.changeSpecificData.changeType) {
-					oRegistryEntry.pendingAppliance[sKey] = [].concat(oRegistryEntry.pendingAppliance[sKey]).concat(oChange);
+					oRegistryEntry.pendingAppliance[sKey] = [].concat(oRegistryEntry.pendingAppliance[sKey] || []).concat(oChange);
 				}
 			});
 		}.bind(this));
 	};
 
-	Engine.prototype.getTrace = function(vControl, oChange) {
+	Engine.prototype.getTrace = function (vControl, oChange) {
 		var oRegistryEntry = this._getRegistryEntry(vControl);
 		return Object.keys(oRegistryEntry.pendingAppliance);
 	};
 
-	Engine.prototype.clearTrace = function(vControl, oChange) {
+	Engine.prototype.clearTrace = function (vControl, oChange) {
 		var oRegistryEntry = this._getRegistryEntry(vControl);
 		oRegistryEntry.pendingAppliance = {};
 	};
@@ -1029,7 +1074,7 @@ sap.ui.define([
 		return oModificationSetting;
 	};
 
-	Engine.prototype.hasForReference = function(vControl, sControlType) {
+	Engine.prototype.hasForReference = function (vControl, sControlType) {
 		var sControlId = vControl && vControl.getId ? vControl.getId() : vControl;
 		var aResults = Element.registry.filter(function (oElement) {
 			if (!oElement.isA(sControlType)) {
@@ -1055,7 +1100,7 @@ sap.ui.define([
 	 *
 	 * @returns {boolean} Returns whether an related ancestor could be found.
 	 */
-	Engine.prototype.hasControlAncestorWithId = function(sControlId, sAncestorControlId) {
+	Engine.prototype.hasControlAncestorWithId = function (sControlId, sAncestorControlId) {
 		var oControl;
 
 		if (sControlId === sAncestorControlId) {
@@ -1088,7 +1133,7 @@ sap.ui.define([
 	 * @param {string|sap.ui.core.Control} vControl The control ID or instance
 	 * @returns {sap.ui.core.Control} The control instance
 	 */
-	Engine.getControlInstance = function(vControl) {
+	Engine.getControlInstance = function (vControl) {
 		return typeof vControl == "string" ? sap.ui.getCore().byId(vControl) : vControl;
 	};
 
@@ -1102,7 +1147,7 @@ sap.ui.define([
 	 *
 	 * @returns {boolean} The related flag is the Control has an open P13n container
 	 */
-	Engine.prototype.hasActiveP13n = function(vControl) {
+	Engine.prototype.hasActiveP13n = function (vControl) {
 		return !!this._getRegistryEntry(vControl).activeP13n;
 	};
 
@@ -1116,7 +1161,7 @@ sap.ui.define([
 	 * @param {sap.ui.core.Control} vControl The registered control instance.
 	 * @param {string} sKey The registered key to get the corresponding controller.
 	 */
-	Engine.prototype.setActiveP13n = function(vControl, sKey) {
+	Engine.prototype.setActiveP13n = function (vControl, sKey) {
 		this._getRegistryEntry(vControl).activeP13n = sKey;
 	};
 
@@ -1131,7 +1176,7 @@ sap.ui.define([
 	 * @param {string} sKey The registered key to get the corresponding controller.
 	 * @param {sap.ui.core.Control} oP13nUI The adaptation UI displayed in the container (e.g. BasePanel derivation).
 	 */
-	Engine.prototype.validateP13n = function(vControl, sKey, oP13nUI) {
+	Engine.prototype.validateP13n = function (vControl, sKey, oP13nUI) {
 		var oController = this.getController(vControl, sKey);
 		var oControl = Engine.getControlInstance(vControl);
 
@@ -1139,7 +1184,7 @@ sap.ui.define([
 		var mControllers = this._getRegistryEntry(vControl).controller;
 		var oTheoreticalState = {};
 
-		Object.keys(mControllers).forEach(function(sControllerKey){
+		Object.keys(mControllers).forEach(function (sControllerKey) {
 			oTheoreticalState[sControllerKey] = mControllers[sControllerKey].getCurrentState();
 		});
 
@@ -1180,11 +1225,11 @@ sap.ui.define([
 	 * @param {string[]} aKeys An array of keys
 	 * @returns {Promise} A Promise resolving after all p13n changes have been calculated and processed
 	 */
-	Engine.prototype.handleP13n = function(oControl, aKeys) {
+	Engine.prototype.handleP13n = function (oControl, aKeys) {
 
 		var pChanges = [];
 
-		aKeys.forEach(function(sControllerKey){
+		aKeys.forEach(function (sControllerKey) {
 
 			var oController = this.getController(oControl, sControllerKey);
 
@@ -1197,26 +1242,26 @@ sap.ui.define([
 					suppressAppliance: true,
 					applyAbsolute: true
 				})
-				.then(function(aItemChanges){
+					.then(function (aItemChanges) {
 
-					return oController.getBeforeApply().then(function(aChanges){
+						return oController.getBeforeApply().then(function (aChanges) {
 
-						var aComulatedChanges = aChanges ? aChanges.concat(aItemChanges) : aItemChanges;
-						return aComulatedChanges;
+							var aComulatedChanges = aChanges ? aChanges.concat(aItemChanges) : aItemChanges;
+							return aComulatedChanges;
 
+						});
 					});
-				});
 
 				pChanges.push(p);
 			}
 
 		}.bind(this));
 
-		return Promise.all(pChanges).then(function(aChangeMatrix){
+		return Promise.all(pChanges).then(function (aChangeMatrix) {
 
 			var aApplyChanges = [];
 			var mChangeMap = {};
-			aChangeMatrix.forEach(function(aTypeChanges, iIndex){
+			aChangeMatrix.forEach(function (aTypeChanges, iIndex) {
 				aApplyChanges = aApplyChanges.concat(aTypeChanges);
 				var sKey = aKeys[iIndex];
 				mChangeMap[sKey] = aTypeChanges;
@@ -1233,11 +1278,11 @@ sap.ui.define([
 	 * This method is the central point of access to the Engine Singleton.
 	 *
 	 * @private
-	 * @ui5-restricted sap.m
+	 * @ui5-restricted sap.m, sap.ui.mdc
 	 *
 	 * @returns {sap.m.p13n.Engine} The Engine instance
 	 */
-	Engine.getInstance = function() {
+	Engine.getInstance = function () {
 		if (!oEngine) {
 			oEngine = new Engine();
 		}
@@ -1250,14 +1295,14 @@ sap.ui.define([
 	 * @private
 	 * @returns {object} The Engine registry object
 	 */
-	Engine.prototype._getRegistry = function() {
+	Engine.prototype._getRegistry = function () {
 		var oRegistry = {
 			stateHandlerRegistry: this.stateHandlerRegistry,
 			defaultProviderRegistry: this.defaultProviderRegistry,
 			controlRegistry: {}
 		};
 
-		this._aRegistry.forEach(function(sKey){
+		this._aRegistry.forEach(function (sKey) {
 			var oControl = sap.ui.getCore().byId(sKey);
 			oRegistry.controlRegistry[sKey] = _mRegistry.get(oControl);
 		});
@@ -1269,7 +1314,7 @@ sap.ui.define([
 	 * @override
 	 * @inheritDoc
 	 */
-	Engine.prototype.destroy = function() {
+	Engine.prototype.destroy = function () {
 		AdaptationProvider.prototype.destroy.apply(this, arguments);
 		oEngine = null;
 		this._aRegistry = null;