@openui5/sap.m 1.136.0 → 1.136.2

package/src/sap/m/messagebundle_zh_TW.properties

@@ -88,6 +88,8 @@ LIST_ALL_SELECTED=\u5DF2\u5168\u9078
 
 LIST_REQUIRED=\u5FC5\u8981
 
+LIST_ROLE_DESCRIPTION=\u5217\u51FA\u4E92\u52D5\u9805\u76EE\uFF1B\u82E5\u8981\u79FB\u5230\u5167\u5BB9\uFF0C\u8ACB\u6309\u4E0B F2\u3002
+
 LIST_ITEM_SELECTED=\u5DF2\u9078\u64C7
 
 LIST_ITEM_NOT_SELECTED=\u672A\u9078\u64C7
@@ -372,13 +374,13 @@ INPUTBASE_VALUE_STATE_SUCCESS=\u503C\u72C0\u614B\u3008\u6210\u529F\u3009
 
 INPUTBASE_VALUE_STATE_INFORMATION=\u503C\u72C0\u614B\u8CC7\u8A0A
 
-INPUTBASE_VALUE_STATE_LINK=\u6309\u4E0B Ctrl+Alt+F8 \u5C07\u7126\u9EDE\u79FB\u52D5\u81F3\u9023\u7D50
+INPUTBASE_VALUE_STATE_LINK=\u82E5\u8981\u5C07\u7126\u9EDE\u79FB\u5230\u9023\u7D50\uFF0C\u8ACB\u6309\u4E0B Ctrl+Alt+F8
 
-INPUTBASE_VALUE_STATE_LINK_MAC=\u6309\u4E0B Cmd+Option+F8 \u5C07\u7126\u9EDE\u79FB\u52D5\u81F3\u9023\u7D50
+INPUTBASE_VALUE_STATE_LINK_MAC=\u82E5\u8981\u5C07\u7126\u9EDE\u79FB\u5230\u9023\u7D50\uFF0C\u8ACB\u6309\u4E0B Cmd+Option+F8
 
-INPUTBASE_VALUE_STATE_LINKS=\u6309\u4E0B Ctrl+Alt+F8 \u524D\u5F80\u7B2C\u4E00\u500B\u9023\u7D50\u4E26\u4F7F\u7528 TAB \u79FB\u52D5\u81F3\u4E0B\u4E00\u500B\u9023\u7D50
+INPUTBASE_VALUE_STATE_LINKS=\u82E5\u8981\u524D\u5F80\u7B2C\u4E00\u500B\u9023\u7D50\uFF0C\u8ACB\u6309\u4E0B Ctrl+Alt+F8\uFF1B\u82E5\u8981\u79FB\u5230\u4E0B\u4E00\u500B\u9023\u7D50\uFF0C\u8ACB\u4F7F\u7528 Tab \u9375
 
-INPUTBASE_VALUE_STATE_LINKS_MAC=\u6309\u4E0B Cmd+Option+F8 \u524D\u5F80\u7B2C\u4E00\u500B\u9023\u7D50\u4E26\u4F7F\u7528 TAB \u79FB\u52D5\u81F3\u4E0B\u4E00\u500B\u9023\u7D50
+INPUTBASE_VALUE_STATE_LINKS_MAC=\u82E5\u8981\u524D\u5F80\u7B2C\u4E00\u500B\u9023\u7D50\uFF0C\u8ACB\u6309\u4E0B Cmd+Option+F8\uFF1B\u82E5\u8981\u79FB\u5230\u4E0B\u4E00\u500B\u9023\u7D50\uFF0C\u8ACB\u4F7F\u7528 Tab \u9375
 
 INPUTBASE_VALUE_EMPTY=\u7A7A\u767D
 
@@ -536,6 +538,8 @@ UPLOAD_SET_DIRECTORY_FALSE=\u60A8\u50C5\u53EF\u5728\u6B64\u8655\u62D6\u653E\u6A9
 
 UPLOAD_SET_DROP_DIRECTORY=\u60A8\u50C5\u53EF\u5728\u6B64\u8655\u62D6\u653E\u76EE\u9304\u3002
 
+UPLOAD_SET_LIST_ROLE_DESCRIPTION=\u5217\u51FA\u4E92\u52D5\u9805\u76EE\uFF1B\u82E5\u8981\u79FB\u5230\u5167\u5BB9\uFF0C\u8ACB\u6309\u4E0B F7\u3002
+
 UPLOAD_SET_TABLE_FILE_PREVIEW_DIALOG_CLOSE=\u95DC\u9589
 
 UPLOAD_SET_TABLE_FILE_PREVIEW_DIALOG_DOWNLOAD=\u4E0B\u8F09
@@ -702,7 +706,7 @@ p13n.GROUP_REMOVEICONANNOUNCE=\u5DF2\u79FB\u9664\u5206\u7D44
 p13n.SORT_REMOVEICONTOOLTIP=\u79FB\u9664\u6392\u5E8F\u6E96\u5247
 p13n.SORT_REMOVEICONANNOUNCE=\u5DF2\u79FB\u9664\u6392\u5E8F\u7A0B\u5F0F
 
-p13n.SHOW_SELECTED=\u986F\u793A\u6240\u9078
+p13n.SHOW_SELECTED=\u96B1\u85CF\u672A\u9078\u64C7\u7684\u8F38\u5165\u9805
 p13n.SHOW_ALL=\u986F\u793A\u5168\u90E8
 p13n.HIDE_DESCRIPTIONS=\u96B1\u85CF\u8AAA\u660E
 p13n.FILTERS_POPOVER_TITLE=\u7BE9\u9078\u5668
@@ -1213,7 +1217,7 @@ SPLIT_BUTTON_DESCRIPTION=\u5206\u5272\u6309\u9215
 
 SPLIT_BUTTON_ARROW_TOOLTIP=\u958B\u555F\u529F\u80FD\u8868
 
-SPLIT_BUTTON_KEYBOARD_HINT=\u6309\u4E00\u4E0B Enter \u9A45\u52D5\u52D5\u4F5C\u548C\u5411\u4E0B\u7BAD\u982D\u958B\u555F\u529F\u80FD\u8868
+SPLIT_BUTTON_KEYBOARD_HINT=\u6309\u4E0B Enter \u9375\u9A45\u52D5\u52D5\u4F5C\u548C\u5411\u4E0B\u7BAD\u982D\u958B\u555F\u529F\u80FD\u8868
 
 MENU_PAGE_BACK_BUTTON=\u9000\u56DE
 
@@ -1778,7 +1782,7 @@ IllustratedMessage_TITLE_NoData=\u5C1A\u672A\u6709\u8CC7\u6599
 
 IllustratedMessage_DESCRIPTION_NoData=\u82E5\u51FA\u73FE\u8CC7\u6599\uFF0C\u60A8\u4FBF\u6703\u5728\u6B64\u8655\u770B\u5230\u3002
 
-IllustratedMessage_TITLE_NoMail=\u6C92\u6709\u65B0\u90F5\u4EF6
+IllustratedMessage_TITLE_NoMail=\u6C92\u6709\u90F5\u4EF6
 
 IllustratedMessage_DESCRIPTION_NoMail=\u7A0D\u5F8C\u518D\u8FD4\u56DE\u67E5\u770B\u3002
 
@@ -1786,19 +1790,19 @@ IllustratedMessage_TITLE_NoEntries=\u5C1A\u7121\u8F38\u5165\u9805
 
 IllustratedMessage_DESCRIPTION_NoEntries=\u82E5\u51FA\u73FE\u8F38\u5165\u9805\uFF0C\u60A8\u4FBF\u6703\u5728\u6B64\u8655\u770B\u5230\u3002
 
-IllustratedMessage_TITLE_NoNotifications=\u60A8\u6C92\u6709\u65B0\u901A\u77E5
+IllustratedMessage_TITLE_NoNotifications=\u60A8\u6C92\u6709\u901A\u77E5
 
 IllustratedMessage_DESCRIPTION_NoNotifications=\u7A0D\u5F8C\u518D\u8FD4\u56DE\u67E5\u770B\u3002
 
-IllustratedMessage_TITLE_NoSavedItems=\u60A8\u5C1A\u672A\u65B0\u589E\u6700\u611B\u9805\u76EE
+IllustratedMessage_TITLE_NoSavedItems=\u60A8\u6C92\u6709\u91D8\u9078
 
-IllustratedMessage_DESCRIPTION_NoSavedItems=\u60A8\u73FE\u5728\u8981\u5EFA\u7ACB\u6700\u611B\u9805\u76EE\u6E05\u55AE\u55CE\uFF1F
+IllustratedMessage_DESCRIPTION_NoSavedItems=\u60A8\u73FE\u5728\u8981\u65B0\u589E\u4E00\u500B\u55CE\uFF1F
 
-IllustratedMessage_TITLE_NoSearchResults=\u627E\u4E0D\u5230\u7D50\u679C
+IllustratedMessage_TITLE_NoSearchResults=\u627E\u4E0D\u5230
 
-IllustratedMessage_DESCRIPTION_NoSearchResults=\u5617\u8A66\u66F4\u6539\u60A8\u7684\u641C\u5C0B\u6E96\u5247\u3002
+IllustratedMessage_DESCRIPTION_NoSearchResults=\u5617\u8A66\u8ABF\u6574\u60A8\u7684\u641C\u5C0B\u3002
 
-IllustratedMessage_TITLE_NoTasks=\u60A8\u6C92\u6709\u65B0\u5DE5\u4F5C\u7D30\u9805
+IllustratedMessage_TITLE_NoTasks=\u60A8\u5C1A\u7121\u5DE5\u4F5C\u7D30\u9805
 
 IllustratedMessage_DESCRIPTION_NoTasks=\u82E5\u51FA\u73FE\u5DE5\u4F5C\u7D30\u9805\uFF0C\u60A8\u4FBF\u6703\u5728\u6B64\u8655\u770B\u5230\u3002
 
@@ -1808,6 +1812,14 @@ IllustratedMessage_DESCRIPTION_NoColumnsSet=\u5728\u8868\u683C\u8A2D\u5B9A\u4E2D
 
 IllustratedMessage_TITLE_UnableToLoad=\u7121\u6CD5\u8F09\u5165\u8CC7\u6599
 
+IllustratedMessage_DESCRIPTION_Achievement=\u606D\u559C\u60A8\u5091\u51FA\u7684\u8868\u73FE\u8207\u4ED8\u51FA\uFF01
+
+IllustratedMessage_TITLE_Achievement=\u975E\u5E38\u597D\uFF01
+
+IllustratedMessage_DESCRIPTION_UserHasSignedUp=\u60A8\u5DF2\u8A2D\u5B9A\u5E33\u865F\uFF0C\u60F3\u8981\u5FEB\u901F\u5C0E\u89BD\u55CE\uFF1F
+
+IllustratedMessage_TITLE_UserHasSignedUp=\u6210\u529F\uFF01
+
 IllustratedMessage_DESCRIPTION_UnableToLoad=\u6AA2\u67E5\u60A8\u7684\u7DB2\u969B\u7DB2\u8DEF\u9023\u7DDA\uFF1B\u82E5\u554F\u984C\u672A\u7372\u89E3\u6C7A\uFF0C\u8ACB\u5617\u8A66\u91CD\u65B0\u8F09\u5165\uFF1B\u82E5\u4ECD\u7121\u6CD5\u89E3\u6C7A\u554F\u984C\uFF0C\u8ACB\u806F\u7E6B\u7BA1\u7406\u54E1\u3002
 
 IllustratedMessage_TITLE_UnableToLoadImage=\u7121\u6CD5\u8F09\u5165\u5716\u50CF

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

@@ -22,12 +22,12 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.0
+	 * @version 1.136.2
 	 *
 	 * @constructor
 	 * @alias sap.m.p13n.AbstractContainer
 	 * @author SAP SE
-	 * @version 1.136.0
+	 * @version 1.136.2
 	 * @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.136.0
+		 * @version 1.136.2
 		 *
 		 * @constructor
 		 * @alias sap.m.p13n.AbstractContainerItem
 		 * @author SAP SE
-		 * @version 1.136.0
+		 * @version 1.136.2
 		 * @since 1.96
 		 * @private
 		 * @ui5-restricted

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

@@ -82,7 +82,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.0
+	 * @version 1.136.2
 	 *
 	 * @public
 	 * @abstract
@@ -880,8 +880,9 @@ sap.ui.define([
 
 	BasePanel.prototype._onRearrange = function(oEvent) {
 		const oDraggedItem = oEvent.getParameter("draggedControl");
+		const oModelEntry = this._getModelEntry(oDraggedItem);
 		// SNOW DINC0418886: dedicated check, if a disabled checkbox exists. If a checkbox exists, or it is enabled, skip this check
-		if (oDraggedItem?.getMultiSelectControl() && !oDraggedItem.getMultiSelectControl().getEnabled()) {
+		if (oDraggedItem?.getMultiSelectControl() && !oDraggedItem.getMultiSelectControl().getEnabled() && oModelEntry.enabled !== "visibility") {
 			return;
 		}
 

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

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.AbstractContainer
 	 *
 	 * @author SAP SE
-	 * @version 1.136.0
+	 * @version 1.136.2
 	 *
 	 * @private
 	 * @ui5-restricted

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

@@ -71,7 +71,7 @@ sap.ui.define([
 	 * @alias sap.m.p13n.Engine
 	 * @extends sap.m.p13n.modules.AdaptationProvider
 	 * @author SAP SE
-	 * @version 1.136.0
+	 * @version 1.136.2
 	 * @public
 	 * @since 1.104
 	 */
@@ -246,10 +246,11 @@ sap.ui.define([
 	 * @public
 	 *
 	 * @param {function(sap.ui.base.Event):void} fnStateEventHandler The handler function to call when the event occurs
+	 * @param {object} [oListener] The context object to call the event handler with (value of <code>this</code> in the event handler function).
 	 * @returns {this} Returns <code>this</code> to allow method chaining
 	 */
-	Engine.prototype.attachStateChange = function(fnStateEventHandler) {
-		return this.stateHandlerRegistry.attachChange(fnStateEventHandler);
+	Engine.prototype.attachStateChange = function(fnStateEventHandler, oListener) {
+		return this.stateHandlerRegistry.attachChange(fnStateEventHandler, oListener);
 	};
 
 	/**
@@ -259,10 +260,11 @@ sap.ui.define([
 	 * @public
 	 *
 	 * @param {function(sap.ui.base.Event):void} fnStateEventHandler The handler function to detach from the event
+	 * @param {object} [oListener] The context object to call the event handler with (value of <code>this</code> in the event handler function).
 	 * @returns {this} Returns <code>this</code> to allow method chaining
 	 */
-	Engine.prototype.detachStateChange = function(fnStateEventHandler) {
-		return this.stateHandlerRegistry.detachChange(fnStateEventHandler);
+	Engine.prototype.detachStateChange = function(fnStateEventHandler, oListener) {
+		return this.stateHandlerRegistry.detachChange(fnStateEventHandler, oListener);
 	};
 
 	/**
@@ -315,7 +317,7 @@ sap.ui.define([
 	 *
 	 * @returns {Promise<null>} A Promise resolving once the reset is completed
 	 */
-	Engine.prototype.reset = function(oControl, aKeys) {
+	Engine.prototype.reset = async function(oControl, aKeys) {
 
 		if (aKeys === undefined) {
 			aKeys = this.getRegisteredControllers(oControl);
@@ -343,15 +345,22 @@ sap.ui.define([
 		}
 
 		const oModificationSetting = this._determineModification(oControl);
-		return oModificationSetting.handler.reset(oResetConfig, oModificationSetting.payload).then(() => {
-			//Re-Init housekeeping after update
-			return this.initAdaptation(oControl, aKeys).then((oPropertyHelper) => {
-				aKeys.forEach((sKey) => {
-					const oController = this.getController(oControl, sKey);
-					oController.update(oPropertyHelper);
-				});
+		await oModificationSetting.handler.reset(oResetConfig, oModificationSetting.payload);
+
+		// re-init housekeeping after update
+		const oPropertyHelper = await this.initAdaptation(oControl, aKeys);
+
+		const aUpdatePromises = aKeys.map((sKey) => {
+			const oController = this.getController(oControl, sKey);
+			return oController.update(oPropertyHelper);
+		});
+		const oPromise = new Promise((resolve) => {
+			Promise.all(aUpdatePromises).then(() => {
+				resolve(null);
 			});
 		});
+
+		return oPromise;
 	};
 
 	/**

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

@@ -49,7 +49,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.SelectionController
 	 *
 	 * @author SAP SE
-	 * @version 1.136.0
+	 * @version 1.136.2
 	 * @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.136.0
+	 * @version 1.136.2
 	 *
 	 * @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.136.0
+	 * @version 1.136.2
 	 * @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.136.0
+	 * @version 1.136.2
 	 *
 	 * @public
 	 * @alias sap.m.p13n.GroupPanel

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

@@ -27,7 +27,7 @@ sap.ui.define([
 	 * @extends sap.m.MessageStrip
 	 *
 	 * @author SAP SE
-	 * @version 1.136.0
+	 * @version 1.136.2
 	 *
 	 * @private
          * @ui5-restricted sap.m.p13n, sap.ui.mdc

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

@@ -58,7 +58,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.136.0
+	 * @version 1.136.2
 	 *
 	 * @public
 	 * @since 1.97

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

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.136.0
+	 * @version 1.136.2
 	 *
 	 * @public
 	 *

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

@@ -6,7 +6,7 @@
 
 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.136.0
+	 * @version 1.136.2
 	 *
 	 * @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

@@ -83,7 +83,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.136.0
+	 * @version 1.136.2
 	 *
 	 * @public
 	 * @since 1.96
@@ -448,22 +448,27 @@ sap.ui.define([
 	};
 
 	SelectionPanel.prototype._filterList = function(bShowSelected, sSearch, bHideRedundant) {
-		let oSearchFilter = [],
-			oSelectedFilter = [],
-			oRedundantFilter = [];
+		const aFilter = [];
 
-		if (bShowSelected) {
-			oSelectedFilter = new Filter(this.PRESENCE_ATTRIBUTE, "EQ", true);
-		}
-		if (bHideRedundant) {
+		if (bHideRedundant && bShowSelected) {
 			const oFilter1 = new Filter(this.PRESENCE_ATTRIBUTE, "EQ", true);
 			const oFilter2 = new Filter(this.REDUNDANT_ITEMS_ATTRIBUTE, "NE", true);
-			oRedundantFilter = new Filter([oFilter1, oFilter2], false);
+			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) {
@@ -472,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
@@ -516,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);
@@ -599,6 +608,7 @@ sap.ui.define([
 		if (bHasRedundantColumns) {
 			this._triggerFilter();
 		}
+		this.getModel(this.P13N_MODEL).setProperty("/hideDescriptions", bHasRedundantColumns);
 		return this;
 	};
 

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

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.SelectionController
 	 *
 	 * @author SAP SE
-	 * @version 1.136.0
+	 * @version 1.136.2
 	 * @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.136.0
+	 * @version 1.136.2
 	 *
 	 * @public
 	 * @since 1.96

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.136.0
+	 * @version 1.136.2
 	 *
 	 * @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.136.0
+	 * @version 1.136.2
 	 *
 	 * @private
 	 * @since 1.104
@@ -46,10 +46,11 @@ sap.ui.define([
 	 * The event handler may be fired every time a user triggers a personalization change for a control instance during runtime.
 	 *
 	 * @param {function} fnStateEventHandler The handler function to call when the event occurs
+	 * @param {object} [oListener] The context object to call the event handler with (value of <code>this</code> in the event handler function). Defaults to the StateHandlerRegistry instance itself.
 	 * @returns {this} Returns <code>this</code> to allow method chaining
 	 */
-	StateHandlerRegistry.prototype.attachChange = function(fnStateEventHandler) {
-		return EventProvider.prototype.attachEvent.call(this, "stateChange", fnStateEventHandler);
+	StateHandlerRegistry.prototype.attachChange = function(fnStateEventHandler, oListener) {
+		return EventProvider.prototype.attachEvent.call(this, "stateChange", fnStateEventHandler, oListener);
 	};
 
 	/**
@@ -60,10 +61,11 @@ sap.ui.define([
 	 * The passed parameters must match those used for registration with {@link StateHandlerRegistry#attachChange} beforehand.
 	 *
 	 * @param {function} fnStateEventHandler The handler function to detach from the event
+	 * @param {object} [oListener] The context object to call the event handler with (value of <code>this</code> in the event handler function). Defaults to the StateHandlerRegistry instance itself.
 	 * @returns {this} Returns <code>this</code> to allow method chaining
 	 */
-	StateHandlerRegistry.prototype.detachChange = function(fnStateEventHandler) {
-		return EventProvider.prototype.detachEvent.call(this, "stateChange", fnStateEventHandler);
+	StateHandlerRegistry.prototype.detachChange = function(fnStateEventHandler, oListener) {
+		return EventProvider.prototype.detachEvent.call(this, "stateChange", fnStateEventHandler, oListener);
 	};
 
 	/**

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.136.0
+	 * @version 1.136.2
 	 *
 	 * @private
 	 *

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

@@ -80,10 +80,13 @@ sap.ui.define([
 				const oAppComponent = mPropertyBag ? mPropertyBag.appComponent : undefined;
 
 				let pDelete = Promise.resolve();
-				if (oXConfig && oControl.isA) {
+				if (oXConfig) {
 					pDelete = oModifier.removeAggregation(oControl, "customData", oXConfig)
 						.then(() => {
-							return oModifier.destroy(oXConfig);
+							if (oControl.isA) {
+								return oModifier.destroy(oXConfig);
+							}
+							return Promise.resolve();
 						});
 				}