@navikt/ds-react 8.10.6 → 8.11.1

package/esm/data/table/hooks/useTableSelection.js

@@ -1,59 +1,76 @@
 import { useCallback, useMemo } from "react";
+import { useDataGridContext } from "../../../data-grid/root/DataGridRoot.context.js";
 import { useId } from "../../../utils-external/index.js";
 import { useControllableState } from "../../../utils/hooks/index.js";
 import { getMultipleSelectProps } from "../helpers/selection/getMultipleSelectProps.js";
 import { getSingleSelectProps } from "../helpers/selection/getSingleSelectProps.js";
 function useTableSelection({ selection = {
-    selectionMode: "none",
-}, tableItems, }) {
-    const { selectionMode, defaultSelectedKeys, selectedKeys: selectedKeysProp, onSelectionChange, enableRowSelection, selectionTrigger = "row", } = selection;
+    mode: "none",
+}, selectionTrigger = "row", tableItems, }) {
+    const { isLoading } = useDataGridContext();
+    const { mode, defaultSelectedRowIds, selectedRowIds: selectedRowIdsProp, onSelectedRowIdsChange, enableRowSelection, } = selection;
     const { visibleRowIds = [] } = tableItems;
     const radioGroupName = useId();
     const [selectedKeys, setSelectedKeys] = useControllableState({
-        value: selectionMode !== "none" ? selectedKeysProp : undefined,
-        defaultValue: defaultSelectedKeys !== null && defaultSelectedKeys !== void 0 ? defaultSelectedKeys : [],
-        onChange: onSelectionChange,
+        value: mode !== "none" ? selectedRowIdsProp : undefined,
+        defaultValue: defaultSelectedRowIds !== null && defaultSelectedRowIds !== void 0 ? defaultSelectedRowIds : [],
+        onChange: onSelectedRowIdsChange,
     });
     const selectedKeysSet = useMemo(() => new Set(selectedKeys), [selectedKeys]);
     const isRowSelected = useCallback((rowId) => selectedKeysSet.has(rowId), [selectedKeysSet]);
-    const baseSelection = { selectedKeys, isRowSelected };
-    if (selectionMode === "none") {
+    return useMemo(() => {
+        const baseSelection = { selectedKeys, isRowSelected };
+        if (mode === "none") {
+            return {
+                selection: Object.assign(Object.assign({ mode }, baseSelection), { selectedKeys: [] }),
+                selectionTrigger,
+                renderSelection: false,
+            };
+        }
+        if (mode === "single") {
+            return {
+                selection: Object.assign(Object.assign({ mode }, baseSelection), getSingleSelectProps({
+                    selectedKeysSet,
+                    setSelectedKeys,
+                    name: radioGroupName,
+                    enableRowSelection,
+                })),
+                selectionTrigger,
+                renderSelection: visibleRowIds.length !== 0,
+            };
+        }
         return {
-            selection: Object.assign(Object.assign({ selectionMode }, baseSelection), { selectedKeys: [] }),
-            selectionTrigger,
-            renderSelection: false,
-        };
-    }
-    if (selectionMode === "single") {
-        return {
-            selection: Object.assign(Object.assign({ selectionMode }, baseSelection), getSingleSelectProps({
+            selection: Object.assign(Object.assign({ mode }, baseSelection), getMultipleSelectProps({
                 selectedKeysSet,
+                selectedKeys,
                 setSelectedKeys,
-                name: radioGroupName,
                 enableRowSelection,
+                tableItems,
+                isLoading,
             })),
             selectionTrigger,
             renderSelection: visibleRowIds.length !== 0,
         };
-    }
-    return {
-        selection: Object.assign(Object.assign({ selectionMode }, baseSelection), getMultipleSelectProps({
-            selectedKeysSet,
-            selectedKeys,
-            setSelectedKeys,
-            enableRowSelection,
-            tableItems,
-        })),
+    }, [
+        mode,
+        selectedKeys,
+        selectedKeysSet,
+        isRowSelected,
         selectionTrigger,
-        renderSelection: visibleRowIds.length !== 0,
-    };
+        visibleRowIds,
+        setSelectedKeys,
+        radioGroupName,
+        enableRowSelection,
+        tableItems,
+        isLoading,
+    ]);
 }
 /**
  * TODO: Only temp needed to keep Root happy
  */
 const noSelectionState = {
     selection: {
-        selectionMode: "none",
+        mode: "none",
         selectedKeys: [],
         isRowSelected: () => false,
     },

package/esm/data/table/hooks/useTableSelection.js.map

@@ -1 +1 @@
-{"version":3,"file":"useTableSelection.js","sourceRoot":"","sources":["../../../../src/data/table/hooks/useTableSelection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAoBjF,SAAS,iBAAiB,CAAI,EAC5B,SAAS,GAAG;IACV,aAAa,EAAE,MAAM;CACtB,EACD,UAAU,GACe;IACzB,MAAM,EACJ,aAAa,EACb,mBAAmB,EACnB,YAAY,EAAE,gBAAgB,EAC9B,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,GAAG,KAAK,GACzB,GAAG,SAAS,CAAC;IAEd,MAAM,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,UAAU,CAAC;IAE1C,MAAM,cAAc,GAAG,KAAK,EAAE,CAAC;IAE/B,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,oBAAoB,CAAgB;QAC1E,KAAK,EAAE,aAAa,KAAK,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,SAAS;QAC9D,YAAY,EAAE,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,EAAE;QACvC,QAAQ,EAAE,iBAAiB;KAC5B,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAE7E,MAAM,aAAa,GAAG,WAAW,CAC/B,CAAC,KAAsB,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EACtD,CAAC,eAAe,CAAC,CAClB,CAAC;IAEF,MAAM,aAAa,GAAG,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC;IAEtD,IAAI,aAAa,KAAK,MAAM,EAAE,CAAC;QAC7B,OAAO;YACL,SAAS,gCACP,aAAa,IACV,aAAa,KAChB,YAAY,EAAE,EAAE,GACjB;YACD,gBAAgB;YAChB,eAAe,EAAE,KAAK;SACvB,CAAC;IACJ,CAAC;IAED,IAAI,aAAa,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO;YACL,SAAS,gCACP,aAAa,IACV,aAAa,GACb,oBAAoB,CAAC;gBACtB,eAAe;gBACf,eAAe;gBACf,IAAI,EAAE,cAAc;gBACpB,kBAAkB;aACnB,CAAC,CACH;YACD,gBAAgB;YAChB,eAAe,EAAE,aAAa,CAAC,MAAM,KAAK,CAAC;SAC5C,CAAC;IACJ,CAAC;IAED,OAAO;QACL,SAAS,gCACP,aAAa,IACV,aAAa,GACb,sBAAsB,CAAC;YACxB,eAAe;YACf,YAAY;YACZ,eAAe;YACf,kBAAkB;YAClB,UAAU;SACX,CAAC,CACH;QACD,gBAAgB;QAChB,eAAe,EAAE,aAAa,CAAC,MAAM,KAAK,CAAC;KAC5C,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,gBAAgB,GAA4B;IAChD,SAAS,EAAE;QACT,aAAa,EAAE,MAAM;QACrB,YAAY,EAAE,EAAE;QAChB,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;KAC3B;IACD,gBAAgB,EAAE,KAAK;IACvB,eAAe,EAAE,KAAK;CACvB,CAAC;AAEF,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"useTableSelection.js","sourceRoot":"","sources":["../../../../src/data/table/hooks/useTableSelection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,8CAA8C,CAAC;AAClF,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAoBjF,SAAS,iBAAiB,CAAI,EAC5B,SAAS,GAAG;IACV,IAAI,EAAE,MAAM;CACb,EACD,gBAAgB,GAAG,KAAK,EACxB,UAAU,GACe;IACzB,MAAM,EAAE,SAAS,EAAE,GAAG,kBAAkB,EAAE,CAAC;IAC3C,MAAM,EACJ,IAAI,EACJ,qBAAqB,EACrB,cAAc,EAAE,kBAAkB,EAClC,sBAAsB,EACtB,kBAAkB,GACnB,GAAG,SAAS,CAAC;IAEd,MAAM,EAAE,aAAa,GAAG,EAAE,EAAE,GAAG,UAAU,CAAC;IAE1C,MAAM,cAAc,GAAG,KAAK,EAAE,CAAC;IAE/B,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,oBAAoB,CAAW;QACrE,KAAK,EAAE,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,SAAS;QACvD,YAAY,EAAE,qBAAqB,aAArB,qBAAqB,cAArB,qBAAqB,GAAI,EAAE;QACzC,QAAQ,EAAE,sBAAsB;KACjC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAE7E,MAAM,aAAa,GAAG,WAAW,CAC/B,CAAC,KAAsB,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EACtD,CAAC,eAAe,CAAC,CAClB,CAAC;IAEF,OAAO,OAAO,CAAC,GAAG,EAAE;QAClB,MAAM,aAAa,GAAG,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC;QAEtD,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;YACpB,OAAO;gBACL,SAAS,gCACP,IAAI,IACD,aAAa,KAChB,YAAY,EAAE,EAAE,GACjB;gBACD,gBAAgB;gBAChB,eAAe,EAAE,KAAK;aACvB,CAAC;QACJ,CAAC;QAED,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtB,OAAO;gBACL,SAAS,gCACP,IAAI,IACD,aAAa,GACb,oBAAoB,CAAC;oBACtB,eAAe;oBACf,eAAe;oBACf,IAAI,EAAE,cAAc;oBACpB,kBAAkB;iBACnB,CAAC,CACH;gBACD,gBAAgB;gBAChB,eAAe,EAAE,aAAa,CAAC,MAAM,KAAK,CAAC;aAC5C,CAAC;QACJ,CAAC;QAED,OAAO;YACL,SAAS,gCACP,IAAI,IACD,aAAa,GACb,sBAAsB,CAAC;gBACxB,eAAe;gBACf,YAAY;gBACZ,eAAe;gBACf,kBAAkB;gBAClB,UAAU;gBACV,SAAS;aACV,CAAC,CACH;YACD,gBAAgB;YAChB,eAAe,EAAE,aAAa,CAAC,MAAM,KAAK,CAAC;SAC5C,CAAC;IACJ,CAAC,EAAE;QACD,IAAI;QACJ,YAAY;QACZ,eAAe;QACf,aAAa;QACb,gBAAgB;QAChB,aAAa;QACb,eAAe;QACf,cAAc;QACd,kBAAkB;QAClB,UAAU;QACV,SAAS;KACV,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,gBAAgB,GAA4B;IAChD,SAAS,EAAE;QACT,IAAI,EAAE,MAAM;QACZ,YAAY,EAAE,EAAE;QAChB,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;KAC3B;IACD,gBAAgB,EAAE,KAAK;IACvB,eAAe,EAAE,KAAK;CACvB,CAAC;AAEF,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,CAAC"}

package/esm/data/table/hooks/useTableSort.d.ts

@@ -1,26 +1,32 @@
-import type { SortChangeDetail, SortEntry } from "../root/DataTable.types.js";
+import type { SortChangeDetail, SortEntry } from "../root/DataGridTable.types.js";
 type TableSortOptions = {
     /**
      * Current sort state. Each entry represents a sorted column.
      * Columns not present in the array are unsorted.
      * Supports multi-column sorting when multiple entries are provided.
      *
-     * When provided, the component is controlled — you must also handle `onSortChange`.
-     * For uncontrolled usage, use `defaultSort` instead.
+     * When provided, the component is controlled - you must also handle `onSortOrderChange`.
+     * For uncontrolled usage, use `defaultSortOrder` instead.
      */
-    sort?: SortEntry[];
+    sortOrder?: SortEntry[];
     /**
      * Initial sort state for uncontrolled usage.
-     * Use `sort` + `onSortChange` for controlled usage.
+     * Use `sortOrder` + `onSortOrderChange` for controlled usage.
      * @default []
      */
-    defaultSort?: SortEntry[];
+    defaultSortOrder?: SortEntry[];
     /**
      * Called when the user clicks a sortable column header.
      * - `sort` — the full updated sort array after cycling: unsorted → asc → desc → unsorted.
      * - `detail` — the specific column that changed, including its new direction (`"none"` means removed).
      */
-    onSortChange?: (sort: SortEntry[], detail: SortChangeDetail) => void;
+    onSortOrderChange?: (sortOrder: SortEntry[], detail: SortChangeDetail) => void;
+    /**
+     * When true, allows multiple columns to be sorted by holding Shift while clicking headers.
+     *
+     * @default true
+     */
+    allowMultiSort?: boolean;
 };
 type UseTableSortResults = {
     /**

package/esm/data/table/hooks/useTableSort.js

@@ -1,23 +1,22 @@
-import { useCallback } from "react";
 import { consoleWarning } from "../../../utils/helpers/consoleWarning.js";
-import { useControllableState } from "../../../utils/hooks/index.js";
+import { useControllableState, useEventCallback } from "../../../utils/hooks/index.js";
 function useTableSort(options) {
-    const { defaultSort, onSortChange, sort: sortOption } = options || {};
+    const { defaultSortOrder, onSortOrderChange, sortOrder, allowMultiSort = true, } = options || {};
     const [sort, setSort] = useControllableState({
-        value: sortOption,
-        defaultValue: defaultSort || [],
+        value: sortOrder,
+        defaultValue: defaultSortOrder || [],
     });
-    const handleSortClick = useCallback((id, event) => {
+    const handleSortClick = useEventCallback((id, event) => {
         if (id === undefined) {
-            consoleWarning("DataTable: Column id is undefined for sort event on target", event.target, "Make sure your column definitions include an 'id' property.");
+            consoleWarning("DataGrid.Table: Column id is undefined for sort event on target", event.target, "Make sure your column definitions include an 'id' property.");
             return;
         }
-        const cumulative = event.shiftKey;
+        const cumulative = allowMultiSort && event.shiftKey;
         const base = cumulative ? sort : sort.filter((s) => s.columnId === id);
         const { next, detail } = nextSortEntries(base, id);
         setSort(next);
-        onSortChange === null || onSortChange === void 0 ? void 0 : onSortChange(next, detail);
-    }, [onSortChange, setSort, sort]);
+        onSortOrderChange === null || onSortOrderChange === void 0 ? void 0 : onSortOrderChange(next, detail);
+    });
     return {
         onSortClick: handleSortClick,
         sortState: sort,

package/esm/data/table/hooks/useTableSort.js.map

@@ -1 +1 @@
-{"version":3,"file":"useTableSort.js","sourceRoot":"","sources":["../../../../src/data/table/hooks/useTableSort.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAyC5D,SAAS,YAAY,CAAC,OAA0B;IAC9C,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAEtE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,oBAAoB,CAAC;QAC3C,KAAK,EAAE,UAAU;QACjB,YAAY,EAAE,WAAW,IAAI,EAAE;KAChC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,WAAW,CACjC,CAAC,EAAU,EAAE,KAAgD,EAAE,EAAE;QAC/D,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;YACrB,cAAc,CACZ,4DAA4D,EAC5D,KAAK,CAAC,MAAM,EACZ,6DAA6D,CAC9D,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ,CAAC;QAClC,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC;QACvE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACnD,OAAO,CAAC,IAAI,CAAC,CAAC;QACd,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,IAAI,EAAE,MAAM,CAAC,CAAC;IAC/B,CAAC,EACD,CAAC,YAAY,EAAE,OAAO,EAAE,IAAI,CAAC,CAC9B,CAAC;IAEF,OAAO;QACL,WAAW,EAAE,eAAe;QAC5B,SAAS,EAAE,IAAI;KAChB,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CACtB,OAAoB,EACpB,QAAgB;IAEhB,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;IAC9D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO;YACL,IAAI,EAAE,CAAC,GAAG,OAAO,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;YAClD,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE;SACvC,CAAC;IACJ,CAAC;IACD,IAAI,QAAQ,CAAC,SAAS,KAAK,KAAK,EAAE,CAAC;QACjC,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACtB,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,iCAAM,CAAC,KAAE,SAAS,EAAE,MAAM,IAAG,CAAC,CAAC,CAAC,CAC1D;YACD,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE;SACxC,CAAC;IACJ,CAAC;IACD,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC;QACpD,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE;KACxC,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,YAAY,EAAE,CAAC"}
+{"version":3,"file":"useTableSort.js","sourceRoot":"","sources":["../../../../src/data/table/hooks/useTableSort.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAkD9E,SAAS,YAAY,CAAC,OAA0B;IAC9C,MAAM,EACJ,gBAAgB,EAChB,iBAAiB,EACjB,SAAS,EACT,cAAc,GAAG,IAAI,GACtB,GAAG,OAAO,IAAI,EAAE,CAAC;IAElB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,oBAAoB,CAAC;QAC3C,KAAK,EAAE,SAAS;QAChB,YAAY,EAAE,gBAAgB,IAAI,EAAE;KACrC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,gBAAgB,CACtC,CAAC,EAAU,EAAE,KAAgD,EAAE,EAAE;QAC/D,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;YACrB,cAAc,CACZ,iEAAiE,EACjE,KAAK,CAAC,MAAM,EACZ,6DAA6D,CAC9D,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,UAAU,GAAG,cAAc,IAAI,KAAK,CAAC,QAAQ,CAAC;QACpD,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAC;QACvE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACnD,OAAO,CAAC,IAAI,CAAC,CAAC;QACd,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAG,IAAI,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC,CACF,CAAC;IAEF,OAAO;QACL,WAAW,EAAE,eAAe;QAC5B,SAAS,EAAE,IAAI;KAChB,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CACtB,OAAoB,EACpB,QAAgB;IAEhB,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;IAC9D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO;YACL,IAAI,EAAE,CAAC,GAAG,OAAO,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;YAClD,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE;SACvC,CAAC;IACJ,CAAC;IACD,IAAI,QAAQ,CAAC,SAAS,KAAK,KAAK,EAAE,CAAC;QACjC,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACtB,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,iCAAM,CAAC,KAAE,SAAS,EAAE,MAAM,IAAG,CAAC,CAAC,CAAC,CAC1D;YACD,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE;SACxC,CAAC;IACJ,CAAC;IACD,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC;QACpD,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE;KACxC,CAAC;AACJ,CAAC;AAED,OAAO,EAAE,YAAY,EAAE,CAAC"}

package/esm/data/table/index.d.ts

@@ -1 +1 @@
-export { DataTable, type DataTableProps } from "./root/DataTableRoot.js";
+export { DataGridTable, type DataGridTableProps, } from "./root/DataGridTableRoot.js";

package/esm/data/table/index.js

@@ -1,23 +1,3 @@
 "use client";
-/* export {
-  default as DataTable,
-  DataTableCaption,
-  DataTableThead,
-  DataTableTbody,
-  DataTableTr,
-  DataTableTh,
-  DataTableTd,
-  DataTableTfoot,
-} from "./root/DataTableRoot.legacy.js";
-export type {
-  DataTableProps,
-  DataTableCaptionProps,
-  DataTableTheadProps,
-  DataTableTbodyProps,
-  DataTableTrProps,
-  DataTableThProps,
-  DataTableTdProps,
-  DataTableTfootProps,
-} from "./root/DataTableRoot.legacy.js"; */
-export { DataTable } from "./root/DataTableRoot.js";
+export { DataGridTable, } from "./root/DataGridTableRoot.js";
 //# sourceMappingURL=index.js.map

package/esm/data/table/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/data/table/index.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;AACb;;;;;;;;;;;;;;;;;;;wCAmBwC;AAExC,OAAO,EAAE,SAAS,EAAuB,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/data/table/index.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,OAAO,EACL,aAAa,GAEd,MAAM,0BAA0B,CAAC"}

package/esm/data/table/root/{DataTable.types.d.ts → DataGridTable.types.d.ts}

@@ -1,45 +1,37 @@
 import type { DataTableColumnHeaderProps } from "../column-header/DataTableColumnHeader.js";
-type SortDirection = "asc" | "desc" | "none";
 /**
  * TODO:
  * - Consider "accessorKey" or similar to allow simple column definitions without a cell function.
- * - Add "align" property for better control over text alignment in cells.
  */
 type ColumnDefinition<T> = {
     id: string;
     /**
-     * Text alignment for cells in this column.
+     * Uses `<th>` instead of `<td>` for the cell if true.
      *
-     * @default "left"
-     */
-    align?: "left" | "right" | "center";
-    /**
-     * Assigned to the cell's `th` element instead of `td` if true.
-     *
-     * Should be used for cells that act as row headers. Each row should have one rowheader, and only have one cell with `isRowHeader: true`,
-     * TODO: Better documentation, consider warning if not one column has this set to true.
+     * Should be used on the column that acts as row header.
+     * There should be exactly one column with this set to true.
      */
     isRowHeader?: boolean;
     /**
-     * Renders table header-cell
-     * TODO: Pri zero rename to headerCell
+     * Name of the column.
+     * Used in the header cell unless `headerCell` is provided.
+     * Also used in the settings dialog.
      */
-    header?: React.ReactNode;
+    header: string;
     /**
-     * Renders table-cell
+     * Overrides header cell content. Should not differ too much from `header`.
      */
-    cell: (item: T) => React.ReactNode;
+    headerCell?: React.ReactNode;
     /**
-     * Label of header. Renders if header is not provided.
-     * TODO: Pri zero consider renaming to header
+     * Renders table body cell content.
      */
-    label: string;
+    bodyCell: (item: T) => React.ReactNode;
     /**
      * Makes the column sortable. Renders the header as a sort button.
-     * Use `sort` and `onSortChange` on the root component to control sort state.
+     * Use `sorting` prop on `DataGrid.Table` to configure sorting behavior and state management.
      */
-    sortable?: boolean;
-} & Pick<DataTableColumnHeaderProps, "width">;
+    isSortable?: boolean;
+} & Pick<DataTableColumnHeaderProps, "width" | "align">;
 type ColumnDefinitions<T> = ColumnDefinition<T>[];
 /**
  * A single sort entry representing a column's current sort state.
@@ -59,8 +51,6 @@ type SortChangeDetail = {
     direction: "asc" | "desc" | "none";
 };
 type DataTableLoadingConfig = {
-    isLoading?: boolean;
-} & ({
     variant: "content";
     content: React.ReactNode;
 } | {
@@ -70,6 +60,6 @@ type DataTableLoadingConfig = {
 } | {
     variant: "overlay";
     label?: string;
-});
+};
 type TableRowEntryId = string;
-export type { ColumnDefinition, ColumnDefinitions, DataTableLoadingConfig, SortDirection, SortEntry, SortChangeDetail, TableRowEntryId, };
+export type { ColumnDefinition, ColumnDefinitions, DataTableLoadingConfig, SortEntry, SortChangeDetail, TableRowEntryId, };

package/esm/data/table/root/DataGridTable.types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=DataGridTable.types.js.map

package/esm/data/table/root/DataGridTable.types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DataGridTable.types.js","sourceRoot":"","sources":["../../../../src/data/table/root/DataGridTable.types.ts"],"names":[],"mappings":""}

package/esm/data/table/root/DataGridTableRoot.d.ts

@@ -0,0 +1,104 @@
+import React from "react";
+import { type DetailsPanelProps } from "../hooks/useTableDetailsPanel.js";
+import { type SubRowsProps } from "../hooks/useTableItems.js";
+import { type TableSortOptions } from "../hooks/useTableSort.js";
+import type { DataTableLoadingConfig } from "./DataGridTable.types.js";
+interface DataGridTableProps<T> extends React.HTMLAttributes<HTMLTableElement> {
+    children?: never;
+    /**
+     * Controls table layout.
+     *
+     * ### fixed
+     * Gives you full control of column widths. This is required for resizable columns.
+     *
+     * ### auto
+     * Makes the columns resize automatically based on the content.
+     * The table will take up at least 100% of available width.
+     *
+     * **NB:** When using this with `truncateContent`, you have to manually
+     * set a `contentMaxWidth` on cells that should be truncated.
+     * @default "fixed"
+     */
+    layout?: "fixed" | "auto";
+    /**
+     * Whether the header should be sticky.
+     * For this to work, you have to put the component in a flex container with a height restriction.
+     *
+     * @example
+     * <VStack height="100vh">
+     *   <div>Content before DataGrid</div>
+     *   <DataGrid>
+     *     <DataGrid.Table />
+     *   </DataGrid>
+     *   <div>Content after DataGrid</div>
+     * </VStack>
+     *
+     * @example
+     * <div style={{ display: "flex", maxHeight: "500px" }}>
+     *   <DataGrid>
+     *     <DataGrid.Table />
+     *   </DataGrid>
+     * </div>
+     *
+     * @default true
+     */
+    stickyHeader?: boolean;
+    /**
+     * Callback invoked when a row in the table body is clicked.
+     *
+     * Call `event.preventDefault()` inside the callback to prevent the default row click behavior, such as selection.
+     */
+    onRowAction?: ({ row, id, event, }: {
+        row: T;
+        id: string;
+        event: React.MouseEvent<HTMLTableRowElement>;
+    }) => void;
+    /**
+     * Content to render when `data` is empty.
+     * Rendered inside a row spanning all columns.
+     */
+    emptyContent?: React.ReactNode;
+    /**
+     * Configures how the table behaves during loading.
+     *
+     * Use `variant` to select the loading strategy:
+     * - `"content"` — renders custom content inside a full-width row.
+     * - `"skeleton"` — renders skeleton placeholder rows.
+     * - `"overlay"` — keeps existing data visible with a loading overlay.
+     *
+     * @default { variant: "skeleton", rows: 5 }
+     */
+    loadingContent?: DataTableLoadingConfig;
+    /**
+     * Object with props related to nested rows (sub-rows).
+     */
+    subRows?: SubRowsProps<T>;
+    /**
+     * Object with props related to details panel.
+     * This is a panel that can be expanded below each row to show arbitrary content.
+     */
+    detailsPanel?: DetailsPanelProps<T>;
+    /**
+     * Object with props related to sorting.
+     */
+    sorting?: TableSortOptions;
+    /**
+     * Determines if selection is triggered by clicking the row or the selection control (checkbox/radio).
+     * @default "row"
+     */
+    selectionTrigger?: "row" | "control";
+}
+declare const DataGridTableInternal: React.ForwardRefExoticComponent<DataGridTableProps<any> & React.RefAttributes<HTMLTableElement>>;
+declare const DataGridTable: <RowT>(props: DataGridTableProps<RowT> & React.RefAttributes<HTMLTableElement>) => React.ReactElement | null;
+export declare namespace DataGridTable {
+    type Props<T = unknown> = DataGridTableProps<T>;
+    type Sorting = TableSortOptions;
+    type SortEntry = import("./DataGridTable.types.js").SortEntry;
+    type SortChangeDetail = import("./DataGridTable.types.js").SortChangeDetail;
+    type LoadingContent = DataTableLoadingConfig;
+    type SubRows<T = unknown> = SubRowsProps<T>;
+    type DetailsPanel<T = unknown> = DetailsPanelProps<T>;
+}
+export { DataGridTable, DataGridTableInternal };
+export type { DataGridTableProps };
+export default DataGridTable;

package/esm/data/table/root/{DataTableRoot.js → DataGridTableRoot.js}

@@ -9,13 +9,13 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React, { forwardRef, useCallback, useEffect, useRef, useState, } from "react";
+import React, { forwardRef, memo, useCallback, useEffect, useRef, useState, } from "react";
+import { useDataGridContext } from "../../../data-grid/root/DataGridRoot.context.js";
 import { Skeleton } from "../../../skeleton/index.js";
 import { useId } from "../../../utils-external/index.js";
 import { Slot } from "../../../utils/components/slot/Slot.js";
 import { cl } from "../../../utils/helpers/index.js";
 import { useMergeRefs } from "../../../utils/hooks/index.js";
-import { useDataGridContext } from "../../data-grid/root/DataGridRoot.context.js";
 import { DataTableBaseCell } from "../base-cell/DataTableBaseCell.js";
 import { DataTableColumnHeader } from "../column-header/DataTableColumnHeader.js";
 import { DataTableDetailsPanelRow } from "../details-panel-row/DataTableDetailsPanelRow.js";
@@ -24,7 +24,7 @@ import { useColumnOptions } from "../hooks/useColumnOptions.js";
 import { DataTableDetailsPanelProvider, } from "../hooks/useTableDetailsPanel.js";
 import { useTableItems } from "../hooks/useTableItems.js";
 import { useTableKeyboardNav } from "../hooks/useTableKeyboardNav.js";
-import { useTableSelection, } from "../hooks/useTableSelection.js";
+import { useTableSelection } from "../hooks/useTableSelection.js";
 import { useTableSort } from "../hooks/useTableSort.js";
 import { DataTableLoadingState } from "../loading-state/DataTableLoadingState.js";
 import { DataTableSubRowToggle } from "../sub-row-toggle/DataTableSubRowToggle.js";
@@ -32,10 +32,15 @@ import { DataTableTbody } from "../tbody/DataTableTbody.js";
 import { DataTableThead } from "../thead/DataTableThead.js";
 import { DataTableTr } from "../tr/DataTableTr.js";
 import { DataTableContextProvider, useDataTableContext, } from "./DataTableRoot.context.js";
-const DataTableInternal = forwardRef((_a, // Have to use <any> for docgen to work
-forwardedRef) => {
-    var { className, id, rowDensity = "normal", textSize = "medium", withKeyboardNav = true, zebraStripes = false, truncateContent: truncateContentProp, layout = "fixed", stickyColumns, stickyHeader = true, onRowClick, emptyContent, selection, loading, detailsPanel, subRows, sorting } = _a, rest = __rest(_a, ["className", "id", "rowDensity", "textSize", "withKeyboardNav", "zebraStripes", "truncateContent", "layout", "stickyColumns", "stickyHeader", "onRowClick", "emptyContent", "selection", "loading", "detailsPanel", "subRows", "sorting"]);
-    const { columnDefinitions, data, getRowId } = useDataGridContext();
+const DataGridTableInternal = forwardRef((_a, forwardedRef) => {
+    var _b, _c, _d;
+    var { className, id, layout = "fixed", stickyHeader = true, onRowAction, emptyContent, loadingContent = {
+        variant: "skeleton",
+        rows: 5,
+        label: "Laster innhold",
+    }, // TODO translate label
+    detailsPanel, subRows, sorting, selectionTrigger = "row" } = _a, rest = __rest(_a, ["className", "id", "layout", "stickyHeader", "onRowAction", "emptyContent", "loadingContent", "detailsPanel", "subRows", "sorting", "selectionTrigger"]);
+    const { columnDefinitions, data, getRowId, selection, isLoading, tableSettings, } = useDataGridContext();
     const sortingState = useTableSort(sorting);
     const tableItems = useTableItems({
         items: data,
@@ -44,26 +49,29 @@ forwardedRef) => {
     });
     const tableSelectionState = useTableSelection({
         selection,
+        selectionTrigger,
         tableItems,
     });
     const { columns, stickyStart, totalColSpan } = useColumnOptions(columnDefinitions, {
-        stickyColumns,
-        hasSelection: tableSelectionState.selection.selectionMode !== "none",
+        stickyColumns: tableSettings === null || tableSettings === void 0 ? void 0 : tableSettings.stickyColumns,
+        hasSelection: tableSelectionState.selection.mode !== "none",
         hasDetailsPanel: !!(detailsPanel === null || detailsPanel === void 0 ? void 0 : detailsPanel.getContent),
         layout,
+        columnDisplay: tableSettings === null || tableSettings === void 0 ? void 0 : tableSettings.columnDisplay,
     });
     const tableId = useId(id);
-    const truncateContent = truncateContentProp !== null && truncateContentProp !== void 0 ? truncateContentProp : layout !== "auto";
-    return (React.createElement(DataTableContextProvider, { layout: layout, withKeyboardNav: withKeyboardNav, selectionState: tableSelectionState, stickyStart: stickyStart, stickyHeader: stickyHeader, tableId: tableId, loading: loading, onRowClick: onRowClick, columns: columns, totalColSpan: totalColSpan, tableItems: tableItems, sortingState: sortingState },
-        React.createElement(TableElementWrapper, { enabled: withKeyboardNav },
-            React.createElement("table", Object.assign({}, rest, { ref: forwardedRef, className: cl("aksel-data-table", className), "data-zebra-stripes": zebraStripes, "data-truncate-content": truncateContent, "data-density": rowDensity, "data-text-size": textSize, "data-layout": layout, "data-loading": (loading === null || loading === void 0 ? void 0 : loading.isLoading) || undefined, "aria-busy": (loading === null || loading === void 0 ? void 0 : loading.isLoading) || undefined }),
+    const truncateContent = (_b = tableSettings === null || tableSettings === void 0 ? void 0 : tableSettings.truncateContent) !== null && _b !== void 0 ? _b : layout !== "auto";
+    return (React.createElement(DataTableContextProvider, { layout: layout, withKeyboardNav: true, selectionState: tableSelectionState, stickyStart: stickyStart, stickyHeader: stickyHeader, tableId: tableId, loading: loadingContent, onRowAction: onRowAction, columns: columns, totalColSpan: totalColSpan, tableItems: tableItems, sortingState: sortingState },
+        React.createElement(TableElementWrapper, { enabled: true, hasStickyColumns: !!(((_c = tableSettings === null || tableSettings === void 0 ? void 0 : tableSettings.stickyColumns) === null || _c === void 0 ? void 0 : _c.start) ||
+                ((_d = tableSettings === null || tableSettings === void 0 ? void 0 : tableSettings.stickyColumns) === null || _d === void 0 ? void 0 : _d.end)) },
+            React.createElement("table", Object.assign({}, rest, { ref: forwardedRef, className: cl("aksel-data-table", className), "data-zebra-stripes": tableSettings === null || tableSettings === void 0 ? void 0 : tableSettings.zebraStripes, "data-truncate-content": truncateContent, "data-density": tableSettings === null || tableSettings === void 0 ? void 0 : tableSettings.rowDensity, "data-text-size": tableSettings === null || tableSettings === void 0 ? void 0 : tableSettings.textSize, "data-layout": layout, "data-loading": isLoading || undefined, "aria-busy": isLoading || undefined }),
                 React.createElement(DataTableDetailsPanelProvider, { detailsPanel: detailsPanel },
-                    React.createElement(DataTableThead, null,
+                    React.createElement(DataTableThead, { "data-sticky": stickyHeader || undefined },
                         React.createElement(DataTableTr, null, columns.map(({ isSticky, isStickyLast, stickyLeftOffset, colDef }) => {
                             var _a, _b;
-                            return (React.createElement(DataTableColumnHeader, { id: colDef.id, width: colDef.width, textAlign: (_a = colDef.align) !== null && _a !== void 0 ? _a : "left", key: colDef.id, isSticky: isSticky, sortable: colDef.sortable, label: colDef.label, style: stickyLeftOffset
+                            return (React.createElement(DataTableColumnHeader, { id: colDef.id, width: colDef.width, align: (_a = colDef.align) !== null && _a !== void 0 ? _a : "left", key: colDef.id, isSticky: isSticky, sortable: colDef.isSortable, label: colDef.header, style: stickyLeftOffset
                                     ? { left: stickyLeftOffset }
-                                    : undefined, "data-sticky-last": isStickyLast || undefined }, (_b = colDef.header) !== null && _b !== void 0 ? _b : colDef.label));
+                                    : undefined, "data-sticky-last": isStickyLast || undefined }, (_b = colDef.headerCell) !== null && _b !== void 0 ? _b : colDef.header));
                         }))),
                     React.createElement(DataTableTbody, null,
                         React.createElement(DataTableTBodyContent, { emptyContent: emptyContent })))))));
@@ -71,7 +79,7 @@ forwardedRef) => {
 /**
  * Temp optimization to avoid re-renders on every keyboard-move, selection change etc
  */
-function TableElementWrapper({ children, enabled, }) {
+function TableElementWrapper({ children, enabled, hasStickyColumns, }) {
     const [applyStickyStyles, setApplyStickyStyles] = useState(false);
     const tableWrapperRef = useRef(null);
     const tableRef = useRef(null);
@@ -97,6 +105,9 @@ function TableElementWrapper({ children, enabled, }) {
         });
     }, [updateStickyStyles]);
     useEffect(function observeAndUpdateStickyStyles() {
+        if (!hasStickyColumns) {
+            return;
+        }
         const tableWrapperElement = tableWrapperRef.current;
         if (!tableWrapperElement) {
             return;
@@ -120,7 +131,7 @@ function TableElementWrapper({ children, enabled, }) {
                 rafRef.current = null;
             }
         };
-    }, [scheduleStickyStylesUpdate]);
+    }, [scheduleStickyStylesUpdate, hasStickyColumns]);
     return (React.createElement("div", { className: "aksel-data-table__border-wrapper" },
         React.createElement("div", { ref: tableWrapperRef, className: "aksel-data-table__scroll-wrapper" },
             React.createElement(Slot, { tabIndex: tabIndex, 
@@ -130,27 +141,28 @@ function TableElementWrapper({ children, enabled, }) {
 function DataTableTBodyContent({ emptyContent }) {
     var _a, _b, _c;
     const { columns, loading, totalColSpan, tableItems } = useDataTableContext();
-    if ((loading === null || loading === void 0 ? void 0 : loading.isLoading) && (loading === null || loading === void 0 ? void 0 : loading.variant) === "content") {
+    const { isLoading } = useDataGridContext();
+    if (isLoading && (loading === null || loading === void 0 ? void 0 : loading.variant) === "content") {
         return (React.createElement(DataTableLoadingState, { colSpan: totalColSpan }, loading.content));
     }
-    if ((loading === null || loading === void 0 ? void 0 : loading.isLoading) && (loading === null || loading === void 0 ? void 0 : loading.variant) === "skeleton") {
+    if (isLoading && (loading === null || loading === void 0 ? void 0 : loading.variant) === "skeleton") {
         const rows = (_a = loading.rows) !== null && _a !== void 0 ? _a : 5;
-        const label = (_b = loading.label) !== null && _b !== void 0 ? _b : "Laster innhold";
+        const label = (_b = loading.label) !== null && _b !== void 0 ? _b : "Laster innhold"; // TODO translate
         return (React.createElement(React.Fragment, null,
             React.createElement("tr", null,
                 React.createElement("td", { colSpan: totalColSpan, className: "aksel-sr-only" }, label)),
             Array.from({ length: rows }, (_, rowIndex) => (React.createElement(DataTableTr, { key: `skeleton-row-${rowIndex}`, "aria-hidden": true }, columns.map(({ isSticky, isStickyLast, stickyLeftOffset, colDef }, colDefIndex) => {
                 var _a;
-                return (React.createElement(DataTableBaseCell, { textAlign: (_a = colDef.align) !== null && _a !== void 0 ? _a : "left", key: colDef.id || colDefIndex, as: colDef.isRowHeader ? "th" : "td", isSticky: isSticky, style: stickyLeftOffset ? { left: stickyLeftOffset } : undefined, "data-sticky-last": isStickyLast || undefined },
+                return (React.createElement(DataTableBaseCell, { align: (_a = colDef.align) !== null && _a !== void 0 ? _a : "left", key: colDef.id || colDefIndex, as: colDef.isRowHeader ? "th" : "td", isSticky: isSticky, style: stickyLeftOffset ? { left: stickyLeftOffset } : undefined, "data-sticky-last": isStickyLast || undefined },
                     React.createElement(Skeleton, { variant: "text" })));
             }))))));
     }
     if (tableItems.items.length === 0 && emptyContent !== undefined) {
         return (React.createElement(DataTableEmptyState, { colSpan: totalColSpan }, emptyContent));
     }
-    const renderLoadingAnnouncement = (loading === null || loading === void 0 ? void 0 : loading.isLoading) && (loading === null || loading === void 0 ? void 0 : loading.variant) === "overlay";
+    const renderLoadingAnnouncement = isLoading && (loading === null || loading === void 0 ? void 0 : loading.variant) === "overlay";
     const overlayLabel = (loading === null || loading === void 0 ? void 0 : loading.variant) === "overlay"
-        ? ((_c = loading.label) !== null && _c !== void 0 ? _c : "Laster innhold")
+        ? ((_c = loading.label) !== null && _c !== void 0 ? _c : "Laster innhold") // TODO translate
         : "Laster innhold";
     return (React.createElement(React.Fragment, null,
         renderLoadingAnnouncement && (React.createElement("tr", null,
@@ -162,20 +174,30 @@ function DataTableTBodyContent({ emptyContent }) {
             if (!details) {
                 return null;
             }
-            const hasSubRows = details.children.length > 0;
-            return (React.createElement(React.Fragment, { key: details.id },
-                React.createElement(DataTableTr, { rowId: details.id }, columns.map(({ isSticky, isStickyLast, stickyLeftOffset, colDef }, colDefIndex) => {
-                    var _a;
-                    const renderNestedToggle = colDefIndex === 0 && hasSubRows;
-                    const renderNestedIndent = colDefIndex === 0 && (details.level > 0 || hasSubRows);
-                    const style = Object.assign({ "--__axc-data-table-nested-depth": details.level }, (stickyLeftOffset ? { left: stickyLeftOffset } : {}));
-                    return (React.createElement(DataTableBaseCell, { textAlign: (_a = colDef.align) !== null && _a !== void 0 ? _a : "left", key: colDef.id || colDefIndex, as: colDef.isRowHeader ? "th" : "td", isSticky: isSticky, "data-nested": renderNestedIndent || undefined, "data-sticky-last": isStickyLast || undefined, style: style, beforeContent: renderNestedToggle ? (React.createElement(DataTableSubRowToggle, { details: details })) : undefined }, colDef.cell(rowData)));
-                })),
-                React.createElement(DataTableDetailsPanelRow, { rowId: details.id, rowData: rowData })));
+            return (React.createElement(DataTableDataRow, { key: details.id, rowData: rowData, details: details, columns: columns }));
         })));
 }
-const DataTable = DataTableInternal;
-// docgen doesn't work well with type params, so we let it use DataTableInternal instead
-export { DataTable, DataTableInternal };
-export default DataTable;
-//# sourceMappingURL=DataTableRoot.js.map
+const DataTableDataRow = memo(function DataTableDataRow({ rowData, details, columns, }) {
+    const hasSubRows = details.children.length > 0;
+    return (React.createElement(React.Fragment, null,
+        React.createElement(DataTableTr, { rowId: details.id }, columns.map(({ isSticky, isStickyLast, stickyLeftOffset, colDef }, colDefIndex) => {
+            var _a;
+            const renderNestedToggle = colDefIndex === 0 && hasSubRows;
+            const renderNestedIndent = colDefIndex === 0 && (details.level > 0 || hasSubRows);
+            const style = Object.assign({ "--__axc-data-table-nested-depth": details.level }, (stickyLeftOffset ? { left: stickyLeftOffset } : {}));
+            return (React.createElement(DataTableBaseCell, { align: (_a = colDef.align) !== null && _a !== void 0 ? _a : "left", key: colDef.id || colDefIndex, as: colDef.isRowHeader ? "th" : "td", isSticky: isSticky, "data-nested": renderNestedIndent || undefined, "data-sticky-last": isStickyLast || undefined, style: style, beforeContent: renderNestedToggle ? (React.createElement(DataTableSubRowToggle, { details: details })) : undefined }, colDef.bodyCell(rowData)));
+        })),
+        React.createElement(DataTableDetailsPanelRow, { rowId: details.id, rowData: rowData })));
+}, 
+/* TODO: Might be some better metrics we could use to optimize this */
+(prev, next) => prev.rowData === next.rowData &&
+    prev.columns === next.columns &&
+    prev.details.id === next.details.id &&
+    prev.details.level === next.details.level &&
+    prev.details.children.length === next.details.children.length);
+const DataGridTable = DataGridTableInternal;
+// docgen doesn't work well with type params, so we let it use DataGridTableInternal instead
+// eslint-disable-next-line import/export
+export { DataGridTable, DataGridTableInternal };
+export default DataGridTable;
+//# sourceMappingURL=DataGridTableRoot.js.map