@openui5/sap.m 1.109.0 → 1.111.0

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -50,21 +50,14 @@ sap.ui.define([
 	 * <li>{@link sap.m.p13n.GroupController GroupController}: Used to define a list of groupable properties</li>
 	 * </ul>
 	 *
-	 * The following persistence layers can be chosen for personalization services:
+	 * Can be used in combination with <code>sap.ui.fl.variants.VariantManagement</code> to persist a state in variants using <code>sap.ui.fl</code> capabilities.</li>
 	 *
-	 * <ul>
-	 * <li>{@link sap.m.p13n.modification.FlexModificationHandler FlexModificationHandler}: Used in combination with <code>sap.ui.fl.variants.VariantManagement</code> to persist a state in variants using <code>sap.ui.fl</code> capabilities.</li>
-	 * <li>{@link sap.m.p13n.modification.LocalStorageModificationHandler LocalStorageModificationHandler}: Used to store a personalization state in the local storage</li>
-	 * <li>{@link sap.m.p13n.modification.ModificationHandler ModificationHandler}: Used by default - this handler will not persist a state.</li>
-	 * </ul>
-	 *
-	 * @namespace
+	 * @class
 	 * @alias sap.m.p13n.Engine
-	 * @extends sap.m.p13n.AdaptationProvider
+	 * @extends sap.m.p13n.modules.AdaptationProvider
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @public
-	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 * @since 1.104
 	 */
 	var Engine = AdaptationProvider.extend("sap.m.p13n.Engine", {
@@ -95,14 +88,14 @@ sap.ui.define([
 	 * The registration is a precondition for using <code>Engine</code> functionality for a control instance.
 	 * Once the control instance has been registered, it can be passed to the related <code>Engine</code>
 	 * methods that always expect a control instance as parameter. Only registered control instances can be used for personalization through the <code>Engine</code>.
-	 *
+	 * @public
 	 * @typedef {object} sap.m.p13n.EngineRegistrationConfig
-	 * @property {sap.m.p13n.ModificationHandler} modification The desired <code>{@link sap.m.p13n.modification.ModificationHandler ModificationHandler}</code> instance that is used for persistence.
 	 * @property {sap.m.p13n.MetadataHelper} helper The <code>{@link sap.m.p13n.modification.MetadataHelper MetadataHelper}</code> to provide metadata-specific information.
-	 * @property {object} controller A map of arbitrary keys that contain a controller instance as value. The key must be unique and needs to be provided for later access when using <code>Engine</code> functionality specific for one controller type.
-	 *
+	 * @property {Object<string,sap.m.p13n.SelectionController>} controller A map of arbitrary keys that contain a controller instance as value. The key must be unique and needs to be provided for later access when using <code>Engine</code> functionality specific for one controller type.
+	 */
+
+	/**
 	 * @public
-	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 *
 	 * @param {sap.ui.core.Control} oControl The control instance to be registered for adaptation
 	 * @param {sap.m.p13n.EngineRegistrationConfig} oConfig The Engine registration configuration
@@ -171,7 +164,6 @@ sap.ui.define([
 	 * such as the registered controllers, are destroyed.
 	 *
 	 * @public
-	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 *
 	 * @param {sap.ui.core.Control} oControl The registered control instance
 	 */
@@ -198,7 +190,6 @@ sap.ui.define([
 	 * Opens the personalization dialog.
 	 *
 	 * @public
-	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 *
 	 *
 	 * @param {sap.ui.core.Control} oControl The control instance that is personalized
@@ -210,7 +201,7 @@ sap.ui.define([
 	 * @param {object} [mSettings.contentHeight] Height configuration for the related popup container
 	 * @param {object} [mSettings.contentWidth] Width configuration for the related popup container
 	 *
-	 * @returns {Promise} Promise resolving in the <code>sap.m.p13n.Popup</code> instance
+	 * @returns {Promise<sap.m.p13n.Popup>} Promise resolving in the <code>sap.m.p13n.Popup</code> instance
 	 */
 	Engine.prototype.show = function(oControl, vPanelKeys, mSettings) {
 		return this.uimanager.show(oControl, vPanelKeys, mSettings);
@@ -221,9 +212,8 @@ sap.ui.define([
 	 * The event handler is fired every time a user triggers a personalization change for a control instance during runtime.
 	 *
 	 * @public
-	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 *
-	 * @param {function} fnStateEventHandler The handler function to call when the event occurs
+	 * @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) {
@@ -235,9 +225,8 @@ sap.ui.define([
 	 * The passed parameters must match those used for registration with {@link sap.m.p13n.Engine#attachStateChange} beforehand.
 	 *
 	 * @public
-	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 *
-	 * @param {function} fnStateEventHandler The handler function to detach from the event
+	 * @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) {
@@ -248,12 +237,11 @@ sap.ui.define([
 	 * This method can be used to trigger a reset to the provided control instance.
 	 *
 	 * @public
-	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 *
 	 * @param {sap.ui.core.Control} oControl The related control instance
 	 * @param {string} aKeys The key for the affected configuration
 	 *
-	 * @returns {Promise} A Promise resolving once the reset is completed
+	 * @returns {Promise<null>} A Promise resolving once the reset is completed
 	 */
 	Engine.prototype.reset = function(oControl, aKeys) {
 
@@ -270,6 +258,14 @@ sap.ui.define([
 			selector: oControl
 		};
 
+		if (aKeys) {
+			var aChangeTypes = [];
+			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(){
 			this.stateHandlerRegistry.fireChange(oControl);
@@ -277,12 +273,20 @@ sap.ui.define([
 			return this.initAdaptation(oControl, aKeys).then(function(oPropertyHelper){
 				aKeys.forEach(function(sKey){
 					var oController = this.getController(oControl, sKey);
-					oController.update(oPropertyHelper);
+					if (this.hasActiveP13n(oControl)) {
+						oController.update(oPropertyHelper);
+					}
 				}.bind(this));
 			}.bind(this));
 		}.bind(this));
 	};
 
+	/**
+	 *
+	 * @public
+	 * @typedef {object} sap.m.p13n.State
+	 * @property {Object<string,Object[]>} controller A map of arbitrary keys that contain a controller instance as value. The key must be unique and needs to be provided for later access when using <code>Engine</code> functionality specific for one controller type.
+	 */
 
 	/**
 	 * Applies a state to a control by passing an object that contains the
@@ -296,12 +300,11 @@ sap.ui.define([
 	 * }
 	 *
 	 * @param {sap.ui.core.Control} oControl The registered control instance
-	 * @param {object} oState The state object
-	 * @param {boolean} bApplyAbsolute Defines whether the state should be an additional delta of the current control state
+	 * @param {sap.m.p13n.State} oState The state object
 	 *
-	 * @returns {Promise} A Promise resolving after the state has been applied
+	 * @returns {Promise<sap.m.p13n.State>} A Promise resolving after the state has been applied
 	 */
-	 Engine.prototype.applyState = function(oControl, oState, bApplyAbsolute) {
+	 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){
@@ -322,7 +325,8 @@ sap.ui.define([
 				var oController = this.getController(oControl, sControllerKey);
 
 				if (!oController){
-					//TODO: p13nMode <> register <> StateUtil key alignment
+					//In case no controller can be found, skip change creation & appliance
+					//to avoid errors and react gracefully
 					return;
 				}
 
@@ -331,7 +335,7 @@ sap.ui.define([
 					key: sControllerKey,
 					state: oController.sanityCheck(oState[sControllerKey]),
 					suppressAppliance: true,
-					applyAbsolute: bApplyAbsolute
+					applyAbsolute: false
 				});
 
 				aStatePromise.push(oStatePromise);
@@ -364,9 +368,9 @@ sap.ui.define([
 	 *
 	 * @public
 	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
-	 * @param {object} oControl The control instance implementing IxState to retrieve the externalized state
+	 * @param {sap.ui.core.Control} oControl The control instance implementing IxState to retrieve the externalized state
 	 *
-	 * @returns {Promise} A Promise resolving in the current control state
+	 * @returns {Promise<sap.m.p13n.State>} A Promise resolving in the current control state
 	 */
 	Engine.prototype.retrieveState = function(oControl) {
 
@@ -425,13 +429,14 @@ sap.ui.define([
 	 * <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.
 	 *
+	 * @private
 	 * @ui5-restricted
 	 *
 	 * @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
 	 * @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 {sap.ui.mdc.p13n.ProcessingStrategy} [mDiffParameters.applyAbsolute] Determines about the comparison algorithm between two states
+	 * @param {sap.m.p13n.enum.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.
@@ -449,7 +454,7 @@ sap.ui.define([
 		var bSuppressCallback = !!mDiffParameters.suppressAppliance;
 
 		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.");
+			return Promise.resolve([]);
 		}
 
 		var fDeltaHandling = function() {
@@ -573,7 +578,7 @@ sap.ui.define([
 	 * This method can be used in the designtime metadata of the control
 	 * for key user personalization.
 	 *
-	 * @ui5-restricted
+	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @param {sap.ui.core.Control} oControl The registered control instance
 	 * @param {object} mPropertyBag The property bag provided in the settings action
@@ -1201,24 +1206,28 @@ sap.ui.define([
 
 			var oController = this.getController(oControl, sControllerKey);
 
-			var p = this.createChanges({
-				control: oControl,
-				key: sControllerKey,
-				state: oController.getP13nData(),
-				suppressAppliance: true,
-				applyAbsolute: true
-			})
-			.then(function(aItemChanges){
+			var vP13nData = oController.getP13nData();
+			if (vP13nData) {
+				var p = this.createChanges({
+					control: oControl,
+					key: sControllerKey,
+					state: vP13nData,
+					suppressAppliance: true,
+					applyAbsolute: true
+				})
+				.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);
+				pChanges.push(p);
+			}
+
 		}.bind(this));
 
 		return Promise.all(pChanges).then(function(aChangeMatrix){
@@ -1239,10 +1248,11 @@ sap.ui.define([
 	};
 
 	/**
+	 * This method is the central point of access to the Engine Singleton.
+	 *
 	 * @private
 	 * @ui5-restricted sap.m
 	 *
-	 * This method is the central point of access to the Engine Singleton.
 	 * @returns {sap.m.p13n.Engine} The Engine instance
 	 */
 	Engine.getInstance = function() {

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -21,9 +21,8 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 * @public
-	 * @experimental
 	 * @since 1.104
 	 * @alias sap.m.p13n.GroupController
 	 */

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -21,10 +21,9 @@ sap.ui.define([
 	 * @extends sap.m.p13n.QueryPanel
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @public
-	 * @experimental Since 1.104. Please note that the API of this control is not yet finalized!
 	 * @alias sap.m.p13n.GroupPanel
 	 */
 	var GroupPanel = QueryPanel.extend("sap.m.p13n.GroupPanel", {
@@ -59,7 +58,6 @@ sap.ui.define([
 	/**
 	 * P13n <code>GroupItem</code> object type.
 	 *
-	 * @type {sap.m.p13n.GroupItem}
 	 * @static
 	 * @constant
 	 * @typedef {object} sap.m.p13n.GroupItem

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -12,9 +12,9 @@ sap.ui.define([
     /**
      * The <code>MetadataHelper</code> entity offers utility functionality for providing service metadata during the <code>Engine#register</code> process.
      *
+     * @class
 	 * @author SAP SE
 	 * @public
-     * @experimental Since 1.104.
 	 * @alias sap.m.p13n.MetadataHelper
      */
     var MetadataHelper = BaseObject.extend("sap.m.p13n.MetadataHelper", {

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

@@ -1,11 +1,11 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * 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/apply/api/ControlVariantApplyAPI", "sap/m/p13n/enum/PersistenceMode", "sap/ui/layout/VerticalLayout"
-], function(CoreControl, VariantManagement, ControlVariantApplyAPI, 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", "sap/ui/core/UIArea", "sap/ui/core/Core"
+], function(CoreControl, VariantManagement, ControlVariantApplyAPI, mode, VerticalLayout, UIArea, Core) {
 	"use strict";
 
 	/**
@@ -14,9 +14,10 @@ sap.ui.define([
 	 * since any control that is a direct or indirect descendant of the provided <code>for</code> association is affected by this configuration.
 	 * For example, this controller can be used for <code>sap.ui.mdc</code> controls.
 	 *
+	 * @class
 	 * @private
+	 * @ui5-restricted sap.ui.mdc, sap.fe
 	 *
-	 * @experimental
 	 * @since 1.104
 	*/
 	var PersistenceProvider = CoreControl.extend("sap.m.p13n.PersistenceProvider", /** @lends sap.ui.mdc.p13n.PersistenceProvider.prototype */ {
@@ -67,6 +68,7 @@ sap.ui.define([
 
 		var oModel = this.getModel(ControlVariantApplyAPI.getVariantModelName());
 		if (oModel) {
+			this.reinitialize();
 			this._fnResolveModel(oModel);
 		}
 	};
@@ -92,8 +94,10 @@ sap.ui.define([
 				this.getDomRef().setAttribute("aria-hidden", true);
 			};
 
-			var oStatic = sap.ui.getCore().getUIArea(sap.ui.getCore().getStaticAreaRef());
-			oStatic.addContent(this._oWrapper);
+			var oStaticAreaRef = Core.getStaticAreaRef();
+			var oStatic = UIArea.registry.get(oStaticAreaRef.id);
+			oStatic.addContent(this._oWrapper, true);
+			Core.createRenderManager().render(this._oWrapper, oStaticAreaRef);
 		}
 
 		return this;
@@ -102,7 +106,7 @@ sap.ui.define([
 	PersistenceProvider.prototype.addFor = function (sControlId) {
 		this.addAssociation("for", sControlId);
 
-		var oVM = sap.ui.getCore().byId(this.getId() + "--vm");
+		var oVM = Core.byId(this.getId() + "--vm");
 		if (this.getMode() === mode.Transient && oVM) {
 			oVM.addFor(sControlId);
 		}
@@ -113,7 +117,7 @@ sap.ui.define([
 	PersistenceProvider.prototype.removeFor = function (sControlId) {
 		this.removeAssociation("for", sControlId);
 
-		var oVM = sap.ui.getCore().byId(this.getId() + "--vm");
+		var oVM = Core.byId(this.getId() + "--vm");
 		if (this.getMode() === mode.Transient && oVM) {
 			oVM.removeFor(sControlId);
 		}
@@ -140,9 +144,24 @@ sap.ui.define([
 		return this;
 	};
 
+	/**
+	 * This method reinitializes the inner <code>VariantManagement</code> control be providing the
+	 * variant model and triggering a reinitialize on the inner VM in the static area
+	 *
+	 * @ui5-restricted sap.m.p13n
+	 */
+	PersistenceProvider.prototype.reinitialize = function () {
+		var oVM = Core.byId(this.getId() + "--vm");
+		if (this.getMode() === mode.Transient && oVM) {
+			var oVariantModel = this.getModel(ControlVariantApplyAPI.getVariantModelName());
+			oVM.setModel(oVariantModel, ControlVariantApplyAPI.getVariantModelName());
+			oVM.reinitialize();
+		}
+	};
+
 	PersistenceProvider.prototype.exit = function () {
 		if (this._oWrapper) {
-			var oStatic = sap.ui.getCore().getUIArea(sap.ui.getCore().getStaticAreaRef());
+			var oStatic = Core.getUIArea(Core.getStaticAreaRef());
 			oStatic.removeContent(this._oWrapper);
 
 			this._oWrapper.destroy();

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -30,14 +30,12 @@ sap.ui.define([
 	 * @class
 	 * This control can be used to show personalization-related content in different popup controls.
 	 *
-	 * @class
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @public
-	 * @experimental Since 1.97.
 	 * @since 1.97
 	 * @alias sap.m.p13n.Popup
 	 */
@@ -94,11 +92,13 @@ sap.ui.define([
 				 * This event is fired after the dialog has been closed.
 				 */
 				close: {
-					/**
-					 * The corresponding reason for closing the dialog (Ok & Cancel).
-					 */
-					reason: {
-						type: "string"
+					parameters: {
+						/**
+						 * The corresponding reason for closing the dialog (Ok & Cancel).
+						 */
+						reason: {
+							type: "string"
+						}
 					}
 				}
 			}
@@ -287,7 +287,19 @@ sap.ui.define([
 		var aPanels = this.getPanels();
 		var bUseContainer = aPanels.length > 1;
 		var oResourceBundle = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+
+		var oInitialFocusedControl;
+		if (aPanels.length > 0) {
+			var oContent = aPanels[0];
+			oInitialFocusedControl = oContent.getInitialFocusedControl && oContent.getInitialFocusedControl();
+			if (!oInitialFocusedControl && bUseContainer) {
+				// focus at least the iconTabBar first item
+				oInitialFocusedControl = this._getContainer()._getTabBar().getItems()[0];
+			}
+		}
+
 		var oContainer = new Dialog(this.getId() + "-dialog", {
+			initialFocus: oInitialFocusedControl,
 			title: this.getTitle(),
 			horizontalScrolling: mDialogSettings.hasOwnProperty("horizontalScrolling") ? mDialogSettings.horizontalScrolling : false,
 			verticalScrolling: !bUseContainer,

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2023 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -20,15 +20,14 @@ sap.ui.define([
 	 * @class
 	 * This control serves as base class for a query builder like personalization implementation.
 	 *
-	 * @class
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.109.0
+	 * @version 1.111.0
 	 *
 	 * @private
-	 * @ui5-restricted
-	 * @experimental Since 1.96.
+	 * @ui5-restricted sap.m, sap.ui.mdc
+	 *
 	 * @since 1.96
 	 * @alias sap.m.p13n.QueryPanel
 	 */
@@ -85,7 +84,7 @@ sap.ui.define([
 	QueryPanel.prototype.getP13nData = function (bOnlyActive) {
 		var aItems = [];
 		this._oListControl.getItems().forEach(function (oItem) {
-			var sKey = oItem.getContent()[0].getContent()[0]._key;
+			var sKey = this._getControlFromRow(oItem)._key;
 			if (sKey) {
 				var oField = this._getP13nModel().getProperty("/items").find(function (o) {
 					return o.name == sKey;
@@ -152,7 +151,7 @@ sap.ui.define([
 	};
 
 	QueryPanel.prototype._getModelEntry = function(oRow) {
-		var sKey = oRow.getContent()[0].getContent()[0]._key;
+		var sKey = this._getControlFromRow(oRow)._key;
 		var oField = this._getP13nModel().getProperty("/items").find(function (o) {
 			return o.name == sKey;
 		});
@@ -218,7 +217,7 @@ sap.ui.define([
 			this._addHover(oRow);
 		}
 
-		oRow.getContent()[0].getContent()[0]._key = oItem.name;
+		this._getControlFromRow(oRow)._key = oItem.name;
 
 		this._oListControl.addItem(oRow);
 
@@ -243,8 +242,7 @@ sap.ui.define([
 	QueryPanel.prototype._handleActivated = function(oHoveredItem) {
 		var oQueryRow = oHoveredItem.getContent()[0];
 		if (oQueryRow) {
-			var iItemLength = oQueryRow.getContent().length - 1;
-			var oButtonBox = oHoveredItem.getContent()[0].getContent()[iItemLength];
+			var oButtonBox = this._getControlFromRow(oHoveredItem, -1);
 
 			//Only add the buttons if 1) an hovered item is provided 2) the buttons are not already there
 			if (oHoveredItem && oButtonBox.getItems().length < 2) {
@@ -311,8 +309,7 @@ sap.ui.define([
 		var oListItem = oComboBox.getParent().getParent();
 		var bIsLastRow = this._oListControl.getItems().length - 1 == this._oListControl.getItems().indexOf(oListItem);
 
-		var aContent = oListItem.getContent()[0].getContent();
-		var oBtnContainer = aContent[aContent.length - 1];
+		var oBtnContainer = this._getControlFromRow(oListItem, -1);
 		oBtnContainer.setVisible(!(bIsLastRow && sNewKey == ""));
 
 		//Remove previous
@@ -350,14 +347,12 @@ sap.ui.define([
 						var bNewRowRequired = iQueries === 1 || iQueries == this.getP13nData(true).length;
 
 						this._oListControl.removeItem(oRow);
-						this._updatePresence(oRow.getContent()[0].getContent()[0]._key, false, undefined);
+						this._updatePresence(this._getControlFromRow(oRow)._key, false, undefined);
 						if (bNewRowRequired) {
 							this._addQueryRow();
-						} else {
-							//In case an item has been removed, focus the Select control of the new 'none' row
-							var iLastIndex = this._oListControl.getItems().length - 1;
-							this._oListControl.getItems()[iLastIndex].getContent()[0].getContent()[0].focus();
 						}
+						//In case an item has been removed, focus the Select control of the new 'none' row
+						this.getInitialFocusedControl().focus();
 
 						this._getP13nModel().checkUpdate(true);
 					}.bind(this)
@@ -395,6 +390,31 @@ sap.ui.define([
 		});
 	};
 
+	QueryPanel.prototype.getInitialFocusedControl = function() {
+		var oRow = this._getRow(-1);
+		return this._getControlFromRow(oRow);
+	};
+
+	QueryPanel.prototype._getRow = function(iIndex) {
+		var aItems = this._oListControl.getItems();
+		if (iIndex < 0) {
+			iIndex = aItems.length + iIndex;
+		}
+		return aItems[iIndex];
+	};
+
+	QueryPanel.prototype._getControlFromRow = function(oRow, iIndex) {
+		var aContent = oRow.getContent()[0].getContent();
+		if (iIndex === undefined) {
+			iIndex = 0;
+		}
+		if (iIndex < 0) {
+			iIndex = aContent.length + iIndex;
+		}
+		return aContent[iIndex];
+	};
+
+
 	return QueryPanel;
 
 });