@openui5/sap.m 1.133.1 → 1.135.0

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

@@ -58,7 +58,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.133.1
+	 * @version 1.135.0
 	 *
 	 * @public
 	 * @alias sap.m.p13n.SelectionController
@@ -149,6 +149,16 @@ sap.ui.define([
 		return oState;
 	};
 
+	/**
+	 * Formats an external state to the appropriate internal state containg only the relevant information for the controller.
+	 *
+	 * @param {object} oExternalState external state to format
+	 * @returns {object} formatted internal state
+	 */
+	SelectionController.prototype.formatToInternalState = (oExternalState) => {
+		return oExternalState;
+	};
+
 	/**
 	 * The actual UI used for personalization.
 	 *
@@ -510,7 +520,7 @@ sap.ui.define([
 
 		const oChangeContent = oContent;
 
-		if (sOperation.indexOf("set") !== 0) {
+		if (sOperation.indexOf("set") !== 0 && sOperation.indexOf("reset") !== 0) {
 			oChangeContent.value = (sOperation == this.getChangeOperations()["add"]);
 		}
 
@@ -581,6 +591,7 @@ sap.ui.define([
 			const oExisting = mItemState[oProperty.name || oProperty.key];
 			mItem.visible = !!oExisting;
 			mItem.position = oExisting ? oExisting.position : -1;
+			mItem.isRedundant = oExisting?.isRedundant ?? false;
 			return !(oProperty.visible === false || (this._aStableKeys.indexOf(oProperty.name || oProperty.key) > -1));
 		});
 
@@ -718,6 +729,7 @@ sap.ui.define([
 
 		const oControllerHelper = this.getMetadataHelper();
 		const oHelper = oControllerHelper ? oControllerHelper : oPropertyHelper;
+		const aColumnsWithTextArrangement = (oHelper.getRedundantProperties?.() ?? []).map((p) => p.key);
 		oHelper.getProperties().forEach((oProperty) => {
 
 			const mItem = {};
@@ -733,6 +745,7 @@ sap.ui.define([
 
 			mItem.label = oProperty.label || mItem.key;
 			mItem.tooltip = oProperty.tooltip;
+			mItem.isRedundant = aColumnsWithTextArrangement.includes(mItem.key);
 
 			if (mItemsGrouped) {
 				mItem.group = oProperty.group ? oProperty.group : "BASIC";

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

@@ -18,10 +18,16 @@ sap.ui.define([
 	"sap/m/library",
 	"sap/m/ToolbarSpacer",
 	"sap/m/Button",
+	"sap/m/BadgeCustomData",
+	"sap/m/Switch",
+	"sap/m/Popover",
+	"sap/ui/layout/HorizontalLayout",
+	"sap/ui/layout/VerticalLayout",
 	"sap/m/OverflowToolbar",
 	"sap/ui/model/Filter",
 	"sap/base/util/merge",
-	"sap/ui/core/InvisibleText"
+	"sap/ui/core/InvisibleText",
+	"sap/ui/core/Popup"
 ], (
 	BasePanel,
 	Label,
@@ -37,27 +43,33 @@ sap.ui.define([
 	mLibrary,
 	ToolbarSpacer,
 	Button,
+	BadgeCustomData,
+	Switch,
+	Popover,
+	HorizontalLayout,
+	VerticalLayout,
 	OverflowToolbar,
 	Filter,
 	merge,
-	InvisibleText
+	InvisibleText,
+	Popup
 ) => {
 	"use strict";
 
 	// shortcut for sap.ui.core.IconColor
 	const {IconColor} = coreLibrary;
 
-	// shortcut for sap.m.ListKeyboardMode
-	const {ListKeyboardMode} = mLibrary;
-
-	// shortcut for sap.m.FlexJustifyContent
-	const {FlexJustifyContent} = mLibrary;
-
-	// shortcut for sap.m.ListType
-	const {ListType} = mLibrary;
-
-	// shortcut for sap.m.MultiSelectMode
-	const {MultiSelectMode} = mLibrary;
+	// shortcut for sap.m.*
+	const {
+		ListKeyboardMode,
+		FlexJustifyContent,
+		FlexAlignItems,
+		MultiSelectMode,
+		ButtonType,
+		ListType,
+		PlacementType,
+		BadgeAnimationType
+	} = mLibrary;
 
 	/**
 	 * Constructor for a new <code>SelectionPanel</code>.
@@ -71,7 +83,7 @@ sap.ui.define([
 	 * @extends sap.m.p13n.BasePanel
 	 *
 	 * @author SAP SE
-	 * @version 1.133.1
+	 * @version 1.135.0
 	 *
 	 * @public
 	 * @since 1.96
@@ -144,10 +156,15 @@ sap.ui.define([
 		}
 	});
 
+	BasePanel.prototype.REDUNDANT_ITEMS_ATTRIBUTE = "isRedundant";
 	SelectionPanel.prototype.init = function() {
 		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.LOCALIZATION_MODEL).setProperty("/showSelectedText", this._getResourceText("p13n.SHOW_SELECTED"));
-		this.getModel(this.LOCALIZATION_MODEL).setProperty("/showAllText", this._getResourceText("p13n.SHOW_ALL"));
+		this.getModel(this.LOCALIZATION_MODEL).setProperty("/hideDescriptionsText", this._getResourceText("p13n.HIDE_DESCRIPTIONS"));
 		this.getModel(this.LOCALIZATION_MODEL).setProperty("/fieldColumn", this._getResourceText("p13n.DEFAULT_DESCRIPTION"));
 		if (this.isPropertyInitial("fieldColumn")) {
 			this.bindProperty("fieldColumn", {
@@ -260,35 +277,163 @@ sap.ui.define([
 		return this;
 	};
 
-	SelectionPanel.prototype.setShowHeader = function(bShowHeader) {
-		if (bShowHeader) {
-			this._oShowSelectedButton = new Button({
+	SelectionPanel.prototype._getListFilterLayout = function() {
+		const aP13nData = this.getP13nData() ?? [];
+		const bHasRendundantColumns = aP13nData.some((oItem) => oItem[this.REDUNDANT_ITEMS_ATTRIBUTE]);
+
+		if (!bHasRendundantColumns) {
+			const oShowSelectedButton = new Button({
 				press: (oEvt) => {
-					this._bShowSelected = !this._bShowSelected;
-					this._filterList(this._bShowSelected, this._sSearch);
+					const bShowSelected = this.getModel(this.P13N_MODEL).getProperty("/showSelected");
+					this.getModel(this.P13N_MODEL).setProperty("/showSelected", !bShowSelected);
+					this._triggerFilter();
 					this._updateShowSelectedButton();
 				},
 				text: `{${this.LOCALIZATION_MODEL}>/showSelectedText}`
 			});
 			this._updateShowSelectedButton();
 
+			return oShowSelectedButton;
+		} else {
+			const oFilterButton = new Button({
+				icon: "sap-icon://filter",
+				type: ButtonType.Transparent,
+				press: (oEvt) => {
+					this._getFilterPopover().openBy(oFilterButton);
+				}
+			});
+
+			oFilterButton.addCustomData(new BadgeCustomData({
+				key: "badge",
+				value: {
+					parts: [{
+						path: this.P13N_MODEL + '>/showSelected'
+					}, {
+						path: this.P13N_MODEL + '>/hideDescriptions'
+					}],
+					formatter: (bShowSelected, bHideDescriptions) => {
+						return [bShowSelected, bHideDescriptions].filter(Boolean).length;
+					}
+				},
+				visible: true,
+				animation: BadgeAnimationType.None
+			}));
+
+			const oFilterLayout = new HorizontalLayout({
+				content: [
+					oFilterButton
+				]
+			});
+
+			return oFilterLayout;
+		}
+
+	};
+
+	SelectionPanel.prototype.setShowHeader = function(bShowHeader) {
+		if (bShowHeader) {
 			this._oListControl.setHeaderToolbar(new OverflowToolbar({
 				content: [
 					this._getSearchField(),
 					new ToolbarSpacer(),
-					this._oShowSelectedButton
+					this._getListFilterLayout()
 				]
 			}));
 		}
 		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);
+	};
 
 	SelectionPanel.prototype._updateShowSelectedButton = function() {
 		const sShowSelected = this._getResourceText("p13n.SHOW_SELECTED");
 		const sShowAll = this._getResourceText("p13n.SHOW_ALL");
 
-		this.getModel(this.LOCALIZATION_MODEL).setProperty("/showSelectedText", this._bShowSelected ? sShowAll : sShowSelected);
+		const bShowSelected = this.getModel(this.P13N_MODEL).getProperty("/showSelected");
+		this.getModel(this.LOCALIZATION_MODEL).setProperty("/showSelectedText", bShowSelected ? sShowAll : sShowSelected);
+	};
+
+	SelectionPanel.prototype._getFilterPopover = function() {
+		const oExistingPopover = this.getDependents().find((oDependent) => oDependent.isA("sap.m.Popover"));
+		if (oExistingPopover) {
+			return oExistingPopover;
+		}
+
+		const oShowSelectedText = new Label({
+			text: `{${this.LOCALIZATION_MODEL}>/showSelectedText}`
+		});
+		oShowSelectedText.addStyleClass("sapMSelectionPanelFilters");
+
+		const oHideDescriptionsText = new Label({
+			text: `{${this.LOCALIZATION_MODEL}>/hideDescriptionsText}`
+		});
+		oHideDescriptionsText.addStyleClass("sapMSelectionPanelFilters");
+
+		const oShowSelectedButton = new Switch({
+			state: `{${this.P13N_MODEL}>/showSelected}`,
+			ariaLabelledBy: oShowSelectedText,
+			customTextOn: " ",
+			customTextOff: " ",
+			change: this._triggerFilter.bind(this)
+		});
+
+		const oHideDescriptionsButton = new Switch({
+			state: `{${this.P13N_MODEL}>/hideDescriptions}`,
+			ariaLabelledBy: oHideDescriptionsText,
+			customTextOn: " ",
+			customTextOff: " ",
+			change: this._triggerFilter.bind(this)
+		});
+
+		const oHideDescriptionsContainer = new HBox({
+			alignItems: FlexAlignItems.Center,
+			items: [
+				oHideDescriptionsText,
+				oHideDescriptionsButton
+			]
+		});
+		oHideDescriptionsContainer.addStyleClass("sapMSelectionPanelFiltersContainer");
+
+		const oShowSelectedContainer = new HBox({
+			alignItems: FlexAlignItems.Center,
+			items: [
+				oShowSelectedText,
+				oShowSelectedButton
+			]
+		});
+		oShowSelectedContainer.addStyleClass("sapMSelectionPanelFiltersContainer");
+
+		const oPopoverLayout = new VBox({
+			alignItems: FlexAlignItems.End,
+			items: [oHideDescriptionsContainer, oShowSelectedContainer]
+		});
+
+		oPopoverLayout.addStyleClass("sapMSelectionPanelFiltersPopover");
+		const _oFilterPopover = new Popover({
+			title: this._getResourceText("p13n.FILTERS_POPOVER_TITLE"),
+			placement: PlacementType.Bottom,
+			content: [oPopoverLayout],
+			beforeOpen: function (oEvt) {
+				const source = oEvt.getSource();
+				source.setFollowOf(true);
+			},
+			afterOpen: function (oEvt) {
+				const source = oEvt.getSource();
+				source.setFollowOf(false);
+			}
+		});
+
+		this.addDependent(_oFilterPopover);
+
+		return _oFilterPopover;
 	};
 
 	SelectionPanel.prototype.getSelectedFields = function() {
@@ -302,39 +447,77 @@ sap.ui.define([
 		return aSelectedItems;
 	};
 
-	SelectionPanel.prototype._filterList = function(bShowSelected, sSarch) {
+	SelectionPanel.prototype._filterList = function(bShowSelected, sSearch, bHideRedundant) {
 		let oSearchFilter = [],
-			oSelectedFilter = [];
+			oSelectedFilter = [],
+			oRedundantFilter = [];
+
 		if (bShowSelected) {
 			oSelectedFilter = new Filter(this.PRESENCE_ATTRIBUTE, "EQ", true);
 		}
-		if (sSarch) {
-			oSearchFilter = new Filter("label", "Contains", sSarch);
+		if (bHideRedundant) {
+			oRedundantFilter = new Filter(this.REDUNDANT_ITEMS_ATTRIBUTE, "NE", true);
 		}
-		this._oListControl.getBinding("items").filter(new Filter([].concat(oSelectedFilter, oSearchFilter), true));
+		if (sSearch) {
+			oSearchFilter = new Filter("label", "Contains", sSearch);
+		}
+		this._oListControl.getBinding("items").filter(new Filter([].concat(oSelectedFilter, oSearchFilter, oRedundantFilter), true));
 	};
 
 	SelectionPanel.prototype._onSearchFieldLiveChange = function(oEvent) {
 		this._sSearch = oEvent.getSource().getValue();
-		this._filterList(this._bShowSelected, this._sSearch);
+		this._filterList(this.getModel(this.P13N_MODEL).getProperty("/showSelected"), this._sSearch, this.getModel(this.P13N_MODEL).getProperty("/hideDescriptions"));
 	};
 
 	SelectionPanel.prototype._handleActivated = function(oHoveredItem) {
-		//remove move buttons if unselected item is hovered (not covered by updateStarted)
-		this._removeMoveButtons();
-		//Check if the prior hovered item had a visible icon and renable it if required
+		// remove move buttons
+		// 1. if a new item is hovered OR
+		// 1. if the item is not selected
+		if (this._oHoveredItem !== oHoveredItem || !oHoveredItem.getMultiSelectControl()?.getSelected()) {
+			this._removeMoveButtons();
+		}
+
+		// Check if the prior hovered item had a visible icon and renable it if required
 		if (this._oHoveredItem && !this._oHoveredItem.bIsDestroyed && this._oHoveredItem.getBindingContextPath()) {
 			const bVisible = !!this._getP13nModel().getProperty(this._oHoveredItem.getBindingContextPath()).active;
-			const oOldIcon = this._oHoveredItem.getCells()[1].getItems()[0];
+			const [oOldIcon] = this._oHoveredItem.getCells()[1].getItems();
 			oOldIcon.setVisible(bVisible);
 		}
-		//Store (new) hovered item and set its icon to visible: false + add move buttons to it
-		const oIcon = oHoveredItem.getCells()[1].getItems()[0];
-		if (oHoveredItem.getSelected()) {
+		// Store (new) hovered item and set its icon to visible: false + add move buttons to it
+		const oIcon = oHoveredItem.getCells()[1]?.getItems()[0];
+		if (oHoveredItem.getSelected() && oIcon) {
 			oIcon.setVisible(false);
 		}
+
+		// SNOW: DINC0433588:
+		// We call _handleActivated also when the hover state WITHIN a CustomListItem changes.
+		// However, the oHoveredItem is still the same ColumnListItem.
+		// If no selection change was done and the hoveredItem is still the same, we assume that the focus changed within a ColumnListItem.
+		// Hence, there is no need to add the move buttons again as they were already added previously.
+
+		// do not update anything or proceed to add the buttons:
+		// 1. if hover state has not changed (same item is still hovered) AND
+		// 2. if no selection change was done (same item is still hovered and was neither selected nor deselected) AND
+		// 3. if the hovered item is enabled (move buttons are already there, hence there is no need to add them again: SNOW: DINC0433588)
+		if (this._oHoveredItem === oHoveredItem &&
+			this._oLastSelectedItem !== oHoveredItem &&
+			oHoveredItem.getMultiSelectControl()?.getEnabled()
+		) {
+			return;
+		}
+
+
+		// if not the same,
+		// if same, proceed to: add buttons
+
 		this._oHoveredItem = oHoveredItem;
-		if (!(oHoveredItem.getMultiSelectControl()?.getEnabled() == false)) {
+		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
+		if ((oHoveredItem.getMultiSelectControl()?.getEnabled() &&
+			oHoveredItem.getMultiSelectControl()?.getSelected()) ||
+			!oHoveredItem.getMultiSelectControl()) {
 			this._updateEnableOfMoveButtons(oHoveredItem, false);
 			this._addMoveButtons(oHoveredItem);
 		}
@@ -407,13 +590,16 @@ sap.ui.define([
 		//remove the reorder buttons from their current location and hence reset the hover logic
 		this._removeMoveButtons();
 		this._oSelectedItem = null;
+
+		// this is needed for updating the header toolbar of the table
+		this.setShowHeader(this.getShowHeader());
 		return this;
 	};
 
 	SelectionPanel.prototype.onReset = function() {
 		BasePanel.prototype.onReset.apply(this, arguments);
 		this._sSearch = "";
-		this._bShowSelected = false;
+		this.getModel(this.P13N_MODEL).setProperty("/showSelected", false);
 		this._updateShowSelectedButton();
 	};
 
@@ -563,6 +749,7 @@ sap.ui.define([
 	SelectionPanel.prototype._updateLocalizationTexts = function() {
 		this.getModel(this.LOCALIZATION_MODEL).setProperty("/showSelectedText", this._getResourceText("p13n.SHOW_SELECTED"));
 		this.getModel(this.LOCALIZATION_MODEL).setProperty("/showAllText", this._getResourceText("p13n.SHOW_ALL"));
+		this.getModel(this.LOCALIZATION_MODEL).setProperty("/hideDescriptionsText", this._getResourceText("p13n.HIDE_DESCRIPTIONS"));
 		this.getModel(this.LOCALIZATION_MODEL).setProperty("/fieldColumn", this._getResourceText("p13n.DEFAULT_DESCRIPTION"));
 		this._updateShowSelectedButton();
 	};
@@ -573,7 +760,6 @@ sap.ui.define([
 		this._oHoveredItem = null;
 		this._bShowFactory = null;
 		this._sSearch = null;
-		this._bShowSelected = null;
 	};
 	return SelectionPanel;
 });

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

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

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

@@ -85,7 +85,9 @@ sap.ui.define([
 	 * @param {object} mMetaConfig A map describing the metadata structure that is affected by this changehandler
 	 * @param {boolean} mMetaConfig.aggregationBased Defines whether the aggregation space or the property space should be used in the xConfig object
 	 * @param {string} mMetaConfig.property The property name (such as <code>width</code> or <code>label</code>)
+	 * @param {string} mMetaConfig.aggregation The aggregation name
 	 * @param {string} mMetaConfig.operation The operation to be executed by the handler (add, remove, move, set)
+	 * @param {string[]} mMetaConfig.additionalProperties Property names of the change content that are added to the revert data
 	 *
 	 * @returns {object} The created changehandler object
 	 */
@@ -112,13 +114,20 @@ sap.ui.define([
 							propertyBag: mPropertyBag
 						})
 							.then(async (oPriorAggregationConfig) => {
+								const oChangeContent = oChange.getContent();
 								const sOperation = getOperationType(oChange.getChangeType());
-								sAffectedAggregation = oChange.getContent().targetAggregation;
+								sAffectedAggregation = oChangeContent.targetAggregation;
 
 								const oRevertData = {
-									key: oChange.getContent().key
+									key: oChangeContent.key
 								};
 
+								mMetaConfig.additionalProperties?.forEach((vProperty) => {
+									if (typeof vProperty === "string" && oChangeContent[vProperty] !== undefined) {
+										oRevertData[vProperty] = oChangeContent[vProperty];
+									}
+								});
+
 								if (sChangePersistenceIdentifier) {
 									oRevertData.persistenceIdentifier = sChangePersistenceIdentifier;
 								}
@@ -130,32 +139,32 @@ sap.ui.define([
 									oRevertData.value = null;
 								}
 
-								if (!oPriorAggregationConfig || !(oPriorAggregationConfig?.aggregations?.[sAffectedAggregation]?.length > 0)) {
-									const aCurrentState = await xConfigAPI.getCurrentItemState(oControl, {propertyBag: mPropertyBag, changeType: oChange.getChangeType()}, oPriorAggregationConfig, sAffectedAggregation);
+								if ((!oPriorAggregationConfig || !(oPriorAggregationConfig?.aggregations?.[sAffectedAggregation]?.length > 0)) && typeof mMetaConfig.getCurrentState == "function") {
+									const aCurrentState = await mMetaConfig.getCurrentState?.(oControl, oPriorAggregationConfig, sAffectedAggregation, oChange, mPropertyBag);
 									if (aCurrentState) {
 										const oStateItem = aCurrentState?.find((oItem, iIndex) => {
-											return oItem.key === oChange.getContent().key;
+											return oItem.key === oChangeContent.key;
 										});
 										oRevertData.index = aCurrentState.indexOf(oStateItem);
 									}
 								}
 
-								oRevertData.targetAggregation = oChange.getContent().targetAggregation;
+								oRevertData.targetAggregation = oChangeContent.targetAggregation;
 
-								const oAffectedItem = oPriorAggregationConfig?.aggregations?.[sAffectedAggregation]?.[oChange.getContent().key];
+								const oAffectedItem = oPriorAggregationConfig?.aggregations?.[sAffectedAggregation]?.[oChangeContent.key];
 								if (oAffectedItem) {
 									if (oAffectedItem?.[sAffectedProperty]) {
-										oRevertData.value = oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().key][sAffectedProperty];
+										oRevertData.value = oPriorAggregationConfig.aggregations[sAffectedAggregation][oChangeContent.key][sAffectedProperty];
 									}
-									oRevertData.index = oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().key].position !== undefined ? oPriorAggregationConfig.aggregations[sAffectedAggregation][oChange.getContent().key].position : oRevertData.index;
+									oRevertData.index = oPriorAggregationConfig.aggregations[sAffectedAggregation][oChangeContent.key].position !== undefined ? oPriorAggregationConfig.aggregations[sAffectedAggregation][oChangeContent.key].position : oRevertData.index;
 								}
 
 								oChange.setRevertData(oRevertData);
 
 								const oConfig = {
 									property: sAffectedProperty,
-									key: oChange.getContent().key,
-									value: oChange.getContent(),
+									key: oChangeContent.key,
+									value: oChangeContent,
 									operation: sOperation,
 									changeType: oChange.getChangeType(),
 									propertyBag: mPropertyBag,

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.133.1
+	 * @version 1.135.0
 	 *
 	 * @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.133.1
+	 * @version 1.135.0
 	 *
 	 * @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.133.1
+	 * @version 1.135.0
 	 *
 	 * @private
 	 *
@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @param {string|string[]} vPanelKeys The affected panels that should be added to the <code>sap.m.p13n.Popup</code>
 	 * @param {object} mSettings The settings object for the personalization
 	 * @param {string} [mSettings.title] The title for the <code>sap.m.p13n.Popup</code> control
-	 * @param {sap.ui.core.Control} [mSettings.source] The source contro to be used by the <code>sap.m.p13n.Popup</code> control (only necessary in case the mode is set to <code>ResponsivePopover</code>)
+	 * @param {sap.ui.core.Control} [mSettings.source] The source control to be used by the <code>sap.m.p13n.Popup</code> control (only required if the mode is set to <code>ResponsivePopover</code>)
 	 * @param {sap.m.P13nPopupMode} [mSettings.mode] The mode to be used by the <code>sap.m.p13n.Popup</code> control
 	 * @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
@@ -69,6 +69,8 @@ sap.ui.define([
 	 * (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
+	 * @param {string} [mSettings.activePanel] Key of active panel that is opened initially
+	 * @param {boolean} [mSettings.refreshPropertyHelper] Determines if the property helper should be refreshed
 	 *
 	 * @returns {Promise} Promise resolving in the <code>sap.m.p13n.Popup</code> instance.
 	 */
@@ -139,6 +141,9 @@ sap.ui.define([
 							oP13nContainer.addPanel(oPanel, aPanelKeys[iIndex]);
 						});
 
+						if (mSettings?.activePanel && (!aPanelKeys.includes(mSettings.activePanel) || aPanelKeys.length < 2)) {
+							delete mSettings.activePanel;
+						}
 						oControl.addDependent(oP13nContainer);
 						oP13nContainer.open(mSettings.source, mSettings);
 						return oP13nContainer._oPopup;
@@ -153,11 +158,11 @@ sap.ui.define([
 		}
 	};
 
-	UIManager.prototype.create = function(oControl, vPanelKeys) {
+	UIManager.prototype.create = function(oControl, vPanelKeys, mSettings) {
 		const aPanelKeys = vPanelKeys instanceof Array ? vPanelKeys : [vPanelKeys];
 		const that = this;
 
-		return this.oAdaptationProvider.initAdaptation(oControl, aPanelKeys)
+		return this.oAdaptationProvider.initAdaptation(oControl, aPanelKeys, mSettings.refreshPropertyHelper)
 			.then(() => {
 				const vSettings = this.oAdaptationProvider.getUISettings(oControl, aPanelKeys);
 

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

@@ -121,8 +121,6 @@ sap.ui.define([
 			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
 
@@ -152,6 +150,24 @@ sap.ui.define([
 		return aCurrentState;
 	};
 
+	xConfigAPI.getCurrentSortState = async function (oControl, oModificationPayload, oConfig, sPropertyName) {
+		const changeType = oModificationPayload?.changeType;
+		if (!oModificationPayload.propertyBag || !changeType || changeType.indexOf("Sort") === -1) {
+			return;
+		}
+		const aCurrentState = [];
+		if (oConfig?.properties?.[sPropertyName] !== undefined && Object.keys(oConfig.properties[sPropertyName]).length > 0) {
+			oConfig.properties[sPropertyName].forEach((oItem, iIndex) => {
+				aCurrentState.push({ key: oItem.key, position: iIndex });
+			});
+			aCurrentState
+				.sort((a, b) => a.position - b.position)
+				.map((o) => delete o.position);
+		}
+
+		return await Promise.resolve(aCurrentState);
+	};
+
 	/**
 	 * Returns a copy of the xConfig object
 	 *

package/src/sap/m/plugins/CellSelector.js

@@ -63,7 +63,7 @@ sap.ui.define([
 	 * </ul>
 	 *
 	 * @extends sap.ui.core.Element
-	 * @version 1.133.1
+	 * @version 1.135.0
 	 * @author SAP SE
 	 *
 	 * @public

package/src/sap/m/plugins/ColumnResizer.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.133.1
+	 * @version 1.135.0
 	 *
 	 * @public
 	 * @since 1.91

package/src/sap/m/plugins/ContextMenuSetting.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @class Provides configuration options and an extended behavior for the context menu that is applied to the related control.
 	 * @extends sap.ui.core.Element
 	 * @author SAP SE
-	 * @version 1.133.1
+	 * @version 1.135.0
 	 * @public
 	 * @since 1.121
 	 * @alias sap.m.plugins.ContextMenuSetting