@openui5/sap.m 1.115.1 → 1.117.0

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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 *
 	 * @public
 	 * @alias sap.m.p13n.SelectionController
@@ -409,18 +409,17 @@ sap.ui.define([
     };
 
     SelectionController.prototype._createAddRemoveChange = function(oControl, sOperation, oContent){
-		var oChangeContent = oContent;
 
-		if (sOperation === this.getChangeOperations()["add"]) {
-			oChangeContent.value = true;
-			oChangeContent.targetAggregation = this.getTargetAggregation();
-		}
+        var oChangeContent = oContent;
+
+        oChangeContent.value = (sOperation == this.getChangeOperations()["add"]);
+        oChangeContent.targetAggregation = this.getTargetAggregation();
 
         var oAddRemoveChange = {
             selectorElement: oControl,
             changeSpecificData: {
                 changeType: sOperation,
-                content:  oChangeContent
+                content: oChangeContent
             }
         };
         return oAddRemoveChange;

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

@@ -48,7 +48,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 *
 	 * @public
 	 * @since 1.96
@@ -137,8 +137,10 @@ sap.ui.define([
 			type: {
 				path: this.P13N_MODEL + ">" + this.PRESENCE_ATTRIBUTE,
 				formatter: function(bSelected) {
-					return bSelected ? ListType.Active : ListType.Inactive;
-				}
+					//In case the factory control is displayed, no move buttons are displayed --> item should be inactive
+					//to avoid issues with the label for mechanism
+					return bSelected && !this._bShowFactory ? ListType.Active : ListType.Inactive;
+				}.bind(this)
 			},
 			cells: [
 				new VBox({
@@ -200,7 +202,11 @@ sap.ui.define([
 		return this;
 	};
 
-
+	SelectionPanel.prototype.setFieldColumn = function(sFieldColumn) {
+		this.setProperty("fieldColumn", sFieldColumn);
+		this._displayColumns();
+		return this;
+	};
 
 	SelectionPanel.prototype.setShowHeader = function(bShowHeader) {
 		if (bShowHeader){
@@ -293,6 +299,11 @@ sap.ui.define([
 	SelectionPanel.prototype.showFactory = function(bShow) {
 		this._bShowFactory = bShow;
 		this._displayColumns();
+
+		this._oListControl.getItems().forEach(function(oItem){
+			oItem.setType(bShow ? "Inactive" : "Active");
+		});
+
 		if (bShow){
 			this.removeStyleClass("SelectionPanelHover");
 			this._oListControl.setKeyboardMode(ListKeyboardMode.Edit); //--> tab through editable fields (fields shown)
@@ -479,4 +490,4 @@ sap.ui.define([
 		this._bShowSelected = null;
 	};
 	return SelectionPanel;
-});
+});

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

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.SelectionController
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 * @public
 	 * @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.115.1
+	 * @version 1.117.0
 	 *
 	 * @public
 	 * @since 1.96
@@ -76,11 +76,11 @@ sap.ui.define([
 	 */
 
 	SortPanel.prototype._createRemoveButton = function () {
-		var oRemvoeBtn = QueryPanel.prototype._createRemoveButton.apply(this, arguments);
-		oRemvoeBtn.setLayoutData(new GridData({
+		var oRemoveBtn = QueryPanel.prototype._createRemoveButton.apply(this, arguments);
+		oRemoveBtn.setLayoutData(new GridData({
 			span: "XL3 L3 M3 S4"//on "S" the Asc/Desc text is invisible, we need to increase the size the
 		}));
-		return oRemvoeBtn;
+		return oRemoveBtn;
 	};
 
 	SortPanel.prototype._createOrderSwitch = function (sKey, bDesc) {
@@ -149,6 +149,10 @@ sap.ui.define([
 		return this._getResourceText("p13n.SORT_REMOVEICONTOOLTIP");
 	};
 
+	SortPanel.prototype._getRemoveButtonAnnouncementText = function () {
+		return this._getResourceText("p13n.SORT_REMOVEICONANNOUNCE");
+	};
+
 	SortPanel.prototype._selectKey = function(oComboBox) {
 		QueryPanel.prototype._selectKey.apply(this, arguments);
 

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

@@ -5,6 +5,15 @@
  */
 sap.ui.define(function () {
     "use strict";
+
+	/**
+	 * Enumerations for p13n enum artifacts
+	 * @namespace
+	 * @name sap.m.p13n.enum
+	 * @private
+	 * @ui5-restricted sap.m.p13n
+	 */
+
     /**
      * Enumeration of the preferred persistence mode for personalization changes.
      *

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

@@ -92,20 +92,21 @@ sap.ui.define([
 
                             sAffectedAggregation = oChange.getContent().targetAggregation;
 
-                            var sOldValue = sOperation !== "add";
+                            var oRevertData = {
+                                key: oChange.getContent().key
+                            };
+                            oRevertData.value = sOperation !== "add";
 
+                            var aCurrentState;
                             if (sOperation === "move") {
-                                var aCurrentState = Engine.getInstance().getController(oControl, oChange.getChangeType()).getCurrentState();
+                                aCurrentState = Engine.getInstance().getController(oControl, oChange.getChangeType()).getCurrentState();
                                 var oFound = aCurrentState.find(function(oItem, iIndex){
                                     if (oItem.key === oChange.getContent().key) {
                                         return oItem;
                                     }
                                 });
-                                sOldValue = {
-                                    key: oChange.getContent().key,
-                                    index: aCurrentState.indexOf(oFound),
-                                    targetAggregation: oChange.getContent().targetAggregation
-                                };
+                                oRevertData.targetAggregation = oChange.getContent().targetAggregation;
+                                oRevertData.index = aCurrentState.indexOf(oFound);
                             }
 
                             if (oPriorAggregationConfig
@@ -114,19 +115,17 @@ sap.ui.define([
                                 && oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().key]
                                 && oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().key][sAffectedProperty]
                                 ){
-                                    sOldValue = oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().key][sAffectedProperty];
+                                    oRevertData.value = oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().key][sAffectedProperty];
                             }
 
-                            oChange.setRevertData({
-                                key: oChange.getContent().key,
-                                value: sOldValue
-                            });
+                            oChange.setRevertData(oRevertData);
 
                             var oConfig = {
                                 property: sAffectedProperty,
                                 key: oChange.getContent().key,
                                 value: oChange.getContent(),
                                 operation: sOperation,
+                                changeType: oChange.getChangeType(),
                                 propertyBag: mPropertyBag
                             };
 
@@ -162,8 +161,9 @@ sap.ui.define([
                         },
                         property: sAffectedProperty,
                         operation: sOperation,
+                        changeType: oChange.getChangeType(),
                         key: oChange.getRevertData().key,
-                        value: oChange.getRevertData().value,
+                        value: oChange.getRevertData(),
                         propertyBag: mPropertyBag
                     };
 

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

@@ -11,7 +11,7 @@ sap.ui.define([
 ], function(ModificationHandler, FlexUtil, mode, Core) {
 	"use strict";
 
-    var oFlexModificationHandler, pInitialize, pRuntimeAPI;
+    var oFlexModificationHandler, pInitialize, pRuntimeAPI, pWriteAPI;
 
     var _requireFlexRuntimeAPI = function() {
         if (!pRuntimeAPI) {
@@ -26,6 +26,19 @@ sap.ui.define([
         return pRuntimeAPI;
     };
 
+    var _requireWriteAPI = function() {
+        if (!pWriteAPI) {
+            pWriteAPI = new Promise(function (resolve, reject) {
+                sap.ui.require([
+                    "sap/ui/fl/write/api/ControlPersonalizationWriteAPI"
+                ], function (ControlPersonalizationWriteAPI) {
+                    resolve(ControlPersonalizationWriteAPI);
+                });
+            });
+        }
+        return pWriteAPI;
+    };
+
     /**
 	 * @class This class offers <code>sap.ui.fl</code> capabilities.
      * It should be used as the persistence layer in the {@link sap.m.p13n.Engine#register Engine#register} process.
@@ -64,6 +77,7 @@ sap.ui.define([
             }) : oHandleChangesPromise;
         });
     };
+
     FlexModificationHandler.prototype.waitForChanges = function(mPropertyBag, oModificationPayload){
         return this.initialize()
         .then(function(){
@@ -73,6 +87,15 @@ sap.ui.define([
         });
     };
 
+    FlexModificationHandler.prototype.hasChanges = function(mPropertyBag, oModificationPayload){
+        return this.initialize()
+        .then(function(){
+            return _requireWriteAPI().then(function(ControlPersonalizationWriteAPI){
+                return ControlPersonalizationWriteAPI.hasDirtyFlexObjects(mPropertyBag);
+            });
+        });
+    };
+
     FlexModificationHandler.prototype.reset = function(mPropertyBag, oModificationPayload){
         var sPersistenceMode = oModificationPayload.mode;
 

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

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 *
 	 * @private
 	 * @since 1.104
@@ -81,18 +81,6 @@ sap.ui.define([
 			oDefaultProvider.addFor(vElement);
 		}
 
-		var oProvider = this._mDefaultProviders[sPersistenceMode];
-
-		var fnAttachVariantModel = function(){
-			var oModel = oElement.getModel(ControlVariantApplyAPI.getVariantModelName());
-			if (oModel) {
-				oProvider.setModel(oModel, ControlVariantApplyAPI.getVariantModelName());
-				oElement.detachEvent("modelContextChange", fnAttachVariantModel);
-			}
-		};
-
-		oElement.attachEvent("modelContextChange", fnAttachVariantModel);
-
 		return oDefaultProvider;
 	};
 

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.115.1
+	 * @version 1.117.0
 	 *
 	 * @private
 	 * @since 1.104

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.115.1
+	 * @version 1.117.0
 	 *
 	 * @private
 	 *
@@ -64,6 +64,8 @@ sap.ui.define([
 	 * @param {sap.ui.core.CSSSize} [mSettings.contentHeight] Height configuration for the related popup container
 	 * @param {sap.ui.core.CSSSize} [mSettings.contentWidth] Width configuration for the related popup container
 	 * @param {boolean} [mSettings.showReset] Determines the visibility of the <code>Reset</code> button
+	 * @param {boolean} [mSettings.enableReset] Determines the enablement status of the <code>Reset</code> button
+	 * (Note: only takes effect if the button is shown via <code>showReset</code>)
 	 * @param {function} [mSettings.reset] Custom reset handling to opt out the default reset which will trigger a reset for all open tabs.
 	 * @param {function} [mSettings.close] Event handler once the Popup has been closed
 	 *
@@ -126,7 +128,6 @@ sap.ui.define([
 						});
 					}
 
-
 					aInitializedPanels.forEach(function(oPanel, iIndex){
 						oP13nContainer.addPanel(oPanel, aPanelKeys[iIndex]);
 					});
@@ -217,9 +218,9 @@ sap.ui.define([
 		return oUIManager;
 	};
 
-	UIManager.prototype.setActiveP13n = function(vControl, vKeys) {
+	UIManager.prototype.setActiveP13n = function(vControl, vKeys, bModified) {
 		if (this.oAdaptationProvider.setActiveP13n instanceof Function) {
-			this.oAdaptationProvider.setActiveP13n(vControl, vKeys);
+			this.oAdaptationProvider.setActiveP13n(vControl, vKeys, bModified);
 		}
 	};
 

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

@@ -211,6 +211,32 @@ sap.ui.define([
 
 			switch (oModificationPayload.operation) {
 				case "move":
+					Object.entries(oConfig.aggregations[sAggregationName]).forEach((aEntry) => {
+						if (
+							aEntry[0] !== sPropertyInfoKey &&
+							aEntry[1].position !== undefined
+						){
+							var newIndex = vValue.index;
+							var currentState = oModificationPayload.currentState;
+							var currentItemState = currentState?.find((item) => item.key == sPropertyInfoKey);
+							var currentItemIndex = currentState?.indexOf(currentItemState);
+
+							//In case of move changes, we also need to ensure that existing xConfig position changes
+							//are adapted accordingly to avoid index mismatches
+
+							if (newIndex < aEntry[1].position) {
+								aEntry[1].position++;
+							}
+
+							if (newIndex > aEntry[1].position && currentItemIndex < aEntry[1].position) {
+								aEntry[1].position--;
+							}
+
+							if (aEntry[1].position == newIndex) {
+								currentItemIndex > aEntry[1].position ? aEntry[1].position++ : aEntry[1].position--;
+							}
+						}
+					});
 					oConfig.aggregations[sAggregationName][sPropertyInfoKey][sAffectedProperty] = vValue.index;
 					break;
 				case "remove":