@openui5/sap.m 1.123.1 → 1.124.1

package/src/sap/m/messagebundle_sk.properties

@@ -1256,6 +1256,8 @@ GENERICTILE_REMOVEBUTTON_TEXT=Odstr\u00E1ni\u0165
 
 GENERICTILE_MORE_ACTIONBUTTON_TEXT=Viac
 
+GENERICTILE_BADGE_APP=App
+
 GENERICTILE_LINK_TILE_CONTENT_DESCRIPTION=Stla\u010Den\u00EDm kl\u00E1vesu Tab prejdite na prepojenia vo vn\u00FAtri dla\u017Edice
 
 NOTIFICATION_LIST_GROUP_MAX_NOTIFICATIONS_TITLE=Existuje {0} \u010Fal\u0161\u00EDch ozn\u00E1men\u00ED

package/src/sap/m/messagebundle_sl.properties

@@ -1256,6 +1256,8 @@ GENERICTILE_REMOVEBUTTON_TEXT=Odstranitev
 
 GENERICTILE_MORE_ACTIONBUTTON_TEXT=Ve\u010D
 
+GENERICTILE_BADGE_APP=Aplikacija
+
 GENERICTILE_LINK_TILE_CONTENT_DESCRIPTION=Pritisnite tipko Tab, da se pomaknete do povezav na \u0161iroki plo\u0161\u010Dici
 
 NOTIFICATION_LIST_GROUP_MAX_NOTIFICATIONS_TITLE=Obstaja \u0161e {0} dodatnih obvestil

package/src/sap/m/messagebundle_sr.properties

@@ -1256,6 +1256,8 @@ GENERICTILE_REMOVEBUTTON_TEXT=\u0423\u043A\u043B\u043E\u043D\u0438
 
 GENERICTILE_MORE_ACTIONBUTTON_TEXT=\u0412\u0438\u0448\u0435
 
+GENERICTILE_BADGE_APP=\u0410\u043F\u043B\u0438\u043A\u0430\u0446\u0438\u0458\u0430
+
 GENERICTILE_LINK_TILE_CONTENT_DESCRIPTION=\u041F\u0440\u0438\u0442\u0438\u0441\u043D\u0438\u0442\u0435 \u0442\u0430\u0441\u0442\u0435\u0440 \u0437\u0430 \u043D\u0430\u0432\u0438\u0433\u0430\u0446\u0438\u0458\u0443 \u0434\u043E \u0432\u0435\u0437\u0430 \u043A\u043E\u0458\u0435 \u043F\u043E\u0441\u0442\u043E\u0458\u0435 \u0443\u043D\u0443\u0442\u0430\u0440 \u0448\u0438\u0440\u043E\u043A\u043E\u0433 \u043F\u043E\u0434\u0435\u043A\u0440\u0430\u043D\u0430
 
 NOTIFICATION_LIST_GROUP_MAX_NOTIFICATIONS_TITLE=\u041F\u043E\u0441\u0442\u043E\u0458\u0438 \u0458\u043E\u0448 {0} \u043E\u0431\u0430\u0432\u0435\u0448\u0442\u0435\u045A\u0430

package/src/sap/m/messagebundle_sv.properties

@@ -1256,6 +1256,8 @@ GENERICTILE_REMOVEBUTTON_TEXT=Ta bort
 
 GENERICTILE_MORE_ACTIONBUTTON_TEXT=Mer
 
+GENERICTILE_BADGE_APP=App
+
 GENERICTILE_LINK_TILE_CONTENT_DESCRIPTION=Tryck p\u00E5 Tabb f\u00F6r att g\u00E5 till l\u00E4nkarna i den breda panelen
 
 NOTIFICATION_LIST_GROUP_MAX_NOTIFICATIONS_TITLE=Det finns ytterligare {0} meddelanden

package/src/sap/m/messagebundle_th.properties

@@ -1256,6 +1256,8 @@ GENERICTILE_REMOVEBUTTON_TEXT=\u0E22\u0E49\u0E32\u0E22\u0E2D\u0E2D\u0E01
 
 GENERICTILE_MORE_ACTIONBUTTON_TEXT=\u0E40\u0E1E\u0E34\u0E48\u0E21\u0E40\u0E15\u0E34\u0E21
 
+GENERICTILE_BADGE_APP=\u0E41\u0E2D\u0E1E
+
 GENERICTILE_LINK_TILE_CONTENT_DESCRIPTION=\u0E01\u0E14 Tab \u0E40\u0E1E\u0E37\u0E48\u0E2D\u0E40\u0E19\u0E27\u0E34\u0E40\u0E01\u0E15\u0E44\u0E1B\u0E22\u0E31\u0E07\u0E25\u0E34\u0E07\u0E01\u0E4C\u0E17\u0E35\u0E48\u0E41\u0E2A\u0E14\u0E07\u0E02\u0E49\u0E32\u0E07\u0E43\u0E19 Tile \u0E41\u0E1A\u0E1A\u0E01\u0E27\u0E49\u0E32\u0E07
 
 NOTIFICATION_LIST_GROUP_MAX_NOTIFICATIONS_TITLE=\u0E21\u0E35\u0E01\u0E32\u0E23\u0E41\u0E08\u0E49\u0E07\u0E40\u0E15\u0E37\u0E2D\u0E19\u0E21\u0E32\u0E01\u0E01\u0E27\u0E48\u0E32 {0} \u0E23\u0E32\u0E22\u0E01\u0E32\u0E23

package/src/sap/m/messagebundle_tr.properties

@@ -1256,6 +1256,8 @@ GENERICTILE_REMOVEBUTTON_TEXT=Kald\u0131r
 
 GENERICTILE_MORE_ACTIONBUTTON_TEXT=Daha fazla
 
+GENERICTILE_BADGE_APP=Uygulama
+
 GENERICTILE_LINK_TILE_CONTENT_DESCRIPTION=Geni\u015F kutucu\u011Fun i\u00E7inde bulunan ba\u011Flant\u0131lara gitmek i\u00E7in sekme tu\u015Funa bas\u0131n
 
 NOTIFICATION_LIST_GROUP_MAX_NOTIFICATIONS_TITLE={0} bildirim daha mevcut

package/src/sap/m/messagebundle_uk.properties

@@ -1256,6 +1256,8 @@ GENERICTILE_REMOVEBUTTON_TEXT=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438
 
 GENERICTILE_MORE_ACTIONBUTTON_TEXT=\u0411\u0456\u043B\u044C\u0448\u0435
 
+GENERICTILE_BADGE_APP=\u0417\u0430\u0441\u0442\u043E\u0441\u0443\u043D\u043E\u043A
+
 GENERICTILE_LINK_TILE_CONTENT_DESCRIPTION=\u041D\u0430\u0442\u0438\u0441\u043D\u0456\u0442\u044C \u043A\u043B\u0430\u0432\u0456\u0448\u0443 Tab, \u0449\u043E\u0431 \u043F\u0435\u0440\u0435\u0439\u0442\u0438 \u0434\u043E \u043F\u043E\u0441\u0438\u043B\u0430\u043D\u044C, \u043F\u0440\u0438\u0441\u0443\u0442\u043D\u0456\u0445 \u0432\u0441\u0435\u0440\u0435\u0434\u0438\u043D\u0456 \u0448\u0438\u0440\u043E\u043A\u043E\u0457 \u043F\u043B\u0438\u0442\u043A\u0438
 
 NOTIFICATION_LIST_GROUP_MAX_NOTIFICATIONS_TITLE=\u0406\u0441\u043D\u0443\u044E\u0442\u044C \u0449\u0435 {0} \u0441\u043F\u043E\u0432\u0456\u0449\u0435\u043D\u044C

package/src/sap/m/messagebundle_vi.properties

@@ -1256,6 +1256,8 @@ GENERICTILE_REMOVEBUTTON_TEXT=Loa\u0323i bo\u0309
 
 GENERICTILE_MORE_ACTIONBUTTON_TEXT=Kha\u0301c
 
+GENERICTILE_BADGE_APP=\u1EE8ng d\u1EE5ng
+
 GENERICTILE_LINK_TILE_CONTENT_DESCRIPTION=Nh\u1EA5n Tab \u0111\u1EC3 \u0111i\u1EC1u h\u01B0\u1EDBng \u0111\u1EBFn c\u00E1c li\u00EAn k\u1EBFt hi\u1EC7n di\u1EC7n b\u00EAn trong h\u00ECnh x\u1EBFp r\u1ED9ng
 
 NOTIFICATION_LIST_GROUP_MAX_NOTIFICATIONS_TITLE=Co\u0301 th\u00EAm {0} th\u00F4ng ba\u0301o

package/src/sap/m/messagebundle_zh_CN.properties

@@ -112,7 +112,7 @@ LIST_ITEM_STATE_SUCCESS=\u6210\u529F
 
 LIST_ITEM_DELETE=\u5220\u9664
 
-LIST_ITEM_DELETE_SHORTCUT=Delete \u952E
+LIST_ITEM_DELETE_SHORTCUT=\u5220\u9664(\u5220\u9664\u952E)
 
 LIST_ITEM_EDIT=\u7F16\u8F91
 
@@ -1256,6 +1256,8 @@ GENERICTILE_REMOVEBUTTON_TEXT=\u79FB\u9664
 
 GENERICTILE_MORE_ACTIONBUTTON_TEXT=\u66F4\u591A
 
+GENERICTILE_BADGE_APP=\u5E94\u7528\u7A0B\u5E8F
+
 GENERICTILE_LINK_TILE_CONTENT_DESCRIPTION=\u6309 tab \u5BFC\u822A\u5230\u5BBD\u78C1\u8D34\u5185\u5448\u73B0\u7684\u94FE\u63A5
 
 NOTIFICATION_LIST_GROUP_MAX_NOTIFICATIONS_TITLE=\u8FD8\u6709 {0} \u4E2A\u901A\u77E5

package/src/sap/m/messagebundle_zh_TW.properties

@@ -1256,6 +1256,8 @@ GENERICTILE_REMOVEBUTTON_TEXT=\u79FB\u9664
 
 GENERICTILE_MORE_ACTIONBUTTON_TEXT=\u66F4\u591A
 
+GENERICTILE_BADGE_APP=\u61C9\u7528\u7A0B\u5F0F
+
 GENERICTILE_LINK_TILE_CONTENT_DESCRIPTION=\u6309\u4E0B Tab \u4EE5\u700F\u89BD\u81F3\u5BEC\u5F62\u529F\u80FD\u78DA\u5167\u73FE\u6709\u7684\u9023\u7D50
 
 NOTIFICATION_LIST_GROUP_MAX_NOTIFICATIONS_TITLE=\u9084\u6709 {0} \u500B\u901A\u77E5

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

@@ -22,12 +22,12 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @constructor
 	 * @alias sap.m.p13n.AbstractContainer
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @since 1.96
 	 *
 	 * @private

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

@@ -20,12 +20,12 @@ sap.ui.define(['sap/ui/core/Element'],
 		 * @extends sap.ui.core.Element
 		 *
 		 * @author SAP SE
-		 * @version 1.123.1
+		 * @version 1.124.1
 		 *
 		 * @constructor
 		 * @alias sap.m.p13n.AbstractContainerItem
 		 * @author SAP SE
-		 * @version 1.123.1
+		 * @version 1.124.1
 		 * @since 1.96
 		 * @private
 		 * @ui5-restricted

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

@@ -80,7 +80,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @public
 	 * @abstract

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

@@ -55,7 +55,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.AbstractContainer
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @private
 	 * @ui5-restricted

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

@@ -10,9 +10,9 @@ sap.ui.define([
 	"sap/base/Log",
 	"sap/m/p13n/modification/FlexModificationHandler",
 	"sap/m/MessageStrip",
-	"sap/ui/core/library",
 	"sap/ui/core/Element",
 	"sap/ui/core/ElementRegistry",
+	"sap/ui/core/message/MessageType",
 	"sap/m/p13n/modules/DefaultProviderRegistry",
 	"sap/m/p13n/modules/UIManager",
 	"sap/m/p13n/modules/StateHandlerRegistry",
@@ -24,9 +24,9 @@ sap.ui.define([
 	Log,
 	FlexModificationHandler,
 	MessageStrip,
-	coreLibrary,
 	Element,
 	ElementRegistry,
+	MessageType,
 	DefaultProviderRegistry,
 	UIManager,
 	StateHandlerRegistry,
@@ -37,9 +37,6 @@ sap.ui.define([
 
 	const ERROR_INSTANCING = "Engine: This class is a singleton. Please use the getInstance() method instead.";
 
-	//Shortcut to 'MessageType'
-	const MessageType = coreLibrary.MessageType;
-
 	/*global WeakMap */
 	const _mRegistry = new WeakMap();
 
@@ -72,7 +69,7 @@ sap.ui.define([
 	 * @alias sap.m.p13n.Engine
 	 * @extends sap.m.p13n.modules.AdaptationProvider
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @public
 	 * @since 1.104
 	 */

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

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.SelectionController
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @since 1.121
 	 * @public
 	 * @alias sap.m.p13n.FilterController

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

@@ -53,7 +53,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.QueryPanel
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @private
 	 * @since 1.121

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

@@ -31,7 +31,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.SelectionController
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @public
 	 * @since 1.104
 	 * @alias sap.m.p13n.GroupController

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.QueryPanel
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @public
 	 * @alias sap.m.p13n.GroupPanel
@@ -110,6 +110,7 @@ sap.ui.define([
 			items: [
 				new CheckBox({
 					enabled: sKey ? true : false,
+					wrapping: true,
 					selected: oItem.hasOwnProperty("showIfGrouped") ? oItem.showIfGrouped : true,
 					select: (oEvt) => {
 						const oPanel = oEvt.getSource().getParent().getParent().getParent().getParent().getParent().getParent();

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

@@ -17,7 +17,8 @@ sap.ui.define([
 	"sap/m/library",
 	"sap/ui/core/Element",
 	"sap/ui/core/Lib",
-	"sap/ui/core/library"
+	"sap/ui/core/library",
+	"sap/ui/core/syncStyleClass"
 ], (
 	Control,
 	Button,
@@ -32,7 +33,8 @@ sap.ui.define([
 	mLibrary,
 	Element,
 	Library,
-	coreLibrary
+	coreLibrary,
+	syncStyleClass
 ) => {
 	"use strict";
 
@@ -54,7 +56,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @public
 	 * @since 1.97
@@ -219,6 +221,11 @@ sap.ui.define([
 			this._oPopup.openBy(oSource);
 		}
 
+		const oParent = this.getParent();
+		if (oParent && oParent.hasStyleClass instanceof Function && oParent.hasStyleClass("sapUiSizeCompact") && !this._oPopup.hasStyleClass("sapUiSizeCompact")) {
+			this._oPopup.addStyleClass("sapUiSizeCompact");
+		}
+
 		const oResetBtn = this.getResetButton();
 
 		if (oResetBtn) {

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

@@ -37,7 +37,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @public
 	 *

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

@@ -58,7 +58,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @public
 	 * @alias sap.m.p13n.SelectionController
@@ -197,19 +197,27 @@ sap.ui.define([
 
 		const oXConfig = xConfigAPI.readConfig(this.getAdaptationControl()) || {};
 		const oItemXConfig = oXConfig.hasOwnProperty("aggregations") ? oXConfig.aggregations[this._sTargetAggregation] : {};
+		const aItemXConfig = [];
+		if (oItemXConfig) {
+			Object.entries(oItemXConfig).forEach(([sKey, oConfig]) => {
+				aItemXConfig.push({key: sKey, position: oConfig.position, visible: oConfig.visible});
+			});
+			aItemXConfig.sort((a, b) => a.position - b.position);
+		}
+		aItemXConfig.sort((a,b) => a.position - b.position);
 
-		for (const sKey in oItemXConfig) {
+		aItemXConfig.forEach(({key}) => {
 			const aStateKeys = aState.map((o) => {
 				return o.key;
 			});
-			let iCurrentIndex = aStateKeys.indexOf(sKey);
-			const iNewIndex = oItemXConfig[sKey].position;
-			const bVisible = oItemXConfig[sKey].visible !== false;
+			let iCurrentIndex = aStateKeys.indexOf(key);
+			const iNewIndex = oItemXConfig[key].position;
+			const bVisible = oItemXConfig[key].visible !== false;
 			const bReordered = iNewIndex !== undefined;
 
 			if (bVisible && iCurrentIndex === -1) {
 				aState.push({
-					key: sKey
+					key: key
 				});
 			}
 
@@ -218,11 +226,11 @@ sap.ui.define([
 				aState.splice(iNewIndex, 0, oItem);
 				iCurrentIndex = iNewIndex;
 			}
-			if (oItemXConfig[sKey].visible === false && iCurrentIndex > -1) {
+			if (oItemXConfig[key].visible === false && iCurrentIndex > -1) {
 				aState.splice(iCurrentIndex, 1);
 			}
 
-		}
+		});
 		return aState;
 	};
 

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

@@ -71,7 +71,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @public
 	 * @since 1.96

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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.SelectionController
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 * @public
 	 * @alias sap.m.p13n.SortController
 	 */

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

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.QueryPanel
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @public
 	 * @since 1.96

package/src/sap/m/p13n/handler/xConfigHandler.js

@@ -111,7 +111,7 @@ sap.ui.define([
 						return Engine.getInstance().readXConfig(oControl, {
 								propertyBag: mPropertyBag
 							})
-							.then((oPriorAggregationConfig) => {
+							.then(async (oPriorAggregationConfig) => {
 								const sOperation = getOperationType(oChange.getChangeType());
 								sAffectedAggregation = oChange.getContent().targetAggregation;
 
@@ -130,21 +130,18 @@ sap.ui.define([
 									oRevertData.value = null;
 								}
 
-								const oController = Engine.getInstance().getController(oControl, oChange.getChangeType());
-								const aCurrentState = oController?.getCurrentState();
-								let oStateItem;
-								if (aCurrentState && aCurrentState instanceof Array) {
-									oStateItem = aCurrentState.find((oItem, iIndex) => {
-										return oItem.key === oChange.getContent().key;
-									});
+								if (!oPriorAggregationConfig) {
+									const aCurrentState = await xConfigAPI.getCurrentItemState(oControl, {propertyBag: mPropertyBag, changeType: oChange.getChangeType()}, oPriorAggregationConfig, sAffectedAggregation);
+									if (aCurrentState) {
+										const oStateItem = aCurrentState.find((oItem, iIndex) => {
+											return oItem.key === oChange.getContent().key;
+										});
+										oRevertData.index = aCurrentState.indexOf(oStateItem);
+									}
 								}
 
 								oRevertData.targetAggregation = oChange.getContent().targetAggregation;
 
-								if (oStateItem) {
-									oRevertData.index = aCurrentState.indexOf(oStateItem);
-								}
-
 								if (oPriorAggregationConfig &&
 									oPriorAggregationConfig.aggregations &&
 									oPriorAggregationConfig.aggregations[sAffectedAggregation] &&
@@ -152,6 +149,7 @@ sap.ui.define([
 									oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().key][sAffectedProperty]
 								) {
 									oRevertData.value = oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().key][sAffectedProperty];
+									oRevertData.index = oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().key].position !== undefined ? oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().key].position : oRevertData.index;
 								}
 
 								oChange.setRevertData(oRevertData);

package/src/sap/m/p13n/modules/DefaultProviderRegistry.js

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @private
 	 * @since 1.104

package/src/sap/m/p13n/modules/StateHandlerRegistry.js

@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.EventProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @private
 	 * @since 1.104

package/src/sap/m/p13n/modules/UIManager.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.123.1
+	 * @version 1.124.1
 	 *
 	 * @private
 	 *
@@ -122,6 +122,12 @@ sap.ui.define([
 							}
 						});
 
+						oP13nContainer._getContainer().attachAfterViewSwitch((oEvt) => {
+							const affectedKey = oEvt.getParameter("target");
+							const affectedPanel = aInitializedPanels[aPanelKeys.indexOf(affectedKey)];
+							that.oAdaptationProvider.validateP13n(oControl, affectedKey, affectedPanel);
+						});
+
 						if (mSettings.showReset !== false) {
 							oP13nContainer.setReset(() => {
 								const fnReset = mSettings.reset instanceof Function ? mSettings.reset : that.oAdaptationProvider.reset.bind(that.oAdaptationProvider);

package/src/sap/m/p13n/modules/xConfigAPI.js

@@ -63,10 +63,11 @@ sap.ui.define([
 				}
 				return {};
 			})
-			.then((oExistingConfig) => {
+			.then(async (oExistingConfig) => {
 
 				let oConfig;
 				if (oModificationPayload.controlMeta && oModificationPayload.controlMeta.aggregation) {
+					await xConfigAPI.prepareAggregationConfig(oControl, oModificationPayload, oExistingConfig);
 					oConfig = xConfigAPI.createAggregationConfig(oControl, oModificationPayload, oExistingConfig);
 				} else {
 					oConfig = xConfigAPI.createPropertyConfig(oControl, oModificationPayload, oExistingConfig);
@@ -95,6 +96,38 @@ sap.ui.define([
 			});
 	};
 
+	xConfigAPI.getCurrentItemState = async function(oControl, oModificationPayload, oConfig, sAggregationName) {
+		const changeType = oModificationPayload?.changeType;
+		if (!oModificationPayload.propertyBag || !changeType || changeType.indexOf("Item") === -1) {
+			return;
+		}
+		const {modifier, appComponent} = oModificationPayload.propertyBag;
+		const aTargetAggregationItems = await modifier.getAggregation(oControl, sAggregationName);
+		const aAggregationItems = aTargetAggregationItems || [];
+		const aCurrentState = [];
+		if (oConfig && Object.keys(oConfig.aggregations[sAggregationName]).length > 0) {
+			Object.entries(oConfig.aggregations[sAggregationName]).forEach(([sKey, oItem]) => {
+				if (oItem.visible !== false) {
+					aCurrentState.push({key: sKey, position: oItem.position});
+				}
+			});
+			aCurrentState.sort((a,b) => a.position - b.position);
+			aCurrentState.map((o) => delete o.position);
+		} else {
+			await aAggregationItems.reduce(async (pAccum, oItem, iIndex) => {
+				const pCurrentAccum = await pAccum; //synchronize async loop
+				const sId = appComponent ? appComponent.getRootControl()?.getLocalId(modifier.getId(oItem)) : modifier.getId(oItem);
+				const vRelevant = await modifier.getProperty(oItem, "visible");
+				if (vRelevant && sId) {
+					aCurrentState.push({key: sId});
+				}
+				return pCurrentAccum;
+			}, Promise.resolve());
+		}
+
+		return aCurrentState;
+	};
+
 	/**
 	 * Returns a copy of the xConfig object
 	 *
@@ -179,14 +212,18 @@ sap.ui.define([
 		const newIndex = vValue.index;
 
 		const {operation} = oModificationPayload;
-		const updatedState = merge([], currentState || []);
+		const updatedState = merge([], currentState);
 
 		const operationActions = {
 			add: (affectedKey, index) => {
 				updatedState.splice(index, 0, {key: affectedKey});
 			},
 			remove: (affectedKey, index) => {
-				updatedState.splice(index, 1);
+				const currentItemState = updatedState?.find((item) => item.key == affectedKey);
+				const currentItemIndex = updatedState?.indexOf(currentItemState);
+				if (currentItemIndex > -1) {
+					updatedState.splice(currentItemIndex, 1);
+				}
 			},
 			move: (affectedKey, index) => {
 				const currentItemState = updatedState?.find((item) => item.key == affectedKey);
@@ -220,6 +257,32 @@ sap.ui.define([
 		});
 	};
 
+	xConfigAPI.prepareAggregationConfig = async (oControl, oModificationPayload, oExistingConfig) => {
+		const mControlMeta = oModificationPayload.controlMeta;
+		const oControlMetadata = oModificationPayload.controlMetadata || oControl.getMetadata();
+		const sAffectedAggregation = mControlMeta.aggregation;
+		const sAggregationName = sAffectedAggregation ? sAffectedAggregation : oControlMetadata.getDefaultAggregation().name;
+		const oConfig = oExistingConfig || {};
+
+		if (!oConfig.hasOwnProperty("aggregations")) {
+			oConfig.aggregations = {};
+		}
+
+		if (!oConfig.aggregations.hasOwnProperty(sAggregationName)) {
+			if (oControlMetadata.hasAggregation(sAggregationName)) {
+				oConfig.aggregations[sAggregationName] = {};
+				const currentState = await xConfigAPI.getCurrentItemState(oControl, oModificationPayload, oConfig, sAggregationName);
+				currentState?.forEach((oItem) => {
+					oConfig.aggregations[sAggregationName][oItem.key] = {position: oItem.position};
+				});
+			} else {
+				throw new Error("The aggregation " + sAggregationName + " does not exist for" + oControl);
+			}
+		}
+
+		oModificationPayload.currentState = oModificationPayload.currentState || await xConfigAPI.getCurrentItemState(oControl, oModificationPayload, oConfig, sAggregationName);
+	};
+
 	/**
 	 * Enhances the xConfig object for a given mdc control instance.
 	 *
@@ -266,11 +329,11 @@ sap.ui.define([
 		if (vValue !== null || (vValue && vValue.hasOwnProperty("value") && vValue.value !== null)) {
 			switch (oModificationPayload.operation) {
 				case "move":
-					updateIndex(oControl, oConfig, oModificationPayload);
 					oConfig.aggregations[sAggregationName][sPropertyInfoKey][sAffectedProperty] = vValue.index;
 					if (vValue.persistenceIdentifier) {
 						oConfig.aggregations[sAggregationName][sPropertyInfoKey]["persistenceIdentifier"] = vValue.persistenceIdentifier;
 					}
+					updateIndex(oControl, oConfig, oModificationPayload);
 					break;
 				case "remove":
 				case "add":