Skip to content
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

Jump to bottom

[EuiDataGrid] Add new beta rowHeightsOptions.autoBelowLineCount feature flag #8096

Merged
merged 9 commits into from
Oct 25, 2024
Merged

[EuiDataGrid] Add new beta rowHeightsOptions.autoBelowLineCount feature flag #8096

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
26fc12f
Add `autoBelowLineCount` feature flag
cee-chen Oct 23, 2024
d982dcc
Update `getCalculatedHeight` to account for `autoBelowLineCount`
cee-chen Oct 23, 2024
d75d3f9
[cleanup] Remove unused arg/type
cee-chen Oct 23, 2024
219940e
Short circuit `recalculateLineHeight` if `autoBelowLineCount` flag is…
cee-chen Oct 23, 2024
69bf607
Update cell content / height display to account for new hybrid type
cee-chen Oct 23, 2024
4ba2570
Update display selector label to reflect UX behavior
cee-chen Oct 23, 2024
449de49
Add Storybook
cee-chen Oct 23, 2024
b8059bd
changelog
cee-chen Oct 23, 2024
073f48a
[PR feedback] test title typos
cee-chen Oct 25, 2024
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/eui/src/components/datagrid/utils/grid_height_width.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export const useUnconstrainedHeight = ({
rowHeightOption,
defaultRowHeight,
correctRowIndex,
rowHeightUtils.isRowHeightOverride(correctRowIndex, rowHeightsOptions)
rowHeightsOptions
);
}
}
Expand Down
19 changes: 18 additions & 1 deletion packages/eui/src/components/datagrid/utils/row_heights.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,23 @@ describe('RowHeightUtils', () => {
});
});

describe('autoBelowLineCount', () => {
it('uses the auto height cache', () => {
const rowIndex = 3;
const autoRowHeight = 100;
rowHeightUtils.setRowHeight(rowIndex, 'a', autoRowHeight, 0);

expect(
rowHeightUtils.getCalculatedHeight(
{ lineCount: 10 },
34,
rowIndex,
{ rowHeights: { [rowIndex]: autoRowHeight } }
)
).toEqual(autoRowHeight);
});
});

describe('row-specific overrides', () => {
it('returns the height set in the cache', () => {
const rowIndex = 5;
Expand All @@ -119,7 +136,7 @@ describe('RowHeightUtils', () => {
{ lineCount: 10 },
34,
rowIndex,
true
{ rowHeights: { [rowIndex]: rowHeightOverride } }
)
).toEqual(rowHeightOverride);
});
Expand Down
13 changes: 9 additions & 4 deletions packages/eui/src/components/datagrid/utils/row_heights.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export class RowHeightUtils {
heightOption: EuiDataGridRowHeightOption,
defaultHeight: number,
rowIndex?: number,
isRowHeightOverride?: boolean
rowHeightsOptions?: EuiDataGridRowHeightsOptions
) {
if (isObject(heightOption) && heightOption.height) {
return Math.max(heightOption.height, defaultHeight);
Expand All @@ -65,8 +65,13 @@ export class RowHeightUtils {
}

if (isObject(heightOption) && heightOption.lineCount) {
if (isRowHeightOverride) {
return this.getRowHeight(rowIndex!) || defaultHeight; // lineCount overrides are stored in the heights cache
const { autoBelowLineCount } = rowHeightsOptions || {}; // uses auto height cache
const isRowHeightOverride = // lineCount overrides are stored in the heights cache
rowIndex != null &&
this.isRowHeightOverride(rowIndex, rowHeightsOptions);
mgadewoll marked this conversation as resolved.
Show resolved Hide resolved

if (autoBelowLineCount || isRowHeightOverride) {
return this.getRowHeight(rowIndex!) || defaultHeight;
} else {
return defaultHeight; // default lineCount height is set in minRowHeight state in grid_row_body
}
Expand Down Expand Up @@ -405,7 +410,7 @@ export const useDefaultRowHeight = ({
rowHeightOption,
minRowHeight,
correctRowIndex,
rowHeightUtils.isRowHeightOverride(correctRowIndex, rowHeightsOptions)
rowHeightsOptions
);
}

Expand Down