Skip to content

fix: Use Map for O(1) column lookups in table width calculations #4142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TrevorBurnham wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Use Map for O(1) column lookups in table width calculations #4142

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/table/use-column-widths.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0
import React, { createContext, useContext, useEffect, useRef, useState } from 'react';
import React, { createContext, useContext, useEffect, useMemo, useRef, useState } from 'react';

import { useResizeObserver, useStableCallback } from '@cloudscape-design/component-toolkit/internal';
import { getLogicalBoundingClientRect } from '@cloudscape-design/component-toolkit/internal';
Expand Down Expand Up @@ -35,12 +35,12 @@ function readWidths(
}

function updateWidths(
visibleColumns: readonly ColumnWidthDefinition[],
columnById: Map<PropertyKey, ColumnWidthDefinition>,
oldWidths: Map<PropertyKey, number>,
newWidth: number,
columnId: PropertyKey
) {
const column = visibleColumns.find(column => column.id === columnId);
const column = columnById.get(columnId);
let minWidth = DEFAULT_COLUMN_WIDTH;
if (typeof column?.width === 'number' && column.width < DEFAULT_COLUMN_WIDTH) {
minWidth = column?.width;
Expand Down Expand Up @@ -83,6 +83,9 @@ export function ColumnWidthsProvider({ visibleColumns, resizableColumns, contain
const containerWidthRef = useRef(0);
const [columnWidths, setColumnWidths] = useState<null | Map<PropertyKey, number>>(null);

// Pre-build a Map for column lookups
const columnById = useMemo(() => new Map(visibleColumns.map(column => [column.id, column])), [visibleColumns]);

const cellsRef = useRef(new Map<PropertyKey, HTMLElement>());
const stickyCellsRef = useRef(new Map<PropertyKey, HTMLElement>());
const getCell = (columnId: PropertyKey): null | HTMLElement => cellsRef.current.get(columnId) ?? null;
Expand All @@ -96,7 +99,7 @@ export function ColumnWidthsProvider({ visibleColumns, resizableColumns, contain
};

const getColumnStyles = (sticky: boolean, columnId: PropertyKey): ColumnWidthStyle => {
const column = visibleColumns.find(column => column.id === columnId);
const column = columnById.get(columnId);
if (!column) {
return {};
}
Expand Down Expand Up @@ -190,7 +193,7 @@ export function ColumnWidthsProvider({ visibleColumns, resizableColumns, contain
}, []);

function updateColumn(columnId: PropertyKey, newWidth: number) {
setColumnWidths(columnWidths => updateWidths(visibleColumns, columnWidths ?? new Map(), newWidth, columnId));
setColumnWidths(columnWidths => updateWidths(columnById, columnWidths ?? new Map(), newWidth, columnId));
}

return (
Expand Down
Loading