root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 197 Packages Projects Releases Wiki Activity

fix unit test

This commit is contained in:
Paul Marbach 2025-08-28 11:08:18 -04:00
parent ed80de02c8
commit c46b0f1bec
3 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/grafana-ui/src/components/Table/TableNG/TableNG.tsx
View File

@ -462,25 +462,15 @@ export function TableNG(props: TableNGProps) {
const cellColorStyles = getCellColorInlineStyles(cellOptions, displayValue, applyToRowBgFn != null);
Object.assign(style, cellColorStyles);
}
if (maxRowHeight != null) {
style.maxHeight = maxRowHeight;
}
return (
<Cell
key={key}
{...props}
className={clsx(props.className, { [cellParentStyles]: maxRowHeight == null })}
style={style}
/>
);
return <Cell key={key} {...props} className={clsx(props.className, cellParentStyles)} style={style} />;
};
result.cellRootRenderers[displayName] = renderCellRoot;
const clampByMaxHeight = (maxHeight: number, children: ReactNode, cellStyles: string) => (
<div className={clsx(styles.cellClamp, cellStyles)} style={{ maxHeight }}>
{children}
</div>
);
const renderBasicCellContent = (props: RenderCellProps<TableRow, TableSummaryRow>): JSX.Element => {
const rowIdx = props.row.__index;
const value = props.row[props.column.key];
@ -525,10 +515,6 @@ export function TableNG(props: TableNGProps) {
</>
);
if (maxRowHeight != null) {
result = clampByMaxHeight(maxRowHeight, result, cellParentStyles);
}
return result;
};
@ -559,14 +545,7 @@ export function TableNG(props: TableNGProps) {
const tooltipLinkStyles = getLinkStyles(theme, tooltipCanBeColorized);
const tooltipClasses = getTooltipStyles(theme, textAlign);
const tooltipBodyClasses = clsx(tooltipDefaultStyles, tooltipSpecificStyles, tooltipLinkStyles);
let tooltipFieldRenderer = getCellRenderer(tooltipField, tooltipCellOptions);
if (maxRowHeight != null) {
const OrigCellRenderer = tooltipFieldRenderer;
tooltipFieldRenderer = (props) =>
clampByMaxHeight(maxRowHeight, <OrigCellRenderer {...props} />, tooltipBodyClasses);
}
const tooltipFieldRenderer = getCellRenderer(tooltipField, tooltipCellOptions);
const placement = field.config.custom?.tooltip?.placement ?? TableCellTooltipPlacement.Auto;
const tooltipWidth =
placement === TableCellTooltipPlacement.Left || placement === TableCellTooltipPlacement.Right
@ -678,7 +657,6 @@ export function TableNG(props: TableNGProps) {
rows,
setFilter,
showTypeIcons,
styles.cellClamp,
theme,
timeRange,
]

4
packages/grafana-ui/src/components/Table/TableNG/styles.ts
View File

@ -80,10 +80,6 @@ export const getGridStyles = (theme: GrafanaTheme2, enablePagination?: boolean,
marginBlock: TABLE.CELL_PADDING,
}),
cellNested: css({ '&[aria-selected=true]': { outline: 'none' } }),
cellClamp: css({
overflowY: 'hidden',
justifyContent: 'flex-start !important',
}),
noDataNested: css({
height: TABLE.NESTED_NO_DATA_HEIGHT,
display: 'flex',

3
packages/grafana-ui/src/components/Table/TableNG/utils.test.ts
View File

@ -1171,8 +1171,7 @@ describe('TableNG utils', () => {
const measurers = buildCellHeightMeasurers(fields, ctx);
expect(measurers![0].measure!(fields[0].values[2], 20, fields[0], 2, 100)).toBeGreaterThan(50);
fields[0].config!.custom!.maxHeight = 50;
const measurersWithMax = buildCellHeightMeasurers(fields, ctx);
const measurersWithMax = buildCellHeightMeasurers(fields, ctx, 50);
expect(measurersWithMax![0].measure!(fields[0].values[2], 20, fields[0], 2, 100)).toBe(50);
});
});