Skip to content

fix: DH-22054: GridMetrics type update #2659

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

Merged
mofojed merged 7 commits into from
Apr 30, 2026
+10 −8
Merged

fix: DH-22054: GridMetrics type update #2659

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
39c2aba
readonly type changes
ethanalvizo Jan 21, 2026
c1bb4c6
cast type
ethanalvizo Jan 22, 2026
dd1f38e
add ticket number
ethanalvizo Jan 22, 2026
e7c7e3a
more type changes
ethanalvizo Apr 9, 2026
29361cd
Merge branch 'main' into type-updates
ethanalvizo Apr 9, 2026
0d425c2
build error fixes
ethanalvizo Apr 9, 2026
3b8d81e
revert unnecessary changes
ethanalvizo Apr 30, 2026
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
2 changes: 1 addition & 1 deletion packages/iris-grid/src/IrisGridCacheUtils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const irisGridState = {
metrics: {
userColumnWidths: new Map(),
userRowHeights: new Map(),
} as GridMetrics,
} as Partial<GridMetrics>,
} satisfies HydratedIrisGridState;

describe('makeMemoizedGridStateDehydrator', () => {
Expand Down
10 changes: 4 additions & 6 deletions packages/iris-grid/src/IrisGridCacheUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,10 @@ function areIrisGridStatesEqual(

return (
irisGridStateA === irisGridStateB ||
(irisGridStateA.metrics != null &&
irisGridStateB.metrics != null &&
irisGridStateA.metrics.userColumnWidths ===
irisGridStateB.metrics.userColumnWidths &&
irisGridStateA.metrics.userRowHeights ===
irisGridStateB.metrics.userRowHeights &&
(irisGridStateA.metrics?.userColumnWidths ===
Comment thread
ethanalvizo marked this conversation as resolved.
Outdated
irisGridStateB.metrics?.userColumnWidths &&
irisGridStateA.metrics?.userRowHeights ===
irisGridStateB.metrics?.userRowHeights &&
compareStateKeys.every(
key => irisGridStateA[key] === irisGridStateB[key]
))
Expand Down
2 changes: 1 addition & 1 deletion packages/iris-grid/src/IrisGridUtils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ describe('dehydration methods', () => {
metrics: {
userColumnWidths: new Map(),
userRowHeights: new Map(),
} as GridMetrics,
} as Partial<GridMetrics>,
}),
],
])('%s should be serializable', (_label, result) => {
Expand Down
14 changes: 8 additions & 6 deletions packages/iris-grid/src/IrisGridUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
type GridMetrics,
type GridRange,
type GridState,
GridUtils,
Expand Down Expand Up @@ -76,8 +77,9 @@ export type HydratedIrisGridState = Pick<
| 'conditionalFormats'
| 'columnHeaderGroups'
| 'partitionConfig'
| 'metrics'
>;
> & {
metrics?: Partial<GridMetrics>;
};

export type DehydratedPendingDataMap<T> = [number, { data: [string, T][] }][];

Expand Down Expand Up @@ -1192,10 +1194,10 @@ class IrisGridUtils {
customColumnFormatMap,
columnAlignmentMap = EMPTY_MAP,
isFilterBarShown,
metrics: { userColumnWidths, userRowHeights } = {
userColumnWidths: EMPTY_MAP,
userRowHeights: EMPTY_MAP,
},
metrics: {
userColumnWidths = new Map<ModelIndex, number>(),
userRowHeights = new Map<ModelIndex, number>(),
} = {},
quickFilters,
customColumns,
conditionalFormats = EMPTY_ARRAY,
Expand Down
Loading
⚡