@openui5/sap.ui.table 1.143.1 → 1.144.0

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

@@ -1,33 +1,29 @@
 /*!
  * OpenUI5
- * (c) Copyright 2025 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2026 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-//Provides default renderer for control sap.ui.table.Table
 sap.ui.define([
-	"sap/ui/Device",
-	"./library",
 	"./Column",
 	"./utils/TableUtils",
 	"./extensions/ExtensionBase",
 	"sap/ui/core/Renderer",
 	"sap/ui/core/library",
+	"sap/ui/Device",
 	"sap/base/Log"
 ], function(
-	Device,
-	library,
 	Column,
 	TableUtils,
 	ExtensionBase,
 	Renderer,
 	CoreLibrary,
+	Device,
 	Log
 ) {
 	"use strict";
 
 	const SortOrder = CoreLibrary.SortOrder;
-	const ColumnUtils = TableUtils.Column;
 	const mFlexCellContentAlignment = {
 		Begin: "flex-start",
 		End: "flex-end",
@@ -48,10 +44,11 @@ sap.ui.define([
 	};
 
 	/**
-	 * Renders the HTML for the given control, using the provided {@link sap.ui.core.RenderManager}.
+	 * Renders the table.
 	 *
-	 * @param {sap.ui.core.RenderManager} rm The RenderManager that can be used for writing to the Render-Output-Buffer.
-	 * @param {sap.ui.table.Table} oTable The instance of the table that should be rendered.
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
 	 */
 	TableRenderer.render = function(rm, oTable) {
 		// Clear cashed header row count
@@ -60,10 +57,47 @@ sap.ui.define([
 		mFlexCellContentAlignment.Left = oTable._bRtlMode ? "flex-end" : "flex-start";
 		mFlexCellContentAlignment.Right = oTable._bRtlMode ? "flex-start" : "flex-end";
 
-		// basic table div
 		rm.openStart("div", oTable);
+		this._decorateRootElement(rm, oTable);
+		rm.openEnd();
+		this.renderTabElement(rm, {className: "sapUiTableOuterBefore"});
+		this._renderTopSection(rm, oTable);
+		this._renderMainSection(rm, oTable);
+		this._renderBottomSection(rm, oTable);
+		this.renderTabElement(rm, {className: "sapUiTableOuterAfter"});
+		rm.close("div");
+	};
+
+	/**
+	 * Decorates the table's root element with attributes, styles and CSS classes.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
+	TableRenderer._decorateRootElement = function(rm, oTable) {
 		rm.class("sapUiTable");
 
+		this._addBrowserSpecificClasses(rm);
+		this._addTableStateClasses(rm, oTable);
+		/** @deprecated As of version 1.118 */
+		this._addDeprecatedClasses(rm, oTable);
+
+		if (oTable._bFirstRendering) {
+			rm.class("sapUiTableNoOpacity");
+		}
+
+		rm.style("width", oTable.getWidth());
+		TableUtils.Hook.call(oTable, Hook.RenderTableStyles, rm);
+	};
+
+	/**
+	 * Adds browser or environment specific CSS classes.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @private
+	 */
+	TableRenderer._addBrowserSpecificClasses = function(rm) {
 		if (Device.browser.chrome && window.devicePixelRatio < 1) {
 			rm.class("sapUiTableZoomout");
 		}
@@ -71,23 +105,87 @@ sap.ui.define([
 		if ('ontouchstart' in document) {
 			rm.class("sapUiTableTouch");
 		}
+	};
+
+	/**
+	 * Adds table state related CSS classes.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
+	TableRenderer._addTableStateClasses = function(rm, oTable) {
 		rm.class("sapUiTableSelMode" + oTable.getSelectionMode());
 
 		if (oTable.getColumnHeaderVisible()) {
-			rm.class("sapUiTableCHdr"); // show column headers
+			rm.class("sapUiTableCHdr");
 		}
 		if (TableUtils.hasRowHeader(oTable)) {
-			rm.class("sapUiTableRowSelectors"); // show row selectors
+			rm.class("sapUiTableRowSelectors");
 		}
 		if (TableUtils.hasRowHighlights(oTable)) {
-			rm.class("sapUiTableRowHighlights"); // show row highlights
+			rm.class("sapUiTableRowHighlights");
 		}
+		if (TableUtils.isNoDataVisible(oTable) && !oTable._isWaitingForData()) {
+			rm.class("sapUiTableEmpty");
+		}
+		if (oTable.getShowOverlay()) {
+			rm.class("sapUiTableOverlay");
+		}
+
+		const oScrollExtension = oTable._getScrollExtension();
+		if (oScrollExtension.isVerticalScrollbarRequired() && !oScrollExtension.isVerticalScrollbarExternal()) {
+			rm.class("sapUiTableVScr");
+		}
+
+		this._addRowActionClasses(rm, oTable);
+
+		const sModeClass = TableUtils.Grouping.getModeCssClass(oTable);
+		if (sModeClass) {
+			rm.class(sModeClass);
+		}
+	};
 
+	/**
+	 * Adds CSS classes indicating available row actions or navigation indicators.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
+	TableRenderer._addRowActionClasses = function(rm, oTable) {
+		if (TableUtils.hasRowActions(oTable)) {
+			rm.class("sapUiTableRAct");
+			switch (oTable.getRowActionCount()) {
+				case 1:
+					rm.class("sapUiTableRActS");
+					break;
+				case 2:
+					rm.class("sapUiTableRActM");
+					break;
+				default:
+					rm.class("sapUiTableRActL");
+			}
+		}
+
+		if (TableUtils.hasRowNavigationIndicators(oTable)) {
+			rm.class("sapUiTableRowNavIndicator");
+		}
+	};
+
+	/**
+	 * Adds deprecated CSS classes for backward compatibility.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 * @deprecated As of version 1.118
+	 */
+	TableRenderer._addDeprecatedClasses = function(rm, oTable) {
 		/**
 		 * @deprecated As of version 1.118
 		 */
 		try {
-			// This class flags whether the sap.m. library is loaded or not.
 			const sSapMTableClass = TableUtils._getTableTemplateHelper(true).addTableClass();
 			if (sSapMTableClass) {
 				rm.class(sSapMTableClass);
@@ -96,108 +194,67 @@ sap.ui.define([
 			// ignore
 		}
 
-		const oScrollExtension = oTable._getScrollExtension();
-		const oAccRenderExtension = oTable._getAccRenderExtension();
-		if (oScrollExtension.isVerticalScrollbarRequired() && !oScrollExtension.isVerticalScrollbarExternal()) {
-			rm.class("sapUiTableVScr"); // show vertical scrollbar
-		}
 		/**
 		* @deprecated As of Version 1.115
 		*/
 		if (oTable.getEditable && oTable.getEditable()) {
-			rm.class("sapUiTableEdt"); // editable (background color)
-		}
-
-		if (TableUtils.hasRowActions(oTable)) {
-			rm.class("sapUiTableRAct");
-			const iRowActionCount = oTable.getRowActionCount();
-			if (iRowActionCount === 1) {
-				rm.class("sapUiTableRActS");
-			} else if (iRowActionCount === 2) {
-				rm.class("sapUiTableRActM");
-			} else {
-				rm.class("sapUiTableRActL");
-			}
-		} else if (TableUtils.hasRowNavigationIndicators(oTable)) {
-			rm.class("sapUiTableRowNavIndicator");
-		}
-
-		if (TableUtils.isNoDataVisible(oTable) && !oTable._isWaitingForData()) {
-			rm.class("sapUiTableEmpty"); // no data!
-		}
-
-		if (oTable.getShowOverlay()) {
-			rm.class("sapUiTableOverlay");
-		}
-
-		const sModeClass = TableUtils.Grouping.getModeCssClass(oTable);
-		if (sModeClass) {
-			rm.class(sModeClass);
-		}
-
-		rm.style("width", oTable.getWidth());
-
-		TableUtils.Hook.call(oTable, Hook.RenderTableStyles, rm);
-
-		if (oTable._bFirstRendering) {
-			// This class hides the table by setting opacity to 0. It will be removed in Table#_updateTableSizes.
-			// Makes initial asynchronous renderings a bit nicer, because the table only shows up after everything is done.
-			rm.class("sapUiTableNoOpacity");
+			rm.class("sapUiTableEdt");
 		}
+	};
 
-		rm.openEnd();
-
-		this.renderTabElement(rm, "sapUiTableOuterBefore");
-
+	/**
+	 * Renders the top area containing, for example, extensions.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
+	TableRenderer._renderTopSection = function(rm, oTable) {
 		rm.openStart("div", oTable.getId() + "-before");
 		rm.class("sapUiTableBefore");
 		rm.openEnd();
-
 		rm.renderControl(oTable.getAggregation("_messageStrip"));
-
-		if (oTable.getTitle()) {
-			this.renderHeader(rm, oTable, oTable.getTitle());
-		}
-
-		if (oTable.getToolbar()) {
-			this.renderToolbar(rm, oTable, oTable.getToolbar());
-		}
-
-		if (oTable.getExtension() && oTable.getExtension().length > 0) {
-			this.renderExtensions(rm, oTable, oTable.getExtension());
-		}
-
+		/** @deprecated As of version 1.72 */
+		this.renderHeader(rm, oTable);
+		/** @deprecated As of version 1.38 */
+		this.renderToolbar(rm, oTable);
+		this.renderExtensions(rm, oTable);
 		rm.close("div");
+	};
+
+	/**
+	 * Renders the main content area containing the actual table.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
+	TableRenderer._renderMainSection = function(rm, oTable) {
+		const oAccRenderExtension = oTable._getAccRenderExtension();
+		const bHasFocusableContent = oTable.getRows().length || oTable.getColumnHeaderVisible();
 
 		rm.openStart("div", oTable.getId() + "-sapUiTableCnt");
 		rm.class("sapUiTableCnt");
-
-		// Define group for F6 handling
 		rm.attr("data-sap-ui-fastnavgroup", "true");
-		// Define the paste region for the paste event
 		rm.attr("data-sap-ui-pasteregion", "true");
-
 		rm.openEnd();
 
 		if (!oTable._getScrollExtension().isVerticalScrollbarExternal()) {
 			this.renderVSb(rm, oTable);
 		}
 
-		const bDummyTabbable = oTable.getRows().length || oTable.getColumnHeaderVisible();
-		this.renderTabElement(rm, "sapUiTableCtrlBefore", bDummyTabbable ? "0" : "-1");
+		this.renderTabElement(rm, {className: "sapUiTableCtrlBefore", tabIndex: bHasFocusableContent ? "0" : "-1"});
 
 		rm.openStart("div", oTable.getId() + "-sapUiTableGridCnt");
 		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "Content");
 		rm.openEnd();
-
-		this.renderColRsz(rm, oTable);
-		this.renderColHdr(rm, oTable);
+		this.renderColumnResizer(rm, oTable);
+		this.renderColumnHeader(rm, oTable);
 		this.renderTable(rm, oTable);
-
 		rm.close("div");
 
-		this.renderTabElement(rm, "sapUiTableCtrlAfter", bDummyTabbable ? "0" : "-1");
-		this.renderTabElement(rm, null, "-1", oTable.getId() + "-focusDummy");
+		this.renderTabElement(rm, {className: "sapUiTableCtrlAfter", tabIndex: bHasFocusableContent ? "0" : "-1"});
+		this.renderTabElement(rm, {tabIndex: "-1", id: oTable.getId() + "-focusDummy"});
 
 		const oCreationRow = oTable.getCreationRow();
 		if (oCreationRow && oCreationRow.getVisible()) {
@@ -206,50 +263,119 @@ sap.ui.define([
 
 		this.renderHSbBackground(rm, oTable);
 		this.renderHSb(rm, oTable);
-
+		this._renderOverlay(rm, oTable);
 		oAccRenderExtension.writeHiddenAccTexts(rm, oTable);
 
+		rm.close("div");
+	};
+
+	/**
+	 * Renders the column resize handle.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
+	TableRenderer.renderColumnResizer = function(rm, oTable) {
+		rm.openStart("div", oTable.getId() + "-rsz");
+		rm.class("sapUiTableColRsz");
+		rm.openEnd();
+		rm.close("div");
+	};
+
+	/**
+	 * Renders the column header rows.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
+	TableRenderer.renderColumnHeader = function(rm, oTable) {
+		const iHeaderRowCount = TableUtils.getHeaderRowCount(oTable);
+		const iFixedColumnCount = oTable.getComputedFixedColumnCount();
+
+		rm.openStart("div", oTable.getId() + "-sapUiTableColHdrCnt");
+		rm.class("sapUiTableColHdrCnt");
+		rm.openEnd();
+		this._renderSelectionHeader(rm, oTable);
+		this._renderFixedColumnHeader(rm, oTable, {
+			fixedColumnCount: iFixedColumnCount,
+			headerRowCount: iHeaderRowCount
+		});
+		this._renderScrollableColumnHeader(rm, oTable, {
+			fixedColumnCount: iFixedColumnCount,
+			headerRowCount: iHeaderRowCount
+		});
+		this._renderRowActionHeader(rm, oTable);
+		this._renderVSbHeader(rm);
+		rm.close("div");
+	};
+
+	/**
+	 * Renders the overlay area.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
+	TableRenderer._renderOverlay = function(rm, oTable) {
 		rm.openStart("div", oTable.getId() + "-overlay");
 		rm.class("sapUiTableOverlayArea");
 		rm.attr("tabindex", "0");
-		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "Overlay");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Overlay");
 		rm.openEnd();
 		rm.close("div");
+	};
 
-		rm.close("div");
-
+	/**
+	 * Renders the bottom area containing, for example, the footer.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
+	TableRenderer._renderBottomSection = function(rm, oTable) {
 		rm.openStart("div", oTable.getId() + "-after");
 		rm.openEnd();
-
-		if (oTable.getFooter()) {
-			this.renderFooter(rm, oTable, oTable.getFooter());
-		}
-
+		this.renderFooter(rm, oTable);
 		TableUtils.Hook.call(oTable, Hook.RenderInTableBottomArea, rm);
-
-		rm.close("div");
-
-		this.renderTabElement(rm, "sapUiTableOuterAfter");
 		rm.close("div");
 	};
 
-	// =============================================================================
-	// BASIC AREAS OF THE TABLE
-	// =============================================================================
+	/**
+	 * Renders the table header container.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @deprecated As of version 1.72
+	 * @private
+	 */
+	TableRenderer.renderHeader = function(rm, oTable) {
+		const oTitle = oTable.getTitle();
+
+		if (!oTitle) {
+			return;
+		}
 
-	/** @deprecated As of version 1.72 */
-	TableRenderer.renderHeader = function(rm, oTable, oTitle) {
 		rm.openStart("div");
 		rm.class("sapUiTableHdr");
 		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "TableHeader");
 		rm.openEnd();
-
 		rm.renderControl(oTitle);
-
 		rm.close("div");
 	};
 
-	TableRenderer.renderToolbar = function(rm, oTable, oToolbar) {
+	/**
+	 * Renders the toolbar of the table.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @deprecated As of version 1.38
+	 * @private
+	 */
+	TableRenderer.renderToolbar = function(rm, oTable) {
+		const oToolbar = oTable.getToolbar();
+
 		if (!TableUtils.isA(oToolbar, "sap.ui.core.Toolbar")) {
 			return;
 		}
@@ -257,7 +383,6 @@ sap.ui.define([
 		rm.openStart("div");
 		rm.class("sapUiTableTbr");
 
-		// toolbar has to be embedded (not standalone)!
 		if (typeof oToolbar.getStandalone === "function" && oToolbar.getStandalone()) {
 			oToolbar.setStandalone(false);
 		}
@@ -275,38 +400,96 @@ sap.ui.define([
 		rm.close("div");
 	};
 
-	TableRenderer.renderExtensions = function(rm, oTable, aExtensions) {
-		for (let i = 0, l = aExtensions.length; i < l; i++) {
-			this.renderExtension(rm, oTable, aExtensions[i]);
+	/**
+	 * Renders all extension controls of the table.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance providing the extensions
+	 * @private
+	 */
+	TableRenderer.renderExtensions = function(rm, oTable) {
+		for (const oExtension of oTable.getExtension() ?? []) {
+			this.renderExtension(rm, oTable, oExtension);
 		}
 	};
 
+	/**
+	 * Renders one extension control.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.core.Control} oExtension Extension control
+	 * @private
+	 */
 	TableRenderer.renderExtension = function(rm, oTable, oExtension) {
 		rm.openStart("div");
 		rm.class("sapUiTableExt");
 		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "TableSubHeader");
 		rm.openEnd();
-
 		rm.renderControl(oExtension);
+		rm.close("div");
+	};
+
+	/**
+	 * Renders the footer of the table.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
+	TableRenderer.renderFooter = function(rm, oTable) {
+		const oFooter = oTable.getFooter();
+
+		if (!oFooter) {
+			return;
+		}
 
+		rm.openStart("div");
+		rm.class("sapUiTableFtr");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "TableFooter");
+		rm.openEnd();
+		rm.renderControl(oFooter);
 		rm.close("div");
 	};
 
+	/**
+	 * Renders the area containing the content rows.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
 	TableRenderer.renderTable = function(rm, oTable) {
 		rm.openStart("div", oTable.getId() + "-tableCCnt");
 		TableUtils.Hook.call(oTable, Hook.RenderRowContainerStyles, rm);
 		rm.class("sapUiTableCCnt");
 		rm.openEnd();
-
 		this.renderTableCCnt(rm, oTable);
 		rm.close("div");
 	};
 
+	/**
+	 * Renders the table content components.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
 	TableRenderer.renderTableCCnt = function(rm, oTable) {
 		this.renderTableCtrl(rm, oTable);
-		this.renderRowHdr(rm, oTable);
+		this.renderRowHeader(rm, oTable);
 		this.renderRowActions(rm, oTable);
+		this._renderNoData(rm, oTable);
+	};
 
+	/**
+	 * Renders the NoData element.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
+	TableRenderer._renderNoData = function(rm, oTable) {
 		rm.openStart("div", oTable.getId() + "-noDataCnt");
 		rm.class("sapUiTableCtrlEmpty");
 		rm.attr("tabindex", "0");
@@ -328,94 +511,126 @@ sap.ui.define([
 		rm.close("div");
 	};
 
-	TableRenderer.renderFooter = function(rm, oTable, oFooter) {
+	/**
+	 * Renders the fixed columns portion of the column header if there are fixed columns.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} mConfig Configuration object
+	 * @param {int} mConfig.fixedColumnCount Number of fixed columns
+	 * @param {int} mConfig.headerRowCount Number of header rows
+	 * @private
+	 */
+	TableRenderer._renderFixedColumnHeader = function(rm, oTable, mConfig) {
+		if (mConfig.fixedColumnCount === 0) {
+			return;
+		}
+
 		rm.openStart("div");
-		rm.class("sapUiTableFtr");
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "TableFooter");
+		rm.class("sapUiTableCHA"); // marker for the column header area
+		rm.class("sapUiTableCtrlScrFixed");
+		rm.class("sapUiTableNoOpacity");
 		rm.openEnd();
-
-		rm.renderControl(oFooter);
-
+		this.renderTableElement(rm, oTable, {
+			fixedColumns: true,
+			startColumnIndex: 0,
+			endColumnIndex: mConfig.fixedColumnCount,
+			fixedTopRows: true,
+			fixedBottomRows: false,
+			startRowIndex: 0,
+			endRowIndex: mConfig.headerRowCount,
+			header: true
+		});
 		rm.close("div");
 	};
 
-	// =============================================================================
-	// COLUMN HEADER OF THE TABLE
-	// =============================================================================
-
-	TableRenderer.renderColHdr = function(rm, oTable) {
-		const nRows = TableUtils.getHeaderRowCount(oTable);
-		const aCols = oTable.getColumns();
-		const iFixedColumnCount = oTable.getComputedFixedColumnCount();
-
-		rm.openStart("div", oTable.getId() + "-sapUiTableColHdrCnt");
-		rm.class("sapUiTableColHdrCnt");
-		rm.openEnd();
-
-		this.renderColRowHdr(rm, oTable);
-
-		if (iFixedColumnCount > 0) {
-			rm.openStart("div");
-			rm.class("sapUiTableCHA"); // marker for the column header area
-			rm.class("sapUiTableCtrlScrFixed");
-			rm.class("sapUiTableNoOpacity");
-			rm.openEnd();
-
-			//
-			// write fixed table here
-			//
-			this.renderTableControlCnt(rm, oTable, true, 0, iFixedColumnCount, true, false, 0, nRows, true);
-			rm.close("div");
-		}
+	/**
+	 * Renders the scrollable portion of the column header.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} mConfig Configuration object
+	 * @param {int} mConfig.fixedColumnCount Number of fixed columns
+	 * @param {int} mConfig.headerRowCount Number of header rows
+	 * @private
+	 */
+	TableRenderer._renderScrollableColumnHeader = function(rm, oTable, mConfig) {
+		const aColumns = oTable.getColumns();
 
 		rm.openStart("div", oTable.getId() + "-sapUiTableColHdrScr");
 		rm.class("sapUiTableCHA"); // marker for the column header area
 		rm.class("sapUiTableCtrlScr");
-		if (aCols.length === 0) {
+
+		if (aColumns.length === 0) {
 			rm.class("sapUiTableHasNoColumns");
 		}
-		if (iFixedColumnCount > 0) {
+
+		if (mConfig.fixedColumnCount > 0) {
 			if (oTable._bRtlMode) {
 				rm.style("margin-right", "0");
 			} else {
 				rm.style("margin-left", "0");
 			}
 		}
-		rm.openEnd();
-
-		//
-		// write scrollable table here
-		//
-		this.renderTableControlCnt(rm, oTable, false, iFixedColumnCount, aCols.length, false, false, 0, nRows, true);
 
+		rm.openEnd();
+		this.renderTableElement(rm, oTable, {
+			fixedColumns: false,
+			startColumnIndex: mConfig.fixedColumnCount,
+			endColumnIndex: aColumns.length,
+			fixedTopRows: false,
+			fixedBottomRows: false,
+			startRowIndex: 0,
+			endRowIndex: mConfig.headerRowCount,
+			header: true
+		});
 		rm.close("div");
+	};
 
-		if (TableUtils.hasRowActions(oTable)) {
-			rm.openStart("div", oTable.getId() + "-rowacthdr");
-			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "RowActionHeader");
-
-			rm.class("sapUiTableCell");
-			rm.class("sapUiTableHeaderCell");
-			rm.class("sapUiTableRowActionHeaderCell");
-			rm.attr("tabindex", "-1");
-			rm.attr("aria-label", TableUtils.getResourceText("TBL_ROW_ACTION_COLUMN_LABEL"));
-			rm.openEnd();
-
-			rm.close("div");
+	/**
+	 * Renders the row action header cell when row actions are enabled.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
+	TableRenderer._renderRowActionHeader = function(rm, oTable) {
+		if (!TableUtils.hasRowActions(oTable)) {
+			return;
 		}
 
-		rm.openStart("div");
-		rm.class("sapUiTableVSbHeader");
+		rm.openStart("div", oTable.getId() + "-rowacthdr");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "RowActionHeader");
+		rm.class("sapUiTableCell");
+		rm.class("sapUiTableHeaderCell");
+		rm.class("sapUiTableRowActionHeaderCell");
+		rm.attr("tabindex", "-1");
+		rm.attr("aria-label", TableUtils.getResourceText("TBL_ROW_ACTION_COLUMN_LABEL"));
 		rm.openEnd();
 		rm.close("div");
+	};
 
+	/**
+	 * Renders a placeholder header cell for the internal vertical scrollbar.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @private
+	 */
+	TableRenderer._renderVSbHeader = function(rm) {
+		rm.openStart("div");
+		rm.class("sapUiTableVSbHeader");
+		rm.openEnd();
 		rm.close("div");
 	};
 
-	TableRenderer.renderColRowHdr = function(rm, oTable) {
-		let bEnabled = false;
-		let bSelAll = false;
-		const mRenderConfig = oTable._getSelectionPlugin().getRenderConfig();
+	/**
+	 * Renders the row selection header area.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
+	TableRenderer._renderSelectionHeader = function(rm, oTable) {
 		const oAccRenderExtension = oTable._getAccRenderExtension();
 
 		rm.openStart("div");
@@ -439,204 +654,22 @@ sap.ui.define([
 
 		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "ColumnRowHeaderCell", {bLabel: true});
 		rm.openEnd();
-		rm.openStart("div", oTable.getId() + "-selall");
-
-		rm.class("sapUiTableCell");
-		rm.class("sapUiTableHeaderCell");
-		rm.class("sapUiTableRowSelectionHeaderCell");
-
-		if (mRenderConfig.headerSelector.visible) {
-			const bAllRowsSelected = mRenderConfig.headerSelector.selected;
-
-			if (mRenderConfig.headerSelector.type === "toggle") {
-				rm.attr("title", TableUtils.getResourceText("TBL_SELECT_ALL"));
-			} else if (mRenderConfig.headerSelector.type === "custom") {
-				const sTitle = mRenderConfig.headerSelector.tooltip;
-				rm.attr("title", sTitle);
-
-				if (!mRenderConfig.headerSelector.enabled) {
-					rm.class("sapUiTableSelAllDisabled");
-					rm.attr("aria-disabled", "true");
-				}
-			}
-
-			if (!bAllRowsSelected) {
-				rm.class("sapUiTableSelAll");
-			} else {
-				bSelAll = true;
-			}
-			rm.class("sapUiTableSelAllVisible");
-			bEnabled = true;
-		}
-
-		rm.attr("tabindex", "-1");
-
-		const oParams = {
-			enabled: bEnabled,
-			checked: bSelAll
-		};
-		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "ColumnRowHeader", oParams);
-
-		rm.openEnd();
-
-		if (mRenderConfig.headerSelector.visible) {
-			if (mRenderConfig.headerSelector.type === "custom" && mRenderConfig.headerSelector.icon) {
-				rm.renderControl(mRenderConfig.headerSelector.icon);
-			} else {
-				rm.openStart("div");
-				rm.class("sapUiTableSelectAllCheckBox");
-				rm.openEnd();
-				rm.close("div");
-			}
-		}
-
-		rm.close("div").close("div").close("div");
-	};
-
-	TableRenderer.renderCol = function(rm, oTable, oColumn, iHeader, nSpan, bIsFirstColumn, bIsLastFixedColumn, bIsLastColumn, bRenderIcons) {
-		let oLabel;
-		const bInvisible = !nSpan;
-		const iIndex = oColumn.getIndex();
-		const aLabels = oColumn.getMultiLabels();
-
-		if (aLabels.length > 0) {
-			oLabel = aLabels[iHeader];
-		} else if (iHeader === 0) {
-			oLabel = oColumn.getLabel();
-		}
-
-		let sHeaderId = oColumn.getId();
-		if (iHeader === 0) {
-			rm.openStart("td", oColumn);
-		} else {
-			sHeaderId = sHeaderId + "_" + iHeader;
-			rm.openStart("td", sHeaderId);
-		}
-		rm.attr('data-sap-ui-related', oColumn.getId());
-		rm.attr('data-sap-ui-colid', oColumn.getId());
-		rm.attr("data-sap-ui-colindex", iIndex);
-
-		rm.attr("tabindex", "-1");
-
-		const mAccParams = {
-			column: oColumn,
-			headerId: sHeaderId
-		};
-
-		if (nSpan > 1) {
-			rm.attr("colspan", nSpan);
-			mAccParams.colspan = true;
-		}
-
-		if (bRenderIcons) {
-			const bFiltered = oColumn.getFiltered();
-			let bSorted = oColumn.getSortOrder() !== SortOrder.None;
-
-			/** @deprecated As of version 1.120 */
-			if (!oColumn.getSorted()) {
-				bSorted = false;
-			}
-
-			if (bFiltered) {
-				rm.class("sapUiTableColFiltered");
-			}
-
-			if (bSorted) {
-				rm.class("sapUiTableColSorted");
-
-				if (oColumn.getSortOrder() === SortOrder.Descending) {
-					rm.class("sapUiTableColSortedD");
-				}
-			}
-		}
-
-		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "ColumnHeader", mAccParams);
-
-		rm.class("sapUiTableCell");
-		rm.class("sapUiTableHeaderCell");
-		rm.class("sapUiTableHeaderDataCell");
-
-		const oColumnHeaderMenu = oColumn.getHeaderMenuInstance();
-		if (oTable.getEnableColumnReordering() || oColumnHeaderMenu && oColumnHeaderMenu.getAriaHasPopupType() !== "None") {
-			rm.class("sapUiTableHeaderCellActive");
-		}
-		/**
-		 * @deprecated As of Version 1.117
-		 */
-		if (!oTable.getEnableColumnReordering() && !oTable.hasListeners("columnSelect") && !oColumnHeaderMenu && oColumn._menuHasItems()) {
-			rm.class("sapUiTableHeaderCellActive");
-		}
-		if (bIsFirstColumn) {
-			rm.class("sapUiTableCellFirst");
-		}
-		if (bIsLastFixedColumn) {
-			rm.class("sapUiTableCellLastFixed");
-		}
-		if (bIsLastColumn) {
-			rm.class("sapUiTableCellLast");
-		}
-		if (bInvisible) {
-			rm.class("sapUiTableHidden");
-		}
-
-		if (oTable.getColumnHeaderHeight() > 0) {
-			rm.style("height", oTable.getColumnHeaderHeight() + "px");
-		}
-		const sTooltip = oColumn.getTooltip_AsString();
-		if (sTooltip) {
-			rm.attr("title", sTooltip);
-		}
-		rm.openEnd();
-
-		rm.openStart("div", sHeaderId + "-inner");
-		rm.class("sapUiTableCellInner");
-
-		if (!TableUtils.hasRowHeader(oTable) && bIsFirstColumn && !TableUtils.hasRowHighlights(oTable) && !TableUtils.Grouping.isInTreeMode(oTable)) {
-			rm.class("sapUiTableFirstColumnCell");
-		}
-
-		const sHAlign = oColumn.getHAlign();
-		const sTextAlign = Renderer.getTextAlign(sHAlign);
-
-		if (sTextAlign) {
-			rm.style("text-align", sTextAlign);
-		}
-
-		rm.openEnd();
-
-		rm.openStart("div");
-		rm.style("justify-content", mFlexCellContentAlignment[sHAlign]);
-		rm.openEnd();
-
-		const oAction = oColumn.getAggregation("_action");
-		if (oAction && iHeader === 0) {
-			if (oColumn.getMultiLabels().length > 0) {
-				Log.error(`${oColumn}: ColumnAIAction is not compatible with multi labels`);
-			} else {
-				rm.renderControl(oAction);
-			}
-		}
-		rm.renderControl(oLabel);
-
-		rm.close("div");
-
+		rm.renderControl(oTable._getHeaderSelector());
 		rm.close("div");
-		rm.close("td");
-	};
-
-	TableRenderer.renderColRsz = function(rm, oTable) {
-		rm.openStart("div", oTable.getId() + "-rsz");
-		rm.class("sapUiTableColRsz");
-		rm.openEnd();
 		rm.close("div");
 	};
 
-	// =============================================================================
-	// CONTENT AREA OF THE TABLE
-	// =============================================================================
-
-	TableRenderer.renderRowHdr = function(rm, oTable) {
+	/**
+	 * Renders the row header area containing row header cells for each data row.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
+	TableRenderer.renderRowHeader = function(rm, oTable) {
 		const oAccRenderExtension = oTable._getAccRenderExtension();
+		const aRows = oTable.getRows();
+
 		rm.openStart("div", oTable.getId() + "-sapUiTableRowHdrScr");
 		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "Presentation");
 		rm.class("sapUiTableRowHdrScr");
@@ -644,67 +677,63 @@ sap.ui.define([
 		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "RowHeaderCol");
 		rm.openEnd();
 
-		// start with the first current top visible row
-		for (let row = 0, count = oTable.getRows().length; row < count; row++) {
-			this.renderRowAddon(rm, oTable, oTable.getRows()[row], row, true);
+		for (let iRowIndex = 0, iRowCount = aRows.length; iRowIndex < iRowCount; iRowIndex++) {
+			this.renderRowAddon(rm, oTable, aRows[iRowIndex], {rowIndex: iRowIndex, isRowHeader: true});
 		}
 
 		rm.close("div");
 	};
 
+	/**
+	 * Renders the row action area containing row action cells for each data row.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
 	TableRenderer.renderRowActions = function(rm, oTable) {
 		if (!TableUtils.hasRowActions(oTable) && !TableUtils.hasRowNavigationIndicators(oTable)) {
 			return;
 		}
+
+		const aRows = oTable.getRows();
+
 		rm.openStart("div", oTable.getId() + "-sapUiTableRowActionScr");
 		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Presentation");
-		TableUtils.hasRowActions(oTable) ? rm.class("sapUiTableRowWithAction") : rm.class("sapUiTableRowActionScr");
+		if (TableUtils.hasRowActions(oTable)) {
+			rm.class("sapUiTableRowWithAction");
+		} else {
+			rm.class("sapUiTableRowActionScr");
+		}
 		rm.class("sapUiTableNoOpacity");
 		rm.openEnd();
 
-		// start with the first current top visible row
-		for (let row = 0, count = oTable.getRows().length; row < count; row++) {
-			this.renderRowAddon(rm, oTable, oTable.getRows()[row], row, false);
+		for (let iRowIndex = 0, iRowCount = aRows.length; iRowIndex < iRowCount; iRowIndex++) {
+			this.renderRowAddon(rm, oTable, aRows[iRowIndex], {rowIndex: iRowIndex, isRowHeader: false});
 		}
 
 		rm.close("div");
 	};
 
-	TableRenderer.addRowCSSClasses = function(rm, oTable, iIndex) {
-		const mRowCounts = oTable._getRowCounts();
-		const iFirstFixedBottomRowIndex = TableUtils.getFirstFixedBottomRowIndex(oTable);
-
-		if (iIndex === 0) {
-			rm.class("sapUiTableFirstRow");
-		} else if (iIndex === oTable.getRows().length - 1) {
-			rm.class("sapUiTableLastRow");
-		}
-
-		if (mRowCounts.fixedTop > 0) {
-			if (iIndex === mRowCounts.fixedTop - 1) {
-				rm.class("sapUiTableRowLastFixedTop");
-			}
-			if (iIndex === mRowCounts.fixedTop) {
-				rm.class("sapUiTableRowFirstScrollable");
-			}
-		}
-
-		if (iFirstFixedBottomRowIndex >= 0 && iFirstFixedBottomRowIndex === iIndex) {
-			rm.class("sapUiTableRowFirstFixedBottom");
-		} else if (iFirstFixedBottomRowIndex >= 1 && iFirstFixedBottomRowIndex - 1 === iIndex) {
-			rm.class("sapUiTableRowLastScrollable");
-		}
-	};
-
-	TableRenderer.renderRowAddon = function(rm, oTable, oRow, iRowIndex, bHeader) {
+	/**
+	 * Renders a row addon entry for either the row header or the row action area.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Row} oRow Row instance
+	 * @param {object} mConfig Configuration object
+	 * @param {int} mConfig.rowIndex Index of the row in the aggregation
+	 * @param {boolean} mConfig.isRowHeader True for row header area; false for action area
+	 * @private
+	 */
+	TableRenderer.renderRowAddon = function(rm, oTable, oRow, mConfig) {
 		const bRowSelected = oRow._isSelected();
 		const oAccRenderExtension = oTable._getAccRenderExtension();
 
 		rm.openStart("div");
 		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "RowAddon");
-
 		rm.attr("data-sap-ui-related", oRow.getId());
-		rm.attr("data-sap-ui-rowindex", iRowIndex);
+		rm.attr("data-sap-ui-rowindex", mConfig.rowIndex);
 
 		rm.class("sapUiTableRow");
 		rm.class("sapUiTableContentRow");
@@ -715,53 +744,56 @@ sap.ui.define([
 			rm.class("sapUiTableRowSel");
 		}
 
-		if (iRowIndex % 2 !== 0 && oTable.getAlternateRowColors() && !TableUtils.Grouping.isInTreeMode(oTable)) {
+		if (mConfig.rowIndex % 2 !== 0 && oTable.getAlternateRowColors() && !TableUtils.Grouping.isInTreeMode(oTable)) {
 			rm.class("sapUiTableRowAlternate");
 		}
 
-		this.addRowCSSClasses(rm, oTable, iRowIndex);
+		this.addRowClasses(rm, oTable, mConfig.rowIndex);
 
 		rm.openEnd();
-
-		rm.openStart("div", oTable.getId() + (bHeader ? "-rowsel" : "-rowact") + iRowIndex);
+		rm.openStart("div", oTable.getId() + (mConfig.isRowHeader ? "-rowsel" : "-rowact") + mConfig.rowIndex);
 		rm.class("sapUiTableCell");
 		rm.class("sapUiTableContentCell");
-		rm.class(bHeader ? "sapUiTableRowSelectionCell" : "sapUiTableRowActionCell");
+		rm.class(mConfig.isRowHeader ? "sapUiTableRowSelectionCell" : "sapUiTableRowActionCell");
 
 		TableUtils.Hook.call(oTable, Hook.RenderRowStyles, rm);
 
 		rm.attr("tabindex", "-1");
 
-		const oParams = {
+		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, mConfig.isRowHeader ? "RowHeader" : "RowAction", {
 			rowSelected: bRowSelected,
 			rowHidden: oRow.isEmpty()
-		};
-		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, bHeader ? "RowHeader" : "RowAction", oParams);
+		});
 
 		rm.openEnd();
-		if (bHeader) {
-			this.writeRowHighlightContent(rm, oTable, oRow, iRowIndex);
+		if (mConfig.isRowHeader) {
+			this.writeRowHighlightContent(rm, oTable, oRow);
 			this.writeRowSelectorContent(rm, oTable, oRow);
 		} else {
 			const oAction = oRow.getRowAction();
 			if (oAction) {
 				rm.renderControl(oAction);
 			}
-			this.writeRowNavigationContent(rm, oTable, oRow, iRowIndex);
+			this.writeRowNavigationContent(rm, oTable, oRow);
 		}
 		rm.close("div");
 
 		rm.close("div");
 	};
 
+	/**
+	 * Renders the table control area containing fixed and scrollable data sections.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
 	TableRenderer.renderTableCtrl = function(rm, oTable) {
 		if (oTable.getComputedFixedColumnCount() > 0) {
 			rm.openStart("div", oTable.getId() + "-sapUiTableCtrlScrFixed");
 			rm.class("sapUiTableCtrlScrFixed");
 			rm.openEnd();
-
-			this.renderTableControl(rm, oTable, true);
-
+			this.renderTableControl(rm, oTable, {fixedColumns: true});
 			rm.close("div");
 		}
 
@@ -779,110 +811,255 @@ sap.ui.define([
 		rm.openStart("div", oTable.getId() + "-tableCtrlCnt");
 		rm.class("sapUiTableCtrlCnt");
 		rm.openEnd();
-
-		this.renderTableControl(rm, oTable, false);
-
+		this.renderTableControl(rm, oTable, {fixedColumns: false});
 		rm.close("div");
+
 		rm.close("div");
 	};
 
-	TableRenderer.renderTableControl = function(rm, oTable, bFixedTable) {
-		let iStartColumn; let iEndColumn;
+	/**
+	 * Renders a table control section (either fixed columns or scrollable columns).
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.fixedColumns True if fixed columns area
+	 * @private
+	 */
+	TableRenderer.renderTableControl = function(rm, oTable, mConfig) {
+		const mRowCounts = oTable._getRowCounts();
+		const aRows = oTable.getRows();
+		let iStartColumnIndex;
+		let iEndColumnIndex;
 
-		if (bFixedTable) {
-			iStartColumn = 0;
-			iEndColumn = oTable.getComputedFixedColumnCount();
+		if (mConfig.fixedColumns) {
+			iStartColumnIndex = 0;
+			iEndColumnIndex = oTable.getComputedFixedColumnCount();
 		} else {
-			iStartColumn = oTable.getComputedFixedColumnCount();
-			iEndColumn = oTable.getColumns().length;
+			iStartColumnIndex = oTable.getComputedFixedColumnCount();
+			iEndColumnIndex = oTable.getColumns().length;
 		}
 
-		const mRowCounts = oTable._getRowCounts();
-		const aRows = oTable.getRows();
-
 		if (mRowCounts.fixedTop > 0) {
-			this.renderTableControlCnt(rm, oTable, bFixedTable, iStartColumn, iEndColumn, true, false, 0, mRowCounts.fixedTop);
+			this.renderTableElement(rm, oTable, {
+				fixedColumns: mConfig.fixedColumns,
+				startColumnIndex: iStartColumnIndex,
+				endColumnIndex: iEndColumnIndex,
+				fixedTopRows: true,
+				fixedBottomRows: false,
+				startRowIndex: 0,
+				endRowIndex: mRowCounts.fixedTop,
+				header: false
+			});
 		}
-		this.renderTableControlCnt(rm, oTable, bFixedTable, iStartColumn, iEndColumn, false, false, mRowCounts.fixedTop, aRows.length - mRowCounts.fixedBottom);
+
+		this.renderTableElement(rm, oTable, {
+			fixedColumns: mConfig.fixedColumns,
+			startColumnIndex: iStartColumnIndex,
+			endColumnIndex: iEndColumnIndex,
+			fixedTopRows: false,
+			fixedBottomRows: false,
+			startRowIndex: mRowCounts.fixedTop,
+			endRowIndex: aRows.length - mRowCounts.fixedBottom,
+			header: false
+		});
+
 		if (mRowCounts.fixedBottom > 0 && aRows.length > 0) {
-			this.renderTableControlCnt(rm, oTable, bFixedTable, iStartColumn, iEndColumn, false, true, aRows.length - mRowCounts.fixedBottom, aRows.length);
+			this.renderTableElement(rm, oTable, {
+				fixedColumns: mConfig.fixedColumns,
+				startColumnIndex: iStartColumnIndex,
+				endColumnIndex: iEndColumnIndex,
+				fixedTopRows: false,
+				fixedBottomRows: true,
+				startRowIndex: aRows.length - mRowCounts.fixedBottom,
+				endRowIndex: aRows.length,
+				header: false
+			});
 		}
 	};
 
-	TableRenderer.renderTableControlCnt = function(rm, oTable, bFixedTable, iStartColumn, iEndColumn, bFixedRow, bFixedBottomRow, iStartRow, iEndRow, bHeader) {
-		let sSuffix = bHeader ? "-header" : "-table";
-		let sId = oTable.getId() + sSuffix;
-		const sClasses = [];
-
-		if (bFixedTable) {
-			sId += "-fixed";
-			sClasses.push("sapUiTableCtrlFixed");
-		} else {
-			sClasses.push("sapUiTableCtrlScroll");
-		}
-		if (bFixedRow) {
-			sId += "-fixrow";
-			sClasses.push("sapUiTableCtrlRowFixed");
-		} else if (bFixedBottomRow) {
-			sId += "-fixrow-bottom";
-			sClasses.push("sapUiTableCtrlRowFixedBottom");
-		} else {
-			sClasses.push("sapUiTableCtrlRowScroll");
-		}
+	/**
+	 * Renders an table element covering a defined column and row slice.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.fixedColumns True if segment is in fixed columns area
+	 * @param {boolean} mConfig.fixedTopRows True if segment shows fixed top rows
+	 * @param {boolean} mConfig.fixedBottomRows True if segment shows fixed bottom rows
+	 * @param {int} mConfig.startColumnIndex Start column index (inclusive)
+	 * @param {int} mConfig.endColumnIndex End column index (exclusive)
+	 * @param {int} mConfig.startRowIndex Start row index (inclusive)
+	 * @param {int} mConfig.endRowIndex End row index (exclusive)
+	 * @param {boolean} mConfig.header True if header segment
+	 * @private
+	 */
+	TableRenderer.renderTableElement = function(rm, oTable, mConfig) {
+		const {fixedColumns, startColumnIndex, endColumnIndex, fixedTopRows, fixedBottomRows, startRowIndex, endRowIndex, header} = mConfig;
+		const sId = this._buildTableSectionId(oTable, {fixedColumns, fixedTopRows, fixedBottomRows, header});
 
 		rm.openStart("table", sId);
-		sClasses.forEach(function(sClass) {
-			rm.class(sClass);
-		});
+		this._decorateTableElement(rm, oTable, {fixedColumns, fixedTopRows, fixedBottomRows, startColumnIndex, endColumnIndex, header});
+		rm.openEnd();
+		this._renderTableHead(rm, oTable, {fixedColumns, startColumnIndex, endColumnIndex, startRowIndex, header});
+		this._renderTableBody(rm, oTable, {fixedColumns, startColumnIndex, endColumnIndex, startRowIndex, endRowIndex, header});
+		rm.close("table");
+	};
 
-		const oAccRenderExtension = oTable._getAccRenderExtension();
-		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, bHeader ? "Presentation" : "Table");
+	/**
+	 * Builds the table section ID.
+	 *
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.fixedColumns True if fixed columns area
+	 * @param {boolean} mConfig.fixedTopRows True if fixed top rows area
+	 * @param {boolean} mConfig.fixedBottomRows True if fixed bottom rows area
+	 * @param {boolean} mConfig.header True if header section
+	 * @returns {string} Table section ID
+	 * @private
+	 */
+	TableRenderer._buildTableSectionId = function(oTable, mConfig) {
+		const {fixedColumns, fixedTopRows, fixedBottomRows, header} = mConfig;
+		const suffix = header ? "-header" : "-table";
+		let id = oTable.getId() + suffix;
 
-		rm.class("sapUiTableCtrl");
-		if (bHeader) {
-			rm.class("sapUiTableCHT"); // marker for the column header table
+		if (fixedColumns) {
+			id += "-fixed";
 		}
 
-		rm.style(bFixedTable ? "width" : "min-width", oTable._getColumnsWidth(iStartColumn, iEndColumn) + "px");
+		if (fixedTopRows) {
+			id += "-fixrow";
+		} else if (fixedBottomRows) {
+			id += "-fixrow-bottom";
+		}
 
-		rm.openEnd();
+		return id;
+	};
 
-		rm.openStart("thead").openEnd();
+	/**
+	 * Decorates the table element with attributes, styles and CSS classes.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.fixedColumns True if fixed columns area
+	 * @param {boolean} mConfig.fixedTopRows True if fixed top rows area
+	 * @param {boolean} mConfig.fixedBottomRows True if fixed bottom rows area
+	 * @param {int} mConfig.startColumnIndex Start column index (inclusive)
+	 * @param {int} mConfig.endColumnIndex End column index (exclusive)
+	 * @param {boolean} mConfig.header True if header table
+	 * @private
+	 */
+	TableRenderer._decorateTableElement = function(rm, oTable, mConfig) {
+		rm.class(mConfig.fixedColumns ? "sapUiTableCtrlFixed" : "sapUiTableCtrlScroll");
 
-		rm.openStart("tr");
-		rm.class("sapUiTableCtrlCol");
-		if (iStartRow === 0) {
+		if (mConfig.fixedTopRows) {
+			rm.class("sapUiTableCtrlRowFixed");
+		} else if (mConfig.fixedBottomRows) {
+			rm.class("sapUiTableCtrlRowFixedBottom");
+		} else {
+			rm.class("sapUiTableCtrlRowScroll");
+		}
+
+		if (mConfig.header) {
+			rm.class("sapUiTableCHT");
+		}
+
+		rm.class("sapUiTableCtrl");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, mConfig.header ? "Presentation" : "Table");
+		rm.style(mConfig.fixedColumns ? "width" : "min-width", oTable._getColumnsWidth(mConfig.startColumnIndex, mConfig.endColumnIndex) + "px");
+	};
+
+	/**
+	 * Renders the table head section.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.fixedColumns True if fixed columns area
+	 * @param {int} mConfig.startColumnIndex Start column index (inclusive)
+	 * @param {int} mConfig.endColumnIndex End column index (exclusive)
+	 * @param {int} mConfig.startRowIndex Start row index (inclusive)
+	 * @param {boolean} mConfig.header True if header table
+	 * @private
+	 */
+	TableRenderer._renderTableHead = function(rm, oTable, mConfig) {
+		rm.openStart("thead").openEnd();
+		const {fixedColumns, startColumnIndex, endColumnIndex, startRowIndex, header} = mConfig;
+		this._renderTableHeaderRow(rm, oTable, {fixedColumns, startColumnIndex, endColumnIndex, startRowIndex, header});
+		rm.close("thead");
+	};
+
+	/**
+	 * Renders the table header row.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.fixedColumns True if fixed columns area
+	 * @param {int} mConfig.startColumnIndex Start column index (inclusive)
+	 * @param {int} mConfig.endColumnIndex End column index (exclusive)
+	 * @param {int} mConfig.startRowIndex Start row index (inclusive)
+	 * @param {boolean} mConfig.header True if header table
+	 * @private
+	 */
+	TableRenderer._renderTableHeaderRow = function(rm, oTable, mConfig) {
+		rm.openStart("tr");
+		rm.class("sapUiTableCtrlCol");
+		if (mConfig.startRowIndex === 0) {
 			rm.class("sapUiTableCtrlFirstCol");
 		}
-		if (bHeader) {
-			rm.class("sapUiTableCHTHR"); // marker for the column header row
+		if (mConfig.header) {
+			rm.class("sapUiTableCHTHR");
 		}
 		rm.openEnd();
 
+		const {fixedColumns, startColumnIndex, endColumnIndex, startRowIndex, header} = mConfig;
+		const mColumnData = this._prepareColumnData(oTable, {fixedColumns, startColumnIndex, endColumnIndex});
+		this._renderTableColumns(rm, oTable, {columnData: mColumnData, startColumnIndex, endColumnIndex, startRowIndex, header});
+
+		if (mColumnData.bRenderDummyColumn) {
+			this._renderDummyColumnHeaderCell(rm, oTable, {header});
+		}
+
+		rm.close("tr");
+	};
+
+	/**
+	 * Prepares per-column metadata needed for rendering.
+	 *
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.fixedColumns True if preparing data for the fixed columns area
+	 * @param {int} mConfig.startColumnIndex Start column index (inclusive)
+	 * @param {int} mConfig.endColumnIndex End column index (exclusive)
+	 * @returns {object} Object containing:
+	 *   {sap.ui.table.Column[]} aCols All columns of the table
+	 *   {object[]} aColParams Per-column params with properties {shouldRender:boolean, width:string|undefined}
+	 *   {boolean} bRenderDummyColumn True if dummy column should be rendered for variable-width balancing
+	 *   {sap.ui.table.Column[]} aVisibleColumns Currently visible columns
+	 * @private
+	 */
+	TableRenderer._prepareColumnData = function(oTable, mConfig) {
 		const aCols = oTable.getColumns();
-		const aColParams = new Array(iEndColumn);
-		let iCol;
-		let oColumn;
-		let bRenderDummyColumn = !bFixedTable && iEndColumn > iStartColumn;
-		const aVisibleColumns = oTable._getVisibleColumns();
-
-		for (iCol = iStartColumn; iCol < iEndColumn; iCol++) {
-			oColumn = aCols[iCol];
+		const aColParams = new Array(mConfig.endColumnIndex);
+		let bRenderDummyColumn = !mConfig.fixedColumns && mConfig.endColumnIndex > mConfig.startColumnIndex;
+
+		for (let iCol = mConfig.startColumnIndex; iCol < mConfig.endColumnIndex; iCol++) {
+			const oColumn = aCols[iCol];
 			const oColParam = {
 				shouldRender: !!(oColumn && oColumn.shouldRender())
 			};
+
 			if (oColParam.shouldRender) {
 				let sWidth = oColumn.getWidth();
 				if (TableUtils.isVariableWidth(sWidth)) {
-					// if some of the columns have variable width, they serve as the dummy column
-					// and take available place. Do not render a dummy column in this case.
 					bRenderDummyColumn = false;
-					// in fixed area, use stored fixed width or 10rem:
-					if (bFixedTable) {
+					if (mConfig.fixedColumns) {
 						oColumn._iFixWidth = oColumn._iFixWidth || 160;
 						sWidth = oColumn._iFixWidth + "px";
 					}
-				} else if (bFixedTable) {
+				} else if (mConfig.fixedColumns) {
 					delete oColumn._iFixWidth;
 				}
 				oColParam.width = sWidth;
@@ -890,77 +1067,210 @@ sap.ui.define([
 			aColParams[iCol] = oColParam;
 		}
 
+		return {
+			aCols,
+			aColParams,
+			bRenderDummyColumn,
+			aVisibleColumns: oTable._getVisibleColumns()
+		};
+	};
+
+	/**
+	 * Renders table columns.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} mConfig Configuration object
+	 * @param {object} mConfig.columnData Prepared column data
+	 * @param {int} mConfig.startColumnIndex Start column index (inclusive)
+	 * @param {int} mConfig.endColumnIndex End column index (exclusive)
+	 * @param {int} mConfig.startRowIndex Start row index (inclusive)
+	 * @param {boolean} mConfig.header True if header table
+	 * @private
+	 */
+	TableRenderer._renderTableColumns = function(rm, oTable, mConfig) {
+		const {columnData, startColumnIndex, endColumnIndex, startRowIndex, header} = mConfig;
+		const {aCols, aColParams, aVisibleColumns} = columnData;
+		const oAccRenderExtension = oTable._getAccRenderExtension();
+
 		if (aCols.length === 0) {
 			rm.openStart("th").openEnd().close("th");
+			return;
 		}
 
-		for (iCol = iStartColumn; iCol < iEndColumn; iCol++) {
-			sSuffix = bHeader ? "_hdr" : "_col";
-			oColumn = aCols[iCol];
+		for (let iCol = startColumnIndex; iCol < endColumnIndex; iCol++) {
+			const sSuffix = header ? "_hdr" : "_col";
+			const oColumn = aCols[iCol];
 			const oColParam = aColParams[iCol];
 
 			if (oColParam.shouldRender) {
-				if (iStartRow === 0) {
+				if (startRowIndex === 0) {
 					rm.openStart("th", oTable.getId() + sSuffix + iCol);
 					oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "Th", {column: oColumn});
 				} else {
 					rm.openStart("th");
 				}
+
 				rm.style("width", oColParam.width);
 				rm.attr("data-sap-ui-headcolindex", iCol);
 				rm.attr("data-sap-ui-colid", oColumn.getId());
+
 				if (oColumn === aVisibleColumns[0]) {
 					rm.class("sapUiTableFirstVisibleColumnTH");
 				}
+
 				rm.openEnd();
-				if (iStartRow === 0 && TableUtils.getHeaderRowCount(oTable) === 0 && !bHeader) {
+
+				if (startRowIndex === 0 && TableUtils.getHeaderRowCount(oTable) === 0 && !header) {
 					if (oColumn.getMultiLabels().length > 0) {
 						rm.renderControl(oColumn.getMultiLabels()[0]);
 					} else {
 						rm.renderControl(oColumn.getLabel());
 					}
 				}
+
 				rm.close("th");
 			}
 		}
+	};
 
-		// dummy column to fill the table width
-		if (bRenderDummyColumn) {
-			rm.openStart("th", bHeader && oTable.getId() + "-dummycolhdr");
-			oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "Presentation");
-			rm.openEnd().close("th");
-		}
+	/**
+	 * Renders the header cell of the dummy column.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.header True if header table
+	 * @private
+	 */
+	TableRenderer._renderDummyColumnHeaderCell = function(rm, oTable, mConfig) {
+		rm.openStart("th", mConfig.header && oTable.getId() + "-dummycolhdr");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Presentation");
+		rm.openEnd();
+		rm.close("th");
+	};
 
-		rm.close("tr");
-		rm.close("thead");
+	/**
+	 * Renders the body rows (either header rows for a header segment or data rows for a data segment).
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.fixedColumns True if fixed columns area
+	 * @param {int} mConfig.startColumnIndex Start column index (inclusive)
+	 * @param {int} mConfig.endColumnIndex End column index (exclusive)
+	 * @param {int} mConfig.startRowIndex Start row index (inclusive)
+	 * @param {int} mConfig.endRowIndex End row index (exclusive)
+	 * @param {boolean} mConfig.header True if rendering a header segment
+	 * @private
+	 */
+	TableRenderer._renderTableBody = function(rm, oTable, mConfig) {
+		const {fixedColumns, startColumnIndex, endColumnIndex, startRowIndex, endRowIndex} = mConfig;
+		const mColumnData = this._prepareColumnData(oTable, {fixedColumns, startColumnIndex, endColumnIndex});
 
-		rm.openStart("tbody").openEnd();
+		rm.openStart("tbody");
+		rm.openEnd();
 
-		// render the table rows
-		const aRows = oTable.getRows();
-		let row;
-		let count;
-		if (bHeader) {
-			for (row = iStartRow, count = iEndRow; row < count; row++) {
-				this.renderColumnHeaderRow(rm, oTable, row, bFixedTable, iStartColumn, iEndColumn, bRenderDummyColumn, row === count - 1);
-			}
+		if (mConfig.header) {
+			this._renderHeaderRows(rm, oTable, {
+				fixedColumns,
+				startColumnIndex,
+				endColumnIndex,
+				startRowIndex,
+				endRowIndex,
+				renderDummyColumn: mColumnData.bRenderDummyColumn
+			});
 		} else {
-			// check whether the row can be clicked to change the selection
-			const bSelectOnCellsAllowed = TableUtils.isRowSelectionAllowed(oTable);
-			const bRowsDraggable = oTable.getDragDropConfig().some(function(oDragDropInfo) {
-				return oDragDropInfo.isDraggable(oTable, "rows");
+			this._renderDataRows(rm, oTable, {
+				fixedColumns,
+				startColumnIndex,
+				endColumnIndex,
+				startRowIndex,
+				endRowIndex,
+				visibleColumns: mColumnData.aVisibleColumns,
+				renderDummyColumn: mColumnData.bRenderDummyColumn
 			});
+		}
 
-			const iLastFixedColumnIndex = this.getLastFixedColumnIndex(oTable);
+		rm.close("tbody");
+	};
 
-			for (row = iStartRow, count = iEndRow; row < count; row++) {
-				this.renderTableRow(rm, oTable, aRows[row], row, bFixedTable, iStartColumn, iEndColumn, false, aVisibleColumns, iLastFixedColumnIndex, bRenderDummyColumn, bSelectOnCellsAllowed, bRowsDraggable);
-			}
+	/**
+	 * Renders all header rows for a header table segment.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.fixedColumns True if fixed columns area
+	 * @param {int} mConfig.startColumnIndex Start column index (inclusive)
+	 * @param {int} mConfig.endColumnIndex End column index (exclusive)
+	 * @param {int} mConfig.startRowIndex First header row index (inclusive)
+	 * @param {int} mConfig.endRowIndex One past last header row index (exclusive)
+	 * @param {boolean} mConfig.renderDummyColumn True if dummy column should be rendered
+	 * @private
+	 */
+	TableRenderer._renderHeaderRows = function(rm, oTable, mConfig) {
+		const {fixedColumns, startColumnIndex, endColumnIndex, renderDummyColumn} = mConfig;
+		for (let iRowIndex = mConfig.startRowIndex; iRowIndex < mConfig.endRowIndex; iRowIndex++) {
+			this.renderColumnHeaderRow(rm, oTable, {
+				rowIndex: iRowIndex,
+				fixedColumns,
+				startColumnIndex,
+				endColumnIndex,
+				renderDummyColumn,
+				isLastRow: iRowIndex === mConfig.endRowIndex - 1
+			});
 		}
-		rm.close("tbody");
-		rm.close("table");
 	};
+	/**
+	 * Renders data rows for a data table segment.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.fixedColumns True if fixed columns area
+	 * @param {int} mConfig.startColumnIndex Start column index (inclusive)
+	 * @param {int} mConfig.endColumnIndex End column index (exclusive)
+	 * @param {int} mConfig.startRowIndex Start row index (inclusive)
+	 * @param {int} mConfig.endRowIndex End row index (exclusive)
+	 * @param {sap.ui.table.Column[]} mConfig.visibleColumns Visible columns
+	 * @param {boolean} mConfig.renderDummyColumn True if dummy column should be rendered
+	 * @private
+	 */
+	TableRenderer._renderDataRows = function(rm, oTable, mConfig) {
+		const {fixedColumns, startColumnIndex, endColumnIndex, visibleColumns, renderDummyColumn} = mConfig;
+		const aRows = oTable.getRows();
 
+		if (aRows.length === 0) {
+			return;
+		}
+
+		const bRowsDraggable = oTable.getDragDropConfig().some(function(oDragDropInfo) {
+			return oDragDropInfo.isDraggable(oTable, "rows");
+		});
+		const iLastFixedColumnIndex = this.getLastFixedColumnIndex(oTable);
+
+		for (let iRowIndex = mConfig.startRowIndex; iRowIndex < mConfig.endRowIndex; iRowIndex++) {
+			this.renderDataRow(rm, oTable, aRows[iRowIndex], {
+				rowIndex: iRowIndex,
+				fixedColumns,
+				startColumnIndex: startColumnIndex,
+				endColumnIndex: endColumnIndex,
+				visibleColumns,
+				lastFixedColumnIndex: iLastFixedColumnIndex,
+				renderDummyColumn,
+				draggable: bRowsDraggable
+			});
+		}
+	};
+
+	/**
+	 * Writes the content of a row selector cell including group icons and accessibility text.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Row} oRow Row instance
+	 */
 	TableRenderer.writeRowSelectorContent = function(rm, oTable, oRow) {
 		oTable._getAccRenderExtension().writeAccRowSelectorText(rm, oTable, oRow);
 
@@ -979,12 +1289,11 @@ sap.ui.define([
 	/**
 	 * Writes the row highlight element (including the accessibility text element) to the render manager.
 	 *
-	 * @param {sap.ui.core.RenderManager} rm The render manager to write to
-	 * @param {sap.ui.table.Table} oTable Instance of the table
-	 * @param {sap.ui.table.Row} oRow Instance of the row
-	 * @param {int} iRowIndex Index of the row
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Row} oRow Row instance
 	 */
-	TableRenderer.writeRowHighlightContent = function(rm, oTable, oRow, iRowIndex) {
+	TableRenderer.writeRowHighlightContent = function(rm, oTable, oRow) {
 		if (!TableUtils.hasRowHighlights(oTable)) {
 			return;
 		}
@@ -996,224 +1305,779 @@ sap.ui.define([
 		rm.class("sapUiTableRowHighlight");
 		rm.class(sHighlightClass);
 		rm.openEnd();
-		oTable._getAccRenderExtension().writeAccRowHighlightText(rm, oTable, oRow, iRowIndex);
+		oTable._getAccRenderExtension().writeAccRowHighlightText(rm, oTable, oRow);
+		rm.close("div");
+	};
+
+	/**
+	 * Writes the navigation indicator for a row (including the accessibility text element) to the render manager.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Row} oRow Row instance
+	 */
+	TableRenderer.writeRowNavigationContent = function(rm, oTable, oRow) {
+		if (!TableUtils.hasRowNavigationIndicators(oTable)) {
+			return;
+		}
+
+		const oRowSettings = oRow.getAggregation("_settings");
+
+		rm.openStart("div", oRow.getId() + "-navIndicator");
+		if (oRowSettings.getNavigated()) {
+			rm.class("sapUiTableRowNavigated");
+		}
+		rm.openEnd();
 		rm.close("div");
 	};
 
 	/**
-	 * Writes the navigation indicator for a row (including the accessibility text element) to the render manager.
+	 * Renders a column header row.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.fixedColumns True if fixed columns area
+	 * @param {int} mConfig.startColumnIndex Start column index (inclusive)
+	 * @param {int} mConfig.endColumnIndex End column index (exclusive)
+	 * @param {boolean} mConfig.renderDummyColumn True if only fixed columns are present
+	 * @param {boolean} mConfig.isLastRow True if last header row
+	 * @private
+	 */
+	TableRenderer.renderColumnHeaderRow = function(rm, oTable, mConfig) {
+		const {rowIndex, fixedColumns, startColumnIndex, endColumnIndex, isLastRow} = mConfig;
+		const oAccRenderExtension = oTable._getAccRenderExtension();
+
+		rm.openStart("tr");
+		rm.class("sapUiTableRow");
+		rm.class("sapUiTableHeaderRow");
+		rm.class("sapUiTableColHdrTr");
+		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "ColumnHeaderRow", {rowIndex, fixedCol: fixedColumns});
+		rm.openEnd();
+
+		const aColumns = this.getColumnsToRender(oTable, startColumnIndex, endColumnIndex);
+		const iLastVisibleColumnIndex = this._collectHeaderSpans(aColumns, rowIndex);
+		this._renderHeaderColumns(rm, oTable, aColumns, {rowIndex, fixedColumns, lastVisibleColumnIndex: iLastVisibleColumnIndex, isLastRow});
+
+		if (!fixedColumns && mConfig.renderDummyColumn && aColumns.length > 0) {
+			this._renderDummyColumnContentCell(rm, oTable);
+		}
+
+		rm.close("tr");
+	};
+
+	/**
+	 * Calculates column spans for header cells in multi-label scenarios and returns the index of the last visible column.
+	 *
+	 * @param {sap.ui.table.Column[]} aColumns Array of columns to process
+	 * @param {int} iRowIndex Header row index
+	 * @returns {int} Index of the last visible column
+	 * @private
+	 */
+	TableRenderer._collectHeaderSpans = function(aColumns, iRowIndex) {
+		let nSpan = 0;
+		let iLastVisibleCol = -1;
+
+		aColumns.forEach(function(oColumn, index, aCols) {
+			let colSpan = TableUtils.Column.getHeaderSpan(oColumn, iRowIndex);
+			let iColIndex;
+
+			if (nSpan < 1) {
+				if (colSpan > 1) {
+					// In case when a user makes some of the underlying columns invisible, adjust colspan
+					iColIndex = oColumn.getIndex();
+					colSpan = aCols.slice(index + 1, index + colSpan).reduce(function(span, column) {
+						return column.getIndex() - iColIndex < colSpan ? span + 1 : span;
+					}, 1);
+				}
+
+				oColumn._nSpan = nSpan = colSpan;
+				iLastVisibleCol = index;
+			} else {
+				// Render column header but this is invisible because of the previous span
+				oColumn._nSpan = 0;
+			}
+			nSpan--;
+		});
+
+		return iLastVisibleCol;
+	};
+
+	/**
+	 * Renders all column headers in a header row.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Column[]} aColumns Array of columns to render
+	 * @param {object} mConfig Configuration object
+	 * @param {int} mConfig.rowIndex Header row index
+	 * @param {boolean} mConfig.fixedColumns True if fixed columns area
+	 * @param {int} mConfig.lastVisibleColumnIndex Index of the last visible column
+	 * @param {boolean} mConfig.isLastRow True if last header row
+	 * @private
+	 */
+	TableRenderer._renderHeaderColumns = function(rm, oTable, aColumns, mConfig) {
+		aColumns.forEach((oColumn, iIndex) => {
+			this.renderColumnHeaderCell(rm, oTable, oColumn, {
+				rowIndex: mConfig.rowIndex,
+				span: oColumn._nSpan,
+				isFirstColumn: iIndex === 0,
+				isLastFixedColumn: mConfig.fixedColumns && (iIndex === mConfig.lastVisibleColumnIndex),
+				isLastColumn: !mConfig.fixedColumns && (iIndex === mConfig.lastVisibleColumnIndex),
+				renderIcons: oColumn._nSpan === 1 && !oColumn._bIconsRendered
+			});
+			oColumn._bIconsRendered = oColumn._bIconsRendered || oColumn._nSpan === 1;
+			delete oColumn._nSpan;
+
+			if (mConfig.isLastRow) {
+				delete oColumn._bIconsRendered;
+			}
+		});
+	};
+
+	/**
+	 * Renders a column header cell.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Column} oColumn Column instance to render
+	 * @param {object} mConfig Configuration object
+	 * @param {int} mConfig.rowIndex Header row index
+	 * @param {int} mConfig.span Computed column span (0 = hidden in this row)
+	 * @param {boolean} mConfig.isFirstColumn True if first visible column in area
+	 * @param {boolean} mConfig.isLastFixedColumn True if last visible fixed column
+	 * @param {boolean} mConfig.isLastColumn True if last visible column overall
+	 * @param {boolean} mConfig.renderIcons True if sort/filter icons should be rendered
+	 * @private
+	 */
+	TableRenderer.renderColumnHeaderCell = function(rm, oTable, oColumn, mConfig) {
+		const sHeaderId = mConfig.rowIndex === 0 ? oColumn.getId() : `${oColumn.getId()}_${mConfig.rowIndex}`;
+
+		rm.openStart("td", mConfig.rowIndex === 0 ? oColumn : sHeaderId);
+		this._decorateColumnHeaderCell(rm, oTable, oColumn, {
+			span: mConfig.span,
+			isFirstColumn: mConfig.isFirstColumn,
+			isLastFixedColumn: mConfig.isLastFixedColumn,
+			isLastColumn: mConfig.isLastColumn,
+			renderIcons: mConfig.renderIcons,
+			headerId: sHeaderId
+		});
+		rm.openEnd();
+
+		rm.openStart("div", sHeaderId + "-inner");
+		this._decorateColumnHeaderCellInner(rm, oTable, oColumn, {isFirstColumn: mConfig.isFirstColumn});
+		rm.openEnd();
+		rm.openStart("div");
+		rm.style("justify-content", mFlexCellContentAlignment[oColumn.getHAlign()]);
+		rm.openEnd();
+		this._renderColumnHeaderCellContent(rm, oColumn, {rowIndex: mConfig.rowIndex});
+		rm.close("div");
+		rm.close("div");
+
+		rm.close("td");
+	};
+
+	/**
+	 * Decorates a column header cell with attributes, styles and CSS classes.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Column} oColumn Column instance
+	 * @param {object} mConfig Configuration object
+	 * @param {int} mConfig.span Computed column span (0 = hidden in this row)
+	 * @param {boolean} mConfig.isFirstColumn True if first column
+	 * @param {boolean} mConfig.isLastFixedColumn True if last fixed column
+	 * @param {boolean} mConfig.isLastColumn True if last column
+	 * @param {boolean} mConfig.renderIcons True if sort and filter icons should be rendered
+	 * @param {string} mConfig.headerId Header ID
+	 * @private
+	 */
+	TableRenderer._decorateColumnHeaderCell = function(rm, oTable, oColumn, mConfig) {
+		const {span, headerId, isFirstColumn, isLastFixedColumn, isLastColumn, renderIcons} = mConfig;
+
+		this._setColumnHeaderCellAttributes(rm, oTable, oColumn, {span, headerId});
+		this._setColumnHeaderCellStyles(rm, oTable);
+		this._addColumnHeaderCellClasses(rm, oTable, oColumn, {
+			isFirstColumn,
+			isLastFixedColumn,
+			isLastColumn,
+			isHiddenBySpan: !span,
+			renderIcons
+		});
+	};
+
+	/**
+	 * Sets column header cell attributes.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Column} oColumn Column instance
+	 * @param {object} mConfig Configuration object
+	 * @param {int} mConfig.span Computed column span (0 = hidden in this row)
+	 * @param {string} mConfig.headerId Header ID
+	 * @private
+	 */
+	TableRenderer._setColumnHeaderCellAttributes = function(rm, oTable, oColumn, mConfig) {
+		rm.attr('data-sap-ui-related', oColumn.getId());
+		rm.attr('data-sap-ui-colid', oColumn.getId());
+		rm.attr("data-sap-ui-colindex", oColumn.getIndex());
+		rm.attr("tabindex", "-1");
+
+		if (mConfig.span > 1) {
+			rm.attr("colspan", mConfig.span);
+		}
+
+		const sTooltip = oColumn.getTooltip_AsString();
+		if (sTooltip) {
+			rm.attr("title", sTooltip);
+		}
+
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "ColumnHeader", {
+			column: oColumn,
+			headerId: mConfig.headerId,
+			colspan: mConfig.span > 1
+		});
+	};
+
+	/**
+	 * Sets column header cell styles.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
+	TableRenderer._setColumnHeaderCellStyles = function(rm, oTable) {
+		const iColumnHeaderHeight = oTable.getColumnHeaderHeight();
+
+		if (iColumnHeaderHeight > 0) {
+			rm.style("height", iColumnHeaderHeight + "px");
+		}
+	};
+
+	/**
+	 * Adds column header cell CSS classes.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Column} oColumn Column instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.isFirstColumn True if first column
+	 * @param {boolean} mConfig.isLastFixedColumn True if last fixed column
+	 * @param {boolean} mConfig.isLastColumn True if last column
+	 * @param {boolean} mConfig.isHiddenBySpan True if hidden because of span
+	 * @param {boolean} mConfig.renderIcons True if sort and filter icons should be rendered
+	 * @private
+	 */
+	TableRenderer._addColumnHeaderCellClasses = function(rm, oTable, oColumn, mConfig) {
+		rm.class("sapUiTableCell");
+		rm.class("sapUiTableHeaderCell");
+		rm.class("sapUiTableHeaderDataCell");
+
+		const oColumnHeaderMenu = oColumn.getHeaderMenuInstance();
+		if (oTable.getEnableColumnReordering() || oColumnHeaderMenu && oColumnHeaderMenu.getAriaHasPopupType() !== "None") {
+			rm.class("sapUiTableHeaderCellActive");
+		}
+
+		/**
+		 * @deprecated As of Version 1.117
+		 */
+		if (!oTable.getEnableColumnReordering() && !oTable.hasListeners("columnSelect") &&
+			!oColumnHeaderMenu && oColumn._menuHasItems()) {
+			rm.class("sapUiTableHeaderCellActive");
+		}
+
+		if (mConfig.isHiddenBySpan) {
+			rm.class("sapUiTableHidden");
+		}
+
+		const {isFirstColumn, isLastFixedColumn, isLastColumn} = mConfig;
+		this._addCellPositionClasses(rm, {isFirstColumn, isLastFixedColumn, isLastColumn});
+
+		if (mConfig.renderIcons) {
+			this._addColumnSortAndFilterClasses(rm, oColumn);
+		}
+	};
+
+	/**
+	 * Adds sorting and filtering marker CSS classes to a header cell.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Column} oColumn Column instance
+	 * @private
+	 */
+	TableRenderer._addColumnSortAndFilterClasses = function(rm, oColumn) {
+		const bFiltered = oColumn.getFiltered();
+		let bSorted = oColumn.getSortOrder() !== SortOrder.None;
+
+		if (bFiltered) {
+			rm.class("sapUiTableColFiltered");
+		}
+
+		/** @deprecated As of version 1.120 */
+		if (!oColumn.getSorted()) {
+			bSorted = false;
+		}
+
+		if (bSorted) {
+			rm.class("sapUiTableColSorted");
+			if (oColumn.getSortOrder() === SortOrder.Descending) {
+				rm.class("sapUiTableColSortedD");
+			}
+		}
+	};
+
+	/**
+	 * Decorates the cell content wrapper of a column header cell with attributes, styles and CSS classes.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Column} oColumn Column instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.isFirstColumn True if first visible column in area
+	 * @private
+	 */
+	TableRenderer._decorateColumnHeaderCellInner = function(rm, oTable, oColumn, mConfig) {
+		const sHAlign = oColumn.getHAlign();
+
+		rm.class("sapUiTableCellInner");
+
+		if (!TableUtils.hasRowHeader(oTable) && mConfig.isFirstColumn &&
+			!TableUtils.hasRowHighlights(oTable) && !TableUtils.Grouping.isInTreeMode(oTable)) {
+			rm.class("sapUiTableFirstColumnCell");
+		}
+
+		const sTextAlign = Renderer.getTextAlign(sHAlign);
+		if (sTextAlign) {
+			rm.style("text-align", sTextAlign);
+		}
+	};
+
+	/**
+	 * Renders the content of a column header cell.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Column} oColumn Column instance
+	 * @param {object} mConfig Configuration object
+	 * @param {int} mConfig.rowIndex Header row index
+	 * @private
+	 */
+	TableRenderer._renderColumnHeaderCellContent = function(rm, oColumn, mConfig) {
+		const oAction = oColumn.getAggregation("_action");
+		const oLabel = this._getColumnLabel(oColumn, mConfig.rowIndex);
+
+		if (oAction && mConfig.rowIndex === 0) {
+			if (oColumn.getMultiLabels().length > 0) {
+				Log.error(`${oColumn}: ColumnAIAction is not compatible with multi labels`);
+			} else {
+				rm.renderControl(oAction);
+			}
+		}
+
+		if (oLabel) {
+			rm.renderControl(oLabel);
+		}
+	};
+
+	/**
+	 * Gets the label for a column header.
 	 *
-	 * @param {sap.ui.core.RenderManager} rm The render manager to which the indicator is written
-	 * @param {sap.ui.table.Table} oTable Instance of the table
-	 * @param {sap.ui.table.Row} oRow Instance of the row
-	 * @param {int} iRowIndex Index of the row
+	 * @param {sap.ui.table.Column} oColumn Column instance
+	 * @param {int} iHeader Header index
+	 * @returns {sap.ui.core.Control|undefined} Header label control or undefined if none exists
+	 * @private
 	 */
-	TableRenderer.writeRowNavigationContent = function(rm, oTable, oRow, iRowIndex) {
-		if (!TableUtils.hasRowNavigationIndicators(oTable)) {
-			return;
+	TableRenderer._getColumnLabel = function(oColumn, iHeader) {
+		const aLabels = oColumn.getMultiLabels();
+
+		if (aLabels.length > 0) {
+			return aLabels[iHeader];
+		} else if (iHeader === 0) {
+			return oColumn.getLabel();
 		}
 
-		const oRowSettings = oRow.getAggregation("_settings");
+		return undefined;
+	};
 
-		rm.openStart("div", oRow.getId() + "-navIndicator");
-		if (oRowSettings.getNavigated()) {
-			rm.class("sapUiTableRowNavigated");
+	/**
+	 * Renders a data row.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Row} oRow Row instance
+	 * @param {object} mConfig Configuration object
+	 * @param {int} mConfig.rowIndex Index of the row in the aggregation
+	 * @param {boolean} mConfig.fixedColumns True if rendering in the fixed columns area
+	 * @param {int} mConfig.startColumnIndex Start column index (inclusive)
+	 * @param {int} mConfig.endColumnIndex End column index (exclusive)
+	 * @param {sap.ui.table.Column[]} mConfig.visibleColumns Visible columns
+	 * @param {int|undefined} mConfig.lastFixedColumnIndex Index of last fixed column (or undefined if none)
+	 * @param {boolean} mConfig.renderDummyColumn True if a dummy column should be rendered (scrollable area balancing)
+	 * @param {boolean} mConfig.draggable True if row is draggable
+	 * @private
+	 */
+	TableRenderer.renderDataRow = function(rm, oTable, oRow, mConfig) {
+		const {rowIndex, fixedColumns, draggable} = mConfig;
+
+		if (fixedColumns) {
+			rm.openStart("tr", oRow.getId() + "-fixed");
+		} else {
+			rm.openStart("tr", oRow);
 		}
-		rm.openEnd();
-		rm.close("div");
-	};
 
-	TableRenderer.renderColumnHeaderRow = function(rm, oTable, iRow, bFixedTable, iStartColumn, iEndColumn, bHasOnlyFixedColumns, bLastRow) {
-		rm.openStart("tr");
-		rm.class("sapUiTableRow");
-		rm.class("sapUiTableHeaderRow");
-		rm.class("sapUiTableColHdrTr");
-		const oAccRenderExtension = oTable._getAccRenderExtension();
-		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "ColumnHeaderRow", {rowIndex: iRow, fixedCol: bFixedTable});
+		this._decorateDataRow(rm, oTable, oRow, {rowIndex, fixedColumns, draggable});
 		rm.openEnd();
 
-		//
-		// Render header cells
-		//
-		const aColumns = this.getColumnsToRender(oTable, iStartColumn, iEndColumn);
-		let nSpan = 0;
-		let iLastVisibleCol = -1;
-
-		// collect header spans and find the last visible column header
-		function collectHeaderSpans(oColumn, index, aCols) {
-			let colSpan = ColumnUtils.getHeaderSpan(oColumn, iRow);
-			let iColIndex;
+		const {startColumnIndex, endColumnIndex, visibleColumns, lastFixedColumnIndex, renderDummyColumn} = mConfig;
+		this._renderDataCells(rm, oTable, oRow, {
+			fixedColumns,
+			startColumnIndex,
+			endColumnIndex,
+			visibleColumns,
+			lastFixedColumnIndex,
+			renderDummyColumn
+		});
 
-			if (nSpan < 1) {
-				if (colSpan > 1) {
-					// In case when a user makes some of the underlying columns invisible, adjust colspan
-					iColIndex = oColumn.getIndex();
-					colSpan = aCols.slice(index + 1, index + colSpan).reduce(function(span, column) {
-						return column.getIndex() - iColIndex < colSpan ? span + 1 : span;
-					}, 1);
-				}
+		rm.close("tr");
+	};
 
-				oColumn._nSpan = nSpan = colSpan;
-				iLastVisibleCol = index;
-			} else {
-				//Render column header but this is invisible because of the previous span
-				oColumn._nSpan = 0;
-			}
-			nSpan--;
-		}
-		aColumns.forEach(collectHeaderSpans);
+	/**
+	 * Decorates a data row with attributes, styles and CSS classes.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Row} oRow Row instance
+	 * @param {object} mConfig Configuration object
+	 * @param {int} mConfig.rowIndex Index of the row in the aggregation
+	 * @param {boolean} mConfig.fixedColumns True if rendering in the fixed columns area
+	 * @param {boolean} mConfig.draggable True if row is draggable
+	 * @private
+	 */
+	TableRenderer._decorateDataRow = function(rm, oTable, oRow, mConfig) {
+		const {rowIndex, fixedColumns, draggable} = mConfig;
 
-		function renderColumn(oColumn, iIndex) {
-			this.renderCol(rm, oTable, oColumn, iRow, oColumn._nSpan,
-				iIndex === 0,
-				bFixedTable && (iIndex === iLastVisibleCol),
-				!bFixedTable && (iIndex === iLastVisibleCol),
-				oColumn._nSpan === 1 && !oColumn._bIconsRendered);
+		this._setDataRowAttributes(rm, oTable, oRow, {rowIndex, fixedColumns, draggable});
+		this._addDataRowClasses(rm, oTable, oRow, {rowIndex});
+		TableUtils.Hook.call(oTable, Hook.RenderRowStyles, rm);
+	};
 
-			oColumn._bIconsRendered = oColumn._bIconsRendered || oColumn._nSpan === 1;
-			delete oColumn._nSpan;
+	/**
+	 * Sets data row attributes.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Row} oRow Row instance
+	 * @param {object} mConfig Configuration object
+	 * @param {int} mConfig.rowIndex Index of the row in the aggregation
+	 * @param {boolean} mConfig.fixedColumns True if rendering in the fixed columns area
+	 * @param {boolean} mConfig.draggable True if row is draggable
+	 * @private
+	 */
+	TableRenderer._setDataRowAttributes = function(rm, oTable, oRow, mConfig) {
+		rm.attr("data-sap-ui-rowindex", mConfig.rowIndex);
 
-			if (bLastRow) {
-				delete oColumn._bIconsRendered;
-			}
+		if (mConfig.fixedColumns) {
+			rm.attr("data-sap-ui-related", oRow.getId());
 		}
-		aColumns.forEach(renderColumn.bind(this));
 
-		if (!bFixedTable && bHasOnlyFixedColumns && aColumns.length > 0) {
-			rm.openStart("td").class("sapUiTableCellDummy");
-			oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "Presentation");
-			rm.openEnd().close("td");
+		if (mConfig.draggable && mConfig.fixedColumns) {
+			rm.attr("draggable", "true");
+			rm.attr("data-sap-ui-draggable", "true");
 		}
-		rm.close("tr");
-	};
 
-	TableRenderer.renderTableRow = function(rm, oTable, oRow, iRowIndex, bFixedTable, iStartColumn, iEndColumn, bFixedRow, aVisibleColumns, iLastFixedColumnIndex, bHasOnlyFixedColumns, bSelectOnCellsAllowed, bDraggable) {
-		if (!oRow) {
-			return;
-		}
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Tr", {
+			index: mConfig.rowIndex,
+			fixedCol: mConfig.fixedColumns,
+			rowNavigated: oRow.getAggregation("_settings")?.getNavigated() ?? false
+		});
+	};
 
-		if (bFixedTable) {
-			rm.openStart("tr", oRow.getId() + "-fixed");
-			rm.attr("data-sap-ui-related", oRow.getId());
-		} else {
-			rm.openStart("tr", oRow);
-		}
-		if (oRow._bDummyRow) {
-			rm.style("opacity", "0");
-		}
+	/**
+	 * Adds CSS classes to a data row.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Row} oRow Row instance
+	 * @param {object} mConfig Configuration object
+	 * @param {int} mConfig.rowIndex Index of the row in the aggregation
+	 * @private
+	 */
+	TableRenderer._addDataRowClasses = function(rm, oTable, oRow, mConfig) {
 		rm.class("sapUiTableRow");
 		rm.class("sapUiTableContentRow");
 		rm.class("sapUiTableTr");
 
-		if (bDraggable && bFixedTable) {
-			rm.attr("draggable", "true");
-			rm.attr("data-sap-ui-draggable", "true");
-		}
-
 		if (oRow.isContentHidden()) {
 			rm.class("sapUiTableRowHidden");
 		} else if (oRow._isSelected()) {
 			rm.class("sapUiTableRowSel");
 		}
 
-		if (iRowIndex % 2 !== 0 && oTable.getAlternateRowColors() && !TableUtils.Grouping.isInTreeMode(oTable)) {
+		if (mConfig.rowIndex % 2 !== 0 && oTable.getAlternateRowColors() && !TableUtils.Grouping.isInTreeMode(oTable)) {
 			rm.class("sapUiTableRowAlternate");
 		}
 
-		this.addRowCSSClasses(rm, oTable, iRowIndex);
+		this.addRowClasses(rm, oTable, mConfig.rowIndex);
+	};
 
-		rm.attr("data-sap-ui-rowindex", iRowIndex);
-		TableUtils.Hook.call(oTable, Hook.RenderRowStyles, rm);
+	/**
+	 * Adds CSS classes to a row based on its position and table state.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {int} iIndex Index of the row in the aggregation
+	 * @private
+	 */
+	TableRenderer.addRowClasses = function(rm, oTable, iIndex) {
+		const mRowCounts = oTable._getRowCounts();
+		const iFirstFixedBottomRowIndex = TableUtils.getFirstFixedBottomRowIndex(oTable);
 
-		const oRowSettings = oRow.getAggregation("_settings");
-		const oParams = {
-			index: iRowIndex,
-			fixedCol: bFixedTable,
-			rowNavigated: oRowSettings ? oRowSettings.getNavigated() : false
-		};
-		const oAccRenderExtension = oTable._getAccRenderExtension();
-		oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "Tr", oParams);
+		if (iIndex === 0) {
+			rm.class("sapUiTableFirstRow");
+		} else if (iIndex === oTable.getRows().length - 1) {
+			rm.class("sapUiTableLastRow");
+		}
 
-		rm.openEnd();
+		if (mRowCounts.fixedTop > 0) {
+			if (iIndex === mRowCounts.fixedTop - 1) {
+				rm.class("sapUiTableRowLastFixedTop");
+			}
+			if (iIndex === mRowCounts.fixedTop) {
+				rm.class("sapUiTableRowFirstScrollable");
+			}
+		}
 
-		const bSelected = !oRow.isEmpty() && oRow._isSelected(); //see TableRenderer.renderRowAddon
-		const aCells = oRow.getCells();
+		if (iFirstFixedBottomRowIndex >= 0 && iFirstFixedBottomRowIndex === iIndex) {
+			rm.class("sapUiTableRowFirstFixedBottom");
+		} else if (iFirstFixedBottomRowIndex >= 1 && iFirstFixedBottomRowIndex - 1 === iIndex) {
+			rm.class("sapUiTableRowLastScrollable");
+		}
+	};
 
-		for (let cell = 0, count = aCells.length; cell < count; cell++) {
-			this.renderTableCell(rm, oTable, oRow, aCells[cell], cell, bFixedTable, iStartColumn, iEndColumn, aVisibleColumns, iLastFixedColumnIndex, bSelected);
+	/**
+	 * Renders all data cells for a row.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Row} oRow Row instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.fixedColumns True if fixed column area
+	 * @param {int} mConfig.startColumnIndex Start column index
+	 * @param {int} mConfig.endColumnIndex End column index
+	 * @param {sap.ui.table.Column[]} mConfig.visibleColumns Visible columns array
+	 * @param {int|undefined} mConfig.lastFixedColumnIndex Index of last fixed column
+	 * @param {boolean} mConfig.renderDummyColumn True if only fixed columns exist in this area
+	 */
+	TableRenderer._renderDataCells = function(rm, oTable, oRow, mConfig) {
+		const aCells = oRow.getCells();
+		const {fixedColumns, startColumnIndex, endColumnIndex, visibleColumns, lastFixedColumnIndex} = mConfig;
+
+		for (let iCellIndex = 0, iCellCount = aCells.length; iCellIndex < iCellCount; iCellIndex++) {
+			this._renderDataCell(rm, oTable, oRow, aCells[iCellIndex], {
+				cellIndex: iCellIndex,
+				fixedColumns,
+				startColumnIndex,
+				endColumnIndex,
+				visibleColumns,
+				lastFixedColumnIndex
+			});
 		}
-		if (!bFixedTable && bHasOnlyFixedColumns && aCells.length > 0) {
-			rm.openStart("td").class("sapUiTableCellDummy");
-			oAccRenderExtension.writeAriaAttributesFor(rm, oTable, "Presentation");
-			rm.openEnd();
-			rm.close("td");
+
+		if (!mConfig.fixedColumns && mConfig.renderDummyColumn && aCells.length > 0) {
+			this._renderDummyColumnContentCell(rm, oTable);
 		}
-		rm.close("tr");
 	};
 
-	TableRenderer.renderTableCell = function(rm, oTable, oRow, oCell, iCellIndex, bFixedTable, iStartColumn, iEndColumn, aVisibleColumns, iLastFixedColumnIndex) {
+	/**
+	 * Renders a content cell of the dummy column.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
+	TableRenderer._renderDummyColumnContentCell = function(rm, oTable) {
+		rm.openStart("td").class("sapUiTableCellDummy");
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "Presentation");
+		rm.openEnd();
+		rm.close("td");
+	};
+
+	/**
+	 * Renders a data cell.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Row} oRow Parent row instance
+	 * @param {sap.ui.core.Control} oCell Cell control to render
+	 * @param {object} mConfig Configuration object
+	 * @param {int} mConfig.cellIndex Index of the cell within the row
+	 * @param {boolean} mConfig.fixedColumns True if in fixed columns area
+	 * @param {int} mConfig.startColumnIndex Start column index
+	 * @param {int} mConfig.endColumnIndex End column index
+	 * @param {sap.ui.table.Column[]} mConfig.visibleColumns Visible columns
+	 * @param {int|undefined} mConfig.lastFixedColumnIndex Last fixed column index
+	 */
+	TableRenderer._renderDataCell = function(rm, oTable, oRow, oCell, mConfig) {
 		const oColumn = Column.ofCell(oCell);
-		const iColIndex = oColumn.getIndex();
+		const iColumnIndex = oColumn.getIndex();
+		const bShouldRenderCell = oColumn.shouldRender() && mConfig.startColumnIndex <= iColumnIndex && mConfig.endColumnIndex > iColumnIndex;
 
-		if (oColumn.shouldRender() && iStartColumn <= iColIndex && iEndColumn > iColIndex) {
-			const sId = oRow.getId() + "-col" + iCellIndex;
-			rm.openStart("td", sId);
-			rm.attr("tabindex", "-1");
-			rm.attr("data-sap-ui-colid", oColumn.getId());
+		if (!bShouldRenderCell) {
+			return;
+		}
 
-			const nColumns = aVisibleColumns.length;
-			const bIsFirstColumn = nColumns > 0 && aVisibleColumns[0] === oColumn;
-			const bIsLastColumn = nColumns > 0 && aVisibleColumns[nColumns - 1] === oColumn;
-			const bIsLastFixedColumn = bFixedTable && iLastFixedColumnIndex === iColIndex;
+		const iVisibleColumnCount = mConfig.visibleColumns.length;
+		const bIsFirstColumn = iVisibleColumnCount > 0 && mConfig.visibleColumns[0] === oColumn;
+		const bIsLastColumn = iVisibleColumnCount > 0 && mConfig.visibleColumns[iVisibleColumnCount - 1] === oColumn;
+		const bIsLastFixedColumn = mConfig.fixedColumns && mConfig.lastFixedColumnIndex === iColumnIndex;
 
-			const oParams = {
-				column: oColumn
-			};
-			oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "DataCell", oParams);
+		rm.openStart("td", oRow.getId() + "-col" + mConfig.cellIndex);
+		this._decorateDataCell(rm, oTable, oColumn, {
+			isFirstColumn: bIsFirstColumn,
+			isLastFixedColumn: bIsLastFixedColumn,
+			isLastColumn: bIsLastColumn
+		});
+		rm.openEnd();
+		this._renderDataCellContent(rm, oTable, oCell, oColumn, mConfig.visibleColumns);
+		rm.close("td");
+	};
 
-			const sTextAlign = Renderer.getTextAlign(oColumn.getHAlign());
-			if (sTextAlign) {
-				rm.style("text-align", sTextAlign);
-			}
+	/**
+	 * Decorates a data cell with attributes, styles and CSS classes.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Column} oColumn Column instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.isFirstColumn True if first visible column
+	 * @param {boolean} mConfig.isLastFixedColumn True if last fixed column
+	 * @param {boolean} mConfig.isLastColumn True if last visible column overall
+	 * @private
+	 */
+	TableRenderer._decorateDataCell = function(rm, oTable, oColumn, mConfig) {
+		const {isFirstColumn, isLastFixedColumn, isLastColumn} = mConfig;
 
-			rm.class("sapUiTableCell");
-			rm.class("sapUiTableContentCell");
-			rm.class("sapUiTableDataCell");
-			if (bIsFirstColumn) {
-				rm.class("sapUiTableCellFirst");
-			}
-			if (bIsLastFixedColumn) {
-				rm.class("sapUiTableCellLastFixed");
-			}
-			if (bIsLastColumn) {
-				rm.class("sapUiTableCellLast");
-			}
-			if (bIsFirstColumn && TableUtils.Grouping.isInTreeMode(oTable)) {
-				rm.class("sapUiTableCellFlex"); // without flex, icon pushes contents too wide
-			}
+		this._setDataCellAttributes(rm, oTable, oColumn);
+		this._setDataCellStyles(rm, oColumn);
+		this._addDataCellClasses(rm, oTable, {isFirstColumn, isLastFixedColumn, isLastColumn});
+	};
 
-			rm.openEnd();
+	/**
+	 * Writes data cell attributes.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.table.Column} oColumn Column instance
+	 * @private
+	 */
+	TableRenderer._setDataCellAttributes = function(rm, oTable, oColumn) {
+		rm.attr("tabindex", "-1");
+		rm.attr("data-sap-ui-colid", oColumn.getId());
+		oTable._getAccRenderExtension().writeAriaAttributesFor(rm, oTable, "DataCell", {
+			column: oColumn
+		});
+	};
 
-			rm.openStart("div");
-			rm.class("sapUiTableCellInner");
+	/**
+	 * Sets data cell styles.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Column} oColumn Column instance
+	 * @private
+	 */
+	TableRenderer._setDataCellStyles = function(rm, oColumn) {
+		const sTextAlign = Renderer.getTextAlign(oColumn.getHAlign());
 
-			if (!TableUtils.hasRowHeader(oTable) && bIsFirstColumn && !TableUtils.hasRowHighlights(oTable) && !TableUtils.Grouping.isInTreeMode(oTable)) {
-				rm.class("sapUiTableFirstColumnCell");
-			}
+		if (sTextAlign) {
+			rm.style("text-align", sTextAlign);
+		}
+	};
 
-			TableUtils.Hook.call(oTable, Hook.RenderCellContentStyles, rm);
+	/**
+	 * Adds data cell CSS classes.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.isFirstColumn True if first visible column
+	 * @param {boolean} mConfig.isLastFixedColumn True if last fixed column
+	 * @param {boolean} mConfig.isLastColumn True if last visible column overall
+	 * @private
+	 */
+	TableRenderer._addDataCellClasses = function(rm, oTable, mConfig) {
+		rm.class("sapUiTableCell");
+		rm.class("sapUiTableContentCell");
+		rm.class("sapUiTableDataCell");
 
-			rm.openEnd();
-			this.renderTableCellControl(rm, oTable, oCell, bIsFirstColumn);
-			rm.close("div");
+		const {isFirstColumn, isLastFixedColumn, isLastColumn} = mConfig;
+		this._addCellPositionClasses(rm, {isFirstColumn, isLastFixedColumn, isLastColumn});
+
+		if (mConfig.isFirstColumn && TableUtils.Grouping.isInTreeMode(oTable)) {
+			rm.class("sapUiTableCellFlex"); // without flex, icon pushes contents too wide
+		}
+	};
+
+	/**
+	 * Adds positional marker CSS classes for a cell.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.isFirstColumn True if first visible column
+	 * @param {boolean} mConfig.isLastFixedColumn True if last fixed column
+	 * @param {boolean} mConfig.isLastColumn True if last visible column overall
+	 */
+	TableRenderer._addCellPositionClasses = function(rm, mConfig) {
+		if (mConfig.isFirstColumn) {
+			rm.class("sapUiTableCellFirst");
+		}
+		if (mConfig.isLastFixedColumn) {
+			rm.class("sapUiTableCellLastFixed");
+		}
+		if (mConfig.isLastColumn) {
+			rm.class("sapUiTableCellLast");
+		}
+	};
+
+	/**
+	 * Renders the content of a data cell.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.core.Control} oCell Cell control
+	 * @param {sap.ui.table.Column} oColumn Column instance
+	 * @param {sap.ui.table.Column[]} aVisibleColumns Visible columns
+	 * @private
+	 */
+	TableRenderer._renderDataCellContent = function(rm, oTable, oCell, oColumn, aVisibleColumns) {
+		const nColumns = aVisibleColumns.length;
+		const bIsFirstColumn = nColumns > 0 && aVisibleColumns[0] === oColumn;
+
+		rm.openStart("div");
+		rm.class("sapUiTableCellInner");
 
-			rm.close("td");
+		if (!TableUtils.hasRowHeader(oTable) && bIsFirstColumn && !TableUtils.hasRowHighlights(oTable) && !TableUtils.Grouping.isInTreeMode(oTable)) {
+			rm.class("sapUiTableFirstColumnCell");
 		}
+
+		TableUtils.Hook.call(oTable, Hook.RenderCellContentStyles, rm);
+
+		rm.openEnd();
+		this.renderDataCellControl(rm, oTable, oCell, {isFirstColumn: bIsFirstColumn});
+		rm.close("div");
 	};
 
-	TableRenderer.renderTableCellControl = function(rm, oTable, oCell, bIsFirstColumn) {
-		if (bIsFirstColumn && TableUtils.Grouping.isInTreeMode(oTable)) {
+	/**
+	 * Renders the inner control of a data cell including optional tree icon.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {sap.ui.core.Control} oCell Cell control
+	 * @param {object} mConfig Configuration object
+	 * @param {boolean} mConfig.isFirstColumn True if first visible column
+	 */
+	TableRenderer.renderDataCellControl = function(rm, oTable, oCell, mConfig) {
+		if (mConfig.isFirstColumn && TableUtils.Grouping.isInTreeMode(oTable)) {
 			const oRow = oCell.getParent();
+
 			rm.openStart("span", oRow.getId() + "-treeicon");
 			rm.class("sapUiTableTreeIcon");
 			rm.attr("tabindex", "0");
@@ -1221,33 +2085,37 @@ sap.ui.define([
 			rm.openEnd();
 			rm.close("span");
 		}
+
 		rm.renderControl(oCell);
 	};
 
+	/**
+	 * Renders the vertical scrollbar (internal container and content) of the table.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} [mConfig] Optional configuration object
+	 * @param {string} [mConfig.cssClass] Additional CSS class to apply
+	 * @private
+	 */
 	TableRenderer.renderVSb = function(rm, oTable, mConfig) {
 		const oScrollExtension = oTable._getScrollExtension();
 
-		mConfig = Object.assign({
-			tabIndex: true
-		}, mConfig);
-
 		rm.openStart("div");
 		rm.class("sapUiTableVSbContainer");
 		if (!oScrollExtension.isVerticalScrollbarRequired()) {
 			rm.class("sapUiTableHidden");
 		}
-		rm.class(mConfig.cssClass);
+		rm.class(mConfig?.cssClass);
 		rm.openEnd();
 
 		rm.openStart("div", oTable.getId() + "-vsb");
 		rm.class("sapUiTableVSb");
 		rm.style("max-height", oScrollExtension.getVerticalScrollbarHeight() + "px");
 
-		if (mConfig.tabIndex) {
-			// https://bugzilla.mozilla.org/show_bug.cgi?id=1069739
-			// Avoid focusing of the scrollbar in Firefox with tab.
-			rm.attr("tabindex", "-1");
-		}
+		// https://bugzilla.mozilla.org/show_bug.cgi?id=1069739
+		// Avoid focusing of the scrollbar with tab.
+		rm.attr("tabindex", "-1");
 		rm.openEnd();
 		rm.openStart("div");
 		rm.class("sapUiTableVSbContent");
@@ -1259,22 +2127,39 @@ sap.ui.define([
 		rm.close("div");
 	};
 
+	/**
+	 * Renders an external vertical scrollbar for synchronization scenarios.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
 	TableRenderer.renderVSbExternal = function(rm, oTable) {
 		if (ExtensionBase.isEnrichedWith(oTable, "sap.ui.table.extensions.Synchronization")) {
 			this.renderVSb(rm, oTable, {
-				cssClass: "sapUiTableVSbExternal",
-				tabIndex: false
+				cssClass: "sapUiTableVSbExternal"
 			});
 		} else {
 			Log.error("This method can only be used with synchronization enabled.", oTable, "TableRenderer.renderVSbExternal");
 		}
 	};
 
+	/**
+	 * Renders the horizontal scrollbar of the table.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} [mConfig] Optional configuration object
+	 * @param {string} [mConfig.id] Scrollbar ID
+	 * @param {string} [mConfig.cssClass] Additional CSS class
+	 * @param {boolean} [mConfig.hidden=true] True if scrollbar initially hidden
+	 * @param {int} [mConfig.scrollWidth=0] Scroll content width
+	 * @private
+	 */
 	TableRenderer.renderHSb = function(rm, oTable, mConfig) {
 		mConfig = Object.assign({
 			id: oTable.getId() + "-hsb",
 			cssClass: "sapUiTableHSb",
-			tabIndex: true,
 			hidden: true,
 			scrollWidth: 0
 		}, mConfig);
@@ -1284,9 +2169,7 @@ sap.ui.define([
 		if (mConfig.hidden) {
 			rm.class("sapUiTableHidden");
 		}
-		if (mConfig.tabIndex) {
-			rm.attr("tabindex", "-1"); // Avoid focusing of the scrollbar in Firefox with tab.
-		}
+		rm.attr("tabindex", "-1"); // Avoid focusing of the scrollbar with tab.
 		rm.openEnd();
 
 		rm.openStart("div", mConfig.id + "-content");
@@ -1300,49 +2183,69 @@ sap.ui.define([
 		rm.close("div");
 	};
 
-	TableRenderer.renderHSbExternal = function(rm, oTable, sId, iScrollWidth) {
+	/**
+	 * Renders an external horizontal scrollbar for synchronization scenarios.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {object} mConfig Configuration object
+	 * @param {string} mConfig.id Scrollbar ID
+	 * @param {int} mConfig.scrollWidth Scroll content width
+	 */
+	TableRenderer.renderHSbExternal = function(rm, oTable, mConfig) {
 		if (ExtensionBase.isEnrichedWith(oTable, "sap.ui.table.extensions.Synchronization")) {
 			this.renderHSb(rm, oTable, {
-				id: sId,
+				id: mConfig.id,
 				cssClass: "sapUiTableHSbExternal",
-				tabIndex: false,
 				hidden: false,
-				scrollWidth: iScrollWidth
+				scrollWidth: mConfig.scrollWidth
 			});
 		} else {
-			Log.error("This method can only be used with synchronization enabled.", oTable, "TableRenderer.renderVSbExternal");
+			Log.error("This method can only be used with synchronization enabled.", oTable, "TableRenderer.renderHSbExternal");
 		}
 	};
 
+	/**
+	 * Renders the horizontal scrollbar background area.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @private
+	 */
 	TableRenderer.renderHSbBackground = function(rm, oTable) {
 		rm.openStart("div", oTable.getId() + "-hsb-bg");
 		rm.class("sapUiTableHSbBg");
-		rm.openEnd().close("div");
+		rm.openEnd();
+		rm.close("div");
 	};
 
-	// =============================================================================
-	// HELPER FUNCTIONALITY
-	// =============================================================================
-
 	/**
 	 * Renders an empty area with tabindex=0 and the given class and id.
+	 *
+	 * @param {sap.ui.core.RenderManager} rm RenderManager instance
+	 * @param {object} mConfig Configuration object
+	 * @param {string} [mConfig.className] Optional CSS class name
+	 * @param {string|int} [mConfig.tabIndex="0"] Tab index to apply
+	 * @param {string} [mConfig.id] Optional ID to apply
 	 * @private
 	 */
-	TableRenderer.renderTabElement = function(rm, sClass, sTabIndex, sId) {
-		rm.openStart("div");
-		if (sClass) {
-			rm.class(sClass);
-		}
-		if (sId) {
-			rm.attr("id", sId);
+	TableRenderer.renderTabElement = function(rm, mConfig) {
+		rm.openStart("div", mConfig.id);
+		if (mConfig.className) {
+			rm.class(mConfig.className);
 		}
 		rm.attr("role", "none");
-		rm.attr("tabindex", sTabIndex == null ? "0" : sTabIndex);
+		rm.attr("tabindex", mConfig.tabIndex == null ? "0" : String(mConfig.tabIndex));
 		rm.openEnd().close("div");
 	};
 
 	/**
-	* Returns the columns with indices in the range between iStartIndex and iEndIndex that should be rendered.
+	 * Returns the columns with indices in the range between iStartIndex and iEndIndex that should be rendered.
+	 *
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @param {int} iStartIndex Start index (inclusive)
+	 * @param {int} iEndIndex End index (exclusive)
+	 * @returns {sap.ui.table.Column[]} Columns to render
 	 * @private
 	 */
 	TableRenderer.getColumnsToRender = function(oTable, iStartIndex, iEndIndex) {
@@ -1352,21 +2255,24 @@ sap.ui.define([
 	};
 
 	/**
-	 * Returns the index of the last fixed column
+	 * Returns the index of the last fixed column.
+	 *
+	 * @param {sap.ui.table.Table} oTable Table instance
+	 * @returns {int} Index of last fixed column or -1 if there are no fixed columns
 	 * @private
 	 */
 	TableRenderer.getLastFixedColumnIndex = function(oTable) {
 		const iFixedColumnCount = oTable.getComputedFixedColumnCount();
-		const aCols = oTable.getColumns();
-		let oColumn; let iLastFixedColumnIndex;
+		const aColumns = oTable.getColumns();
+		let iLastFixedColumnIndex = -1;
 
 		for (let i = iFixedColumnCount - 1; i >= 0; i--) {
-			oColumn = aCols[i];
-			if (oColumn.shouldRender()) {
+			if (aColumns[i].shouldRender()) {
 				iLastFixedColumnIndex = i;
 				break;
 			}
 		}
+
 		return iLastFixedColumnIndex;
 	};