diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 8cd9252d9b..176a846ef0 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @amanmahajan7 @nstepien
+* @grafana/dataviz-squad
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c00752d3c9..023ef422b3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,14 +5,19 @@ on:
       - main
   pull_request:
 
+permissions:
+  contents: read
+
 jobs:
   test:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        with:
+          persist-credentials: false
 
-      - uses: actions/setup-node@v7
+      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7
         with:
           node-version-file: 'package.json'
           check-latest: true
@@ -48,7 +53,7 @@ jobs:
 
       - name: Upload test failure artifacts
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
           name: test-artifacts
           path: |
@@ -58,21 +63,56 @@ jobs:
           if-no-files-found: ignore
 
       - name: Upload coverage
-        uses: codecov/codecov-action@v7
+        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
 
-      - name: Deploy gh-pages
-        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+  publish:
+    name: Publish to NPM
+    runs-on: ubuntu-latest
+    needs: [test]
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    permissions:
+      contents: write # push the release tag
+      id-token: write # npm trusted publishing
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7
+        with:
+          fetch-depth: 0
+
+      # only publish when package.json version changes - https://github.com/EndBug/version-check
+      - name: Check version changes
+        uses: EndBug/version-check@36ff30f37c7deabe56a30caa043d127be658c425 # 2.1.5
+        id: version_check
+        with:
+          diff-search: true
+
+      - name: Setup Node for npm registry
+        if: steps.version_check.outputs.changed == 'true'
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7
+        with:
+          node-version-file: 'package.json'
+          check-latest: true
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Install dependencies
+        if: steps.version_check.outputs.changed == 'true'
+        run: npm ci
+
+      - name: Bundle
+        if: steps.version_check.outputs.changed == 'true'
+        run: node --run build
+
+      - name: Publish to npm
+        if: steps.version_check.outputs.changed == 'true'
+        run: npm publish --tag latest
+
+      - name: Push tag and create GitHub release
+        if: steps.version_check.outputs.changed == 'true'
+        env:
+          GH_TOKEN: ${{ github.token }}
+          NEW_VERSION: ${{ steps.version_check.outputs.version }}
         run: |
-          git config --global user.email 'action@github.com'
-          git config --global user.name 'GitHub Action'
-          git fetch origin gh-pages
-          git worktree add gh-pages gh-pages
-          cd gh-pages
-          git rm -r .
-          mv ../dist/* .
-          touch .nojekyll
-          git add .
-          git commit -m "gh-pages deployment" || echo "Nothing to commit"
-          git push -f https://comcast:${{secrets.GITHUB_TOKEN}}@github.com/Comcast/react-data-grid.git
+          git tag "v${NEW_VERSION}"
+          git push origin "v${NEW_VERSION}"
+          gh release create "v${NEW_VERSION}" --title "v${NEW_VERSION}" --generate-notes
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
deleted file mode 100644
index 59c00efc32..0000000000
--- a/.github/workflows/publish.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-name: Publish
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version to publish (e.g., 0.1.1, 0.2.0, 1.0.0)'
-        required: true
-        type: string
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    permissions:
-      contents: write
-      id-token: write
-
-    steps:
-      - uses: actions/checkout@v7
-        with:
-          fetch-depth: 0
-
-      - uses: actions/setup-node@v7
-        with:
-          node-version-file: 'package.json'
-          check-latest: true
-          registry-url: 'https://registry.npmjs.org'
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Typecheck
-        run: node --run typecheck
-
-      - name: ESLint
-        run: node --run eslint
-
-      - name: Oxfmt
-        run: node --run format:check
-
-      - name: Bundle
-        run: node --run build
-
-      - name: Build website
-        run: node --run build:website
-
-      - name: Check routeTree.gen.ts
-        run: git diff --exit-code website/routeTree.gen.ts
-
-      - name: Install Playwright Browsers
-        run: npx playwright install chromium firefox
-        timeout-minutes: 2
-
-      - name: Test
-        run: node --run test:ci
-        timeout-minutes: 4
-
-      - name: Update version
-        run: |
-          git config user.name "${{ github.actor }}"
-          git config user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
-          npm version ${{ inputs.version }}
-
-      # https://docs.npmjs.com/trusted-publishers
-      - name: Publish to npm
-        run: npm publish --tag latest
-
-      - name: Push tag
-        run: git push origin v${{ inputs.version }}
-
-      - name: Create GitHub Release
-        run: gh release create v${{ inputs.version }} --title "v${{ inputs.version }}" --generate-notes
-        env:
-          GH_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/update-screenshots.yml b/.github/workflows/update-screenshots.yml
deleted file mode 100644
index 5201002371..0000000000
--- a/.github/workflows/update-screenshots.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-name: Update Screenshots
-
-on:
-  pull_request:
-    types: [labeled]
-  workflow_dispatch:
-
-jobs:
-  update-screenshots:
-    if: ${{ github.event.label.name == 'Update Screenshots' || github.event_name == 'workflow_dispatch' }}
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-
-    permissions:
-      contents: write
-      pull-requests: write
-
-    # one at a time per branch
-    concurrency:
-      group: update-screenshots@${{ github.head_ref }}
-      cancel-in-progress: true
-
-    steps:
-      - uses: actions/checkout@v7
-        with:
-          ref: ${{ github.head_ref }}
-
-      - uses: actions/setup-node@v7
-        with:
-          node-version-file: 'package.json'
-          check-latest: true
-
-      - name: Remove label
-        if: github.event_name == 'pull_request'
-        run: gh pr edit --remove-label 'Update Screenshots'
-        env:
-          GH_TOKEN: ${{ github.token }}
-
-      - name: Install dependencies
-        run: npm ci
-      - name: Install Playwright Browsers
-        run: npx playwright install chromium firefox
-        timeout-minutes: 2
-
-      - name: Update screenshots
-        run: |
-          rm -r test/**/screenshots/**
-          node --run test:ci:update
-        timeout-minutes: 4
-
-      - name: Push new screenshots
-        run: |
-          git config user.name "${{ github.actor }}"
-          git config user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
-          git add "test/**/screenshots/**"
-          git diff-index --quiet HEAD || git commit -m "Update screenshots"
-          git push
diff --git a/README.md b/README.md
index 7ad7807480..fe69903430 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,8 @@
 [![codecov-badge]][codecov-url]
 [![ci-badge]][ci-url]
 
+_Note: This package is a Grafana-maintained fork of [react-data-grid](https://github.com/Comcast/react-data-grid), published as `@grafana/react-data-grid`. It adds auto-height support for non-virtualized rendering and a few accessibility improvements on top of upstream._
+
 The DataGrid component is designed to handle large datasets efficiently while offering a rich set of features for customization and interactivity.
 
 ## Table of contents
@@ -881,7 +883,7 @@ function MyGrid() {
 
 Function to generate unique IDs for group rows. If not provided, a default implementation is used that concatenates parent and group keys with `__`.
 
-###### `rowHeight?: Maybe<number | ((args: RowHeightArgs<R>) => number)>`
+###### `rowHeight?: Maybe<number | string | ((args: RowHeightArgs<R>) => number)>`
 
 **Note:** Unlike `DataGrid`, the `rowHeight` function receives [`RowHeightArgs<R>`](#rowheightargstrow) which includes a `type` property to distinguish between regular rows and group rows:
 
diff --git a/package-lock.json b/package-lock.json
index 75e8588587..4e8ac93794 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
-  "name": "react-data-grid",
-  "version": "7.0.0-beta.60",
+  "name": "@grafana/react-data-grid",
+  "version": "7.0.0-beta.59",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "react-data-grid",
-      "version": "7.0.0-beta.60",
+      "name": "@grafana/react-data-grid",
+      "version": "7.0.0-beta.59",
       "license": "MIT",
       "devDependencies": {
         "@eslint-react/eslint-plugin": "^5.6.0",
diff --git a/package.json b/package.json
index 0175302559..3e6e5218be 100644
--- a/package.json
+++ b/package.json
@@ -1,17 +1,17 @@
 {
-  "name": "react-data-grid",
-  "version": "7.0.0-beta.60",
+  "name": "@grafana/react-data-grid",
+  "version": "7.0.0-beta.59",
   "description": "Feature-rich and customizable data grid React component",
   "keywords": [
     "data grid",
     "react"
   ],
-  "homepage": "https://github.com/Comcast/react-data-grid#readme",
-  "bugs": "https://github.com/Comcast/react-data-grid/issues",
+  "homepage": "https://github.com/grafana/react-data-grid#readme",
+  "bugs": "https://github.com/grafana/react-data-grid/issues",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/Comcast/react-data-grid.git"
+    "url": "git+https://github.com/grafana/react-data-grid.git"
   },
   "files": [
     "lib"
@@ -31,6 +31,9 @@
       "default": "./lib/index.js"
     }
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "start": "vite serve --clearScreen false",
     "preview": "vite preview",
diff --git a/src/DataGrid.tsx b/src/DataGrid.tsx
index 5c750a00fc..402f944916 100644
--- a/src/DataGrid.tsx
+++ b/src/DataGrid.tsx
@@ -1,10 +1,13 @@
-import { useCallback, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import type { Key, KeyboardEvent } from 'react';
+import { useCallback, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { flushSync } from 'react-dom';
 
 import {
+  type ActivePosition,
   HeaderRowSelectionChangeContext,
   HeaderRowSelectionContext,
+  type HeaderRowSelectionContextValue,
+  type PartialPosition,
   RowSelectionChangeContext,
   useActivePosition,
   useCalculatedColumns,
@@ -14,10 +17,7 @@ import {
   useScrollState,
   useScrollToPosition,
   useViewportColumns,
-  useViewportRows,
-  type ActivePosition,
-  type HeaderRowSelectionContextValue,
-  type PartialPosition
+  useViewportRows
 } from './hooks';
 import {
   assertIsValidKeyGetter,
@@ -45,7 +45,6 @@ import type {
   CellMouseEventHandler,
   CellNavigationMode,
   CellPasteArgs,
-  PositionChangeArgs,
   Column,
   ColumnOrColumnGroup,
   ColumnWidths,
@@ -53,11 +52,12 @@ import type {
   FillEvent,
   Maybe,
   Position,
+  PositionChangeArgs,
   Renderers,
   RowsChangeData,
-  SetActivePositionOptions,
   SelectHeaderRowEvent,
   SelectRowEvent,
+  SetActivePositionOptions,
   SortColumn
 } from './types';
 import { defaultRenderCell } from './Cell';
@@ -138,7 +138,7 @@ export interface DataGridProps<R, SR = unknown, K extends Key = Key> extends Sha
    * Height of each row in pixels
    * @default 35
    */
-  rowHeight?: Maybe<number | ((row: NoInfer<R>) => number)>;
+  rowHeight?: Maybe<number | string | ((row: NoInfer<R>) => number)>;
   /**
    * Height of the header row in pixels
    * @default 35
@@ -303,9 +303,13 @@ export function DataGrid<R, SR = unknown, K extends Key = Key>(props: DataGridPr
   const renderCheckbox =
     renderers?.renderCheckbox ?? defaultRenderers?.renderCheckbox ?? defaultRenderCheckbox;
   const noRowsFallback = renderers?.noRowsFallback ?? defaultRenderers?.noRowsFallback;
-  const enableVirtualization = rawEnableVirtualization ?? true;
+  const enableVirtualization = rawEnableVirtualization ?? typeof rawRowHeight !== 'string';
   const direction = rawDirection ?? 'ltr';
 
+  if (enableVirtualization && typeof rowHeight === 'string') {
+    throw new Error('`rowHeight` cannot be a string when `enableVirtualization` is true.');
+  }
+
   /**
    * ref
    */
@@ -413,7 +417,9 @@ export function DataGrid<R, SR = unknown, K extends Key = Key>(props: DataGridPr
     maxRowIdx,
     setDraggedOverRowIdx
   });
-  const { setScrollToPosition, scrollToPositionElement } = useScrollToPosition({ gridRef });
+  const { setScrollToPosition, scrollToPositionElement } = useScrollToPosition({
+    gridRef
+  });
 
   const defaultGridComponents = useMemo(
     () => ({
@@ -457,10 +463,16 @@ export function DataGrid<R, SR = unknown, K extends Key = Key>(props: DataGridPr
     findRowIdx
   } = useViewportRows({
     rows,
-    rowHeight,
     clientHeight,
     scrollTop,
-    enableVirtualization
+    enableVirtualization,
+    ...(typeof rowHeight === 'string'
+      ? {
+          rowHeight,
+          gridRef,
+          gridHeight
+        }
+      : { rowHeight })
   });
 
   const {
@@ -690,7 +702,11 @@ export function DataGrid<R, SR = unknown, K extends Key = Key>(props: DataGridPr
     if (isSelectable && shiftKey && key === ' ') {
       assertIsValidKeyGetter<R, K>(rowKeyGetter);
       const rowKey = rowKeyGetter(row);
-      selectRow({ row, checked: !selectedRows.has(rowKey), isShiftClick: false });
+      selectRow({
+        row,
+        checked: !selectedRows.has(rowKey),
+        isShiftClick: false
+      });
       // prevent scrolling
       event.preventDefault();
       return;
@@ -776,7 +792,11 @@ export function DataGrid<R, SR = unknown, K extends Key = Key>(props: DataGridPr
     const indexes: number[] = [];
     for (let i = startRowIdx; i < endRowIdx; i++) {
       if (isCellEditable({ rowIdx: i, idx })) {
-        const updatedRow = onFill!({ columnKey: column.key, sourceRow, targetRow: rows[i] });
+        const updatedRow = onFill!({
+          columnKey: column.key,
+          sourceRow,
+          targetRow: rows[i]
+        });
         if (updatedRow !== rows[i]) {
           updatedRows[i] = updatedRow;
           indexes.push(i);
@@ -971,6 +991,7 @@ export function DataGrid<R, SR = unknown, K extends Key = Key>(props: DataGridPr
     return (
       <div
         style={dragHandleStyle}
+        aria-hidden="true"
         className={classnames(
           cellDragHandleClassname,
           column.frozen && cellDragHandleFrozenClassname
@@ -1048,7 +1069,11 @@ export function DataGrid<R, SR = unknown, K extends Key = Key>(props: DataGridPr
     });
 
     function closeEditor(shouldFocus: boolean) {
-      const newPosition: ActivePosition = { idx: activePosition.idx, rowIdx, mode: 'ACTIVE' };
+      const newPosition: ActivePosition = {
+        idx: activePosition.idx,
+        rowIdx,
+        mode: 'ACTIVE'
+      };
       setActivePosition(newPosition);
       if (shouldFocus) {
         setPositionToFocus(newPosition);
diff --git a/src/HeaderCell.tsx b/src/HeaderCell.tsx
index c677186e10..b77d0bcc36 100644
--- a/src/HeaderCell.tsx
+++ b/src/HeaderCell.tsx
@@ -278,6 +278,7 @@ export default function HeaderCell<R, SR>({
     <>
       {isDragging && (
         <div
+          aria-hidden="true"
           ref={dragImageRef}
           style={style}
           className={getCellClassname(column, column.headerCellClass, dragImageClassname)}
diff --git a/src/hooks/useScrollToPosition.tsx b/src/hooks/useScrollToPosition.tsx
index b34758a0f3..3dcbb089f1 100644
--- a/src/hooks/useScrollToPosition.tsx
+++ b/src/hooks/useScrollToPosition.tsx
@@ -19,6 +19,7 @@ export function useScrollToPosition({ gridRef }: Props) {
     setScrollToPosition,
     scrollToPositionElement: scrollToPosition && (
       <div
+        aria-hidden="true"
         ref={(div) => {
           if (div === null) return;
           const grid = gridRef.current!;
diff --git a/src/hooks/useViewportRows.ts b/src/hooks/useViewportRows.ts
index 13b8502302..2f4ecfe399 100644
--- a/src/hooks/useViewportRows.ts
+++ b/src/hooks/useViewportRows.ts
@@ -1,22 +1,37 @@
-import { useMemo } from 'react';
+import { useMemo, type RefObject } from 'react';
 
 import { floor, max, min } from '../utils';
 
-interface ViewportRowsArgs<R> {
+interface ViewportRowsBaseArgs<R> {
   rows: readonly R[];
-  rowHeight: number | ((row: R) => number);
   clientHeight: number;
   scrollTop: number;
   enableVirtualization: boolean;
+  gridHeight?: number;
+}
+
+interface ViewportRowsArgsStringHeight {
+  rowHeight: string;
+  gridRef: RefObject<HTMLDivElement | null>;
+  gridHeight: number;
+}
+
+interface ViewportRowsArgsRegularHeight<R> {
+  rowHeight: number | ((row: R) => number);
 }
 
+type ViewportRowsArgs<R> = ViewportRowsBaseArgs<R> &
+  (ViewportRowsArgsStringHeight | ViewportRowsArgsRegularHeight<R>);
+
 export function useViewportRows<R>({
   rows,
   rowHeight,
   clientHeight,
   scrollTop,
-  enableVirtualization
+  enableVirtualization,
+  ...rest
 }: ViewportRowsArgs<R>) {
+  const { gridRef, gridHeight } = rest as Partial<ViewportRowsArgsStringHeight>;
   const { totalRowHeight, gridTemplateRows, getRowTop, getRowHeight, findRowIdx } = useMemo(() => {
     if (typeof rowHeight === 'number') {
       return {
@@ -28,6 +43,68 @@ export function useViewportRows<R>({
       };
     }
 
+    if (typeof rowHeight === 'string') {
+      if (!gridHeight) {
+        throw new Error(
+          'props.gridHeight is required when rowHeight is a string. This is needed to calculate the total height of the rows.'
+        );
+      }
+
+      const getRowElementFirstCell = (element: Element, rowIdx: number): Element | null => {
+        const nth = element.querySelector('.rdg-header-row') ? rowIdx + 2 : rowIdx + 1;
+        return element.querySelector(`[role="row"][aria-rowindex="${nth}"] > [role="gridcell"]`);
+      };
+
+      const getRowYTop = (element: Element, rowIdx: number) => {
+        const cell = getRowElementFirstCell(element, rowIdx);
+        if (!cell) return -1;
+        return cell.getBoundingClientRect().top + element.scrollTop;
+      };
+
+      return {
+        totalRowHeight: gridHeight,
+        gridTemplateRows: ` repeat(${rows.length}, ${rowHeight})`,
+        getRowTop(rowIdx: number) {
+          const element = gridRef?.current;
+          if (!element) return -1;
+          const cell = getRowElementFirstCell(element, rowIdx);
+          if (!cell) return -1;
+          return cell.getBoundingClientRect().top + element.scrollTop;
+        },
+        getRowHeight(rowIdx: number) {
+          const element = gridRef?.current;
+          if (!element) return -1;
+          const cell = getRowElementFirstCell(element, rowIdx);
+          if (!cell) return -1;
+          return cell.clientHeight;
+        },
+        findRowIdx(offset: number) {
+          const element = gridRef?.current;
+          if (!element) return -1;
+          let start = 0;
+          let end = rows.length - 1;
+
+          while (start <= end) {
+            const middle = start + floor((end - start) / 2);
+            const currentScrollTop = getRowYTop(element, middle);
+            const prevScrollTop = getRowYTop(element, middle - 1);
+
+            if (currentScrollTop >= offset && prevScrollTop < offset) return middle;
+
+            if (currentScrollTop < offset) {
+              start = middle + 1;
+            } else if (currentScrollTop > offset) {
+              end = middle - 1;
+            }
+
+            if (start > end) return end;
+          }
+
+          return -1;
+        }
+      };
+    }
+
     // Calcule the height of all the rows upfront. This can cause performance issues
     // and we can consider using a similar approach as react-window
     // https://github.com/bvaughn/react-window/blob/b0a470cc264e9100afcaa1b78ed59d88f7914ad4/src/VariableSizeList.js#L68
@@ -102,15 +179,21 @@ export function useViewportRows<R>({
         return 0;
       }
     };
-  }, [rowHeight, rows]);
+  }, [rowHeight, rows, gridRef, gridHeight]);
 
   let rowOverscanStartIdx = 0;
   let rowOverscanEndIdx = rows.length - 1;
 
   if (enableVirtualization) {
     const overscanThreshold = 4;
+    // `findRowIdx` only reads `gridRef.current` in the string-rowHeight branch,
+    // which is unreachable here because `enableVirtualization` is forced off when
+    // `rowHeight` is a string (see DataGrid.tsx).
+    /* eslint-disable react-hooks/refs */
     const rowVisibleStartIdx = findRowIdx(scrollTop);
     const rowVisibleEndIdx = findRowIdx(scrollTop + clientHeight);
+    /* eslint-enable react-hooks/refs */
+
     rowOverscanStartIdx = max(0, rowVisibleStartIdx - overscanThreshold);
     rowOverscanEndIdx = min(rows.length - 1, rowVisibleEndIdx + overscanThreshold);
   }
diff --git a/src/utils/renderMeasuringCells.tsx b/src/utils/renderMeasuringCells.tsx
index e26a0807f5..c341b62179 100644
--- a/src/utils/renderMeasuringCells.tsx
+++ b/src/utils/renderMeasuringCells.tsx
@@ -14,6 +14,7 @@ export function renderMeasuringCells<R, SR>(viewportColumns: readonly Calculated
   return viewportColumns.map(({ key, idx, minWidth, maxWidth }) => (
     <div
       key={key}
+      aria-hidden="true"
       className={measuringCellClassname}
       style={{ gridColumnStart: idx + 1, minWidth, maxWidth }}
       data-measuring-cell-key={key}
diff --git a/test/browser/rowHeight.test.ts b/test/browser/rowHeight.test.tsx
similarity index 62%
rename from test/browser/rowHeight.test.ts
rename to test/browser/rowHeight.test.tsx
index 5ed9647509..142dd3cc72 100644
--- a/test/browser/rowHeight.test.ts
+++ b/test/browser/rowHeight.test.tsx
@@ -102,3 +102,66 @@ test('rowHeight with unique first height', async () => {
     return row === 0 ? 45 : 50;
   }, 'repeat(1, 35px) 45px repeat(49, 50px)');
 });
+
+test('rowHeight is "auto" sets gridTemplateRows to repeat(N, auto)', async () => {
+  await setupGrid('auto');
+
+  expect(grid.element().style.gridTemplateRows).toBe('repeat(1, 35px) repeat(50, auto)');
+});
+
+test('rowHeight as a string auto-disables virtualization and renders all rows', async () => {
+  await setupGrid('auto');
+
+  // virtualization is off by default when `rowHeight` is a string,
+  // so every row is rendered regardless of viewport size
+  await testRowCount(50);
+});
+
+test('rowHeight accepts arbitrary CSS track values', async () => {
+  await setupGrid('min-content');
+
+  expect(grid.element().style.gridTemplateRows).toBe('repeat(1, 35px) repeat(50, min-content)');
+  await testRowCount(50);
+});
+
+test('rowHeight is "auto" sizes rows to fit their content', async () => {
+  const columns: Column<{ id: number; content: string }>[] = [
+    { key: 'id', name: 'ID', width: 80 },
+    {
+      key: 'content',
+      name: 'Content',
+      width: 200,
+      renderCell: ({ row }) => <div style={{ whiteSpace: 'pre' }}>{row.content}</div>
+    }
+  ];
+  const rows = [
+    { id: 0, content: 'short' },
+    { id: 1, content: 'line one\nline two\nline three\nline four' }
+  ];
+
+  await setup({ columns, rows, rowHeight: 'auto' });
+
+  const row0 = page.getRow().nth(0).element() as HTMLElement;
+  const row1 = page.getRow().nth(1).element() as HTMLElement;
+
+  // multi-line cell must render taller than the single-line cell
+  expect(row1.clientHeight).toBeGreaterThan(row0.clientHeight);
+});
+
+test('rowHeight string + explicit enableVirtualization=true throws', async () => {
+  // Suppress React's error logging for this expected render error
+  // eslint-disable-next-line no-console
+  vi.mocked(console.error).mockImplementation(() => {});
+
+  await expect(
+    setup({
+      columns: [{ key: 'id', name: 'ID' }],
+      rows: [{ id: 0 }],
+      rowHeight: 'auto',
+      enableVirtualization: true
+    })
+  ).rejects.toThrow('`rowHeight` cannot be a string when `enableVirtualization` is true.');
+
+  // eslint-disable-next-line no-console
+  vi.mocked(console.error).mockClear();
+});
diff --git a/website/Nav.tsx b/website/Nav.tsx
index 42731a3144..5ad31e64ff 100644
--- a/website/Nav.tsx
+++ b/website/Nav.tsx
@@ -91,6 +91,7 @@ export default function Nav({ direction, onDirectionChange }: Props) {
         <Link to="/ColumnsReordering">Columns Reordering</Link>
         <Link to="/ContextMenu">Context Menu</Link>
         <Link to="/CustomizableRenderers">Customizable Renderers</Link>
+        <Link to="/DynamicHeightCells">Dynamic Height Cells</Link>
         <Link to="/RowGrouping">Row Grouping</Link>
         <Link to="/HeaderFilters">Header Filters</Link>
         <Link to="/InfiniteScrolling">Infinite Scrolling</Link>
diff --git a/website/routeTree.gen.ts b/website/routeTree.gen.ts
index d6d76ed36b..13ba61382a 100644
--- a/website/routeTree.gen.ts
+++ b/website/routeTree.gen.ts
@@ -19,6 +19,7 @@ import { Route as ColumnsReorderingRouteImport } from './routes/ColumnsReorderin
 import { Route as CommonFeaturesRouteImport } from './routes/CommonFeatures'
 import { Route as ContextMenuRouteImport } from './routes/ContextMenu'
 import { Route as CustomizableRenderersRouteImport } from './routes/CustomizableRenderers'
+import { Route as DynamicHeightCellsRouteImport } from './routes/DynamicHeightCells'
 import { Route as HeaderFiltersRouteImport } from './routes/HeaderFilters'
 import { Route as InfiniteScrollingRouteImport } from './routes/InfiniteScrolling'
 import { Route as MasterDetailRouteImport } from './routes/MasterDetail'
@@ -81,6 +82,11 @@ const CustomizableRenderersRoute = CustomizableRenderersRouteImport.update({
   path: '/CustomizableRenderers',
   getParentRoute: () => rootRouteImport,
 } as any)
+const DynamicHeightCellsRoute = DynamicHeightCellsRouteImport.update({
+  id: '/DynamicHeightCells',
+  path: '/DynamicHeightCells',
+  getParentRoute: () => rootRouteImport,
+} as any)
 const HeaderFiltersRoute = HeaderFiltersRouteImport.update({
   id: '/HeaderFilters',
   path: '/HeaderFilters',
@@ -148,6 +154,7 @@ export interface FileRoutesByFullPath {
   '/CommonFeatures': typeof CommonFeaturesRoute
   '/ContextMenu': typeof ContextMenuRoute
   '/CustomizableRenderers': typeof CustomizableRenderersRoute
+  '/DynamicHeightCells': typeof DynamicHeightCellsRoute
   '/HeaderFilters': typeof HeaderFiltersRoute
   '/InfiniteScrolling': typeof InfiniteScrollingRoute
   '/MasterDetail': typeof MasterDetailRoute
@@ -171,6 +178,7 @@ export interface FileRoutesByTo {
   '/CommonFeatures': typeof CommonFeaturesRoute
   '/ContextMenu': typeof ContextMenuRoute
   '/CustomizableRenderers': typeof CustomizableRenderersRoute
+  '/DynamicHeightCells': typeof DynamicHeightCellsRoute
   '/HeaderFilters': typeof HeaderFiltersRoute
   '/InfiniteScrolling': typeof InfiniteScrollingRoute
   '/MasterDetail': typeof MasterDetailRoute
@@ -195,6 +203,7 @@ export interface FileRoutesById {
   '/CommonFeatures': typeof CommonFeaturesRoute
   '/ContextMenu': typeof ContextMenuRoute
   '/CustomizableRenderers': typeof CustomizableRenderersRoute
+  '/DynamicHeightCells': typeof DynamicHeightCellsRoute
   '/HeaderFilters': typeof HeaderFiltersRoute
   '/InfiniteScrolling': typeof InfiniteScrollingRoute
   '/MasterDetail': typeof MasterDetailRoute
@@ -220,6 +229,7 @@ export interface FileRouteTypes {
     | '/CommonFeatures'
     | '/ContextMenu'
     | '/CustomizableRenderers'
+    | '/DynamicHeightCells'
     | '/HeaderFilters'
     | '/InfiniteScrolling'
     | '/MasterDetail'
@@ -243,6 +253,7 @@ export interface FileRouteTypes {
     | '/CommonFeatures'
     | '/ContextMenu'
     | '/CustomizableRenderers'
+    | '/DynamicHeightCells'
     | '/HeaderFilters'
     | '/InfiniteScrolling'
     | '/MasterDetail'
@@ -266,6 +277,7 @@ export interface FileRouteTypes {
     | '/CommonFeatures'
     | '/ContextMenu'
     | '/CustomizableRenderers'
+    | '/DynamicHeightCells'
     | '/HeaderFilters'
     | '/InfiniteScrolling'
     | '/MasterDetail'
@@ -290,6 +302,7 @@ export interface RootRouteChildren {
   CommonFeaturesRoute: typeof CommonFeaturesRoute
   ContextMenuRoute: typeof ContextMenuRoute
   CustomizableRenderersRoute: typeof CustomizableRenderersRoute
+  DynamicHeightCellsRoute: typeof DynamicHeightCellsRoute
   HeaderFiltersRoute: typeof HeaderFiltersRoute
   InfiniteScrollingRoute: typeof InfiniteScrollingRoute
   MasterDetailRoute: typeof MasterDetailRoute
@@ -375,6 +388,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof CustomizableRenderersRouteImport
       parentRoute: typeof rootRouteImport
     }
+    '/DynamicHeightCells': {
+      id: '/DynamicHeightCells'
+      path: '/DynamicHeightCells'
+      fullPath: '/DynamicHeightCells'
+      preLoaderRoute: typeof DynamicHeightCellsRouteImport
+      parentRoute: typeof rootRouteImport
+    }
     '/HeaderFilters': {
       id: '/HeaderFilters'
       path: '/HeaderFilters'
@@ -466,6 +486,7 @@ const rootRouteChildren: RootRouteChildren = {
   CommonFeaturesRoute: CommonFeaturesRoute,
   ContextMenuRoute: ContextMenuRoute,
   CustomizableRenderersRoute: CustomizableRenderersRoute,
+  DynamicHeightCellsRoute: DynamicHeightCellsRoute,
   HeaderFiltersRoute: HeaderFiltersRoute,
   InfiniteScrollingRoute: InfiniteScrollingRoute,
   MasterDetailRoute: MasterDetailRoute,
diff --git a/website/routes/DynamicHeightCells.tsx b/website/routes/DynamicHeightCells.tsx
new file mode 100644
index 0000000000..6fd5618fbd
--- /dev/null
+++ b/website/routes/DynamicHeightCells.tsx
@@ -0,0 +1,121 @@
+import { useState, type JSX } from 'react';
+import { createFileRoute } from '@tanstack/react-router';
+import { css } from 'ecij';
+
+import { DataGrid, type Column } from '../../src';
+import { useDirection } from '../directionContext';
+
+export const Route = createFileRoute('/DynamicHeightCells')({
+  component: DynamicHeightCells
+});
+
+interface Row {
+  id: number;
+  task: string;
+  complete: number;
+  priority: string;
+  issueType: string;
+  startDate: string;
+  completeDate: string;
+  dynamicContent: JSX.Element;
+}
+
+const columns: Column<Row>[] = [
+  {
+    key: 'id',
+    name: 'ID',
+    width: 80
+  },
+  {
+    key: 'task',
+    name: 'Title'
+  },
+  {
+    key: 'priority',
+    name: 'Priority'
+  },
+  {
+    key: 'issueType',
+    name: 'Issue Type'
+  },
+  {
+    key: 'complete',
+    name: '% Complete'
+  },
+  {
+    key: 'startDate',
+    name: 'Start Date'
+  },
+  {
+    key: 'completeDate',
+    name: 'Expected Complete',
+    width: 200
+  },
+  {
+    key: 'dynamicContent',
+    name: 'Dynamic HTML Content',
+    width: 200
+  }
+];
+
+function getRandomDate(start: Date, end: Date) {
+  return new Date(
+    start.getTime() + Math.random() * (end.getTime() - start.getTime())
+  ).toLocaleDateString();
+}
+
+function createRows(): Row[] {
+  const rows = [];
+  for (let i = 1; i < 500; i++) {
+    rows.push({
+      id: i,
+      task: `Task ${i}`,
+      complete: Math.min(100, Math.round(Math.random() * 110)),
+      priority: ['Critical', 'High', 'Medium', 'Low'][Math.floor(Math.random() * 3 + 1)],
+      issueType: ['Bug', 'Improvement', 'Epic', 'Story'][Math.floor(Math.random() * 3 + 1)],
+      startDate: getRandomDate(new Date(2015, 3, 1), new Date()),
+      completeDate: getRandomDate(new Date(), new Date(2016, 0, 1)),
+      dynamicContent: (() => {
+        const arr = [];
+        for (let i = 0; i < Math.ceil(Math.random() * 6); i++) {
+          arr.push(`Dynamic content ${i + 1}`);
+        }
+        return (
+          <ul>
+            {arr.map((item, idx) => (
+              <li key={idx}>{item}</li>
+            ))}
+          </ul>
+        );
+      })()
+    });
+  }
+
+  return rows;
+}
+
+const rootClassname = css`
+  display: flex;
+  flex-direction: column;
+  block-size: 100%;
+  gap: 10px;
+
+  > .rdg {
+    flex: 1;
+  }
+
+  .rdg-cell {
+    padding-block: 0.75em;
+  }
+`;
+
+function DynamicHeightCells() {
+  const direction = useDirection();
+  const [rows] = useState(createRows);
+
+  return (
+    <div className={rootClassname}>
+      <DataGrid columns={columns} rows={rows} direction={direction} rowHeight="auto" />
+    </div>
+  );
+}