chore: revert gridStyles update fix

elastic · Jun 4, 2024 · 9f0996d · 9f0996d
1 parent de2cfd5
commit 9f0996d
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 55 deletions.
diff --git a/packages/eui/src/components/datagrid/body/cell/data_grid_cell.tsx b/packages/eui/src/components/datagrid/body/cell/data_grid_cell.tsx
@@ -318,10 +318,6 @@ export class EuiDataGridCell extends Component<
       this.recalculateLineHeight();
     }
 
-    if (this.props?.shouldUpdateLineHeight === true) {
-      this.recalculateLineHeight();
-    }
-
     if (
       (this.props.rowHeightUtils as RowHeightVirtualizationUtils)
         ?.compensateForLayoutShift &&

diff --git a/packages/eui/src/components/datagrid/body/cell/data_grid_cell_wrapper.tsx b/packages/eui/src/components/datagrid/body/cell/data_grid_cell_wrapper.tsx
@@ -75,7 +75,6 @@ export const CellWrapper: FunctionComponent<CellProps> = memo(
     rowHeightsOptions,
     rowHeightUtils,
     rowManager,
-    shouldUpdateLineHeight,
     ...rest
   }) => {
     const popoverContext = useContext(DataGridCellPopoverContext);
@@ -156,7 +155,6 @@ export const CellWrapper: FunctionComponent<CellProps> = memo(
           width={leadingColumn.width}
           renderCellValue={rowCellRender}
           isExpandable={false}
-          shouldUpdateLineHeight={shouldUpdateLineHeight}
           {...rest}
         />
       );
@@ -173,7 +171,6 @@ export const CellWrapper: FunctionComponent<CellProps> = memo(
           width={trailingColumn.width}
           renderCellValue={rowCellRender}
           isExpandable={false}
-          shouldUpdateLineHeight={shouldUpdateLineHeight}
           {...rest}
         />
       );
@@ -197,7 +194,6 @@ export const CellWrapper: FunctionComponent<CellProps> = memo(
           renderCellPopover={renderCellPopover}
           interactiveCellId={interactiveCellId}
           isExpandable={isExpandable}
-          shouldUpdateLineHeight={shouldUpdateLineHeight}
           {...rest}
         />
       );

diff --git a/packages/eui/src/components/datagrid/body/data_grid_body_virtualized.tsx b/packages/eui/src/components/datagrid/body/data_grid_body_virtualized.tsx
@@ -42,13 +42,11 @@ import {
 } from '../utils/grid_height_width';
 import { useDefaultColumnWidth, useColumnWidths } from '../utils/col_widths';
 import { useRowHeightUtils, useDefaultRowHeight } from '../utils/row_heights';
-import { useShouldUpdateCellLineHeight } from '../utils/cell_heights';
 import { useScrollBars, useScroll } from '../utils/scrolling';
 import { IS_JEST_ENVIRONMENT } from '../../../utils';
 
 export const Cell: FunctionComponent<GridChildComponentProps> = memo(
   ({ columnIndex, rowIndex, style, data }) => {
-    const { gridStyles, ...cellData } = data;
     const memoizedStyles = useDeepEqual(style);
     const cellStyles = useMemo(() => {
       const { headerRowHeight } = data;
@@ -58,15 +56,12 @@ export const Cell: FunctionComponent<GridChildComponentProps> = memo(
       };
     }, [memoizedStyles, data]);
 
-    const shouldUpdateLineHeight = useShouldUpdateCellLineHeight(gridStyles);
-
     return (
       <CellWrapper
         colIndex={columnIndex}
         visibleRowIndex={rowIndex}
         style={cellStyles}
-        shouldUpdateLineHeight={shouldUpdateLineHeight}
-        {...cellData}
+        {...data}
       />
     );
   }
@@ -339,7 +334,6 @@ export const EuiDataGridBodyVirtualized: FunctionComponent<EuiDataGridBodyProps>
           rowManager,
           pagination,
           headerRowHeight,
-          gridStyles,
         };
       }, [
         schemaDetectors,
@@ -360,7 +354,6 @@ export const EuiDataGridBodyVirtualized: FunctionComponent<EuiDataGridBodyProps>
         rowManager,
         pagination,
         headerRowHeight,
-        gridStyles,
       ]);
 
       const rowWrapperContextValue = useMemo(() => {

diff --git a/packages/eui/src/components/datagrid/data_grid_types.ts b/packages/eui/src/components/datagrid/data_grid_types.ts
@@ -640,7 +640,6 @@ export interface EuiDataGridCellProps {
   rowHeightUtils?: RowHeightUtilsType;
   rowManager?: EuiDataGridRowManager;
   pagination?: Required<EuiDataGridPaginationProps>;
-  shouldUpdateLineHeight?: boolean;
 }
 
 export interface EuiDataGridCellState {

diff --git a/packages/eui/src/components/datagrid/utils/cell_heights.ts b/packages/eui/src/components/datagrid/utils/cell_heights.ts