@navikt/ds-react 8.10.5 → 8.11.0

package/cjs/data/table/helpers/selection/getSingleSelectProps.d.ts

@@ -1,12 +1,13 @@
 import type { RadioInputProps } from "../../../../form/radio/radio-input/RadioInput";
-type GetSingleSelectPropsArgs = {
-    selectedKeysSet: Set<string | number>;
-    setSelectedKeys: (keys: (string | number)[]) => void;
-    disabledKeysSet: Set<string | number>;
+import type { TableRowEntryId } from "../../root/DataGridTable.types";
+import type { SelectionProps } from "./selection.types";
+type GetSingleSelectPropsArgs<T> = {
+    selectedKeysSet: Set<TableRowEntryId>;
+    setSelectedKeys: (keys: string[]) => void;
     name: string;
-};
-declare function getSingleSelectProps({ selectedKeysSet, setSelectedKeys, disabledKeysSet, name, }: GetSingleSelectPropsArgs): {
-    getRowRadioProps: (key: string | number) => RadioInputProps;
-    toggleSelection: (key: string | number) => void;
+} & Pick<SelectionProps<T>, "enableRowSelection">;
+declare function getSingleSelectProps<T>({ selectedKeysSet, setSelectedKeys, name, enableRowSelection, }: GetSingleSelectPropsArgs<T>): {
+    getRowRadioProps: (key: TableRowEntryId, row: T) => RadioInputProps;
+    toggleSelection: (key: TableRowEntryId, row: T) => void;
 };
 export { getSingleSelectProps };

package/cjs/data/table/helpers/selection/getSingleSelectProps.js

@@ -1,21 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSingleSelectProps = getSingleSelectProps;
-function getSingleSelectProps({ selectedKeysSet, setSelectedKeys, disabledKeysSet, name, }) {
-    const handleSelectionChange = (key) => {
-        if (disabledKeysSet.has(key)) {
+const consoleWarning_1 = require("../../../../utils/helpers/consoleWarning");
+const selection_utils_1 = require("./selection.utils");
+function getSingleSelectProps({ selectedKeysSet, setSelectedKeys, name, enableRowSelection, }) {
+    const handleSelectionChange = (key, row) => {
+        if (!row) {
+            (0, consoleWarning_1.consoleWarning)(`DataGrid.Table: Row data is undefined for key ${key}. This may cause issues with selection if enableRowSelection is used.`);
+        }
+        if (!(0, selection_utils_1.canSelectTableRow)(enableRowSelection, { row, id: key })) {
             return;
         }
         setSelectedKeys([key]);
     };
     return {
-        getRowRadioProps: (key) => ({
-            checked: selectedKeysSet.has(key),
-            onChange: () => handleSelectionChange(key),
-            disabled: disabledKeysSet.has(key),
-            value: key,
-            name,
-        }),
+        getRowRadioProps: (key, row) => {
+            const isSelectionDisabled = !(0, selection_utils_1.canSelectTableRow)(enableRowSelection, {
+                row,
+                id: key,
+            });
+            return {
+                checked: selectedKeysSet.has(key),
+                onChange: isSelectionDisabled
+                    ? () => null
+                    : () => handleSelectionChange(key, row),
+                disabled: isSelectionDisabled,
+                value: key,
+                name,
+            };
+        },
         toggleSelection: handleSelectionChange,
     };
 }

package/cjs/data/table/helpers/selection/getSingleSelectProps.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSingleSelectProps.js","sourceRoot":"","sources":["../../../../../src/data/table/helpers/selection/getSingleSelectProps.ts"],"names":[],"mappings":";;AAkCS,oDAAoB;AAzB7B,SAAS,oBAAoB,CAAC,EAC5B,eAAe,EACf,eAAe,EACf,eAAe,EACf,IAAI,GACqB;IACzB,MAAM,qBAAqB,GAAG,CAAC,GAAoB,EAAE,EAAE;QACrD,IAAI,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7B,OAAO;QACT,CAAC;QACD,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC;IAEF,OAAO;QACL,gBAAgB,EAAE,CAAC,GAAoB,EAAmB,EAAE,CAAC,CAAC;YAC5D,OAAO,EAAE,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC;YACjC,QAAQ,EAAE,GAAG,EAAE,CAAC,qBAAqB,CAAC,GAAG,CAAC;YAC1C,QAAQ,EAAE,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC;YAClC,KAAK,EAAE,GAAG;YACV,IAAI;SACL,CAAC;QACF,eAAe,EAAE,qBAAqB;KACvC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"getSingleSelectProps.js","sourceRoot":"","sources":["../../../../../src/data/table/helpers/selection/getSingleSelectProps.ts"],"names":[],"mappings":";;AAoDS,oDAAoB;AAnD7B,6EAA0E;AAG1E,uDAAsD;AAQtD,SAAS,oBAAoB,CAAI,EAC/B,eAAe,EACf,eAAe,EACf,IAAI,EACJ,kBAAkB,GACU;IAC5B,MAAM,qBAAqB,GAAG,CAAC,GAAoB,EAAE,GAAM,EAAE,EAAE;QAC7D,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,IAAA,+BAAc,EACZ,iDAAiD,GAAG,uEAAuE,CAC5H,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,IAAA,mCAAiB,EAAC,kBAAkB,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;YAC7D,OAAO;QACT,CAAC;QAED,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACzB,CAAC,CAAC;IAEF,OAAO;QACL,gBAAgB,EAAE,CAAC,GAAoB,EAAE,GAAM,EAAmB,EAAE;YAClE,MAAM,mBAAmB,GAAG,CAAC,IAAA,mCAAiB,EAAC,kBAAkB,EAAE;gBACjE,GAAG;gBACH,EAAE,EAAE,GAAG;aACR,CAAC,CAAC;YAEH,OAAO;gBACL,OAAO,EAAE,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC;gBACjC,QAAQ,EAAE,mBAAmB;oBAC3B,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI;oBACZ,CAAC,CAAC,GAAG,EAAE,CAAC,qBAAqB,CAAC,GAAG,EAAE,GAAG,CAAC;gBACzC,QAAQ,EAAE,mBAAmB;gBAC7B,KAAK,EAAE,GAAG;gBACV,IAAI;aACL,CAAC;QACJ,CAAC;QACD,eAAe,EAAE,qBAAqB;KACvC,CAAC;AACJ,CAAC"}

package/cjs/data/table/helpers/selection/selection.types.d.ts

@@ -1,7 +1,6 @@
 import type { CheckboxInputProps } from "../../../../form/checkbox/checkbox-input/CheckboxInput";
 import type { RadioInputProps } from "../../../../form/radio/radio-input/RadioInput";
-type SelectedKeysT = (string | number)[];
-type SelectionProps = {
+type SelectionProps<T = unknown> = {
     /**
      * Enables selection of rows.
      *
@@ -12,55 +11,48 @@ type SelectionProps = {
      *
      * @default "none"
      */
-    selectionMode?: "none" | "single" | "multiple";
+    mode: "none" | "single" | "multiple";
     /**
-     * Controlled selected keys. Should be used in conjunction with `onSelectionChange`.
+     * Controlled selected keys. Should be used in conjunction with `onSelectedRowIdsChange`.
      */
-    selectedKeys?: SelectedKeysT;
+    selectedRowIds?: string[];
     /**
      * Default selected keys when using uncontrolled selection. Should not be used together with `selectedKeys`.
      */
-    defaultSelectedKeys?: SelectedKeysT;
+    defaultSelectedRowIds?: string[];
     /**
      * Callback with array of selected keys.
      */
-    onSelectionChange?: (keys: SelectedKeysT) => void;
+    onSelectedRowIdsChange?: (ids: string[]) => void;
     /**
-     * Keys that should be disabled for selection. These keys will not be selectable and will be styled as disabled.
+     * Callback to determine if a row should be enabled for selection.
      *
-     *
-     * TODO: Consider making this optionally a callback with (rowData:T) => boolean, to allow for more dynamic disabling of selection based on row data.
-     */
-    disabledSelectionKeys?: SelectedKeysT;
-    /**
-     * If true, stops clicking a row from toggling its selection state. This can be used if you want to only allow selection through the checkboxes/radios, and not have the entire row be clickable for selection.
-     *
-     * @default false
+     * If set to a boolean, it will enable selection for all rows when true, and disable selection for all rows when false.
      */
-    disableRowSelectionOnClick?: boolean;
+    enableRowSelection?: (({ row, id }: {
+        row: T;
+        id: string;
+    }) => boolean) | boolean;
 };
 type NoneSelection = {
-    selectionMode: "none";
-    selectedKeys: SelectedKeysT;
-    disabledSelectionKeys: SelectedKeysT;
+    mode: "none";
+    selectedKeys: string[];
 };
 type SingleSelection = {
-    selectionMode: "single";
-    selectedKeys: SelectedKeysT;
-    disabledSelectionKeys: SelectedKeysT;
-    getRowRadioProps: (key: string | number) => RadioInputProps;
-    toggleSelection: (key: string | number) => void;
+    mode: "single";
+    selectedKeys: string[];
+    getRowRadioProps: (key: string, row: any) => RadioInputProps;
+    toggleSelection: (key: string, row: any) => void;
 };
 type MultipleSelection = {
-    selectionMode: "multiple";
-    selectedKeys: SelectedKeysT;
-    disabledSelectionKeys: SelectedKeysT;
+    mode: "multiple";
+    selectedKeys: string[];
     getTheadCheckboxProps: () => CheckboxInputProps;
-    getRowCheckboxProps: (key: string | number) => CheckboxInputProps;
-    toggleSelection: (key: string | number) => void;
+    getRowCheckboxProps: (key: string, row: any) => CheckboxInputProps;
+    toggleSelection: (key: string, row: any) => void;
 };
 type TableSelectionBase = {
-    isRowSelected: (rowId: string | number) => boolean;
+    isRowSelected: (rowId: string) => boolean;
 };
 type TableSelection = TableSelectionBase & (NoneSelection | SingleSelection | MultipleSelection);
-export type { MultipleSelection, NoneSelection, SelectionProps, SingleSelection, TableSelection, SelectedKeysT, };
+export type { MultipleSelection, NoneSelection, SelectionProps, SingleSelection, TableSelection, };

package/cjs/data/table/helpers/selection/selection.utils.d.ts

@@ -0,0 +1,21 @@
+import type { TableRowEntryId } from "../../root/DataGridTable.types";
+import type { ItemDetail } from "../collectTableRowEntries";
+import type { SelectionProps } from "./selection.types";
+declare function canSelectTableRow<T>(enableRowSelection: SelectionProps<T>["enableRowSelection"], args: {
+    row: T;
+    id: TableRowEntryId;
+}): boolean;
+type MutateRowSelectionArgs<T> = {
+    selectedRowIds: Set<TableRowEntryId>;
+    rowId: TableRowEntryId;
+    checked: boolean;
+    childRowIdsById: Map<TableRowEntryId, TableRowEntryId[]>;
+    itemDetails: Map<TableRowEntryId, ItemDetail<T>>;
+    enableRowSelection?: SelectionProps<T>["enableRowSelection"];
+};
+/**
+ * Traverses the row and its children and updates selected-state directly on given selectedRowIds set.
+ * Returns true if any changes were made to the set, false otherwise.
+ */
+declare function mutateRowSelection<T>({ selectedRowIds, rowId, checked, childRowIdsById, itemDetails, enableRowSelection, }: MutateRowSelectionArgs<T>): boolean;
+export { canSelectTableRow, mutateRowSelection };

package/cjs/data/table/helpers/selection/selection.utils.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.canSelectTableRow = canSelectTableRow;
+exports.mutateRowSelection = mutateRowSelection;
+function canSelectTableRow(enableRowSelection, args) {
+    if (typeof enableRowSelection === "function") {
+        return enableRowSelection(args);
+    }
+    return enableRowSelection !== null && enableRowSelection !== void 0 ? enableRowSelection : true;
+}
+/**
+ * Traverses the row and its children and updates selected-state directly on given selectedRowIds set.
+ * Returns true if any changes were made to the set, false otherwise.
+ */
+function mutateRowSelection({ selectedRowIds, rowId, checked, childRowIdsById, itemDetails, enableRowSelection, }) {
+    let changed = false;
+    const item = itemDetails.get(rowId);
+    if (item &&
+        canSelectTableRow(enableRowSelection, { row: item.rowData, id: rowId })) {
+        if (checked && !selectedRowIds.has(rowId)) {
+            selectedRowIds.add(rowId);
+            changed = true;
+        }
+        else if (!checked && selectedRowIds.has(rowId)) {
+            selectedRowIds.delete(rowId);
+            changed = true;
+        }
+    }
+    const children = childRowIdsById.get(rowId);
+    if (children) {
+        for (const childId of children) {
+            if (mutateRowSelection({
+                selectedRowIds,
+                rowId: childId,
+                checked,
+                childRowIdsById,
+                itemDetails,
+                enableRowSelection,
+            })) {
+                changed = true;
+            }
+        }
+    }
+    return changed;
+}
+//# sourceMappingURL=selection.utils.js.map

package/cjs/data/table/helpers/selection/selection.utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"selection.utils.js","sourceRoot":"","sources":["../../../../../src/data/table/helpers/selection/selection.utils.ts"],"names":[],"mappings":";;AAwES,8CAAiB;AAAE,gDAAkB;AApE9C,SAAS,iBAAiB,CACxB,kBAA2D,EAC3D,IAAqC;IAErC,IAAI,OAAO,kBAAkB,KAAK,UAAU,EAAE,CAAC;QAC7C,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IACD,OAAO,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,GAAI,IAAI,CAAC;AACpC,CAAC;AAWD;;;GAGG;AACH,SAAS,kBAAkB,CAAI,EAC7B,cAAc,EACd,KAAK,EACL,OAAO,EACP,eAAe,EACf,WAAW,EACX,kBAAkB,GACQ;IAC1B,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAEpC,IACE,IAAI;QACJ,iBAAiB,CAAC,kBAAkB,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EACvE,CAAC;QACD,IAAI,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1C,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC1B,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;aAAM,IAAI,CAAC,OAAO,IAAI,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACjD,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC7B,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;IACH,CAAC;IAED,MAAM,QAAQ,GAAG,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC5C,IAAI,QAAQ,EAAE,CAAC;QACb,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IACE,kBAAkB,CAAC;gBACjB,cAAc;gBACd,KAAK,EAAE,OAAO;gBACd,OAAO;gBACP,eAAe;gBACf,WAAW;gBACX,kBAAkB;aACnB,CAAC,EACF,CAAC;gBACD,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}

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

@@ -1,19 +1,30 @@
-import type { ColumnDefinition, ColumnDefinitions } from "../root/DataTable.types";
-import type { SelectionProps } from "./useTableSelection";
+import type { ColumnDefinition, ColumnDefinitions } from "../root/DataGridTable.types";
 type UseColumnOptions = {
     stickyColumns?: {
-        first?: "1";
-        last?: "1";
+        start?: 1;
+        end?: 1;
     };
-    selectionMode: SelectionProps["selectionMode"];
+    hasSelection: boolean;
+    hasDetailsPanel: boolean;
+    layout: "fixed" | "auto";
+};
+type StickyStartState = {
+    selection: boolean;
+    expansion: boolean;
+    selectionOffset: number;
+    firstColumnOffset: number;
 };
 type UseColumnOptionsResult<T> = {
     columns: {
         isSticky: "start" | "end" | false;
+        isStickyLast?: boolean;
+        stickyLeftOffset?: number;
         colDef: ColumnDefinition<T>;
     }[];
-    stickySelection: boolean;
+    stickyStart: StickyStartState;
+    totalColSpan: number;
 };
 declare function useColumnOptions<T>(columnDefinitions: ColumnDefinitions<T>, options: UseColumnOptions): UseColumnOptionsResult<T>;
 export { useColumnOptions };
+export type { StickyStartState };
 export type { UseColumnOptionsResult };

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

@@ -2,31 +2,49 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useColumnOptions = useColumnOptions;
 const react_1 = require("react");
+const DataTableTr_1 = require("../tr/DataTableTr");
 function useColumnOptions(columnDefinitions, options) {
-    const { stickyColumns, selectionMode } = options;
-    const hasSelection = selectionMode !== "none";
+    const { stickyColumns, hasSelection, hasDetailsPanel, layout } = options;
+    const hasStickyStart = (stickyColumns === null || stickyColumns === void 0 ? void 0 : stickyColumns.start) === 1;
+    const stickyExpansion = hasStickyStart && hasDetailsPanel;
+    const stickySelection = hasStickyStart && hasSelection;
+    const stickySelectionOffset = stickyExpansion ? DataTableTr_1.ACTION_CELL_WIDTH : 0;
+    const stickyFirstColumnOffset = (stickyExpansion ? DataTableTr_1.ACTION_CELL_WIDTH : 0) +
+        (stickySelection ? DataTableTr_1.ACTION_CELL_WIDTH : 0);
     const columns = (0, react_1.useMemo)(() => {
         return columnDefinitions.map((colDef, index) => {
-            const isFirstSticky = (stickyColumns === null || stickyColumns === void 0 ? void 0 : stickyColumns.first) === "1" && index === 0 && !hasSelection;
-            const isLastSticky = (stickyColumns === null || stickyColumns === void 0 ? void 0 : stickyColumns.last) === "1" && index === columnDefinitions.length - 1;
+            const isFirstSticky = hasStickyStart && index === 0;
+            const isLastSticky = (stickyColumns === null || stickyColumns === void 0 ? void 0 : stickyColumns.end) === 1 && index === columnDefinitions.length - 1;
             return {
                 isSticky: isFirstSticky
                     ? "start"
                     : isLastSticky
                         ? "end"
                         : false,
+                isStickyLast: isFirstSticky && !isLastSticky,
+                stickyLeftOffset: isFirstSticky ? stickyFirstColumnOffset : undefined,
                 colDef,
             };
         });
     }, [
         columnDefinitions,
-        hasSelection,
-        stickyColumns === null || stickyColumns === void 0 ? void 0 : stickyColumns.first,
-        stickyColumns === null || stickyColumns === void 0 ? void 0 : stickyColumns.last,
+        hasStickyStart,
+        stickyColumns,
+        stickyFirstColumnOffset,
     ]);
+    const totalColSpan = columns.length +
+        (layout === "fixed" ? 1 : 0) +
+        (hasSelection ? 1 : 0) +
+        (hasDetailsPanel ? 1 : 0);
     return {
-        stickySelection: selectionMode !== "none" && (stickyColumns === null || stickyColumns === void 0 ? void 0 : stickyColumns.first) === "1",
+        stickyStart: {
+            selection: stickySelection,
+            expansion: stickyExpansion,
+            selectionOffset: stickySelectionOffset,
+            firstColumnOffset: stickyFirstColumnOffset,
+        },
         columns,
+        totalColSpan,
     };
 }
 //# sourceMappingURL=useColumnOptions.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useColumnOptions.js","sourceRoot":"","sources":["../../../../src/data/table/hooks/useColumnOptions.ts"],"names":[],"mappings":";;AA4DS,4CAAgB;AA5DzB,iCAAgC;AAuBhC,SAAS,gBAAgB,CACvB,iBAAuC,EACvC,OAAyB;IAEzB,MAAM,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAEjD,MAAM,YAAY,GAAG,aAAa,KAAK,MAAM,CAAC;IAE9C,MAAM,OAAO,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QAC3B,OAAO,iBAAiB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YAC7C,MAAM,aAAa,GACjB,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK,MAAK,GAAG,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC;YAC/D,MAAM,YAAY,GAChB,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,MAAK,GAAG,IAAI,KAAK,KAAK,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC;YAExE,OAAO;gBACL,QAAQ,EAAE,aAAa;oBACrB,CAAC,CAAE,OAAiB;oBACpB,CAAC,CAAC,YAAY;wBACZ,CAAC,CAAE,KAAe;wBAClB,CAAC,CAAE,KAAe;gBACtB,MAAM;aACP,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,EAAE;QACD,iBAAiB;QACjB,YAAY;QACZ,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK;QACpB,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI;KACpB,CAAC,CAAC;IAEH,OAAO;QACL,eAAe,EAAE,aAAa,KAAK,MAAM,IAAI,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK,MAAK,GAAG;QACzE,OAAO;KACR,CAAC;AACJ,CAAC"}
+{"version":3,"file":"useColumnOptions.js","sourceRoot":"","sources":["../../../../src/data/table/hooks/useColumnOptions.ts"],"names":[],"mappings":";;AA6FS,4CAAgB;AA7FzB,iCAAgC;AAKhC,mDAAsD;AA8BtD,SAAS,gBAAgB,CACvB,iBAAuC,EACvC,OAAyB;IAEzB,MAAM,EAAE,aAAa,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEzE,MAAM,cAAc,GAAG,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK,MAAK,CAAC,CAAC;IAElD,MAAM,eAAe,GAAG,cAAc,IAAI,eAAe,CAAC;IAC1D,MAAM,eAAe,GAAG,cAAc,IAAI,YAAY,CAAC;IAEvD,MAAM,qBAAqB,GAAG,eAAe,CAAC,CAAC,CAAC,+BAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;IACtE,MAAM,uBAAuB,GAC3B,CAAC,eAAe,CAAC,CAAC,CAAC,+BAAiB,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,CAAC,eAAe,CAAC,CAAC,CAAC,+BAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE5C,MAAM,OAAO,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QAC3B,OAAO,iBAAiB,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YAC7C,MAAM,aAAa,GAAG,cAAc,IAAI,KAAK,KAAK,CAAC,CAAC;YACpD,MAAM,YAAY,GAChB,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,GAAG,MAAK,CAAC,IAAI,KAAK,KAAK,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC;YAErE,OAAO;gBACL,QAAQ,EAAE,aAAa;oBACrB,CAAC,CAAE,OAAiB;oBACpB,CAAC,CAAC,YAAY;wBACZ,CAAC,CAAE,KAAe;wBAClB,CAAC,CAAE,KAAe;gBACtB,YAAY,EAAE,aAAa,IAAI,CAAC,YAAY;gBAC5C,gBAAgB,EAAE,aAAa,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,SAAS;gBACrE,MAAM;aACP,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,EAAE;QACD,iBAAiB;QACjB,cAAc;QACd,aAAa;QACb,uBAAuB;KACxB,CAAC,CAAC;IAEH,MAAM,YAAY,GAChB,OAAO,CAAC,MAAM;QACd,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5B,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE5B,OAAO;QACL,WAAW,EAAE;YACX,SAAS,EAAE,eAAe;YAC1B,SAAS,EAAE,eAAe;YAC1B,eAAe,EAAE,qBAAqB;YACtC,iBAAiB,EAAE,uBAAuB;SAC3C;QACD,OAAO;QACP,YAAY;KACb,CAAC;AACJ,CAAC"}

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

@@ -1,10 +1,10 @@
 import React from "react";
 type DetailsPanelProps<T> = {
     /**
-     * Renders a details panel below the row when expanded.
+     * Function to get the content to show in the details panel for a given row.
      * When provided, an expand toggle column is added automatically.
      */
-    getContent?: (rowData: T) => React.ReactNode;
+    getContent: (rowData: T) => React.ReactNode;
     /**
      * Determines whether a row can be expanded to show details panel content.
      * @default () => true
@@ -12,22 +12,18 @@ type DetailsPanelProps<T> = {
     isRowExpandable?: (rowData: T) => boolean;
     /**
      * Controlled list of expanded row IDs.
-     * Use with `onDetailsPanelChange` for controlled usage, or `defaultDetailsPanelRowIds` for uncontrolled.
+     * Use with `onExpandedRowIdsChange` for controlled usage, or `defaultExpandedRowIds` for uncontrolled.
      */
-    expandedRowIds?: (string | number)[];
+    expandedRowIds?: string[];
     /**
      * Initial list of expanded row IDs for uncontrolled usage.
      * @default []
      */
-    defaultExpandedRowIds?: (string | number)[];
+    defaultExpandedRowIds?: string[];
     /**
      * Called when the list of expanded row IDs changes.
-     *
-     *
-     * TODO:
-     * - Docs: This pattern is called "Master / Detail" in general terms
      */
-    onExpandedRowIdsChange?: (ids: (string | number)[]) => void;
+    onExpandedRowIdsChange?: (ids: string[]) => void;
     /**
      * Returns the height (in px) or `"auto"` for a row's details panel.
      * When a number is returned, the panel scrolls within that fixed height.
@@ -41,9 +37,9 @@ type DetailsPanelProps<T> = {
     showExpandAll?: boolean;
 };
 type DataTableDetailsPanelContextT = {
-    isExpanded: (id: string | number) => boolean;
-    isDetailsPanelExpandable: (id: string | number) => boolean;
-    toggleExpansion: (id: string | number) => void;
+    isExpanded: (id: string) => boolean;
+    isDetailsPanelExpandable: (id: string) => boolean;
+    toggleExpansion: (id: string) => void;
     toggleAll: () => void;
     isAllExpanded: boolean;
     getDetailsPanelContent?: (row: unknown) => React.ReactNode;
@@ -57,6 +53,6 @@ declare function DataTableDetailsPanelProvider<T>({ children, detailsPanel, }: {
 } & {
     children: React.ReactNode;
 }): React.JSX.Element;
-declare function getDataTableDetailsPanelId(tableId: string, rowId: string | number): string;
+declare function getDataTableDetailsPanelId(tableId: string, rowId: string): string;
 export { DataTableDetailsPanelProvider, getDataTableDetailsPanelId, useDataTableDetailsPanel, };
 export type { DetailsPanelProps };

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

@@ -39,22 +39,23 @@ exports.getDataTableDetailsPanelId = getDataTableDetailsPanelId;
 const react_1 = __importStar(require("react"));
 const helpers_1 = require("../../../utils/helpers");
 const hooks_1 = require("../../../utils/hooks");
-const useTableItems_1 = require("./useTableItems");
+const DataTableRoot_context_1 = require("../root/DataTableRoot.context");
 const { Provider: DataTableDetailsPanelContextProvider, useContext: useDataTableDetailsPanel, } = (0, helpers_1.createStrictContext)({
     name: "DataTableDetailsPanelContext",
     errorMessage: "useDataTableDetailsPanel must be used within a DataTableDetailsPanelProvider.",
 });
 exports.useDataTableDetailsPanel = useDataTableDetailsPanel;
-function DataTableDetailsPanelProvider({ children, detailsPanel = {}, }) {
-    const { expandedRowIds, defaultExpandedRowIds = [], onExpandedRowIdsChange, getContent, isRowExpandable, getHeight, showExpandAll = false, } = detailsPanel;
+function DataTableDetailsPanelProvider({ children, detailsPanel, }) {
+    var _a;
+    const { expandedRowIds, defaultExpandedRowIds = [], onExpandedRowIdsChange, getContent, isRowExpandable, getHeight, showExpandAll = false, } = detailsPanel || {};
     const [expandedIds, setExpandedIds] = (0, hooks_1.useControllableState)({
         value: expandedRowIds,
         defaultValue: defaultExpandedRowIds,
         onChange: onExpandedRowIdsChange,
     });
     /* TODO: False is just fallback until auto and root is merged */
-    const tableItemsContext = (0, useTableItems_1.useTableItemsContext)(false);
-    const { itemDetails } = tableItemsContext !== null && tableItemsContext !== void 0 ? tableItemsContext : {
+    const tableContext = (0, DataTableRoot_context_1.useDataTableContext)(false);
+    const { itemDetails } = (_a = tableContext === null || tableContext === void 0 ? void 0 : tableContext.tableItems) !== null && _a !== void 0 ? _a : {
         itemDetails: new Map(),
     };
     const expandableIds = react_1.default.useMemo(() => {

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

@@ -1 +1 @@
-{"version":3,"file":"useTableDetailsPanel.js","sourceRoot":"","sources":["../../../../src/data/table/hooks/useTableDetailsPanel.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"useTableDetailsPanel.js","sourceRoot":"","sources":["../../../../src/data/table/hooks/useTableDetailsPanel.tsx"],"names":[],"mappings":"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"}

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

@@ -1,30 +1,43 @@
-import { type ItemDetail, type TableRowEntryId } from "../helpers/collectTableRowEntries";
+import { type ItemDetail } from "../helpers/collectTableRowEntries";
 type SubRowsProps<T> = {
-    getRows?: (rowData: T) => T[];
-    expandedRowIds?: (string | number)[];
-    defaultExpandedRowIds?: (string | number)[];
+    /**
+     * Function to get sub-rows for a given row.
+     */
+    getRows: (rowData: T) => T[];
+    /**
+     * Controlled list of IDs of rows that should be expanded.
+     */
+    expandedRowIds?: string[];
+    /**
+     * IDs of rows that should be initially expanded.
+     * Only used when `expandedRowIds` is not provided, i.e. when the expanded state is uncontrolled.
+     */
+    defaultExpandedRowIds?: string[];
+    /**
+     * Called when the list of expanded row IDs changes.
+     */
+    onExpandedRowIdsChange?: (ids: string[]) => void;
+    /**
+     * Determines whether a row should be expandable.
+     * By default, all rows are expandable when `getRows` is provided.
+     */
     isRowExpandable?: (rowData: T) => boolean;
-    onExpandedRowIdsChange?: (ids: (string | number)[]) => void;
 };
 type UseTableItemsArgs<T> = {
     items: T[];
-    getRowId?: (rowData: T) => TableRowEntryId;
+    getRowId?: (rowData: T) => string;
     subRows?: SubRowsProps<T>;
 };
-type useTableItemsReturn<T> = {
+type UseTableItemsReturn<T> = {
     items: T[];
-    itemDetails: Map<TableRowEntryId, ItemDetail<T>>;
+    itemDetails: Map<string, ItemDetail<T>>;
     /** Row ids for the rows currently rendered in the table body. */
-    visibleRowIds: TableRowEntryId[];
+    visibleRowIds: string[];
     /** Direct child ids for each row, used to traverse selection groups lazily. */
-    childRowIdsById: Map<TableRowEntryId, TableRowEntryId[]>;
-    onExpandedRowIdsChange: (id: string | number) => void;
-    isSubRowExpanded: (id: string | number) => boolean;
+    childRowIdsById: Map<string, string[]>;
+    onExpandedRowIdsChange: (id: string) => void;
+    isSubRowExpanded: (id: string) => boolean;
 };
-declare function useTableItems<T>(args: UseTableItemsArgs<T>): useTableItemsReturn<T>;
-declare const TableItemsProvider: import("react").FC<Omit<useTableItemsReturn<any>, "childRowIdsById"> & {
-    children: React.ReactNode;
-    ref?: never;
-}>, useTableItemsContext: <S extends boolean = true>(strict?: S | undefined) => S extends true ? Omit<useTableItemsReturn<any>, "childRowIdsById"> : Omit<useTableItemsReturn<any>, "childRowIdsById"> | undefined;
-export { useTableItems, TableItemsProvider, useTableItemsContext };
-export type { ItemDetail, SubRowsProps };
+declare function useTableItems<T>(args: UseTableItemsArgs<T>): UseTableItemsReturn<T>;
+export { useTableItems };
+export type { ItemDetail, SubRowsProps, UseTableItemsReturn };

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

@@ -1,14 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useTableItemsContext = exports.TableItemsProvider = void 0;
 exports.useTableItems = useTableItems;
 const react_1 = require("react");
-const helpers_1 = require("../../../utils/helpers");
 const hooks_1 = require("../../../utils/hooks");
 const collectTableRowEntries_1 = require("../helpers/collectTableRowEntries");
 function useTableItems(args) {
-    const { items, subRows = {}, getRowId } = args;
-    const { expandedRowIds, defaultExpandedRowIds, getRows, onExpandedRowIdsChange, isRowExpandable, } = subRows;
+    const { items, subRows, getRowId } = args;
+    const { expandedRowIds, defaultExpandedRowIds, getRows, onExpandedRowIdsChange, isRowExpandable, } = subRows || {};
     const [nestedSubRowsExpandedIds, setNestedSubRowsExpandedIds] = (0, hooks_1.useControllableState)({
         value: expandedRowIds,
         defaultValue: defaultExpandedRowIds !== null && defaultExpandedRowIds !== void 0 ? defaultExpandedRowIds : [],
@@ -55,21 +53,21 @@ function useTableItems(args) {
             ? prev.filter((expandedId) => expandedId !== id)
             : [...prev, id]);
     }, [setNestedSubRowsExpandedIds]);
-    return {
+    const isSubRowExpanded = (0, react_1.useCallback)((id) => expandedIdsSet.has(id), [expandedIdsSet]);
+    return (0, react_1.useMemo)(() => ({
         items: visibleItems,
         itemDetails,
         visibleRowIds,
         childRowIdsById,
         onExpandedRowIdsChange: handleExpandedSubRowIdChange,
-        isSubRowExpanded: (id) => expandedIdsSet.has(id),
-    };
+        isSubRowExpanded,
+    }), [
+        visibleItems,
+        itemDetails,
+        visibleRowIds,
+        childRowIdsById,
+        handleExpandedSubRowIdChange,
+        isSubRowExpanded,
+    ]);
 }
-const { Provider: TableItemsProvider, useContext: useTableItemsContext } = 
-/* TODO: Can we type this better? */
-(0, helpers_1.createStrictContext)({
-    name: "TableItemsContext",
-    errorMessage: "useTableItemsContext must be used within a TableItemsProvider",
-});
-exports.TableItemsProvider = TableItemsProvider;
-exports.useTableItemsContext = useTableItemsContext;
 //# sourceMappingURL=useTableItems.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useTableItems.js","sourceRoot":"","sources":["../../../../src/data/table/hooks/useTableItems.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useTableItems.js","sourceRoot":"","sources":["../../../../src/data/table/hooks/useTableItems.ts"],"names":[],"mappings":"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"}

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

@@ -1,12 +1,7 @@
 type UseTableKeyboardNavOptions = {
     enabled: boolean;
-    /**
-     * Custom callback to determine if navigation should be blocked.
-     * Called before default blocking logic.
-     */
-    shouldBlockNavigation?: (event: KeyboardEvent) => boolean;
 };
-declare function useTableKeyboardNav({ enabled, shouldBlockNavigation: customBlockFn, }: UseTableKeyboardNavOptions): {
+declare function useTableKeyboardNav({ enabled }: UseTableKeyboardNavOptions): {
     tabIndex: number | undefined;
     setTableRef: import("react").Dispatch<import("react").SetStateAction<HTMLTableElement | null>>;
 };

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

@@ -8,7 +8,7 @@ const table_focus_1 = require("../helpers/table-focus");
 const table_grid_nav_1 = require("../helpers/table-grid-nav");
 const table_keyboard_1 = require("../helpers/table-keyboard");
 const useGridCache_1 = require("./useGridCache");
-function useTableKeyboardNav({ enabled, shouldBlockNavigation: customBlockFn, }) {
+function useTableKeyboardNav({ enabled }) {
     const [tableRef, setTableRef] = (0, react_1.useState)(null);
     const { getTableGrid, activeCell, setActiveCell } = (0, useGridCache_1.useGridCache)(tableRef, enabled);
     /**
@@ -67,9 +67,6 @@ function useTableKeyboardNav({ enabled, shouldBlockNavigation: customBlockFn, })
      * Checks if navigation should be blocked based on current focus context.
      */
     const handleTableKeyDown = (0, hooks_1.useEventCallback)((event) => {
-        if (customBlockFn === null || customBlockFn === void 0 ? void 0 : customBlockFn(event)) {
-            return;
-        }
         const action = (0, table_keyboard_1.getNavigationAction)(event);
         if (!action) {
             return;