@navikt/ds-react 8.10.4 → 8.10.6

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

@@ -7,8 +7,11 @@ const utils_external_1 = require("../../../utils-external");
 const hooks_1 = require("../../../utils/hooks");
 const getMultipleSelectProps_1 = require("../helpers/selection/getMultipleSelectProps");
 const getSingleSelectProps_1 = require("../helpers/selection/getSingleSelectProps");
-function useTableSelection({ selection = {}, visibleRowIds = [], childRowIdsById, }) {
-    const { selectionMode = "none", defaultSelectedKeys, selectedKeys: selectedKeysProp, onSelectionChange, disabledSelectionKeys = [], disableRowSelectionOnClick = false, } = selection;
+function useTableSelection({ selection = {
+    selectionMode: "none",
+}, tableItems, }) {
+    const { selectionMode, defaultSelectedKeys, selectedKeys: selectedKeysProp, onSelectionChange, enableRowSelection, selectionTrigger = "row", } = selection;
+    const { visibleRowIds = [] } = tableItems;
     const radioGroupName = (0, utils_external_1.useId)();
     const [selectedKeys, setSelectedKeys] = (0, hooks_1.useControllableState)({
         value: selectionMode !== "none" ? selectedKeysProp : undefined,
@@ -16,13 +19,12 @@ function useTableSelection({ selection = {}, visibleRowIds = [], childRowIdsById
         onChange: onSelectionChange,
     });
     const selectedKeysSet = (0, react_1.useMemo)(() => new Set(selectedKeys), [selectedKeys]);
-    const disabledKeysSet = (0, react_1.useMemo)(() => new Set(disabledSelectionKeys), [disabledSelectionKeys]);
     const isRowSelected = (0, react_1.useCallback)((rowId) => selectedKeysSet.has(rowId), [selectedKeysSet]);
-    const baseSelection = { selectedKeys, disabledSelectionKeys, isRowSelected };
+    const baseSelection = { selectedKeys, isRowSelected };
     if (selectionMode === "none") {
         return {
             selection: Object.assign(Object.assign({ selectionMode }, baseSelection), { selectedKeys: [] }),
-            disableRowSelectionOnClick,
+            selectionTrigger,
             renderSelection: false,
         };
     }
@@ -31,10 +33,10 @@ function useTableSelection({ selection = {}, visibleRowIds = [], childRowIdsById
             selection: Object.assign(Object.assign({ selectionMode }, baseSelection), (0, getSingleSelectProps_1.getSingleSelectProps)({
                 selectedKeysSet,
                 setSelectedKeys,
-                disabledKeysSet,
                 name: radioGroupName,
+                enableRowSelection,
             })),
-            disableRowSelectionOnClick,
+            selectionTrigger,
             renderSelection: visibleRowIds.length !== 0,
         };
     }
@@ -43,11 +45,10 @@ function useTableSelection({ selection = {}, visibleRowIds = [], childRowIdsById
             selectedKeysSet,
             selectedKeys,
             setSelectedKeys,
-            disabledKeysSet,
-            visibleRowIds,
-            childRowIdsById,
+            enableRowSelection,
+            tableItems,
         })),
-        disableRowSelectionOnClick,
+        selectionTrigger,
         renderSelection: visibleRowIds.length !== 0,
     };
 }
@@ -58,10 +59,9 @@ const noSelectionState = {
     selection: {
         selectionMode: "none",
         selectedKeys: [],
-        disabledSelectionKeys: [],
         isRowSelected: () => false,
     },
-    disableRowSelectionOnClick: false,
+    selectionTrigger: "row",
     renderSelection: false,
 };
 exports.noSelectionState = noSelectionState;

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

@@ -1 +1 @@
-{"version":3,"file":"useTableSelection.js","sourceRoot":"","sources":["../../../../src/data/table/hooks/useTableSelection.ts"],"names":[],"mappings":";;;AA0HS,8CAAiB;AA1H1B,iCAA6C;AAC7C,4DAAgD;AAChD,gDAA4D;AAC5D,wFAAqF;AACrF,oFAAiF;AAqBjF,SAAS,iBAAiB,CAAC,EACzB,SAAS,GAAG,EAAE,EACd,aAAa,GAAG,EAAE,EAClB,eAAe,GACO;IACtB,MAAM,EACJ,aAAa,GAAG,MAAM,EACtB,mBAAmB,EACnB,YAAY,EAAE,gBAAgB,EAC9B,iBAAiB,EACjB,qBAAqB,GAAG,EAAE,EAC1B,0BAA0B,GAAG,KAAK,GACnC,GAAG,SAAS,CAAC;IAEd,MAAM,cAAc,GAAG,IAAA,sBAAK,GAAE,CAAC;IAE/B,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,4BAAoB,EAAgB;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,IAAA,eAAO,EAAC,GAAG,EAAE,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAE7E,MAAM,eAAe,GAAG,IAAA,eAAO,EAC7B,GAAG,EAAE,CAAC,IAAI,GAAG,CAAC,qBAAqB,CAAC,EACpC,CAAC,qBAAqB,CAAC,CACxB,CAAC;IAEF,MAAM,aAAa,GAAG,IAAA,mBAAW,EAC/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,qBAAqB,EAAE,aAAa,EAAE,CAAC;IAE7E,IAAI,aAAa,KAAK,MAAM,EAAE,CAAC;QAC7B,OAAO;YACL,SAAS,gCACP,aAAa,IACV,aAAa,KAChB,YAAY,EAAE,EAAE,GACjB;YACD,0BAA0B;YAC1B,eAAe,EAAE,KAAK;SACvB,CAAC;IACJ,CAAC;IAED,IAAI,aAAa,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO;YACL,SAAS,gCACP,aAAa,IACV,aAAa,GACb,IAAA,2CAAoB,EAAC;gBACtB,eAAe;gBACf,eAAe;gBACf,eAAe;gBACf,IAAI,EAAE,cAAc;aACrB,CAAC,CACH;YACD,0BAA0B;YAC1B,eAAe,EAAE,aAAa,CAAC,MAAM,KAAK,CAAC;SAC5C,CAAC;IACJ,CAAC;IAED,OAAO;QACL,SAAS,gCACP,aAAa,IACV,aAAa,GACb,IAAA,+CAAsB,EAAC;YACxB,eAAe;YACf,YAAY;YACZ,eAAe;YACf,eAAe;YACf,aAAa;YACb,eAAe;SAChB,CAAC,CACH;QACD,0BAA0B;QAC1B,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,qBAAqB,EAAE,EAAE;QACzB,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;KAC3B;IACD,0BAA0B,EAAE,KAAK;IACjC,eAAe,EAAE,KAAK;CACvB,CAAC;AAE0B,4CAAgB"}
+{"version":3,"file":"useTableSelection.js","sourceRoot":"","sources":["../../../../src/data/table/hooks/useTableSelection.ts"],"names":[],"mappings":";;;AAqHS,8CAAiB;AArH1B,iCAA6C;AAC7C,4DAAgD;AAChD,gDAA4D;AAC5D,wFAAqF;AACrF,oFAAiF;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,IAAA,sBAAK,GAAE,CAAC;IAE/B,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,4BAAoB,EAAgB;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,IAAA,eAAO,EAAC,GAAG,EAAE,CAAC,IAAI,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAE7E,MAAM,aAAa,GAAG,IAAA,mBAAW,EAC/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,IAAA,2CAAoB,EAAC;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,IAAA,+CAAsB,EAAC;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;AAE0B,4CAAgB"}

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

@@ -32,6 +32,6 @@ type UseTableSortResults = {
      */
     sortState: SortEntry[];
 };
-declare function useTableSort(options: TableSortOptions): UseTableSortResults;
+declare function useTableSort(options?: TableSortOptions): UseTableSortResults;
 export { useTableSort };
-export type { TableSortOptions };
+export type { TableSortOptions, UseTableSortResults };

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

@@ -2,18 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useTableSort = useTableSort;
 const react_1 = require("react");
+const consoleWarning_1 = require("../../../utils/helpers/consoleWarning");
 const hooks_1 = require("../../../utils/hooks");
 function useTableSort(options) {
-    const { defaultSort = [], onSortChange, sort: sortOption } = options;
+    const { defaultSort, onSortChange, sort: sortOption } = options || {};
     const [sort, setSort] = (0, hooks_1.useControllableState)({
         value: sortOption,
-        defaultValue: defaultSort,
+        defaultValue: defaultSort || [],
     });
     const handleSortClick = (0, react_1.useCallback)((id, event) => {
         if (id === undefined) {
-            if (process.env.NODE_ENV === "development") {
-                console.warn(`Aksel: Column id is undefined for sort event on target ${event.target}. Make sure your column definitions include an 'id' property.`);
-            }
+            (0, consoleWarning_1.consoleWarning)("DataTable: 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;

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

@@ -1 +1 @@
-{"version":3,"file":"useTableSort.js","sourceRoot":"","sources":["../../../../src/data/table/hooks/useTableSort.ts"],"names":[],"mappings":";;AAqGS,oCAAY;AArGrB,iCAAoC;AACpC,gDAA4D;AAyC5D,SAAS,YAAY,CAAC,OAAyB;IAC7C,MAAM,EAAE,WAAW,GAAG,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAErE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,4BAAoB,EAAC;QAC3C,KAAK,EAAE,UAAU;QACjB,YAAY,EAAE,WAAW;KAC1B,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,IAAA,mBAAW,EACjC,CAAC,EAAU,EAAE,KAAgD,EAAE,EAAE;QAC/D,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;YACrB,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;gBAC3C,OAAO,CAAC,IAAI,CACV,0DAA0D,KAAK,CAAC,MAAM,+DAA+D,CACtI,CAAC;YACJ,CAAC;YACD,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"}
+{"version":3,"file":"useTableSort.js","sourceRoot":"","sources":["../../../../src/data/table/hooks/useTableSort.ts"],"names":[],"mappings":";;AAsGS,oCAAY;AAtGrB,iCAAoC;AACpC,0EAAuE;AACvE,gDAA4D;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,IAAA,4BAAoB,EAAC;QAC3C,KAAK,EAAE,UAAU;QACjB,YAAY,EAAE,WAAW,IAAI,EAAE;KAChC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,IAAA,mBAAW,EACjC,CAAC,EAAU,EAAE,KAAgD,EAAE,EAAE;QAC/D,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;YACrB,IAAA,+BAAc,EACZ,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"}

package/cjs/data/table/root/DataTable.types.d.ts

@@ -1,16 +1,15 @@
-import type { ResizeProps } from "../column-header/useTableColumnResize";
+import type { DataTableColumnHeaderProps } from "../column-header/DataTableColumnHeader";
 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, DetailsT = Record<string, any>> = Pick<ResizeProps, "resizable" | "width" | "defaultWidth" | "autoWidth" | "minWidth" | "maxWidth" | "onWidthChange"> & {
+type ColumnDefinition<T> = {
     id: string;
     /**
      * Text alignment for cells in this column.
      *
-     *
      * @default "left"
      */
     align?: "left" | "right" | "center";
@@ -18,13 +17,12 @@ type ColumnDefinition<T, DetailsT = Record<string, any>> = Pick<ResizeProps, "re
      * 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: Not implemented
-     * - Add a generic tablecell component that can render either a td or th based on context or this prop.
+     * TODO: Better documentation, consider warning if not one column has this set to true.
      */
     isRowHeader?: boolean;
     /**
      * Renders table header-cell
+     * TODO: Pri zero rename to headerCell
      */
     header?: React.ReactNode;
     /**
@@ -33,6 +31,7 @@ type ColumnDefinition<T, DetailsT = Record<string, any>> = Pick<ResizeProps, "re
     cell: (item: T) => React.ReactNode;
     /**
      * Label of header. Renders if header is not provided.
+     * TODO: Pri zero consider renaming to header
      */
     label: string;
     /**
@@ -40,12 +39,8 @@ type ColumnDefinition<T, DetailsT = Record<string, any>> = Pick<ResizeProps, "re
      * Use `sort` and `onSortChange` on the root component to control sort state.
      */
     sortable?: boolean;
-    /**
-     * Additional metadata that can be used for filtering or other purposes. Not used by the table itself.
-     */
-    details?: DetailsT;
-};
-type ColumnDefinitions<T, DetailsT = Record<string, any>> = ColumnDefinition<T, DetailsT>[];
+} & Pick<DataTableColumnHeaderProps, "width">;
+type ColumnDefinitions<T> = ColumnDefinition<T>[];
 /**
  * A single sort entry representing a column's current sort state.
  * Absent from the `sort` array means the column is unsorted.
@@ -63,4 +58,18 @@ type SortChangeDetail = {
     /** The new direction for this column. `"none"` means the column was removed from the sort. */
     direction: "asc" | "desc" | "none";
 };
-export type { ColumnDefinition, ColumnDefinitions, SortDirection, SortEntry, SortChangeDetail, };
+type DataTableLoadingConfig = {
+    isLoading?: boolean;
+} & ({
+    variant: "content";
+    content: React.ReactNode;
+} | {
+    variant: "skeleton";
+    rows?: number;
+    label?: string;
+} | {
+    variant: "overlay";
+    label?: string;
+});
+type TableRowEntryId = string;
+export type { ColumnDefinition, ColumnDefinitions, DataTableLoadingConfig, SortDirection, SortEntry, SortChangeDetail, TableRowEntryId, };

package/cjs/data/table/root/DataTableRoot.context.d.ts

@@ -1,22 +1,28 @@
-import type { UseColumnOptionsResult } from "../hooks/useColumnOptions";
+import type { StickyStartState, UseColumnOptionsResult } from "../hooks/useColumnOptions";
+import type { UseTableItemsReturn } from "../hooks/useTableItems";
 import type { UseTableSelectionReturn } from "../hooks/useTableSelection";
+import type { UseTableSortResults } from "../hooks/useTableSort";
+import type { DataTableLoadingConfig, TableRowEntryId } from "./DataTable.types";
 type DataTableContextProps<T> = {
     layout: "fixed" | "auto";
     withKeyboardNav: boolean;
     selectionState: UseTableSelectionReturn;
-    stickySelection: boolean;
+    stickyStart: StickyStartState;
     stickyHeader: boolean;
     tableId: string;
-    showLoadingSkeletons: boolean;
-    onRowClick?: (rowId: string | number, event: React.MouseEvent<HTMLTableRowElement>) => void;
-    isLoading?: boolean;
-    showLoadingOverlay: boolean;
+    loading: DataTableLoadingConfig | undefined;
+    onRowClick?: (rowId: TableRowEntryId, event: React.MouseEvent<HTMLTableRowElement>) => void;
     columns: UseColumnOptionsResult<T>["columns"];
     /**
      * Used to set exact colspan for detailsPanel, loadingState and emptyState.
      * This is necessary to ensure that these components span the entire width of the table.
      */
-    fullWidthColSpan: number;
+    totalColSpan: number;
+    /**
+     * The current items and related metadata.
+     */
+    tableItems: UseTableItemsReturn<T>;
+    sortingState: UseTableSortResults;
 };
 declare const DataTableContextProvider: import("react").FC<DataTableContextProps<any> & {
     children: React.ReactNode;

package/cjs/data/table/root/DataTableRoot.context.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataTableRoot.context.js","sourceRoot":"","sources":["../../../../src/data/table/root/DataTableRoot.context.ts"],"names":[],"mappings":";;;AAAA,oDAA6D;AA0B7D,MAAM,EAAE,QAAQ,EAAE,wBAAwB,EAAE,UAAU,EAAE,mBAAmB,EAAE,GAC3E,IAAA,6BAAmB,EAA6B;IAC9C,IAAI,EAAE,kBAAkB;IACxB,YAAY,EAAE,mDAAmD;CAClE,CAAC,CAAC;AAcH,4DAAwB;AAExB,kDAAmB;AAZrB,MAAM,EACJ,QAAQ,EAAE,yBAAyB,EACnC,UAAU,EAAE,oBAAoB,GACjC,GAAG,IAAA,6BAAmB,EAAkC;IACvD,IAAI,EAAE,mBAAmB;IACzB,YAAY,EACV,mIAAmI;CACtI,CAAC,CAAC;AAID,8DAAyB;AAEzB,oDAAoB"}
+{"version":3,"file":"DataTableRoot.context.js","sourceRoot":"","sources":["../../../../src/data/table/root/DataTableRoot.context.ts"],"names":[],"mappings":";;;AAAA,oDAA6D;AAsC7D,MAAM,EAAE,QAAQ,EAAE,wBAAwB,EAAE,UAAU,EAAE,mBAAmB,EAAE,GAC3E,IAAA,6BAAmB,EAA6B;IAC9C,IAAI,EAAE,kBAAkB;IACxB,YAAY,EAAE,mDAAmD;CAClE,CAAC,CAAC;AAcH,4DAAwB;AAExB,kDAAmB;AAZrB,MAAM,EACJ,QAAQ,EAAE,yBAAyB,EACnC,UAAU,EAAE,oBAAoB,GACjC,GAAG,IAAA,6BAAmB,EAAkC;IACvD,IAAI,EAAE,mBAAmB;IACzB,YAAY,EACV,mIAAmI;CACtI,CAAC,CAAC;AAID,8DAAyB;AAEzB,oDAAoB"}

package/cjs/data/table/root/DataTableRoot.d.ts

@@ -1,11 +1,22 @@
-/** biome-ignore-all lint/correctness/useHookAtTopLevel: False positive because of the way forwardRef() is added */
 import React from "react";
 import { type DetailsPanelProps } from "../hooks/useTableDetailsPanel";
 import { type SubRowsProps } from "../hooks/useTableItems";
 import { type SelectionProps } from "../hooks/useTableSelection";
 import { type TableSortOptions } from "../hooks/useTableSort";
-import type { ColumnDefinitions } from "./DataTable.types";
-interface DataTableProps<T> extends React.HTMLAttributes<HTMLTableElement>, TableSortOptions {
+import type { DataTableLoadingConfig, TableRowEntryId } from "./DataTable.types";
+/**
+ * TODO: For consideration:
+ * - Use namespacing for types. There will be a lot of standalone types connected to this component,
+ * it could make sense to access them under DataTable.X instead of separate imports.
+ * - Consider having a "Wrapper" component that only handles context and logic like,
+ * "DataTableRoot" or "DataGrid" or something, and then have the main "DataTable" component only handle rendering of table itself.
+ * This would make props more focused and discoverable since its not mixed with htmltable-props.
+ */
+/**
+ * TODO:
+ * - Test `onColumnDefinitionChange` callback that is called when resize, sort, order etc changes
+ */
+interface DataTableProps<T> extends React.HTMLAttributes<HTMLTableElement> {
     children?: never;
     /**
      * Controls vertical cell padding.
@@ -20,8 +31,9 @@ interface DataTableProps<T> extends React.HTMLAttributes<HTMLTableElement>, Tabl
     /**
      * Truncate content in cells and show ellipsis for overflowed text.
      *
-     * **NB:** When using `layout="auto"`, you have to manually set a `maxWidth` on columns that should be truncated.
-     * @default true
+     * **NB:** When using this together with `layout="auto"`,
+     * you have to manually set a `maxWidth` on columns that should be truncated.
+     * @default false if layout="auto", else true
      */
     truncateContent?: boolean;
     /**
@@ -29,12 +41,6 @@ interface DataTableProps<T> extends React.HTMLAttributes<HTMLTableElement>, Tabl
      * @default true
      */
     withKeyboardNav?: boolean;
-    /**
-     * Custom callback to determine if navigation should be blocked.
-     * Called before default blocking logic.
-     * Requires `withKeyboardNav` to be `true`.
-     */
-    shouldBlockNavigation?: (event: KeyboardEvent) => boolean;
     /**
      * Controls table layout.
      *
@@ -50,35 +56,14 @@ interface DataTableProps<T> extends React.HTMLAttributes<HTMLTableElement>, Tabl
      * @default "fixed"
      */
     layout?: "fixed" | "auto";
-    /**
-     * Defines the columns of the table and how to render them.
-     *
-     *
-     * Each column definition should have a unique `id` (or use the column index as fallback) and a `cell`-renderer function that takes the row data as argument and returns a React node.
-     */
-    columnDefinitions: ColumnDefinitions<T>;
-    /**
-     * The data to display in the table.
-     *
-     *
-     * Each object in the array represents a row, and the properties of the object are used to render the cells based on the `columnDefinitions`.
-     */
-    data: T[];
-    /**
-     * Function to get unique row id from row data.
-     *
-     *
-     * If not provided, the row index will be used as id. This can cause issues if your data changes dynamically, so it's recommended to provide a stable id if possible.
-     */
-    getRowId?: (rowData: T, index: number) => string | number;
     /**
      * Sticky columns that remain visible when horizontally scrolling the table.
      *
      * You can specify 1 sticky column on the left and 1 on the right.
      */
     stickyColumns?: {
-        first?: "1";
-        last?: "1";
+        start?: "1";
+        end?: "1";
     };
     /**
      * @default true
@@ -88,54 +73,46 @@ interface DataTableProps<T> extends React.HTMLAttributes<HTMLTableElement>, Tabl
      * Callback invoked when a data row is clicked.
      * Not called when clicking header, loading, or empty-state rows.
      */
-    onRowClick?: (rowId: string | number, event: React.MouseEvent<HTMLTableRowElement>) => void;
+    onRowClick?: (rowId: TableRowEntryId, event: React.MouseEvent<HTMLTableRowElement>) => void;
     /**
      * Content to render when `data` is empty.
      * Rendered inside a `DataTable.EmptyState` row spanning all columns.
      */
-    emptyState?: React.ReactNode;
-    loading?: {
-        /**
-         * Shows the table in a loading state.
-         *
-         * - When `loadingState` is provided, it is rendered inside a `DataTable.LoadingState` row.
-         * - When `loadingState` is **not** provided, skeleton placeholder rows are rendered instead.
-         * @default false
-         */
-        isLoading?: boolean;
-        /**
-         * Custom content to render when `isLoading` is `true`.
-         * Rendered inside a `DataTable.LoadingState` row spanning all columns.
-         * When omitted, skeleton rows are rendered based on `loadingRows`.
-         */
-        loadingState?: React.ReactNode;
-        /**
-         * Number of skeleton rows to render when `isLoading` is `true` and no `loadingState` is provided.
-         *
-         *
-         * If not provided, the rendered content will get a temporarily overlay while loading
-         */
-        loadingRows?: number;
-        /**
-         * Visually hidden label announced to screen readers when skeleton rows are shown.
-         * Only used when `isLoading` is `true` and no `loadingState` is provided.
-         * @default "Laster innhold"
-         */
-        loadingLabel?: string;
-    };
+    emptyContent?: React.ReactNode;
     /**
-     * Function to get sub-rows for a given row, used for nested rows.
-     * When provided, an expand toggle column is added automatically.
+     * Configures how the table behaves during loading.
      *
-     *
-     * TODO:
-     * - Table might need to be implemented with role="treegrid" for a11y when having nested rows.
+     * 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.
+     */
+    loading?: DataTableLoadingConfig;
+    /**
+     * Adjusts font-size
+     * @default "medium"
+     */
+    textSize?: "small" | "medium";
+    /**
+     * Object with props related to row selection.
+     */
+    selection?: SelectionProps<T>;
+    /**
+     * Object with props related to nested rows (sub-rows).
      */
-    selection?: SelectionProps;
     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;
 }
+declare const DataTableInternal: React.ForwardRefExoticComponent<DataTableProps<any> & React.RefAttributes<HTMLTableElement>>;
 declare const DataTable: <T>(props: DataTableProps<T> & React.RefAttributes<HTMLTableElement>) => React.ReactElement | null;
-export { DataTable };
+export { DataTable, DataTableInternal };
 export type { DataTableProps };
 export default DataTable;