@openui5/sap.m 1.98.0 → 1.101.0

package/src/sap/m/UploadCollection.js

@@ -29,7 +29,8 @@ sap.ui.define([
 	"sap/m/UploadCollectionParameter",
 	"sap/m/UploadCollectionToolbarPlaceholder",
 	"sap/ui/core/HTML",
-	"sap/m/CustomListItem",
+    "sap/ui/core/InvisibleText",
+    "sap/m/CustomListItem",
 	"sap/ui/core/ResizeHandler",
 	"sap/ui/Device",
 	"./UploadCollectionRenderer",
@@ -62,6 +63,7 @@ sap.ui.define([
 	UploadCollectionParameter,
 	UploadCollectionToolbarPlaceholder,
 	HTML,
+	InvisibleText,
 	CustomListItem,
 	ResizeHandler,
 	Device,
@@ -88,7 +90,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -671,7 +673,7 @@ sap.ui.define([
 		this._oListEventDelegate = null;
 		this._oItemToUpdate = null;
 		this._sReziseHandlerId = null;
-		this.oInvisibleText = new sap.ui.core.InvisibleText().toStatic();
+		this.oInvisibleText = new InvisibleText().toStatic();
 	};
 
 	/* =========================================================== */

package/src/sap/m/UploadCollectionItem.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/UploadCollectionParameter.js

@@ -20,7 +20,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/UploadCollectionRenderer.js

@@ -18,7 +18,7 @@ sap.ui.define(['./ListItemBaseRenderer'], function(ListItemBaseRenderer) {
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl an object representation of the control that should be rendered
+	 * @param {sap.m.UploadCollection} oControl an object representation of the control that should be rendered
 	 */
 	UploadCollectionRenderer.render = function(oRm, oControl) {
 		// write the HTML into the render manager
@@ -36,6 +36,7 @@ sap.ui.define(['./ListItemBaseRenderer'], function(ListItemBaseRenderer) {
 		var oUploadCollection = oControl.getParent();
 		oRm.openStart("li", oUploadCollection._oList.getId("nodata"));
 		oRm.attr("tabindex", "0");
+		oRm.attr("role", "option");
 		ListItemBaseRenderer.addFocusableClasses.call(ListItemBaseRenderer, oRm);
 		oRm.class("sapMLIB");
 		oRm.class("sapMUCNoDataPage");

package/src/sap/m/UploadCollectionToolbarPlaceholder.js

@@ -22,7 +22,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/VBox.js

@@ -26,7 +26,7 @@ sap.ui.define(['./FlexBox', './library', "./VBoxRenderer"],
 	 * @extends sap.m.FlexBox
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/VBoxRenderer.js

@@ -20,7 +20,7 @@ sap.ui.define(['./FlexBoxRenderer'],
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl an object representation of the control that should be rendered
+	 * @param {sap.m.VBox} oControl an object representation of the control that should be rendered
 	 */
 	VBoxRenderer.render = function(oRm, oControl){
 		FlexBoxRenderer.render.apply(this, [oRm, oControl]);

package/src/sap/m/ValueStateHeader.js

@@ -23,7 +23,7 @@ sap.ui.define(
 		 *
 		 * @extends sap.ui.core.Control
 		 * @author SAP SE
-		 * @version 1.98.0
+		 * @version 1.101.0
 		 *
 		 * @constructor
 		 * @private

package/src/sap/m/ViewSettingsCustomItem.js

@@ -22,7 +22,7 @@ sap.ui.define(['./ViewSettingsItem', './library'],
 	 * @extends sap.m.ViewSettingsItem
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/m/ViewSettingsCustomTab.js

@@ -20,7 +20,7 @@ sap.ui.define(['./library', 'sap/ui/core/Item', 'sap/ui/core/IconPool'],
 			 * @extends sap.ui.core.Item
 			 *
 			 * @author SAP SE
-			 * @version 1.98.0
+			 * @version 1.101.0
 			 *
 			 * @constructor
 			 * @public

package/src/sap/m/ViewSettingsDialog.js

@@ -1,4 +1,4 @@
-/*!
+	/*!
 * OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
@@ -7,6 +7,7 @@
 // Provides control sap.m.ViewSettingsDialog.
 sap.ui.define([
 	'./library',
+	'sap/ui/core/Core',
 	'sap/ui/core/Control',
 	'sap/ui/core/IconPool',
 	'./Toolbar',
@@ -37,6 +38,7 @@ sap.ui.define([
 ],
 function(
 	library,
+	Core,
 	Control,
 	IconPool,
 	Toolbar,
@@ -142,7 +144,7 @@ function(
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public
@@ -337,7 +339,7 @@ function(
 	ViewSettingsDialog.prototype.init = function() {
 		var sId = this.getId();
 
-		this._rb                            = sap.ui.getCore().getLibraryResourceBundle("sap.m");
+		this._rb                            = Core.getLibraryResourceBundle("sap.m");
 		this._sDialogWidth                  = "350px";
 		this._sDialogHeight                 = "434px";
 
@@ -414,8 +416,8 @@ function(
 		// sap.ui.core.Popup removes its content on close()/destroy() automatically from the static UIArea,
 		// but only if it added it there itself. As we did that, we have to remove it also on our own
 		if ( this._bAppendedToUIArea && this._dialog ) {
-			var oStatic = sap.ui.getCore().getStaticAreaRef();
-			oStatic = sap.ui.getCore().getUIArea(oStatic);
+			var oStatic = Core.getStaticAreaRef();
+			oStatic = Core.getUIArea(oStatic);
 			oStatic.removeContent(this._dialog, true);
 		}
 
@@ -631,7 +633,7 @@ function(
 	 * Overwrites the aggregation setter in order to have ID validation logic as some strings
 	 * are reserved for the predefined tabs.
 	 *
-	 * @overwrite
+	 * @override
 	 * @public
 	 * @param {object} oCustomTab The custom tab to be added
 	 * @returns {this} this pointer for chaining
@@ -731,7 +733,7 @@ function(
 	/**
 	 * Sets the title of the internal dialog.
 	 *
-	 * @overwrite
+	 * @override
 	 * @public
 	 * @param {string} sTitle The title text for the dialog
 	 * @return {this} this pointer for chaining
@@ -1125,7 +1127,7 @@ function(
 	/**
 	 * Adds a sort item and sets the association to reflect the selected state.
 	 *
-	 * @overwrite
+	 * @override
 	 * @public
 	 * @param {sap.m.ViewSettingsItem} oItem The item to be added to the aggregation
 	 * @return {this} this pointer for chaining
@@ -1133,16 +1135,21 @@ function(
 	ViewSettingsDialog.prototype.addSortItem = function(oItem) {
 		this.addAggregation("sortItems", oItem);
 
+		if (this.getSelectedSortItem() === oItem.getId() || this.getSelectedSortItem() === oItem.getKey()) {
+			oItem.setSelected(true);
+		}
+
 		if (oItem.getSelected()) {
-			this.setSelectedSortItem(oItem);
+			this.setAssociation("selectedSortItem", oItem, true);
 		}
+
 		return this;
 	};
 
 	/**
 	 * Adds a group item and sets the association to reflect the selected state.
 	 *
-	 * @overwrite
+	 * @override
 	 * @public
 	 * @param {sap.m.ViewSettingsItem} oItem The item to be added to the group items
 	 * @return {this} this pointer for chaining
@@ -1150,16 +1157,21 @@ function(
 	ViewSettingsDialog.prototype.addGroupItem = function(oItem) {
 		this.addAggregation("groupItems", oItem);
 
+		if (this.getSelectedGroupItem() === oItem.getId() || this.getSelectedGroupItem() === oItem.getKey()) {
+			oItem.setSelected(true);
+		}
+
 		if (oItem.getSelected()) {
-			this.setSelectedGroupItem(oItem);
+			this.setAssociation("selectedGroupItem", oItem, true);
 		}
+
 		return this;
 	};
 
 	/**
 	 * Adds a preset filter item and sets the association to reflect the selected state.
 	 *
-	 * @overwrite
+	 * @override
 	 * @public
 	 * @param {sap.m.ViewSettingsItem} oItem The selected item or a string with the key
 	 * @return {this} this pointer for chaining
@@ -1174,11 +1186,12 @@ function(
 	};
 
 	/**
-	 * Sets the selected sort item (either by key or by item).
+	 * Sets the selected sort item (either by key, item id or item instance).
 	 *
-	 * @overwrite
+	 * @override
 	 * @public
-	 * @param {sap.m.ViewSettingsItem|string} vItemOrKey The selected item or the item's key string
+	 * @param {sap.m.ViewSettingsItem|string} vItemOrKey The selected item, the item's string key
+	 * or the item id
 	 * @return {this} this pointer for chaining
 	 */
 	ViewSettingsDialog.prototype.setSelectedSortItem = function(vItemOrKey) {
@@ -1186,10 +1199,13 @@ function(
 			i = 0,
 			oItem = findViewSettingsItemByKey(
 				vItemOrKey,
-				aItems,
-				"Could not set selected sort item. Item is not found: '" + vItemOrKey + "'"
+				aItems
 			);
 
+		if (!oItem && (typeof vItemOrKey === "string")) {
+			oItem = Core.byId(vItemOrKey);
+		}
+
 		//change selected item only if it is found among the sort items or if there is no selected item
 		if (!oItem || validateViewSettingsItem(oItem)) {
 			// set selected = true for this item & selected = false for all others items
@@ -1207,18 +1223,20 @@ function(
 			if (this._getDialog().isOpen()) {
 				this._updateListSelection(this._sortList, oItem);
 			}
-			this.setAssociation("selectedSortItem", oItem, true);
 		}
 
+		this.setAssociation("selectedSortItem", oItem || vItemOrKey, true);
+
 		return this;
 	};
 
 	/**
-	 * Sets the selected group item (either by key or by item).
+	 * Sets the selected group item (either by key, item id or item instance).
 	 *
-	 * @overwrite
+	 * @override
 	 * @public
-	 * @param {sap.m.ViewSettingsItem|string} vItemOrKey The selected item or the item's key string
+	 * @param {sap.m.ViewSettingsItem|string} vItemOrKey The selected item, the item's string key
+	 * or the item id
 	 * @return {this} this pointer for chaining
 	 */
 	ViewSettingsDialog.prototype.setSelectedGroupItem = function(vItemOrKey) {
@@ -1226,15 +1244,21 @@ function(
 			i = 0,
 			oItem = findViewSettingsItemByKey(
 				vItemOrKey,
-				aItems,
-				"Could not set selected group item. Item is not found: '" + vItemOrKey + "'"
+				aItems
 			);
 
+		if (!oItem && (typeof vItemOrKey === "string")) {
+			oItem = Core.byId(vItemOrKey);
+		}
+
 		// if no Item is found and the key is empty set the default "None" item as selected
 		// BCP: 1780536754
 		if (!oItem && !vItemOrKey) {
 			oItem = this._oGroupingNoneItem;
+			this.setAssociation("selectedGroupItem", oItem, true);
+			return this;
 		}
+
 		//change selected item only if it is found among the group items
 		if (validateViewSettingsItem(oItem)) {
 			// set selected = true for this item & selected = false for all others items
@@ -1248,16 +1272,17 @@ function(
 			if (this._getDialog().isOpen()) {
 				this._updateListSelection(this._groupList, oItem);
 			}
-			this.setAssociation("selectedGroupItem", oItem, true);
 		}
 
+		this.setAssociation("selectedGroupItem", oItem || vItemOrKey, true);
+
 		return this;
 	};
 
 	/**
 	 * Sets the selected preset filter item.
 	 *
-	 * @overwrite
+	 * @override
 	 * @public
 	 * @param {sap.m.ViewSettingsItem|string|null} vItemOrKey The selected item or the item's key string
 	 * @return {this} this pointer for chaining
@@ -1304,8 +1329,8 @@ function(
 		// add to static UI area manually because we don't have a renderer
 
 		if (!this.getParent() && !this._bAppendedToUIArea) {
-			var oStatic = sap.ui.getCore().getStaticAreaRef();
-			oStatic = sap.ui.getCore().getUIArea(oStatic);
+			var oStatic = Core.getStaticAreaRef();
+			oStatic = Core.getUIArea(oStatic);
 			// add as content the Dialog to the Static area and not the ViewSettingsDialog
 			// once the Static area is invalidated, the Dialog will be rendered and not the ViewSettingsDialog which has no renderer
 			// and uses the renderer of the Dialog
@@ -1323,11 +1348,11 @@ function(
 
 		// store the current dialog state to be able to reset it on cancel
 		this._oPreviousState = {
-			sortItem : sap.ui.getCore().byId(this.getSelectedSortItem()),
+			sortItem : Core.byId(this._getSelectedSortItem()),
 			sortDescending : this.getSortDescending(),
-			groupItem : sap.ui.getCore().byId(this.getSelectedGroupItem()),
+			groupItem : Core.byId(this._getSelectedGroupItem()),
 			groupDescending : this.getGroupDescending(),
-			presetFilterItem : sap.ui.getCore().byId(this.getSelectedPresetFilterItem()),
+			presetFilterItem : Core.byId(this.getSelectedPresetFilterItem()),
 			filterKeys : this.getSelectedFilterKeys(),
 			filterCompoundKeys: this.getSelectedFilterCompoundKeys(),
 			navPage : this._getNavContainer().getCurrentPage(),
@@ -1338,9 +1363,9 @@ function(
 		// store initial dialog state in order to be able to reset it on reset button click
 		if (!this._oInitialState) {
 			this._oInitialState = {
-				sortItem: this.getSelectedSortItem(),
+				sortItem: this._getSelectedSortItem(),
 				sortDescending: this.getSortDescending(),
-				groupItem: this.getSelectedGroupItem(),
+				groupItem: this._getSelectedGroupItem(),
 				groupDescending: this.getGroupDescending(),
 				presetFilterItem: this.getSelectedPresetFilterItem()
 			};
@@ -1378,7 +1403,7 @@ function(
 	 * Returns the selected filters as an array of ViewSettingsItems.
 	 *
 	 * It can be used to create matching sorters and filters to apply the selected settings to the data.
-	 * @overwrite
+	 * @override
 	 * @public
 	 * @return {sap.m.ViewSettingsItem[]} An array of selected filter items
 	 * @ui5-metamodel This method also will be described in the UI5 (legacy) designtime metamodel
@@ -1430,7 +1455,7 @@ function(
 
 		if (oPresetFilterItem) {
 			// preset filter: add "filter name"
-			sFilterString = this._rb.getText("VIEWSETTINGS_FILTERTEXT").concat(" " + sap.ui.getCore().byId(oPresetFilterItem).getText());
+			sFilterString = this._rb.getText("VIEWSETTINGS_FILTERTEXT").concat(" " + Core.byId(oPresetFilterItem).getText());
 		} else { // standard & custom filters
 			for (; i < aFilterItems.length; i++) {
 				if (aFilterItems[i] instanceof sap.m.ViewSettingsCustomItem) {
@@ -1751,12 +1776,12 @@ function(
 				}
 
 				// check if the sortItem or sortDescending are different than initial
-				if (this._oInitialState.sortItem !== this.getSelectedSortItem() || this._oInitialState.sortDescending !== this.getSortDescending()) {
+				if (this._oInitialState.sortItem !== this._getSelectedSortItem() || this._oInitialState.sortDescending !== this.getSortDescending()) {
 					bChanges = true;
 				}
 
 				// check if the groupItem or groupDescending are different than initial
-				if ((this._oInitialState.groupItem && this._oInitialState.groupItem !== this.getSelectedGroupItem()) || this._oInitialState.groupDescending !== this.getGroupDescending()) {
+				if ((this._oInitialState.groupItem && this._oInitialState.groupItem !== this._getSelectedGroupItem()) || this._oInitialState.groupDescending !== this.getGroupDescending()) {
 					bChanges = true;
 				}
 
@@ -1786,12 +1811,12 @@ function(
 		this.clearFilters();
 
 		// clear sortItem/sortDescending
-		this.setSelectedSortItem(sap.ui.getCore().byId(this._oInitialState.sortItem));
+		this.setSelectedSortItem(Core.byId(this._oInitialState.sortItem));
 		this.setSortDescending(this._oInitialState.sortDescending);
 		this._updateListSelection(this._sortOrderList, this._oInitialState.sortDescending);
 
 		// clear groupItem/groupDescending
-		this._oInitialState.groupItem !== undefined && this.setSelectedGroupItem(sap.ui.getCore().byId(this._oInitialState.groupItem));
+		this._oInitialState.groupItem !== undefined && this.setSelectedGroupItem(Core.byId(this._oInitialState.groupItem));
 		this.setGroupDescending(this._oInitialState.groupDescending);
 		this._updateListSelection(this._groupOrderList, this._oInitialState.groupDescending);
 
@@ -2233,7 +2258,7 @@ function(
 
 		// Aria - used to label the sort order list
 		this._ariaSortOrderInvisibleText = new InvisibleText(this.getId() + "-sortOrderLabel", {
-			text: this._rb.getText("VIEWSETTINGS_SORT_DIRECTION")
+			text: this._rb.getText("VIEWSETTINGS_SORT_BY")
 		});
 
 		this._sortOrderList = new List(this.getId() + "-sortorderlist", {
@@ -2258,7 +2283,7 @@ function(
 
 		// Aria - used to label the sort list
 		this._ariaSortListInvisibleText = new InvisibleText(this.getId() + "-sortListLabel", {
-			text: this._rb.getText("VIEWSETTINGS_TITLE_SORT")
+			text: this._rb.getText("VIEWSETTINGS_SORT_OBJECT")
 		});
 
 		this._sortList.addAriaLabelledBy(this._ariaSortListInvisibleText);
@@ -2291,7 +2316,7 @@ function(
 			}, this);
 
 			if (!this._oGroupingNoneItem || this._oGroupingNoneItem.bIsDestroyed) {
-				bHasSelections = !!this.getSelectedGroupItem();
+				bHasSelections = !!this._getSelectedGroupItem();
 				this._oGroupingNoneItem = new ViewSettingsItem({
 					text: this._rb.getText("VIEWSETTINGS_NONE_ITEM"),
 					selected: !bHasSelections,
@@ -2324,7 +2349,6 @@ function(
 	 * @private
 	 */
 	ViewSettingsDialog.prototype._initGroupContent = function() {
-		var sTitleGroupBy = this._rb.getText("VIEWSETTINGS_GROUP_BY");
 
 		if (this._groupContent) {
 			return;
@@ -2333,7 +2357,7 @@ function(
 
 		// Aria - used to label the group order
 		this._ariaGroupOrderInvisibleText = new InvisibleText(this.getId() + "-groupOrderLabel", {
-			text: this._rb.getText("VIEWSETTINGS_GROUP_DIRECTION")
+			text: this._rb.getText("VIEWSETTINGS_GROUP_BY")
 		});
 
 		this._groupOrderList = new List(this.getId() + "-grouporderlist", {
@@ -2347,7 +2371,7 @@ function(
 			ariaLabelledBy: this._ariaGroupOrderInvisibleText
 		});
 
-		this._groupOrderList.addItem(new GroupHeaderListItem({title: sTitleGroupBy}));
+		this._groupOrderList.addItem(new GroupHeaderListItem({title: this._rb.getText("VIEWSETTINGS_GROUP_BY")}));
 		this._groupOrderList.addItem(new StandardListItem({
 			title : this._rb.getText("VIEWSETTINGS_ASCENDING_ITEM")
 		}).data("item", false).setSelected(true));
@@ -2357,7 +2381,7 @@ function(
 
 		// Aria - used to label the group list
 		this._ariaGroupListInvisibleText = new InvisibleText(this.getId() + "-groupListLabel", {
-			text: this._rb.getText("VIEWSETTINGS_TITLE_GROUP")
+			text: this._rb.getText("VIEWSETTINGS_GROUP_OBJECT")
 		});
 
 		this._groupList = new List(this.getId() + "-grouplist",
@@ -2459,7 +2483,7 @@ function(
 
 		// Aria - used to label the filter by list
 		this._ariaFilterByInvisibleText = new InvisibleText(this.getId() + "-filterByLabel", {
-			text: this._rb.getText("VIEWSETTINGS_TITLE_FILTER")
+			text: this._rb.getText("VIEWSETTINGS_FILTER_BY")
 		});
 
 		this._presetFilterList = new List(
@@ -2525,12 +2549,12 @@ function(
 	 * Gets or creates the sap.m.Button which is used inside the SegmentedButton for representation of the custom tab.
 	 * @private
 	 * @param {Object} oCustomTab with options for the button
-	 * @param {String} sButtonIdPrefix preffix for the button id
+	 * @param {string} sButtonIdPrefix preffix for the button id
 	 * @returns {sap.m.Button} The created button
 	 */
 	ViewSettingsDialog.prototype._getTabButton = function (oCustomTab, sButtonIdPrefix) {
 		var sButtonId = sButtonIdPrefix + oCustomTab.getId(),
-			oButton = sap.ui.getCore().byId(sButtonId);
+			oButton = Core.byId(sButtonId);
 
 		if (oButton) {
 			return oButton;
@@ -2812,7 +2836,7 @@ function(
 	/**
 	 * Removes a filter Item and resets the remembered page if it was the filter detail page of the removed filter.
 	 *
-	 * @overwrite
+	 * @override
 	 * @public
 	 * @param { int| sap.m.ViewSettingsFilterItem | string } vFilterItem The filter item's index, or the item itself, or its id
 	 * @returns {sap.m.ViewSettingsFilterItem|null} The removed item or null
@@ -2840,7 +2864,7 @@ function(
 	/**
 	 * Removes all filter Items and resets the remembered page if it was a filter detail page and all of its filter items are being removed.
 	 *
-	 * @overwrite
+	 * @override
 	 * @public
 	 * @returns {sap.m.ViewSettingsFilterItem[]} the removed items
 	 */
@@ -2929,7 +2953,7 @@ function(
 				}
 				// update status (something could have been changed on a detail filter
 				// page or by API
-				this._updateListSelection(this._presetFilterList, sap.ui.getCore()
+				this._updateListSelection(this._presetFilterList, Core
 					.byId(this.getSelectedPresetFilterItem()));
 				this._updateFilterCounters();
 				for (; i < this._filterContent.length; i++) {
@@ -3170,11 +3194,11 @@ function(
 	 * @private
 	 */
 	ViewSettingsDialog.prototype._updateListSelections = function() {
-		this._updateListSelection(this._sortList, sap.ui.getCore().byId(this.getSelectedSortItem()));
+		this._updateListSelection(this._sortList, Core.byId(this._getSelectedSortItem()));
 		this._updateListSelection(this._sortOrderList, this.getSortDescending());
-		this._updateListSelection(this._groupList, sap.ui.getCore().byId(this.getSelectedGroupItem()));
+		this._updateListSelection(this._groupList, Core.byId(this._getSelectedGroupItem()));
 		this._updateListSelection(this._groupOrderList, this.getGroupDescending());
-		this._updateListSelection(this._presetFilterList, sap.ui.getCore().byId(this.getSelectedPresetFilterItem()));
+		this._updateListSelection(this._presetFilterList, Core.byId(this.getSelectedPresetFilterItem()));
 		this._updateFilterCounters();
 	};
 
@@ -3356,7 +3380,8 @@ function(
 	 *
 	 * @param {sap.m.ViewSettingsItem|string} vItemOrKey The searched item or its key
 	 * @param {array} aViewSettingsItems The list of sap.m.ViewSettingsItem objects to be searched
-	 * @param {string} sErrorMessage The error message that will be logged if the item is not found
+	 * @param {string} sErrorMessage If an error message is provided, it will be logged when the
+	 * item is not found
 	 * @returns {*} The sap.m.ViewSettingsItem found in the list of items
 	 * @private
 	 */
@@ -3368,7 +3393,7 @@ function(
 			// find item with this key
 			oItem = getViewSettingsItemByKey(aViewSettingsItems, vItemOrKey);
 
-			if (!oItem) {
+			if (!oItem && sErrorMessage) {
 				Log.error(sErrorMessage);
 			}
 		} else {
@@ -3407,22 +3432,22 @@ function(
 			that            = this,
 			fnAfterClose = function () {
 				var oSettingsState, vGroupItem,
-					sGroupItemId = that.getSelectedGroupItem();
+					sGroupItemId = that._getSelectedGroupItem();
 
 				// BCP: 1670245110 "None" should be undefined
 				if (!that._oGroupingNoneItem || sGroupItemId != that._oGroupingNoneItem.getId()) {
-					vGroupItem = sap.ui.getCore().byId(sGroupItemId);
+					vGroupItem = Core.byId(sGroupItemId);
 				}
 
 				// Reset the title on closing the dialog, since it will be needed for the next opening.
 				that._toggleDialogTitle(that._sTitleLabelId);
 
 				oSettingsState = {
-					sortItem            : sap.ui.getCore().byId(that.getSelectedSortItem()),
+					sortItem            : Core.byId(that._getSelectedSortItem()),
 					sortDescending      : that.getSortDescending(),
 					groupItem           : vGroupItem,
 					groupDescending     : that.getGroupDescending(),
-					presetFilterItem    : sap.ui.getCore().byId(that.getSelectedPresetFilterItem()),
+					presetFilterItem    : Core.byId(that.getSelectedPresetFilterItem()),
 					filterItems         : that.getSelectedFilterItems(),
 					filterKeys          : that.getSelectedFilterKeys(),
 					filterCompoundKeys  : that.getSelectedFilterCompoundKeys(),
@@ -3508,7 +3533,7 @@ function(
 			this._getSegmentedButton().setSelectedButton(this._getFilterButton());
 		}
 		// update preset list selection
-		this._updateListSelection(this._presetFilterList, sap.ui.getCore().byId(
+		this._updateListSelection(this._presetFilterList, Core.byId(
 			this.getSelectedPresetFilterItem()));
 
 		return this;
@@ -3548,6 +3573,38 @@ function(
 		Control.prototype._applyContextualSettings.call(this);
 	};
 
+	/**
+	 * If there is selected sort item, returns its id,
+	 * unlike the original getter - that can return id or key.
+	 * @return {string} The selected ViewSettingsItem's id or any unknown string in the association
+	 * @private
+	 */
+	ViewSettingsDialog.prototype._getSelectedSortItem = function() {
+		var sSortItem = this.getSelectedSortItem(),
+			oItem = findViewSettingsItemByKey(sSortItem, this.getSortItems())
+				|| Core.byId(sSortItem);
+
+		if (validateViewSettingsItem(oItem)) {
+			return oItem.getId();
+		}
+	};
+
+	/**
+	 * If there is selected group item, returns its id,
+	 * unlike the original getter - that can return id or key.
+	 * @return {string} The selected ViewSettingsItem's id or any unknown string in the association
+	 * @private
+	 */
+	ViewSettingsDialog.prototype._getSelectedGroupItem = function() {
+		var sGroupItem = this.getSelectedGroupItem(),
+			oItem = findViewSettingsItemByKey(sGroupItem, this.getGroupItems())
+				|| Core.byId(sGroupItem);
+
+		if (validateViewSettingsItem(oItem)) {
+			return oItem.getId();
+		}
+	};
+
 	/**
 	 * Handle the "content" aggregation of a custom tab, as the items in it might be transferred to the dialog page
 	 * instance.

package/src/sap/m/ViewSettingsDialogRenderer.js

@@ -20,7 +20,7 @@ sap.ui.define([],
 	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
 	 *
 	 * @param {sap.ui.core.RenderManager} oRm the RenderManager that can be used for writing to the render output buffer
-	 * @param {sap.ui.core.Control} oControl an object representation of the control that should be rendered
+	 * @param {sap.m.ViewSettingsDialog} oControl an object representation of the control that should be rendered
 	 */
 	ViewSettingsDialogRenderer.render = function (oRm, oControl) {
 	};

package/src/sap/m/ViewSettingsFilterItem.js

@@ -24,7 +24,7 @@ sap.ui.define(['./ViewSettingsItem', './library'],
 	 * @extends sap.m.ViewSettingsItem
 	 *
 	 * @author SAP SE
-	 * @version 1.98.0
+	 * @version 1.101.0
 	 *
 	 * @constructor
 	 * @public