@openui5/sap.ui.table 1.105.0 → 1.106.0

package/.reuse/dep5

@@ -43,6 +43,14 @@ License: Apache-2.0
 #
 
 
+# Library: sap.m:
+
+Files: src/sap.m/src/sap/m/_thirdparty/purify.js
+Copyright: Mario Heiderich
+License: Apache-2.0
+Comment: these files belong to: purify.js
+
+
 # Library: sap.ui.codeeditor:
 
 Files: src/sap.ui.codeeditor/src/sap/ui/codeeditor/js/ace/*
@@ -127,17 +135,17 @@ Copyright:
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery UI 1.11: zIndex.js is overall written by SAP, but contains an implementation of the function 'fnzIndex' which is taken from jQuery UI Datepicker 1.11.1
 
-Files: src/sap.ui.core/src/sap/ui/thirdparty/qunit.*
+Files: src/sap.ui.core/src/sap/ui/thirdparty/qunit.css src/sap.ui.core/src/sap/ui/thirdparty/qunit.js
 Copyright: jQuery Foundation and other contributors
 License: MIT
 Comment: these files belong to: QUnit
 
-Files: src/sap.ui.core/src/sap/ui/thirdparty/qunit-2.*
+Files: src/sap.ui.core/src/sap/ui/thirdparty/qunit-2.css src/sap.ui.core/src/sap/ui/thirdparty/qunit-2.js
 Copyright: jQuery Foundation and other contributors
 License: MIT
 Comment: these files belong to: QUnit 2
 
-Files: src/sap.ui.core/test/sap/ui/core/qunit/thirdparty/qunit-2.18.*
+Files: src/sap.ui.core/test/sap/ui/core/qunit/thirdparty/qunit-2.18.css src/sap.ui.core/test/sap/ui/core/qunit/thirdparty/qunit-2.18.js
 Copyright: jQuery Foundation and other contributors
 License: MIT
 Comment: these files belong to: QUnit 2.18
@@ -159,7 +167,7 @@ Copyright:
 License: Apache-2.0 and MIT
 Comment: these files contain content from SAP and jQuery.rtl-scroll-type: _FeatureDetection.js is overall written by SAP, but contains code which is inspired by jQuery.rtl-scroll-type
 
-Files: src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite.*
+Files: src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite.css src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite.js
 Copyright: jQuery Foundation and other contributors
 License: MIT
 Comment: these files belong to: QUnit Composite
@@ -239,7 +247,7 @@ Copyright: 2010-2017, Christian Johansen, christian@cjohansen.no
 License: BSD-3-Clause
 Comment: these files belong to: SinonJS
 
-Files: src/sap.ui.core/test/sap/ui/core/qunit/thirdparty/sinon-14.0.*
+Files: src/sap.ui.core/test/sap/ui/core/qunit/thirdparty/sinon-14.0.js
 Copyright: 2010-2022, Christian Johansen, christian@cjohansen.no
 License: BSD-3-Clause
 Comment: these files belong to: SinonJS 14
@@ -313,7 +321,7 @@ Copyright: 2018 Michael Mclaughlin
 License: MIT
 Comment: these files belong to: bignumber.js
 
-Files: src/sap.ui.core/src/sap/ui/base/util/restricted/_/lodash.custom.js
+Files: src/sap.ui.core/src/sap/base/util/restricted/_/lodash.custom.js
 Copyright: OpenJS Foundation and other contributors
 License: MIT
 Comment: these files belong to: lodash
@@ -323,7 +331,7 @@ Copyright: 2021 Mathias Nater
 License: MIT
 Comment: these files belong to: Hyphenopoly
 
-Files: src/sap.ui.core/src/sap/ui/base/util/restricted/_CancelablePromise.js
+Files: src/sap.ui.core/src/sap/base/util/restricted/_CancelablePromise.js
 Copyright:
     Sindre Sorhus <sindresorhus@gmail.com>
     2014-present Sebastian McKenzie and other contributors
@@ -418,16 +426,6 @@ License: MIT
 Comment: these files belong to: @cfworker/json-schema
 
 
-# Library: sap.ui.mdc:
-
-Files: src/sap.ui.mdc/test/sap/ui/mdc/sample/field/filterfieldwithoperators/BoolExprTool.js
-Copyright:
-    2009-2022 SAP SE or an SAP affiliate company and OpenUI5 contributors
-    2015 unnikked
-License: Apache-2.0 and MIT
-Comment: these files contain content from SAP and BooleanExpressionEvaluator: BoolExprTool.js is authored by SAP, but partly inspired by BooleanExpressionEvaluator
-
-
 # Library: sap.ui.webc.common:
 
 Files: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/theming/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/localization/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.* src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
@@ -448,6 +446,11 @@ Copyright: SAP
 License: Apache-2.0
 Comment: these files belong to: UI5 Web Components
 
+Files: src/sap.ui.webc.fiori/src/sap/ui/webc/fiori/lib/zxing.js
+Copyright: 2005 Sun Microsystems, Inc.; 2010-2014 University of Manchester; 2010-2015 Stian Soiland-Reyes; 2015 Peter Hull
+License: Apache-2.0
+Comment: these files belong to: ZXing
+
 
 # Library: sap.ui.webc.main:
 

package/THIRDPARTY.txt

@@ -4,6 +4,15 @@ each subcomponent.
 The full text of all referenced licenses is appended at the end of this file.
 
 
+Library: sap.m:
+
+Component: purify.js, version: 2.3.8
+Copyright: Mario Heiderich
+License: Apache-2.0
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
+Contained in: src/sap.m/src/sap/m/_thirdparty/purify.js
+
+
 Library: sap.ui.codeeditor:
 
 Component: Ace (Ajax.org Cloud9 Editor), version: 1.4.13
@@ -68,19 +77,22 @@ Component: QUnit, version: 1.18.0
 Copyright: jQuery Foundation and other contributors
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.core/src/sap/ui/thirdparty/qunit.*
+Contained in: src/sap.ui.core/src/sap/ui/thirdparty/qunit.css
+	src/sap.ui.core/src/sap/ui/thirdparty/qunit.js
 
 Component: QUnit 2, version: 2.3.2
 Copyright: jQuery Foundation and other contributors
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.core/src/sap/ui/thirdparty/qunit-2.*
+Contained in: src/sap.ui.core/src/sap/ui/thirdparty/qunit-2.css
+	src/sap.ui.core/src/sap/ui/thirdparty/qunit-2.js
 
 Component: QUnit 2.18, version: 2.18.0
 Copyright: jQuery Foundation and other contributors
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.core/test/sap/ui/core/qunit/thirdparty/qunit-2.18.*
+Contained in: src/sap.ui.core/test/sap/ui/core/qunit/thirdparty/qunit-2.18.css
+	src/sap.ui.core/test/sap/ui/core/qunit/thirdparty/qunit-2.18.js
 
 Component: jQuery-Migrate, version: 3.3.1
 Copyright: OpenJS Foundation and other contributors
@@ -104,7 +116,8 @@ Component: QUnit Composite, version: 1.0.2-pre
 Copyright: jQuery Foundation and other contributors
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite.*
+Contained in: src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite.css
+	src/sap.ui.core/src/sap/ui/thirdparty/qunit-composite.js
 
 Component: JUnit Reporter for QUnit, version: 1.1.1
 Copyright: jQuery Foundation and other contributors
@@ -201,7 +214,7 @@ Component: SinonJS 14, version: 14.0.0
 Copyright: 2010-2022, Christian Johansen, christian@cjohansen.no
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
-Contained in: src/sap.ui.core/test/sap/ui/core/qunit/thirdparty/sinon-14.0.*
+Contained in: src/sap.ui.core/test/sap/ui/core/qunit/thirdparty/sinon-14.0.js
 
 Component: Sinon-qunit, version: 2.0.0
 Copyright: 2010-2011, Christian Johansen
@@ -289,7 +302,7 @@ Component: lodash, version: 4.17.21
 Copyright: OpenJS Foundation and other contributors
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.core/src/sap/ui/base/util/restricted/_/lodash.custom.js
+Contained in: src/sap.ui.core/src/sap/base/util/restricted/_/lodash.custom.js
 
 Component: Hyphenopoly, version: 3.4.0
 Copyright: 2021 Mathias Nater
@@ -301,13 +314,13 @@ Component: p-cancelable, version: 2.0.0
 Copyright: Sindre Sorhus <sindresorhus@gmail.com>
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.core/src/sap/ui/base/util/restricted/_CancelablePromise.js
+Contained in: src/sap.ui.core/src/sap/base/util/restricted/_CancelablePromise.js
 
 Component: @babel/helpers, version: 7.10.4
 Copyright: 2014-present Sebastian McKenzie and other contributors
 License: MIT
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.core/src/sap/ui/base/util/restricted/_CancelablePromise.js
+Contained in: src/sap.ui.core/src/sap/base/util/restricted/_CancelablePromise.js
 
 Component: Jalaali JS
 Copyright: Behrang Norouzinia
@@ -407,18 +420,9 @@ License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
 Contained in: src/sap.ui.integration/test/sap/ui/integration/demokit/cardExplorer/webapp/thirdparty/CfWorkerJsonSchemaValidator.js
 
 
-Library: sap.ui.mdc:
-
-Component: BooleanExpressionEvaluator, version: master-18530acbf3
-Copyright: 2015 unnikked
-License: MIT
-License Text: https://github.com/SAP/openui5/blob/master/LICENSES/MIT.txt
-Contained in: src/sap.ui.mdc/test/sap/ui/mdc/sample/field/filterfieldwithoperators/BoolExprTool.js
-
-
 Library: sap.ui.webc.common:
 
-Component: UI5 Web Components, version: 1.1.2
+Component: UI5 Web Components, version: 1.5.0
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
@@ -429,7 +433,7 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/base/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-tnt/*.*
 	src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/icons-business-suite/*.*
 
-Component: lit-html, version: 2.0.1
+Component: lit-html, version: 2.2.2
 Copyright: Google LLC
 License: BSD-3-Clause
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/BSD-3-Clause.txt
@@ -438,16 +442,22 @@ Contained in: src/sap.ui.webc.common/src/sap/ui/webc/common/thirdparty/lit-html/
 
 Library: sap.ui.webc.fiori:
 
-Component: UI5 Web Components, version: 1.1.2
+Component: UI5 Web Components, version: 1.5.0
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
 Contained in: src/sap.ui.webc.fiori/src/sap/ui/webc/fiori/thirdparty/*.*
 
+Component: ZXing, version: 0.19.1
+Copyright: 2005 Sun Microsystems, Inc.; 2010-2014 University of Manchester; 2010-2015 Stian Soiland-Reyes; 2015 Peter Hull
+License: Apache-2.0
+License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt
+Contained in: src/sap.ui.webc.fiori/src/sap/ui/webc/fiori/lib/zxing.js
+
 
 Library: sap.ui.webc.main:
 
-Component: UI5 Web Components, version: 1.1.2
+Component: UI5 Web Components, version: 1.5.0
 Copyright: SAP
 License: Apache-2.0
 License Text: https://github.com/SAP/openui5/blob/master/LICENSES/Apache-2.0.txt

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openui5/sap.ui.table",
-  "version": "1.105.0",
+  "version": "1.106.0",
   "description": "OpenUI5 UI Library sap.ui.table",
   "author": "SAP SE (https://www.sap.com)",
   "license": "Apache-2.0",
@@ -14,7 +14,7 @@
     "url": "https://github.com/SAP/openui5.git"
   },
   "dependencies": {
-    "@openui5/sap.ui.core": "1.105.0",
-    "@openui5/sap.ui.unified": "1.105.0"
+    "@openui5/sap.ui.core": "1.106.0",
+    "@openui5/sap.ui.unified": "1.106.0"
   }
 }

package/src/sap/ui/table/.library

@@ -6,7 +6,7 @@
   <copyright>OpenUI5
  * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.</copyright>
-  <version>1.105.0</version>
+  <version>1.106.0</version>
 
   <documentation>Table-like controls, mainly for desktop scenarios.</documentation>
 

package/src/sap/ui/table/AnalyticalColumn.js

@@ -31,6 +31,8 @@ sap.ui.define([
 	) {
 	"use strict";
 
+	var GroupEventType = library.GroupEventType;
+
 	function isInstanceOfAnalyticalTable(oControl) {
 		return TableUtils.isA(oControl, "sap.ui.table.AnalyticalTable");
 	}
@@ -46,7 +48,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.Column
 	 *
 	 * @author SAP SE
-	 * @version 1.105.0
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @public
@@ -107,6 +109,22 @@ sap.ui.define([
 		return new AnalyticalColumnMenu(this.getId() + "-menu");
 	};
 
+	AnalyticalColumn.prototype._setGrouped = function(bGrouped) {
+		var oTable = this._getTable();
+		var sGroupEventType = bGrouped ? GroupEventType.group : GroupEventType.ungroup;
+
+		this.setGrouped(bGrouped);
+		oTable.fireGroup({column: this, groupedColumns: oTable._aGroupedColumns, type: sGroupEventType});
+	};
+
+	AnalyticalColumn.prototype._isAggregatableByMenu = function() {
+		var oTable = this._getTable(),
+			oBinding = oTable.getBinding(),
+			oResultSet = oBinding && oBinding.getAnalyticalQueryResult();
+
+		return oTable && oResultSet && oResultSet.findMeasureByPropertyName(this.getLeadingProperty());
+	};
+
 	AnalyticalColumn.prototype.setGrouped = function(bGrouped) {
 		var oParent = this.getParent();
 

package/src/sap/ui/table/AnalyticalColumnMenu.js

@@ -5,13 +5,10 @@
  */
 
 // Provides control sap.ui.table.AnalyticalColumnMenu.
-sap.ui.define(['./ColumnMenu', "sap/ui/unified/MenuRenderer", './library', "sap/ui/thirdparty/jquery"],
-	function(ColumnMenu, MenuRenderer, library, jQuery) {
+sap.ui.define(['./ColumnMenu', "sap/ui/unified/MenuRenderer", './utils/TableUtils', './library', "sap/ui/thirdparty/jquery"],
+	function(ColumnMenu, MenuRenderer, TableUtils, library, jQuery) {
 	"use strict";
 
-	// shortcut
-	var GroupEventType = library.GroupEventType;
-
 	/**
 	 * Constructor for a new AnalyticalColumnMenu.
 	 *
@@ -23,7 +20,7 @@ sap.ui.define(['./ColumnMenu', "sap/ui/unified/MenuRenderer", './library', "sap/
 	 * @extends sap.ui.table.ColumnMenu
 	 *
 	 * @author SAP SE
-	 * @version 1.105.0
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @public
@@ -67,10 +64,21 @@ sap.ui.define(['./ColumnMenu', "sap/ui/unified/MenuRenderer", './library', "sap/
 				function(oEvent) {
 					var oMenuItem = oEvent.getSource();
 					var bGrouped = oColumn.getGrouped();
-					var sGroupEventType = bGrouped ? GroupEventType.group : GroupEventType.ungroup;
 
-					oColumn.setGrouped(!bGrouped);
-					oTable.fireGroup({column: oColumn, groupedColumns: oTable._aGroupedColumns, type: sGroupEventType});
+					oColumn._setGrouped(!bGrouped);
+					if (!bGrouped && !oColumn.getShowIfGrouped()) {
+						var oDomRef;
+
+						if (TableUtils.isNoDataVisible(oTable)) {
+							oDomRef = oTable.getDomRef("noDataCnt");
+						} else {
+							oDomRef = oTable.getDomRef("rowsel0");
+						}
+
+						if (oDomRef) {
+							oDomRef.focus();
+						}
+					}
 					oMenuItem.setIcon(!bGrouped ? "sap-icon://accept" : null);
 				}
 			);
@@ -83,12 +91,9 @@ sap.ui.define(['./ColumnMenu', "sap/ui/unified/MenuRenderer", './library', "sap/
 	 * @private
 	 */
 	AnalyticalColumnMenu.prototype._addSumMenuItem = function() {
-		var oColumn = this._oColumn,
-			oTable = this._oTable,
-			oBinding = oTable.getBinding(),
-			oResultSet = oBinding && oBinding.getAnalyticalQueryResult();
+		var oColumn = this._oColumn;
 
-		if (oTable && oResultSet && oResultSet.findMeasureByPropertyName(oColumn.getLeadingProperty())) {
+		if (oColumn._isAggregatableByMenu()) {
 			this._oSumItem = this._createMenuItem(
 				"total",
 				"TBL_TOTAL",

package/src/sap/ui/table/AnalyticalTable.js

@@ -56,7 +56,7 @@ sap.ui.define([
 	 * @see http://scn.sap.com/docs/DOC-44986
 	 *
 	 * @extends sap.ui.table.Table
-	 * @version 1.105.0
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @public

package/src/sap/ui/table/Column.js

@@ -8,7 +8,9 @@
 sap.ui.define([
 	"./ColumnMenu",
 	"./utils/TableUtils",
+	"./menus/ColumnHeaderMenuAdapter",
 	"./library",
+	"sap/ui/core/Core",
 	"sap/ui/core/Element",
 	"sap/ui/core/Popup",
 	"sap/ui/core/library",
@@ -24,7 +26,9 @@ sap.ui.define([
 ], function(
 	ColumnMenu,
 	TableUtils,
+	ColumnHeaderMenuAdapter,
 	library,
+	Core,
 	Element,
 	Popup,
 	coreLibrary,
@@ -68,7 +72,7 @@ sap.ui.define([
 	 * @class
 	 * The column allows you to define column specific properties that will be applied when rendering the table.
 	 * @extends sap.ui.core.Element
-	 * @version 1.105.0
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @public
@@ -323,11 +327,11 @@ sap.ui.define([
 		},
 		associations: {
 			/**
-			 * Provides a menu that is used by the column and replaces the menu aggregation when set.
-			 * The given menu has to follow the same pattern as the <code>sap.ui.core.IColumnHeaderMenu</code> interface.
-			 * @since 1.98.0
+			 * The menu that can be opened by the header element of this column.
+			 *
+			 * @since 1.104
 			 */
-			columnHeaderMenu: {type: "sap.ui.core.IColumnHeaderMenu", multiple: false, visibility: "hidden"}
+			headerMenu: {type: "sap.ui.core.IColumnHeaderMenu", multiple: false, visibility: "hidden"}
 		},
 		events : {
 			/**
@@ -386,6 +390,7 @@ sap.ui.define([
 	 */
 	Column.prototype.exit = function() {
 		this._destroyTemplateClones();
+		ColumnHeaderMenuAdapter.unlink(this);
 	};
 
 	/**
@@ -807,6 +812,31 @@ sap.ui.define([
 		}
 	};
 
+	Column.prototype._openHeaderMenu = function(oDomRef) {
+		var oHeaderMenu = this.getHeaderMenuInstance();
+		if (oHeaderMenu) {
+			ColumnHeaderMenuAdapter.activateFor(this).then(function() {
+				oHeaderMenu.openBy(oDomRef);
+			});
+		}
+	};
+
+	Column.prototype._isMenuOpen = function() {
+		var oHeaderMenu = this.getHeaderMenuInstance();
+		if (!oHeaderMenu) {
+			return false;
+		}
+		return oHeaderMenu.isOpen();
+	};
+
+	Column.prototype._setGrouped = function(bGrouped) {
+		var oTable = this._getTable();
+		oTable.setGroupBy(bGrouped ? this : null);
+	};
+
+	Column.prototype._isAggregatableByMenu = function() {
+		return false;
+	};
 
 	/**
 	 * Toggles the sort order of the column.
@@ -847,54 +877,70 @@ sap.ui.define([
 			});
 
 			if (bExecuteDefault) {
-				var aSortedCols = oTable.getSortedColumns();
-				var aColumns = oTable.getColumns();
-
-				// reset the sorting status of all columns which are not sorted anymore
-				for (var i = 0, l = aColumns.length; i < l; i++) {
-					if (aSortedCols.indexOf(aColumns[i]) < 0) {
-						// column is not sorted anymore -> reset default and remove sorter
-						aColumns[i].setProperty("sorted", false, true);
-						aColumns[i].setProperty("sortOrder", SortOrder.Ascending, true);
-						aColumns[i]._updateIcons(true);
-						delete _private(aColumns[i]).oSorter;
-					}
-				}
-
 				// update properties of current column
 				this.setProperty("sorted", true, true);
 				this.setProperty("sortOrder", sNewSortOrder, true);
 				_private(this).oSorter = new Sorter(this.getSortProperty(), this.getSortOrder() === SortOrder.Descending);
 
-				// add sorters of all sorted columns to one sorter-array and update sort icon rendering for sorted columns
-				var aSorters = [];
-				for (var i = 0, l = aSortedCols.length; i < l; i++) {
-					aSortedCols[i]._updateIcons(true);
-					aSorters.push(_private(aSortedCols[i]).oSorter);
-				}
+				this._applySorters(sNewSortOrder, bAdd);
+			}
+		}
+		return this;
+	};
 
-				oTable._resetColumnHeaderHeights();
-				oTable._updateRowHeights(oTable._collectRowHeights(true), true);
-
-				var oBinding = oTable.getBinding();
-				if (oBinding) {
-					// For the AnalyticalTable with an AnalyticalColumn.
-					if (this._updateTableAnalyticalInfo) {
-						// The analytical info must be updated before sorting via the binding. The request will still be correct, but the binding
-						// will create its internal data structure based on the analytical info. We also do not need to get the contexts right
-						// now (therefore "true" is passed"), this will be done later in refreshRows.
-						this._updateTableAnalyticalInfo(true);
-					}
+	Column.prototype._unsort = function() {
+		var oTable = this.getParent();
+		if (oTable) {
+			// add current column to list of sorted columns
+			oTable._removeSortedColumn(this);
 
-					// sort the binding
-					oBinding.sort(aSorters);
+			this._applySorters();
+		}
+		return this;
+	};
 
-				} else {
-					Log.warning("Sorting not performed because no binding present", this);
-				}
+	Column.prototype._applySorters = function(sNewSortOrder, bAdd) {
+		var oTable = this.getParent();
+		var aSortedCols = oTable.getSortedColumns();
+		var aColumns = oTable.getColumns();
+
+		// reset the sorting status of all columns which are not sorted anymore
+		for (var i = 0, l = aColumns.length; i < l; i++) {
+			if (aSortedCols.indexOf(aColumns[i]) < 0) {
+				// column is not sorted anymore -> reset default and remove sorter
+				aColumns[i].setProperty("sorted", false, true);
+				aColumns[i].setProperty("sortOrder", SortOrder.Ascending, true);
+				aColumns[i]._updateIcons(true);
+				delete _private(aColumns[i]).oSorter;
 			}
 		}
-		return this;
+
+		// add sorters of all sorted columns to one sorter-array and update sort icon rendering for sorted columns
+		var aSorters = [];
+		for (var i = 0, l = aSortedCols.length; i < l; i++) {
+			aSortedCols[i]._updateIcons(true);
+			aSorters.push(_private(aSortedCols[i]).oSorter);
+		}
+
+		oTable._resetColumnHeaderHeights();
+		oTable._updateRowHeights(oTable._collectRowHeights(true), true);
+
+		var oBinding = oTable.getBinding();
+		if (oBinding) {
+			// For the AnalyticalTable with an AnalyticalColumn.
+			if (this._updateTableAnalyticalInfo) {
+				// The analytical info must be updated before sorting via the binding. The request will still be correct, but the binding
+				// will create its internal data structure based on the analytical info. We also do not need to get the contexts right
+				// now (therefore "true" is passed"), this will be done later in refreshRows.
+				this._updateTableAnalyticalInfo(true);
+			}
+
+			// sort the binding
+			oBinding.sort(aSorters);
+
+		} else {
+			Log.warning("Sorting not performed because no binding present", this);
+		}
 	};
 
 	Column.prototype._updateIcons = function(bSkipUpdateRowHeights) {
@@ -925,6 +971,15 @@ sap.ui.define([
 		this._updateIcons();
 	};
 
+	Column.prototype._getFilterState = function() {
+		try {
+			this._getFilter();
+			return ValueState.None;
+		} catch (e) {
+			return ValueState.Error;
+		}
+	};
+
 	Column.prototype._getFilter = function() {
 
 		var oFilter,
@@ -1316,13 +1371,13 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns the <code>sap.ui.core.IColumnHeaderMenu<\code>, which is the current target of the association <code>columnHeaderMenu</code>, or null.
+	 * Returns the column header menu instance that this column is associated with via the <code>headerMenu</code> association.
 	 *
-	 * @returns {sap.ui.core.IColumnHeaderMenu}
+	 * @returns {sap.ui.core.IColumnHeaderMenu | undefined} The column header menu instance
 	 * @private
 	 */
-	Column.prototype.getColumnHeaderMenu = function () {
-		return sap.ui.getCore().byId(this.getAssociation("columnHeaderMenu"));
+	Column.prototype.getHeaderMenuInstance = function () {
+		return Core.byId(this.getAssociation("headerMenu"));
 	};
 
 	function validateCellContentVisibilitySettings(mSettings) {

package/src/sap/ui/table/ColumnMenu.js

@@ -39,7 +39,7 @@ sap.ui.define([
 	 * @class
 	 * The column menu provides all common actions that can be performed on a column.
 	 * @extends sap.ui.unified.Menu
-	 * @version 1.105.0
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @public
@@ -265,7 +265,18 @@ sap.ui.define([
 				"TBL_GROUP",
 				null,
 				function() {
+					var oDomRef;
 					oTable.setGroupBy(oColumn);
+
+					if (TableUtils.isNoDataVisible(oTable)) {
+						oDomRef = oTable.getDomRef("noDataCnt");
+					} else {
+						oDomRef = oTable.getDomRef("rowsel0");
+					}
+
+					if (oDomRef) {
+						oDomRef.focus();
+					}
 				}
 			));
 		}
@@ -356,6 +367,10 @@ sap.ui.define([
 						});
 					}
 					if (bExecuteDefault) {
+						if (oTable.getFocusDomRef().getAttribute("id") === oColumn.getId()) {
+							var aVisibleColumns = oTable._getVisibleColumns();
+							aVisibleColumns[Math.min(aVisibleColumns.indexOf(oColumn) + 1, TableUtils.getVisibleColumnCount(oTable) - 2)].focus();
+						}
 						oColumn.setVisible(bVisible);
 					}
 				}
@@ -404,7 +419,7 @@ sap.ui.define([
 
 
 	/**
-	 * sets a new filter value into the filter field
+	 * Sets a new filter value into the filter field
 	 * @param {string} sValue value of the filter input field to be set
 	 * @returns {this} this reference for chaining
 	 * @private
@@ -421,7 +436,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * sets a new filter value into the filter field
+	 * Sets the value state of the filter field
 	 * @param {sap.ui.core.ValueState} sFilterState value state for filter text field item
 	 * @returns {this} this reference for chaining
 	 * @private

package/src/sap/ui/table/CreationRow.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * <code>sap.ui.commons</code> library.
 	 * @extends sap.ui.core.Control
 	 * @author SAP SE
-	 * @version 1.105.0
+	 * @version 1.106.0
 	 *
 	 * @constructor
 	 * @private