rename metric

Author: dgodinez-dh

packages/grid/src/GridMetricCalculator.ts

@@ -262,8 +262,11 @@ export class GridMetricCalculator {
     const treePaddingY = 0; // We don't support trees on columns (at least not yet)
 
     const visibleRowHeights = this.getVisibleRowHeights(state);
-    const [visibleColumnWidths, visibleNonHiddenColumns] =
-      this.getVisibleColumnWidths(state, firstColumn, treePaddingX);
+    const [visibleColumnWidths, columnsForRender] = this.getVisibleColumnWidths(
+      state,
+      firstColumn,
+      treePaddingX
+    );
 
     // Calculate the metrics for the main grid
     const visibleRows = Array.from(visibleRowHeights.keys());
@@ -614,7 +617,7 @@ export class GridMetricCalculator {
       visibleColumns,
 
       // Array of visible, non-hidden columns, by grid index
-      visibleNonHiddenColumns,
+      columnsForRender,
 
       // Map of the height/width of columns in the viewport (excluding floating columns)
       visibleRowHeights,
@@ -1072,7 +1075,7 @@ export class GridMetricCalculator {
     let x = 0;
     let column = left;
     const columnWidths = new Map();
-    const visibleNonHiddenColumns: VisibleIndex[] = [];
+    const columnsForRender: VisibleIndex[] = [];
     const { columnCount, floatingRightColumnCount } = model;
     while (
       x < width + leftOffset &&
@@ -1086,13 +1089,13 @@ export class GridMetricCalculator {
       );
       columnWidths.set(column, columnWidth);
       if (columnWidth > 0) {
-        visibleNonHiddenColumns.push(column);
+        columnsForRender.push(column);
       }
       x += columnWidth;
       column += 1;
     }
 
-    return [columnWidths, visibleNonHiddenColumns];
+    return [columnWidths, columnsForRender];
   }
 
   /**

packages/grid/src/GridMetrics.ts

@@ -133,10 +133,9 @@ export type GridMetrics = {
   visibleRows: readonly VisibleIndex[];
   visibleColumns: readonly VisibleIndex[];
 
-  // Array of visible, non-hidden columns, by grid index
-  // Hidden columns may be included in visibleColumns and visibleColumnWidths with a width of 0 because users can see them and adjust their width
-  // But we do not want the grid renderer to iterate over them, so we provide this separate array
-  visibleNonHiddenColumns: readonly VisibleIndex[];
+  // Renderer performance optimization - array of visible, non-hidden columns, by grid index
+  // Use visibleColumns if hidden columns should be included (e.g. rendering column headers)
+  columnsForRender: readonly VisibleIndex[];
 
   // Map of the height/width of visible rows/columns
   visibleRowHeights: SizeMap;

packages/grid/src/GridRenderer.ts

@@ -259,7 +259,7 @@ export class GridRenderer {
       floatingBottomRowCount,
       floatingRows,
       rowCount,
-      visibleNonHiddenColumns,
+      columnsForRender,
       allRowYs,
       allRowHeights,
     } = metrics;
@@ -284,7 +284,7 @@ export class GridRenderer {
     this.drawGridLinesForItems(
       context,
       state,
-      visibleNonHiddenColumns,
+      columnsForRender,
       floatingRows,
       theme.floatingGridColumnColor,
       theme.floatingGridRowColor
@@ -293,7 +293,7 @@ export class GridRenderer {
     this.drawCellBackgroundsForItems(
       context,
       state,
-      visibleNonHiddenColumns,
+      columnsForRender,
       floatingRows
     );
 
@@ -323,8 +323,8 @@ export class GridRenderer {
     }
 
     // Draw the cell content...
-    for (let c = 0; c < visibleNonHiddenColumns.length; c += 1) {
-      const column = visibleNonHiddenColumns[c];
+    for (let c = 0; c < columnsForRender.length; c += 1) {
+      const column = columnsForRender[c];
       for (let r = 0; r < floatingRows.length; r += 1) {
         const row = floatingRows[r];
         this.drawCellContent(context, state, column, row);
@@ -850,12 +850,12 @@ export class GridRenderer {
     state: GridRenderState
   ): void {
     const { metrics, theme } = state;
-    const { visibleNonHiddenColumns, visibleRows } = metrics;
+    const { columnsForRender, visibleRows } = metrics;
 
     this.drawGridLinesForItems(
       context,
       state,
-      visibleNonHiddenColumns,
+      columnsForRender,
       visibleRows,
       theme.gridColumnColor,
       theme.gridRowColor
@@ -927,11 +927,11 @@ export class GridRenderer {
     state: GridRenderState
   ): void {
     const { metrics } = state;
-    const { visibleNonHiddenColumns, visibleRows } = metrics;
+    const { columnsForRender, visibleRows } = metrics;
     this.drawCellBackgroundsForItems(
       context,
       state,
-      visibleNonHiddenColumns,
+      columnsForRender,
       visibleRows
     );
   }
@@ -1004,10 +1004,10 @@ export class GridRenderer {
     state: GridRenderState
   ): void {
     const { metrics } = state;
-    const { visibleNonHiddenColumns } = metrics;
+    const { columnsForRender } = metrics;
 
-    for (let i = 0; i < visibleNonHiddenColumns.length; i += 1) {
-      const column = visibleNonHiddenColumns[i];
+    for (let i = 0; i < columnsForRender.length; i += 1) {
+      const column = columnsForRender[i];
       this.drawColumnCellContents(context, state, column);
     }
   }