@openui5/sap.m 1.135.0 → 1.136.1

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -58,7 +58,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 *
 	 * @public
 	 * @since 1.97

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 *
 	 * @public
 	 *

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

@@ -1,12 +1,12 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
 sap.ui.define([
 	"sap/base/i18n/Localization",
-	'sap/base/util/array/diff',
+	'sap/m/p13n/util/diff',
 	'sap/ui/base/Object',
 	'sap/base/util/merge',
 	'sap/base/util/deepEqual',
@@ -58,7 +58,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 *
 	 * @public
 	 * @alias sap.m.p13n.SelectionController
@@ -93,6 +93,8 @@ sap.ui.define([
 		}
 	});
 
+	SelectionController.prototype.DIFF_INSERT_TYPE = "insert";
+	SelectionController.prototype.DIFF_DELETE_TYPE = "delete";
 	/**
 	 * Gets defined <code>persistenceIdentifier</code> of the controller.
 	 * @returns {string|null} String if <code>_sPersistenceIdentifier</code> is defined, otherwise null.
@@ -338,71 +340,61 @@ sap.ui.define([
 			return sDiff;
 		};
 
-		const INSERT_TYPE = "insert";
-		const DELETE_TYPE = "delete";
+		const aDiff = diff(aExistingItems, aChangedItems, {
+			symbol: fnSymbol,
+			includeReference: true
+		});
 
-		const aDeleted = [];
-		const aInserted = [];
-		const aDiff = diff(aExistingItems, aChangedItems, fnSymbol);
+		const aEnhancedDiff = aDiff.map((oDiffEntry) => {
+			oDiffEntry.affectedKey = oDiffEntry.affectedReference[oDiffEntry.affectedIndex].key;
+			return oDiffEntry;
+		});
 
-		for (let i = 0; i < aDiff.length; i++) {
-			const sType = aDiff[i].type;
-			if (sType !== DELETE_TYPE && sType !== INSERT_TYPE) {continue;}
+		for (let i = 0; i < aEnhancedDiff.length; i++) {
+		  if (aEnhancedDiff[i].type === this.DIFF_INSERT_TYPE) {
+			let nIndex = aEnhancedDiff[i].index;
 
-			const {index} = aDiff[i];
-			const oItem = aChangedItems[index];
-			if (!oItem) {continue;}
+			const nIndexDelta = this._getIndexDelta(aEnhancedDiff, i);
+			nIndex += nIndexDelta;
 
-			if (sType === DELETE_TYPE) {
-			  aDeleted.push({ ...oItem, index });
-			  continue;
-			}
-			if (sType === INSERT_TYPE) {
-			  aInserted.push({ ...oItem, index });
-			  continue;
+			if (nIndex >= aChangedItems.length) {
+			  nIndex = aChangedItems.length;
 			}
-		  }
-
 
-		for (let i = 0; i < aDiff.length; i++) {
-			if (aDiff[i].type === "insert") {
-				const sKey = aChangedItems[aDiff[i].index].key || aChangedItems[aDiff[i].index].name;
-
-				let nIndex = aDiff[i].index;
-
-				const fnFilter = (item) => {
-					if (!item) {return false;}
-					if (item.index >= nIndex) {return false;}
-					return true;
-				};
-
-				// number of items that were deleted before current index
-				const nDeleted = aDeleted.filter(fnFilter).length;
-				// number of items that were inserted before current index
-				const nInserted = aInserted.filter(fnFilter).length;
+			aChanges.push(this._createMoveChange(aEnhancedDiff[i].affectedKey, nIndex, sOperation, oControl));
+		  }
+		}
 
-				const isNotFirstElement = nIndex > 0;
-				const hasDeletions = nDeleted > 0;
+		return aChanges;
+	};
 
-				// either take all ins/dels or just take the ones that are before the current index
-				const hasInsertionAbundance = nInserted > nDeleted;
-				const hasDeletionAbundance = nDeleted > nInserted;
 
-				const shouldDecrease = hasInsertionAbundance && hasDeletions && isNotFirstElement;
-				const shouldIncrease = hasDeletionAbundance && isNotFirstElement;
+	SelectionController.prototype._getIndexDelta = function(aDiff, iCurrentIndex) {
+		const oCurrentDiffEntry = aDiff[iCurrentIndex];
+		const aPreviousDiffs = aDiff.slice(0, iCurrentIndex);
+		const aPosteriorDiffs = aDiff.slice(iCurrentIndex);
 
-				if (shouldDecrease) {
-					nIndex -= nInserted;
-				} else if (shouldIncrease) {
-					nIndex += nDeleted;
-				}
+		// get all major inserts and minor deletes independent of affectedKey
+		const aMajorInserts = aPosteriorDiffs.filter((oDiffEntry) => oDiffEntry.type === this.DIFF_INSERT_TYPE);
+		const aMinorDeletes = aPreviousDiffs.filter((oDiffEntry) => oDiffEntry.type == this.DIFF_DELETE_TYPE);
 
-				// eslint-enable-next-line no-loop-func
-				aChanges.push(this._createMoveChange(sKey, Math.min(nIndex, aChangedItems.length - 1), sOperation, oControl));
-			}
-		}
+		const aRelevantMinorDeletes = aMinorDeletes.filter((oDiffEntry) => {
+			// don't take "me" into account
+		  if (oDiffEntry.affectedKey === oCurrentDiffEntry.affectedKey) {
+			return false;
+		  }
+		  // check if there are major inserts with same affectedKey
+		  const oMajorInsert = aMajorInserts.find((oMajorInsert) => oMajorInsert.affectedKey === oDiffEntry.affectedKey);
+		  // don't take into account
+		  // * if delete and insert condense each other (MajorInsert => don't condense each other)
+		  // * if the delete index is not strict smaller than the current index
+		  if (oMajorInsert && oDiffEntry.index < oCurrentDiffEntry.index) {
+			return true;
+		  }
+		  return false;
+		});
 
-		return aChanges;
+		return aRelevantMinorDeletes.length;
 	};
 
 	SelectionController.prototype._createAddRemoveChanges = function(aItems, oControl, sOperation, aDeltaAttributes) {

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -83,7 +83,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 *
 	 * @public
 	 * @since 1.96
@@ -161,7 +161,7 @@ sap.ui.define([
 		BasePanel.prototype.init.apply(this, arguments);
 
 		this.getModel(this.P13N_MODEL).setProperty("/showSelected", false);
-		this.getModel(this.P13N_MODEL).setProperty("/hideDescriptions", false);
+		this.getModel(this.P13N_MODEL).setProperty("/hideDescriptions", true);
 
 		this.getModel(this.LOCALIZATION_MODEL).setProperty("/showSelectedText", this._getResourceText("p13n.SHOW_SELECTED"));
 		this.getModel(this.LOCALIZATION_MODEL).setProperty("/hideDescriptionsText", this._getResourceText("p13n.HIDE_DESCRIPTIONS"));
@@ -186,7 +186,6 @@ sap.ui.define([
 		this._displayColumns();
 		this._updateMovement(this.getEnableReorder());
 		this._oListControl.setMultiSelectMode(this.getMultiSelectMode());
-
 	};
 
 	SelectionPanel.prototype.setMultiSelectMode = function(sMultiSelectMode) {
@@ -343,14 +342,15 @@ sap.ui.define([
 		this.setProperty("showHeader", bShowHeader);
 		return this;
 	};
+
 	/**
 	 * @param {Object} oEvt Event object
 	 * @param {string} sPath Path of model property that should be updated
 	 */
 	SelectionPanel.prototype._triggerFilter = function() {
-			const bShowSelected = this.getModel(this.P13N_MODEL).getProperty("/showSelected");
-			const bHideDescriptions = this.getModel(this.P13N_MODEL).getProperty("/hideDescriptions");
-			this._filterList(bShowSelected, this._sSearch, bHideDescriptions);
+		const bShowSelected = this.getModel(this.P13N_MODEL).getProperty("/showSelected");
+		const bHideDescriptions = this.getModel(this.P13N_MODEL).getProperty("/hideDescriptions");
+		this._filterList(bShowSelected, this._sSearch, bHideDescriptions);
 	};
 
 	SelectionPanel.prototype._updateShowSelectedButton = function() {
@@ -448,20 +448,27 @@ sap.ui.define([
 	};
 
 	SelectionPanel.prototype._filterList = function(bShowSelected, sSearch, bHideRedundant) {
-		let oSearchFilter = [],
-			oSelectedFilter = [],
-			oRedundantFilter = [];
-
-		if (bShowSelected) {
-			oSelectedFilter = new Filter(this.PRESENCE_ATTRIBUTE, "EQ", true);
-		}
-		if (bHideRedundant) {
-			oRedundantFilter = new Filter(this.REDUNDANT_ITEMS_ATTRIBUTE, "NE", true);
+		const aFilter = [];
+
+		if (bHideRedundant && bShowSelected) {
+			const oFilter1 = new Filter(this.PRESENCE_ATTRIBUTE, "EQ", true);
+			const oFilter2 = new Filter(this.REDUNDANT_ITEMS_ATTRIBUTE, "NE", true);
+			const oRedundantFilter = new Filter({filters: [oFilter1, oFilter2], and: true});
+			aFilter.push(oRedundantFilter);
+		} else if (bShowSelected) {
+			const oSelectedFilter = new Filter(this.PRESENCE_ATTRIBUTE, "EQ", true);
+			aFilter.push(oSelectedFilter);
+		} else if (bHideRedundant) {
+			const oRedundantFilter = new Filter(this.REDUNDANT_ITEMS_ATTRIBUTE, "NE", true);
+			aFilter.push(oRedundantFilter);
 		}
+
 		if (sSearch) {
-			oSearchFilter = new Filter("label", "Contains", sSearch);
+			const oSearchFilter = new Filter("label", "Contains", sSearch);
+			aFilter.push(oSearchFilter);
 		}
-		this._oListControl.getBinding("items").filter(new Filter([].concat(oSelectedFilter, oSearchFilter, oRedundantFilter), true));
+
+		this._oListControl.getBinding("items").filter(new Filter(aFilter, true));
 	};
 
 	SelectionPanel.prototype._onSearchFieldLiveChange = function(oEvent) {
@@ -470,6 +477,8 @@ sap.ui.define([
 	};
 
 	SelectionPanel.prototype._handleActivated = function(oHoveredItem) {
+		const oModelEntry = this._getModelEntry(oHoveredItem);
+
 		// remove move buttons
 		// 1. if a new item is hovered OR
 		// 1. if the item is not selected
@@ -514,9 +523,11 @@ sap.ui.define([
 		this._oLastSelectedItem = null;
 		// 1. if checkbox is enabled (disabled checkbox might be the case for rta for ActionToolbar) AND
 		// 2. if checkbox is selected
-		// 3. OR if there is not checkbox
+		// 3. this is is only disabled in RTA for visibility actions (remove, reveal)
+		// 4. OR if there is not checkbox
 		if ((oHoveredItem.getMultiSelectControl()?.getEnabled() &&
 			oHoveredItem.getMultiSelectControl()?.getSelected()) ||
+			oModelEntry.enabled === "visibility" ||
 			!oHoveredItem.getMultiSelectControl()) {
 			this._updateEnableOfMoveButtons(oHoveredItem, false);
 			this._addMoveButtons(oHoveredItem);
@@ -593,6 +604,11 @@ sap.ui.define([
 
 		// this is needed for updating the header toolbar of the table
 		this.setShowHeader(this.getShowHeader());
+		const bHasRedundantColumns = aP13nData.some((oItem) => oItem[this.REDUNDANT_ITEMS_ATTRIBUTE]);
+		if (bHasRedundantColumns) {
+			this._triggerFilter();
+		}
+		this.getModel(this.P13N_MODEL).setProperty("/hideDescriptions", bHasRedundantColumns);
 		return this;
 	};
 

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.SelectionController
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 * @public
 	 * @alias sap.m.p13n.SortController
 	 */

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.QueryPanel
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 *
 	 * @public
 	 * @since 1.96

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

@@ -1,6 +1,6 @@
 /*
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define(["sap/ui/base/DataType"], (DataType) => {

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 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/modification/LocalStorageModificationHandler.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 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/modification/ModificationHandler.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 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/modules/AdaptationProvider.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 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/modules/DefaultProviderRegistry.js

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 *
 	 * @private
 	 * @since 1.104

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -21,7 +21,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.EventProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 *
 	 * @private
 	 * @since 1.104

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

@@ -1,6 +1,6 @@
 /*!
  * OpenUI5
- * (c) Copyright 2009-2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2025 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.135.0
+	 * @version 1.136.1
 	 *
 	 * @private
 	 *

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

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