@equinor/eds-data-grid-react 0.8.1 → 0.9.1

package/dist/eds-data-grid-react.cjs

@@ -513,13 +513,42 @@ function TableRow({
   onCellClick,
   onClick,
   onDoubleClick,
-  onContextMenu
+  onContextMenu,
+  rowVirtualizer,
+  virtualItem
 }) {
   const {
     rowClass,
     rowStyle
   } = useTableContext();
+  const isMountedRef = react.useRef(true);
+
+  // Set mounted flag to false on unmount to prevent measurements during cleanup
+  react.useEffect(() => {
+    return () => {
+      isMountedRef.current = false;
+    };
+  }, []);
+
+  // Create a stable ref callback that guards against calls during unmount
+  const measureRef = react.useCallback(node => {
+    // Only measure if we have a node, the component is still mounted, and we have a virtualizer
+    if (node && isMountedRef.current && rowVirtualizer) {
+      try {
+        rowVirtualizer.measureElement(node);
+      } catch (error) {
+        // Silently catch any errors during measurement to prevent crashes
+        // This can happen if the virtualizer is in an inconsistent state during unmount
+        if (process.env.NODE_ENV === 'development') {
+          console.warn('Failed to measure element during virtualization:', error);
+        }
+      }
+    }
+  }, [rowVirtualizer]);
   return /*#__PURE__*/jsxRuntime.jsx(StyledTableRow, {
+    "data-index": virtualItem?.index,
+    ref: measureRef //measure dynamic row height safely
+    ,
     style: {
       ...(rowStyle?.(row) ?? {})
     },
@@ -578,6 +607,12 @@ function logDevelopmentWarningOfPropUse(deprecatedProps) {
     }
   }
 }
+const isFirefox = () => {
+  return typeof window !== 'undefined' && navigator.userAgent.indexOf('Firefox') !== -1;
+};
+const getMeasureElementHandler = () => {
+  return isFirefox() ? undefined : element => element?.getBoundingClientRect().height;
+};
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 function EdsDataGridInner({
@@ -890,7 +925,9 @@ function EdsDataGridInner({
   const virtualizer = reactVirtual.useVirtualizer({
     count: table.getRowModel().rows.length,
     getScrollElement: () => parentRef.current,
-    estimateSize
+    estimateSize,
+    //measure dynamic row height, except in firefox because it measures table border height incorrectly
+    measureElement: getMeasureElementHandler()
   });
   if (rowVirtualizerInstanceRef) rowVirtualizerInstanceRef.current = virtualizer;
 
@@ -977,6 +1014,8 @@ function EdsDataGridInner({
             }), virtualRows.map(virtualItem => {
               const row = table.getRowModel().rows[virtualItem.index];
               return /*#__PURE__*/jsxRuntime.jsx(TableRow, {
+                virtualItem: virtualItem,
+                rowVirtualizer: virtualizer,
                 row: row,
                 onContextMenu: onRowContextMenu ? event => onRowContextMenu(row, event) : undefined,
                 onClick: onRowClick ? event => onRowClick(row, event) : undefined,

package/dist/esm/EdsDataGrid.js

@@ -7,7 +7,7 @@ import { TableProvider } from './EdsDataGridContext.js';
 import { TableHeaderRow } from './components/TableHeaderRow.js';
 import { TableFooterRow } from './components/TableFooterRow.js';
 import { TableRow } from './components/TableRow.js';
-import { addPxSuffixIfInputHasNoPrefix, logDevelopmentWarningOfPropUse } from './utils.js';
+import { addPxSuffixIfInputHasNoPrefix, logDevelopmentWarningOfPropUse, getMeasureElementHandler } from './utils.js';
 import { mergeRefs } from '@equinor/eds-utils';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 
@@ -322,7 +322,9 @@ function EdsDataGridInner({
   const virtualizer = useVirtualizer({
     count: table.getRowModel().rows.length,
     getScrollElement: () => parentRef.current,
-    estimateSize
+    estimateSize,
+    //measure dynamic row height, except in firefox because it measures table border height incorrectly
+    measureElement: getMeasureElementHandler()
   });
   if (rowVirtualizerInstanceRef) rowVirtualizerInstanceRef.current = virtualizer;
 
@@ -409,6 +411,8 @@ function EdsDataGridInner({
             }), virtualRows.map(virtualItem => {
               const row = table.getRowModel().rows[virtualItem.index];
               return /*#__PURE__*/jsx(TableRow, {
+                virtualItem: virtualItem,
+                rowVirtualizer: virtualizer,
                 row: row,
                 onContextMenu: onRowContextMenu ? event => onRowContextMenu(row, event) : undefined,
                 onClick: onRowClick ? event => onRowClick(row, event) : undefined,

package/dist/esm/components/TableRow.js

@@ -1,4 +1,5 @@
 import { Table } from '@equinor/eds-core-react';
+import { useRef, useEffect, useCallback } from 'react';
 import styled from 'styled-components';
 import { useTableContext } from '../EdsDataGridContext.js';
 import { TableBodyCell } from './TableBodyCell.js';
@@ -9,13 +10,42 @@ function TableRow({
   onCellClick,
   onClick,
   onDoubleClick,
-  onContextMenu
+  onContextMenu,
+  rowVirtualizer,
+  virtualItem
 }) {
   const {
     rowClass,
     rowStyle
   } = useTableContext();
+  const isMountedRef = useRef(true);
+
+  // Set mounted flag to false on unmount to prevent measurements during cleanup
+  useEffect(() => {
+    return () => {
+      isMountedRef.current = false;
+    };
+  }, []);
+
+  // Create a stable ref callback that guards against calls during unmount
+  const measureRef = useCallback(node => {
+    // Only measure if we have a node, the component is still mounted, and we have a virtualizer
+    if (node && isMountedRef.current && rowVirtualizer) {
+      try {
+        rowVirtualizer.measureElement(node);
+      } catch (error) {
+        // Silently catch any errors during measurement to prevent crashes
+        // This can happen if the virtualizer is in an inconsistent state during unmount
+        if (process.env.NODE_ENV === 'development') {
+          console.warn('Failed to measure element during virtualization:', error);
+        }
+      }
+    }
+  }, [rowVirtualizer]);
   return /*#__PURE__*/jsx(StyledTableRow, {
+    "data-index": virtualItem?.index,
+    ref: measureRef //measure dynamic row height safely
+    ,
     style: {
       ...(rowStyle?.(row) ?? {})
     },

package/dist/esm/utils.js

@@ -36,5 +36,11 @@ function logDevelopmentWarningOfPropUse(deprecatedProps) {
     }
   }
 }
+const isFirefox = () => {
+  return typeof window !== 'undefined' && navigator.userAgent.indexOf('Firefox') !== -1;
+};
+const getMeasureElementHandler = () => {
+  return isFirefox() ? undefined : element => element?.getBoundingClientRect().height;
+};
 
-export { addPxSuffixIfInputHasNoPrefix, isNumberOnlyString, logDevelopmentWarningOfPropUse };
+export { addPxSuffixIfInputHasNoPrefix, getMeasureElementHandler, isFirefox, isNumberOnlyString, logDevelopmentWarningOfPropUse };

package/dist/types/components/ClickableCell/ClickableCell.d.ts

@@ -0,0 +1,12 @@
+import React, { ButtonHTMLAttributes } from 'react';
+export type ClickableCellProps = {
+    /** Cell content */
+    children: React.ReactNode;
+    /** Click handler */
+    onClick: () => void;
+    /** Accessible label for screen readers */
+    ariaLabel: string;
+    /** Indicates if the cell is selected */
+    isSelected?: boolean;
+} & Omit<ButtonHTMLAttributes<HTMLButtonElement>, 'onClick' | 'children'>;
+export declare function ClickableCell({ children, onClick, ariaLabel, isSelected, ...rest }: ClickableCellProps): import("react/jsx-runtime").JSX.Element;

package/dist/types/components/ClickableCell/ClickableCell.tokens.d.ts

@@ -0,0 +1,3 @@
+import type { ComponentToken } from '@equinor/eds-tokens';
+export type ClickableCellToken = ComponentToken;
+export declare const clickableCell: ClickableCellToken;

package/dist/types/components/ClickableCell/index.d.ts

@@ -0,0 +1 @@
+export { ClickableCell, type ClickableCellProps } from './ClickableCell';

package/dist/types/components/TableRow.d.ts

@@ -1,9 +1,12 @@
 import { Row } from '@tanstack/react-table';
 import { HTMLAttributes } from 'react';
 import { EdsDataGridProps } from '../EdsDataGridProps';
+import { VirtualItem, Virtualizer } from '@tanstack/react-virtual';
 type Props<T> = {
     row: Row<T>;
     onCellClick?: EdsDataGridProps<T>['onCellClick'];
+    rowVirtualizer?: Virtualizer<HTMLDivElement, HTMLTableRowElement>;
+    virtualItem?: VirtualItem;
 } & HTMLAttributes<HTMLTableRowElement>;
-export declare function TableRow<T>({ row, onCellClick, onClick, onDoubleClick, onContextMenu, }: Props<T>): import("react/jsx-runtime").JSX.Element;
+export declare function TableRow<T>({ row, onCellClick, onClick, onDoubleClick, onContextMenu, rowVirtualizer, virtualItem, }: Props<T>): import("react/jsx-runtime").JSX.Element;
 export {};

package/dist/types/utils.d.ts

@@ -20,3 +20,5 @@ export declare function logDevelopmentWarningOfPropUse(deprecatedProps: Record<s
     value: unknown;
     mitigationInfo?: string;
 }>): void;
+export declare const isFirefox: () => boolean;
+export declare const getMeasureElementHandler: () => (element: HTMLTableRowElement) => number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/eds-data-grid-react",
-  "version": "0.8.1",
+  "version": "0.9.1",
   "description": "A feature-rich data-grid written in React, implementing the Equinor Design System",
   "license": "MIT",
   "types": "dist/types/index.d.ts",
@@ -21,52 +21,48 @@
   },
   "dependencies": {
     "@tanstack/react-table": "^8.21.3",
-    "@tanstack/react-virtual": "^3.13.8",
+    "@tanstack/react-virtual": "^3.13.12",
     "@equinor/eds-icons": "^0.22.0",
-    "@equinor/eds-tokens": "0.9.2",
-    "@equinor/eds-utils": "^0.8.7"
+    "@equinor/eds-utils": "^0.9.0",
+    "@equinor/eds-tokens": "0.10.0"
   },
   "devDependencies": {
     "@rollup/plugin-babel": "^6.0.4",
-    "@rollup/plugin-commonjs": "^28.0.3",
+    "@rollup/plugin-commonjs": "^28.0.6",
     "@rollup/plugin-node-resolve": "^16.0.1",
-    "@storybook/addon-a11y": "^8.6.12",
-    "@storybook/addon-actions": "^8.6.12",
-    "@storybook/addon-docs": "^8.6.12",
-    "@storybook/addon-essentials": "^8.6.12",
-    "@storybook/addon-links": "^8.6.12",
-    "@storybook/blocks": "^8.6.12",
-    "@storybook/preview-api": "^8.6.12",
-    "@storybook/react": "^8.6.12",
-    "@storybook/react-vite": "^8.6.12",
-    "@testing-library/dom": "^10.4.0",
-    "@testing-library/jest-dom": "^6.6.3",
+    "@storybook/addon-a11y": "^9.1.5",
+    "@storybook/addon-docs": "^9.1.5",
+    "@storybook/addon-links": "^9.1.5",
+    "@storybook/react-vite": "^9.1.5",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/jest-dom": "^6.8.0",
     "@testing-library/react": "16.3.0",
     "@testing-library/user-event": "^14.6.1",
     "@types/jest": "^29.5.14",
-    "@types/node": "^22.15.3",
+    "@types/node": "^22.18.0",
     "@types/ramda": "^0.30.2",
-    "@types/react": "^18.3.20",
-    "@types/react-dom": "^18.3.6",
+    "@types/react": "^18.3.24",
+    "@types/react-dom": "^18.3.7",
     "babel-plugin-styled-components": "^2.1.4",
     "jest": "29.7.0",
     "jest-environment-jsdom": "29.7.0",
     "jest-styled-components": "^7.2.0",
     "js-file-download": "^0.4.12",
-    "postcss": "^8.5.3",
-    "ramda": "^0.30.1",
+    "postcss": "^8.5.6",
+    "ramda": "^0.31.3",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-hook-form": "^7.56.1",
-    "rollup": "^4.40.1",
+    "react-hook-form": "^7.62.0",
+    "rollup": "^4.50.0",
     "rollup-plugin-delete": "^2.2.0",
     "rollup-plugin-postcss": "^4.0.2",
-    "storybook": "^8.6.14",
-    "styled-components": "6.1.18",
-    "ts-jest": "29.3.3",
+    "storybook": "^9.1.5",
+    "styled-components": "6.1.19",
+    "ts-jest": "29.4.0",
     "ts-node": "10.9.2",
-    "tsc-watch": "^6.2.1",
-    "typescript": "~5.8.3"
+    "tsc-watch": "^6.3.1",
+    "typescript": "~5.8.3",
+    "eslint-plugin-storybook": "9.1.5"
   },
   "homepage": "https://eds.equinor.com",
   "repository": {
@@ -86,7 +82,7 @@
   ],
   "scripts": {
     "build": "rollup -c --bundleConfigAsCjs && tsc -p tsconfig.build.json",
-    "test": "tsc -p tsconfig.spec.json && jest",
+    "test": "tsc -p tsconfig.test.json && jest",
     "test:watch": "tsc-watch -p tsconfig.test.json --onFirstSuccess  \"jest --watch\"",
     "test:update-snapshots": "jest --updateSnapshot",
     "storybook": "storybook dev -p 9000 --ci",