@openui5/sap.ui.table 1.94.0 → 1.97.0

package/src/sap/ui/table/rowmodes/InteractiveRowMode.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
@@ -168,7 +168,11 @@ sap.ui.define([
 	 * @inheritDoc
 	 */
 	InteractiveRowMode.prototype.getComputedRowCounts = function() {
-		return this.computeStandardizedRowCounts(this.getConfiguredRowCount(), this.getFixedTopRowCount(), this.getFixedBottomRowCount());
+		var iRowCount = this.getConfiguredRowCount();
+		var iFixedTopRowCount = this.getFixedTopRowCount();
+		var iFixedBottomRowCount = this.getFixedBottomRowCount();
+
+		return this.computeStandardizedRowCounts(iRowCount, iFixedTopRowCount, iFixedBottomRowCount);
 	};
 
 	/**
@@ -315,13 +319,23 @@ sap.ui.define([
 		var width = $Splitter.width();
 		var bTouch = oTable._isTouchEvent(oEvent);
 
-		$Body.append(
-			"<div id=\"" + oTable.getId() + "-ghost\" class=\"sapUiTableInteractiveResizerGhost\" style =\" height:" + height + "px; width:"
-			+ width + "px; left:" + offset.left + "px; top:" + offset.top + "px\" ></div>");
-
-		// Append overlay over splitter to enable correct functionality of moving the splitter
-		$Splitter.append(
-			"<div id=\"" + oTable.getId() + "-rzoverlay\" style =\"left: 0px; right: 0px; bottom: 0px; top: 0px; position:absolute\" ></div>");
+		var oGhostDiv = document.createElement("div");
+		oGhostDiv.style.width = width + "px";
+		oGhostDiv.style.height = height + "px";
+		oGhostDiv.style.left = offset.left + "px";
+		oGhostDiv.style.top = offset.top + "px";
+		oGhostDiv.className = "sapUiTableInteractiveResizerGhost";
+		oGhostDiv.id = oTable.getId() + "-ghost";
+		$Body.append(oGhostDiv);
+
+		var oOverlayDiv = document.createElement("div");
+		oOverlayDiv.style.top = "0px";
+		oOverlayDiv.style.bottom = "0px";
+		oOverlayDiv.style.left = "0px";
+		oOverlayDiv.style.right = "0px";
+		oOverlayDiv.style.position = "absolute";
+		oOverlayDiv.id = oTable.getId() + "-rzoverlay";
+		$Splitter.append(oOverlayDiv);
 
 		$Document.on((bTouch ? "touchend" : "mouseup") + ".sapUiTableInteractiveResize",
 			ResizeHelper.exitInteractiveResizing.bind(oTable, oMode));

package/src/sap/ui/table/rowmodes/RowMode.js

@@ -36,7 +36,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
 	var RowMode = Element.extend("sap.ui.table.rowmodes.RowMode", /** @lends sap.ui.table.rowmodes.RowMode.prototype */ {
@@ -578,9 +578,9 @@ sap.ui.define([
 		// There is no need to have rows in the aggregation if the NoData overlay is enabled and no binding is available.
 		if (TableUtils.isNoDataVisible(oTable) && !oTable.getBinding()) {
 			iNewNumberOfRows = 0;
-		} else if (TableUtils.isVariableRowHeightEnabled(oTable)) {
+		} else if (TableUtils.isVariableRowHeightEnabled(oTable) && iNewNumberOfRows > 0) {
 			// TODO: Move this to VariableRowMode#getComputedRowCounts
-			iNewNumberOfRows = iNewNumberOfRows + 1; // Create one additional row for partial row scrolling.
+			iNewNumberOfRows++; // Create one additional row for partial row scrolling.
 		}
 
 		// Destroy rows if they are invalid, but keep the DOM in case the table is going to render.
@@ -785,12 +785,13 @@ sap.ui.define([
 	 */
 	function updateBindingContextsOfRows(oMode, aRows) {
 		var oTable = oMode.getTable();
-		var aContexts = oMode.getRowContexts(aRows.length);
 
 		if (!oTable || aRows.length === 0) {
 			return;
 		}
 
+		var aContexts = oMode.getRowContexts(aRows.length);
+
 		for (var i = 0; i < aRows.length; i++) {
 			aRows[i].setRowBindingContext(aContexts[i], oTable);
 		}

package/src/sap/ui/table/rowmodes/VariableRowMode.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * @extends sap.ui.table.rowmodes.RowMode
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/table/themes/base/Cell.less

@@ -3,8 +3,8 @@
 /* Base theme                 */
 /* ========================== */
 
-@_sap_ui_table_Cell_FocusOutlineOffset: -1px;
-@_sap_ui_table_Cell_FocusOutlineOffsetInZoomedChrome: -2px;
+@_sap_ui_table_Cell_FocusOutlineOffset: -@sapUiContentFocusWidth;
+@_sap_ui_table_Cell_FocusOutlineOffsetInZoomedChrome: calc(-@sapUiContentFocusWidth ~"- 0.0625rem");
 @_sap_ui_table_Cell_Padding: 0 0.5rem;
 @_sap_ui_table_Cell_TouchMenuIconSize: 1.375rem;
 @_sap_ui_table_Cell_ColumnIconSize: 0.75rem;
@@ -24,7 +24,7 @@
 		position: absolute;
 		inset: 0;
 		pointer-events: none;
-		outline: @_sap_ui_table_FocusOutlineWidth dotted @sapUiContentFocusColor;
+		outline: @_sap_ui_table_FocusOutlineWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
 		outline-offset: @_sap_ui_table_Cell_FocusOutlineOffset;
 
 		.sapUiTableZoomout & {
@@ -337,15 +337,6 @@
 		overflow: hidden;
 		padding: @_sap_ui_table_Cell_Padding;
 		white-space: nowrap;
-
-		.sapUiSizeCondensed & {
-			padding: 0;
-
-			> * {
-				box-sizing: border-box;
-				padding: @_sap_ui_table_Cell_Padding;
-			}
-		}
 	}
 }
 
@@ -390,7 +381,7 @@
 	border-left: @_sap_ui_table_BaseBorderWidth solid @sapUiListVerticalBorderColor;
 	pointer-events: none;
 	.sapUiTableContentRow & {
-		background-color: @sapUiListBackground !important;
+		background-color: @sapBackgroundColor !important;
 	}
 }
 

package/src/sap/ui/table/themes/base/Grouping.less

@@ -29,7 +29,7 @@
 	}
 
 	&:focus {
-		outline: @_sap_ui_table_Grouping_GroupOutlineWidth dotted @sapUiContentFocusColor;
+		outline: @_sap_ui_table_Grouping_GroupOutlineWidth @sapUiContentFocusStyle @sapUiContentFocusColor;
 		outline-offset: -2px;
 	}
 }
@@ -42,7 +42,7 @@
 	position: absolute;
 	left: 1px;
 	top: @_sap_ui_table_Grouping_GroupOutlineWidth;
-	bottom: 0;
+	bottom: @_sap_ui_table_Grouping_GroupOutlineWidth;
 	white-space: nowrap;
 	font-weight: normal;
 	color: @sapUiListTextColor;
@@ -80,6 +80,7 @@
 	text-align: center;
 	vertical-align: middle;
 	margin-left: -2px;
+	margin-right: 2px;
 }
 
 .sapUiSizeCozy .sapUiTableGroupIcon::before {
@@ -103,6 +104,10 @@ html[dir=rtl] {
 	}
 }
 
+.sapUiTableTreeIcon.sapUiTableTreeIconLeaf {
+	visibility: hidden;
+}
+
 .sapUiTableGroupHeaderFading(@color) {
 	box-shadow: inset @_sap_ui_table_Grouping_GroupHeaderFadingWidth 0 @_sap_ui_table_Grouping_GroupHeaderFadingWidth / 2 -@_sap_ui_table_Grouping_GroupHeaderFadingWidth / 2 @color;
 }
@@ -121,11 +126,21 @@ html[dir=rtl] {
 
 .sapUiTableGroupHeaderRow > .sapUiTableRowSelectionCell:focus .sapUiTableGroupIcon {
 	outline-width: @_sap_ui_table_Grouping_GroupOutlineWidth;
-	outline-style: dotted;
+	outline-style: @sapUiContentFocusStyle;
 	outline-offset: 0;
 	outline-color: @sapUiContentFocusColor;
 }
 
+.sapUiTableGroupHeaderRow > .sapUiTableRowSelectionCell:focus::before {
+	outline: none;
+}
+
+.sapUiTableGroupHeaderRow > .sapUiTableCell.sapUiTableCellFirst:focus::before,
+.sapUiTableGroupMode .sapUiTableRowIndented > .sapUiTableCell.sapUiTableCellFirst:focus::before {
+	z-index: 2;
+	left: var(--CalculatedGroupIndent, 0);
+}
+
 // Override row background and cell borders in group header rows.
 .sapUiTableGroupHeaderRow {
 	&.sapUiTableRow {
@@ -181,6 +196,10 @@ html[dir=rtl] {
 	pointer-events: none;
 }
 
+.sapUiTableRowHidden > .sapUiTableCell > .sapUiTableGroupShield {
+	display: block;
+}
+
 .sapUiTableGroupHeaderRow > .sapUiTableRowSelectionCell:focus {
 	outline: 0;
 }

package/src/sap/ui/table/themes/base/Table.less

@@ -63,7 +63,7 @@
 	border-left: @_sap_ui_table_BaseBorderWidth solid @sapUiListVerticalBorderColor;
 	border-right: @_sap_ui_table_BaseBorderWidth solid @sapUiListVerticalBorderColor;
 	border-top: @_sap_ui_table_BaseBorderWidth solid @sapUiListBorderColor;
-	background-color: @sapUiListBackground;
+	background-color: @sapBackgroundColor;
 	._sap_ui_table_Table_Table();
 }
 
@@ -183,7 +183,7 @@
 .sapUiTableCtrlEmpty:focus,
 .sapUiTableCnt > .sapUiLocalBusyIndicator:focus {
 	outline-width: @_sap_ui_table_FocusOutlineWidth;
-	outline-style: dotted;
+	outline-style: @sapUiContentFocusStyle;
 	outline-offset: -3px;
 	outline-color: @sapUiContentFocusColor;
 }

package/src/sap/ui/table/themes/base/library.source.less

@@ -45,7 +45,8 @@
 @_sap_ui_table_DeleteIcon: sys-cancel;
 @_sap_ui_table_ClearSelectionIcon: clear-all;
 
-@_sap_ui_table_FocusOutlineWidth: 1px;
+/*TBD: Table specific parameter should be removed and replaced with sapUiContentFocusWidth*/
+@_sap_ui_table_FocusOutlineWidth: @sapUiContentFocusWidth;
 
 @import "Table.less";
 @import "Row.less";

package/src/sap/ui/table/utils/TableUtils.js

@@ -209,7 +209,7 @@ sap.ui.define([
 	 * Static collection of utility functions related to the sap.ui.table.Table, ...
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @namespace
 	 * @alias sap.ui.table.utils.TableUtils
 	 * @private
@@ -1392,8 +1392,22 @@ sap.ui.define([
 			// Converting the row height CSS parameters (e.g. _sap_ui_table_RowHeight) is too complex (CSS calc()).
 			// Therefore, the base sizes are used and calculation is done in JavaScript.
 
+			var mParams = ThemeParameters.get({
+				name: [
+					"_sap_ui_table_BaseSize",
+					"_sap_ui_table_BaseSizeCozy",
+					"_sap_ui_table_BaseSizeCompact",
+					"_sap_ui_table_BaseSizeCondensed",
+					"_sap_ui_table_BaseBorderWidth",
+					"_sap_ui_table_NavigationIcon",
+					"_sap_ui_table_DeleteIcon",
+					"_sap_ui_table_ClearSelectionIcon",
+					"_sap_ui_table_NavIndicatorWidth"
+				]
+			});
+
 			function getPixelValue(sThemeParameterName) {
-				return TableUtils.convertCSSSizeToPixel(ThemeParameters.get(sThemeParameterName));
+				return TableUtils.convertCSSSizeToPixel(mParams[sThemeParameterName]);
 			}
 
 			mBaseSize.undefined = getPixelValue("_sap_ui_table_BaseSize");
@@ -1408,9 +1422,9 @@ sap.ui.define([
 			mDefaultRowHeight.sapUiSizeCompact = mBaseSize.sapUiSizeCompact + iRowHorizontalFrameSize;
 			mDefaultRowHeight.sapUiSizeCondensed = mBaseSize.sapUiSizeCondensed + iRowHorizontalFrameSize;
 
-			mThemeParameters.navigationIcon = ThemeParameters.get("_sap_ui_table_NavigationIcon");
-			mThemeParameters.deleteIcon = ThemeParameters.get("_sap_ui_table_DeleteIcon");
-			mThemeParameters.clearSelectionIcon = ThemeParameters.get("_sap_ui_table_ClearSelectionIcon");
+			mThemeParameters.navigationIcon = mParams["_sap_ui_table_NavigationIcon"];
+			mThemeParameters.deleteIcon = mParams["_sap_ui_table_DeleteIcon"];
+			mThemeParameters.clearSelectionIcon = mParams["_sap_ui_table_ClearSelectionIcon"];
 			mThemeParameters.navIndicatorWidth = getPixelValue("_sap_ui_table_NavIndicatorWidth");
 		},
 

package/src/sap/ui/table/utils/_BindingUtils.js

@@ -14,7 +14,7 @@ sap.ui.define([], function() {
 	 * Note: Do not access the functions of this helper directly, but via <code>sap.ui.table.utils.TableUtils.Binding...</code>
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._BindingUtils
 	 * @private

package/src/sap/ui/table/utils/_ColumnUtils.js

@@ -18,7 +18,7 @@ sap.ui.define([
 	 * Note: Do not access the functions of this helper directly, but via <code>sap.ui.table.utils.TableUtils.Column...</code>
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._ColumnUtils
 	 * @private

package/src/sap/ui/table/utils/_GroupingUtils.js

@@ -23,7 +23,7 @@ sap.ui.define([
 	 * Note: Do not access the functions of this helper directly, but via <code>sap.ui.table.utils.TableUtils.Grouping...</code>
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._GroupingUtils
 	 * @private
@@ -273,12 +273,14 @@ sap.ui.define([
 				$RowHdr.css(bRTL ? "right" : "left", "");
 				$Shield.css("width", "").css(bRTL ? "margin-right" : "margin-left", "");
 				$FirstCellContentInRow.css(bRTL ? "padding-right" : "padding-left", "");
+				$Row.css("--CalculatedGroupIndent", "0");
 			} else {
 				// Apply indent on table row
 				$RowHdr.css(bRTL ? "right" : "left", iIndent + "px");
 				$Shield.css("width", iIndent + "px").css(bRTL ? "margin-right" : "margin-left", ((-1) * iIndent) + "px");
 				$FirstCellContentInRow.css(bRTL ? "padding-right" : "padding-left",
 					(iIndent + 8/* +8px standard padding .sapUiTableCellInner */) + "px");
+				$Row.css("--CalculatedGroupIndent", iIndent + "px");
 			}
 		},
 
@@ -338,6 +340,10 @@ sap.ui.define([
 			if (GroupingUtils.isInTreeMode(oTable)) {
 				var $TreeIcon = $Row.find(".sapUiTableTreeIcon");
 
+				if (!bIsExpandable && document.activeElement === $TreeIcon[0]) {
+					GroupingUtils.TableUtils.getParentCell(oTable, $TreeIcon[0]).trigger("focus");
+				}
+
 				$TreeIcon.toggleClass("sapUiTableTreeIconLeaf", !bIsExpandable)
 						 .toggleClass("sapUiTableTreeIconNodeOpen", bIsExpandable && bIsExpanded)
 						 .toggleClass("sapUiTableTreeIconNodeClosed", bIsExpandable && !bIsExpanded);

package/src/sap/ui/table/utils/_HookUtils.js

@@ -22,7 +22,7 @@ sap.ui.define(["sap/ui/base/DataType", "sap/base/Log"], function(DataType, Log)
 	 * - There is no concept for public or protected hooks. Never expose a hook directly, only indirectly as can be seen in the examples.
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._HookUtils
 	 *

package/src/sap/ui/table/utils/_MenuUtils.js

@@ -42,7 +42,7 @@ sap.ui.define([
 	 * Note: Do not access the functions of this helper directly, but via <code>sap.ui.table.utils.TableUtils.Menu...</code>
 	 *
 	 * @author SAP SE
-	 * @version 1.94.0
+	 * @version 1.97.0
 	 * @namespace
 	 * @alias sap.ui.table.utils._MenuUtils
 	 * @private

package/ui5.yaml

@@ -1,5 +1,5 @@
 ---
-specVersion: "1.1"
+specVersion: "2.0"
 type: library
 metadata:
   name: sap.ui.table
@@ -7,3 +7,6 @@ metadata:
    OpenUI5
     * (c) Copyright 2009-${currentYear} SAP SE or an SAP affiliate company.
     * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+resources:
+  configuration:
+    propertiesFileSourceEncoding: ISO-8859-1