@openui5/sap.ui.table 1.133.0 → 1.134.0

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

@@ -12,7 +12,6 @@ sap.ui.define([
 	"./utils/TableUtils",
 	"./extensions/ExtensionBase",
 	"sap/ui/core/Renderer",
-	"sap/ui/core/IconPool",
 	"sap/ui/core/library",
 	"sap/base/Log"
 ], function(
@@ -22,7 +21,6 @@ sap.ui.define([
 	TableUtils,
 	ExtensionBase,
 	Renderer,
-	IconPool,
 	CoreLibrary,
 	Log
 ) {
@@ -64,7 +62,6 @@ sap.ui.define([
 
 		// basic table div
 		rm.openStart("div", oTable);
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "ROOT");
 		rm.class("sapUiTable");
 
 		if (Device.browser.chrome && window.devicePixelRatio < 1) {
@@ -117,7 +114,7 @@ sap.ui.define([
 			rm.class("sapUiTableRowNavIndicator");
 		}
 
-		if (TableUtils.isNoDataVisible(oTable) && !oTable._hasPendingRequests()) {
+		if (TableUtils.isNoDataVisible(oTable) && !oTable._isWaitingForData()) {
 			rm.class("sapUiTableEmpty"); // no data!
 		}
 
@@ -172,14 +169,17 @@ sap.ui.define([
 		// Define the paste region for the paste event
 		rm.attr("data-sap-ui-pasteregion", "true");
 
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "CONTAINER");
 		rm.openEnd();
 
+		if (!oTable._getScrollExtension().isVerticalScrollbarExternal()) {
+			this.renderVSb(rm, oTable);
+		}
+
 		const bDummyTabbable = oTable.getRows().length || oTable.getColumnHeaderVisible();
 		this.renderTabElement(rm, "sapUiTableCtrlBefore", bDummyTabbable ? "0" : "-1");
 
 		rm.openStart("div", oTable.getId() + "-sapUiTableGridCnt");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "CONTENT");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Content");
 		rm.openEnd();
 
 		this.renderColRsz(rm, oTable);
@@ -194,18 +194,17 @@ sap.ui.define([
 		const oCreationRow = oTable.getCreationRow();
 		if (oCreationRow && oCreationRow.getVisible()) {
 			rm.renderControl(oCreationRow);
-
-			// If the table has a creation row, the horizontal scrollbar needs to be rendered outside the element covered by the busy indicator.
-			this.renderHSbBackground(rm, oTable);
-			this.renderHSb(rm, oTable);
 		}
 
+		this.renderHSbBackground(rm, oTable);
+		this.renderHSb(rm, oTable);
+
 		oTable._getAccRenderExtension().writeHiddenAccTexts(rm, oTable);
 
 		rm.openStart("div", oTable.getId() + "-overlay");
 		rm.class("sapUiTableOverlayArea");
 		rm.attr("tabindex", "0");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "OVERLAY");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Overlay");
 		rm.openEnd();
 		rm.close("div");
 
@@ -234,7 +233,7 @@ sap.ui.define([
 	TableRenderer.renderHeader = function(rm, oTable, oTitle) {
 		rm.openStart("div");
 		rm.class("sapUiTableHdr");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "TABLEHEADER");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "TableHeader");
 		rm.openEnd();
 
 		rm.renderControl(oTitle);
@@ -262,7 +261,7 @@ sap.ui.define([
 			rm.class("sapUiTableMTbr"); // Just a marker when sap.m toolbar is used
 		}
 
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "TABLESUBHEADER");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "TableSubHeader");
 		rm.openEnd();
 		rm.renderControl(oToolbar);
 		rm.close("div");
@@ -277,7 +276,7 @@ sap.ui.define([
 	TableRenderer.renderExtension = function(rm, oTable, oExtension) {
 		rm.openStart("div");
 		rm.class("sapUiTableExt");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "TABLESUBHEADER");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "TableSubHeader");
 		rm.openEnd();
 
 		rm.renderControl(oExtension);
@@ -293,12 +292,6 @@ sap.ui.define([
 
 		this.renderTableCCnt(rm, oTable);
 		rm.close("div");
-
-		const oCreationRow = oTable.getCreationRow();
-		if (!oCreationRow || !oCreationRow.getVisible()) {
-			this.renderHSbBackground(rm, oTable);
-			this.renderHSb(rm, oTable);
-		}
 	};
 
 	TableRenderer.renderTableCCnt = function(rm, oTable) {
@@ -306,14 +299,10 @@ sap.ui.define([
 		this.renderRowHdr(rm, oTable);
 		this.renderRowActions(rm, oTable);
 
-		if (!oTable._getScrollExtension().isVerticalScrollbarExternal()) {
-			this.renderVSb(rm, oTable);
-		}
-
 		rm.openStart("div", oTable.getId() + "-noDataCnt");
 		rm.class("sapUiTableCtrlEmpty");
 		rm.attr("tabindex", "0");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "NODATA");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "NoData");
 		rm.openEnd();
 
 		const vNoContentMessage = TableUtils.getNoContentMessage(oTable);
@@ -334,7 +323,7 @@ sap.ui.define([
 	TableRenderer.renderFooter = function(rm, oTable, oFooter) {
 		rm.openStart("div");
 		rm.class("sapUiTableFtr");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "TABLEFOOTER");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "TableFooter");
 		rm.openEnd();
 
 		rm.renderControl(oFooter);
@@ -351,7 +340,7 @@ sap.ui.define([
 		const aCols = oTable.getColumns();
 		const iFixedColumnCount = oTable.getComputedFixedColumnCount();
 
-		rm.openStart("div");
+		rm.openStart("div", oTable.getId() + "-sapUiTableColHdrCnt");
 		rm.class("sapUiTableColHdrCnt");
 		rm.openEnd();
 
@@ -393,18 +382,14 @@ sap.ui.define([
 
 		rm.close("div");
 
-		rm.openStart("div");
-		rm.class("sapUiTableVSbHeader");
-		rm.openEnd();
-		rm.close("div");
-
 		if (TableUtils.hasRowActions(oTable)) {
 			rm.openStart("div", oTable.getId() + "-rowacthdr");
-			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "ROWACTIONHEADER");
+			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "RowActionHeader");
 
 			rm.class("sapUiTableCell");
 			rm.class("sapUiTableHeaderCell");
 			rm.class("sapUiTableRowActionHeaderCell");
+			rm.attr("tabindex", "-1");
 			rm.openEnd();
 			rm.openStart("span");
 
@@ -415,6 +400,11 @@ sap.ui.define([
 			rm.close("div");
 		}
 
+		rm.openStart("div");
+		rm.class("sapUiTableVSbHeader");
+		rm.openEnd();
+		rm.close("div");
+
 		rm.close("div");
 	};
 
@@ -423,6 +413,12 @@ sap.ui.define([
 		let bSelAll = false;
 		const mRenderConfig = oTable._getSelectionPlugin().getRenderConfig();
 
+		rm.openStart("div");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "ColumnRowHeaderRow");
+		rm.openEnd();
+		rm.openStart("div", oTable.getId() + "-rowcolhdr");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "ColumnRowHeaderCell");
+		rm.openEnd();
 		rm.openStart("div", oTable.getId() + "-selall");
 
 		rm.class("sapUiTableCell");
@@ -459,7 +455,7 @@ sap.ui.define([
 			enabled: bEnabled,
 			checked: bSelAll
 		};
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "COLUMNROWHEADER", oParams);
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "ColumnRowHeader", oParams);
 
 		rm.openEnd();
 
@@ -482,7 +478,7 @@ sap.ui.define([
 			rm.close("span");
 		}
 
-		rm.close("div");
+		rm.close("div").close("div").close("div");
 	};
 
 	TableRenderer.renderCol = function(rm, oTable, oColumn, iHeader, nSpan, bIsFirstColumn, bIsLastFixedColumn, bIsLastColumn, bRenderIcons) {
@@ -543,7 +539,7 @@ sap.ui.define([
 			}
 		}
 
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "COLUMNHEADER", mAccParams);
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "ColumnHeader", mAccParams);
 
 		rm.class("sapUiTableCell");
 		rm.class("sapUiTableHeaderCell");
@@ -624,10 +620,10 @@ sap.ui.define([
 
 	TableRenderer.renderRowHdr = function(rm, oTable) {
 		rm.openStart("div", oTable.getId() + "-sapUiTableRowHdrScr");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "PRESENTATION");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Presentation");
 		rm.class("sapUiTableRowHdrScr");
 		rm.class("sapUiTableNoOpacity");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "ROWHEADER_COL");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "RowHeaderCol");
 		rm.openEnd();
 
 		// start with the first current top visible row
@@ -643,7 +639,7 @@ sap.ui.define([
 			return;
 		}
 		rm.openStart("div", oTable.getId() + "-sapUiTableRowActionScr");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "PRESENTATION");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Presentation");
 		TableUtils.hasRowActions(oTable) ? rm.class("sapUiTableRowWithAction") : rm.class("sapUiTableRowActionScr");
 		rm.class("sapUiTableNoOpacity");
 		rm.openEnd();
@@ -686,6 +682,7 @@ sap.ui.define([
 		const bRowSelected = oTable._getSelectionPlugin().isSelected(oRow);
 
 		rm.openStart("div");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "RowAddon");
 
 		rm.attr("data-sap-ui-related", oRow.getId());
 		rm.attr("data-sap-ui-rowindex", iRowIndex);
@@ -720,7 +717,7 @@ sap.ui.define([
 			rowSelected: bRowSelected,
 			rowHidden: oRow.isEmpty()
 		};
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, bHeader ? "ROWHEADER" : "ROWACTION", oParams);
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, bHeader ? "RowHeader" : "RowAction", oParams);
 
 		rm.openEnd();
 		if (bHeader) {
@@ -819,7 +816,7 @@ sap.ui.define([
 			rm.class(sClass);
 		});
 
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, bHeader ? "COLUMNHEADER_TABLE" : "TABLE");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, bHeader ? "Presentation" : "Table");
 
 		rm.class("sapUiTableCtrl");
 		if (bHeader) {
@@ -885,7 +882,7 @@ sap.ui.define([
 			if (oColParam.shouldRender) {
 				if (iStartRow === 0) {
 					rm.openStart("th", oTable.getId() + sSuffix + iCol);
-					oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "TH", {column: oColumn});
+					oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Th", {column: oColumn});
 				} else {
 					rm.openStart("th");
 				}
@@ -910,7 +907,7 @@ sap.ui.define([
 		// dummy column to fill the table width
 		if (bRenderDummyColumn) {
 			rm.openStart("th", bHeader && oTable.getId() + "-dummycolhdr");
-			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "PRESENTATION");
+			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Presentation");
 			rm.openEnd().close("th");
 		}
 
@@ -1011,7 +1008,7 @@ sap.ui.define([
 		rm.class("sapUiTableRow");
 		rm.class("sapUiTableHeaderRow");
 		rm.class("sapUiTableColHdrTr");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "COLUMNHEADER_ROW");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "ColumnHeaderRow");
 		rm.openEnd();
 
 		//
@@ -1063,7 +1060,7 @@ sap.ui.define([
 
 		if (!bFixedTable && bHasOnlyFixedColumns && aColumns.length > 0) {
 			rm.openStart("td").class("sapUiTableCellDummy");
-			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "PRESENTATION");
+			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Presentation");
 			rm.openEnd().close("td");
 		}
 		rm.close("tr");
@@ -1115,7 +1112,7 @@ sap.ui.define([
 			fixedCol: bFixedTable,
 			rowNavigated: oRowSettings ? oRowSettings.getNavigated() : false
 		};
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "TR", oParams);
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Tr", oParams);
 
 		rm.openEnd();
 
@@ -1127,7 +1124,7 @@ sap.ui.define([
 		}
 		if (!bFixedTable && bHasOnlyFixedColumns && aCells.length > 0) {
 			rm.openStart("td").class("sapUiTableCellDummy");
-			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "PRESENTATION");
+			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Presentation");
 			rm.openEnd();
 			rm.close("td");
 		}
@@ -1156,7 +1153,7 @@ sap.ui.define([
 				fixed: bFixedTable,
 				rowSelected: bSelected
 			};
-			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "DATACELL", oParams);
+			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "DataCell", oParams);
 
 			const sTextAlign = Renderer.getTextAlign(oColumn.getHAlign());
 			if (sTextAlign) {
@@ -1204,7 +1201,7 @@ sap.ui.define([
 			rm.openStart("span", oRow.getId() + "-treeicon");
 			rm.class("sapUiTableTreeIcon");
 			rm.attr("tabindex", "-1");
-			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "TREEICON", {row: oRow});
+			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "TreeIcon", {row: oRow});
 			rm.openEnd();
 			rm.close("span");
 		}
@@ -1225,6 +1222,8 @@ sap.ui.define([
 			rm.class("sapUiTableHidden");
 		}
 		rm.class(mConfig.cssClass);
+		const iHeaderHeight = oTable._collectRowHeights(true).reduce((iSum, iHeight) => iSum + iHeight, 0) + 1;
+		rm.style("margin-top", iHeaderHeight + "px");
 		rm.openEnd();
 
 		rm.openStart("div", oTable.getId() + "-vsb");

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

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * @class
 	 * The TreeTable control provides a comprehensive set of features to display hierarchical data.
 	 * @extends sap.ui.table.Table
-	 * @version 1.133.0
+	 * @version 1.134.0
 	 *
 	 * @constructor
 	 * @public
@@ -601,8 +601,8 @@ sap.ui.define([
 		Table.prototype._onBindingDataReceived.apply(this, arguments);
 	};
 
-	TreeTable.prototype._hasPendingRequests = function() {
-		return _private(this).bPendingRequest;
+	TreeTable.prototype._isWaitingForData = function() {
+		return _private(this).bPendingRequest && Table.prototype._isWaitingForData.apply(this);
 	};
 
 	return TreeTable;