laif-ds 0.2.42 → 0.2.43

package/dist/components/ui/tables/data-table/data-table.js

@@ -1,21 +1,21 @@
 "use client";
 import { jsx as c, jsxs as ae } from "react/jsx-runtime";
-import { useReactTable as Ye } from "../../../../node_modules/@tanstack/react-table/build/lib/index.js";
-import { cn as Ze } from "../../../../lib/utils.js";
-import { useRef as p, useState as u, useEffect as N, useMemo as C } from "react";
-import { Button as $e } from "../../button.js";
+import { useReactTable as $e } from "../../../../node_modules/@tanstack/react-table/build/lib/index.js";
+import { cn as et } from "../../../../lib/utils.js";
+import { useRef as f, useState as u, useEffect as N, useMemo as C } from "react";
+import { Button as tt } from "../../button.js";
 import { Checkbox as ye } from "../../checkbox.js";
-import { DataTableBody as et } from "./components/data-table-body.js";
-import { DataTableColumnVisibility as tt } from "./components/data-table-column-visibility.js";
-import { DataTableFilters as nt } from "./components/data-table-filters.js";
-import { DataTablePaginationComponent as rt } from "./components/data-table-pagination.js";
-import { DataTableSearchbar as ot } from "./components/data-table-searchbar.js";
-import { DataTableSortingComponent as at } from "./components/data-table-sorting.js";
-import { applySearchFilterToRow as Re, debounce as it, buildSearchFilter as st, updatePageSizeFromContainer as lt, createDefaultAdvancedFilter as ct, createBadgeFilterFromHeader as ut } from "./data-table.service.js";
-import { DataTableActionsComponent as dt } from "./components/data-table-actions.js";
-import { defaultDataTableI18n as mt } from "./data-table-i18n.js";
-import { getPaginationRowModel as gt, getFilteredRowModel as pt, getSortedRowModel as ft, getCoreRowModel as ht } from "../../../../node_modules/@tanstack/table-core/build/lib/index.js";
-function Nt({
+import { DataTableBody as nt } from "./components/data-table-body.js";
+import { DataTableColumnVisibility as rt } from "./components/data-table-column-visibility.js";
+import { DataTableFilters as ot } from "./components/data-table-filters.js";
+import { DataTablePaginationComponent as at } from "./components/data-table-pagination.js";
+import { DataTableSearchbar as it } from "./components/data-table-searchbar.js";
+import { DataTableSortingComponent as st } from "./components/data-table-sorting.js";
+import { applySearchFilterToRow as Re, debounce as lt, buildSearchFilter as ct, updatePageSizeFromContainer as ut, createDefaultAdvancedFilter as dt, createBadgeFilterFromHeader as mt } from "./data-table.service.js";
+import { DataTableActionsComponent as gt } from "./components/data-table-actions.js";
+import { defaultDataTableI18n as pt } from "./data-table-i18n.js";
+import { getPaginationRowModel as ft, getFilteredRowModel as ht, getSortedRowModel as bt, getCoreRowModel as Ft } from "../../../../node_modules/@tanstack/table-core/build/lib/index.js";
+function Gt({
   columns: Q,
   data: P,
   loading: B = !1,
@@ -26,9 +26,11 @@ function Nt({
   checkable: V = !1,
   onCheckedRowsChange: Y,
   actions: ze = [],
-  hidePagination: ve = !1,
-  hideActionsRow: Be = !1,
-  i18n: f = mt,
+  customComponentsLeft: ve,
+  customComponentsRight: Be,
+  hidePagination: Me = !1,
+  hideActionsRow: _e = !1,
+  i18n: h = pt,
   maxSortedColumns: se = 2,
   initialState: m,
   // New mode-based API
@@ -36,10 +38,10 @@ function Nt({
   serverConfig: d,
   disableAutoPageSize: F = !1
 }) {
-  const q = p(null), le = (e) => !e || !e.sort_by || !e.sort_order ? [] : e.sort_by.map((t, o) => ({
+  const q = f(null), le = (e) => !e || !e.sort_by || !e.sort_order ? [] : e.sort_by.map((t, o) => ({
     id: t,
     desc: e.sort_order[o] === "desc"
-  })), Me = (e) => {
+  })), De = (e) => {
     const t = le(e?.sorting), o = {
       sort_by: t.map((l) => l.id),
       sort_order: t.map((l) => l.desc ? "desc" : "asc")
@@ -49,11 +51,11 @@ function Nt({
       computedFilter: e?.computedFilter
       // Use provided value or undefined
     };
-  }, [O, _e] = u(() => le(m?.sorting)), [De] = u([]), [He, Ne] = u({}), [h, Oe] = u(() => m?.filters?.searchbarFilter), [E, G] = u(() => m?.pagination ?? { pageIndex: 0, pageSize: 10 }), ce = p(d);
+  }, [O, He] = u(() => le(m?.sorting)), [Ne] = u([]), [Oe, Ge] = u({}), [g, Le] = u(() => m?.filters?.searchbarFilter), [E, G] = u(() => m?.pagination ?? { pageIndex: 0, pageSize: 10 }), ce = f(d);
   ce.current = d;
-  const W = p(d?.onStateChange);
+  const W = f(d?.onStateChange);
   W.current = d?.onStateChange;
-  const J = p(null), M = p(null), Ge = p(0), ue = p(!1), de = p(null), K = p({}), me = p(null), Z = p(B);
+  const J = f(null), M = f(null), ke = f(0), ue = f(!1), de = f(null), K = f({}), me = f(null), Z = f(B);
   Z.current = B;
   const L = (e) => {
     e.computedFilter && (K.current.computedFilter = e.computedFilter), e.computedSorting && (K.current.computedSorting = e.computedSorting);
@@ -64,7 +66,7 @@ function Nt({
       computedSorting: e.computedSorting || K.current.computedSorting
     };
     J.current = t, M.current && clearTimeout(M.current), M.current = setTimeout(() => {
-      J.current && W.current && (Ge.current = Date.now(), W.current(J.current), J.current = null, M.current = null);
+      J.current && W.current && (ke.current = Date.now(), W.current(J.current), J.current = null, M.current = null);
     }, 400);
   };
   N(() => {
@@ -76,7 +78,7 @@ function Nt({
     };
   }, []);
   const [n, k] = u(() => {
-    const { computedSorting: e, computedFilter: t } = Me(m);
+    const { computedSorting: e, computedFilter: t } = De(m);
     return {
       pagination: m?.pagination ?? { pageIndex: 0, pageSize: 10 },
       sorting: m?.sorting,
@@ -86,9 +88,9 @@ function Nt({
     };
   });
   a && !d && console.warn("DataTable: Server mode requires serverConfig");
-  const [Le, ge] = u(0), [ke, pe] = u(0), [Ae, je] = u({}), fe = ie ? Te : Ae, Pe = ie || je, [I, $] = u(
+  const [Ae, ge] = u(0), [je, pe] = u(0), [Pe, Ve] = u({}), fe = ie ? Te : Pe, qe = ie || Ve, [w, $] = u(
     () => m?.filters?.filterBadges ?? []
-  ), [S, ee] = u(() => m?.filters?.advancedFilterBadge), [U, Ve] = u(""), [he, be] = u([]), Fe = C(() => V ? [
+  ), [y, ee] = u(() => m?.filters?.advancedFilterBadge), [U, Ee] = u(""), [he, be] = u([]), Fe = C(() => V ? [
     {
       id: "data-table-integrated-checkbox-column",
       size: 24,
@@ -105,7 +107,7 @@ function Nt({
               className: "cursor-pointer",
               checked: e.getIsAllPageRowsSelected(),
               onCheckedChange: (t) => e.toggleAllPageRowsSelected(!!t),
-              "aria-label": f.selectAll
+              "aria-label": h.selectAll
             }
           )
         }
@@ -121,7 +123,7 @@ function Nt({
               className: "cursor-pointer",
               checked: e.getIsSelected(),
               onCheckedChange: (t) => e.toggleSelected(!!t),
-              "aria-label": f.selectRow
+              "aria-label": h.selectRow
             }
           )
         }
@@ -148,28 +150,28 @@ function Nt({
   }, [T]);
   const _ = C(() => T.filter(
     (e) => !!e?.meta?.searchable
-  ), [T]), z = C(() => _.map((e) => e.id ?? e.accessorKey).filter(Boolean), [_]), [X, qe] = u(() => m?.computedFilter ?? {}), Ee = {
+  ), [T]), z = C(() => _.map((e) => e.accessorKey ?? e.id).filter(Boolean), [_]), [X, We] = u(() => m?.computedFilter ?? {}), Je = {
     data: C(() => a || Object.keys(X).length === 0 ? P : P.filter((e) => Re({
       original: e,
       getValue: (o) => e[o]
     }, X)), [P, X, a]),
     columns: T,
-    getCoreRowModel: ht(),
+    getCoreRowModel: Ft(),
     onSortingChange: (e) => {
       const t = typeof e == "function" ? e(O) : e;
-      _e(t);
+      He(t);
     },
-    getSortedRowModel: ft(),
+    getSortedRowModel: bt(),
     manualSorting: a,
-    onColumnVisibilityChange: Ne,
-    onRowSelectionChange: Pe,
+    onColumnVisibilityChange: Ge,
+    onRowSelectionChange: qe,
     onColumnOrderChange: be,
-    getFilteredRowModel: pt(),
+    getFilteredRowModel: ht(),
     manualFiltering: a,
     globalFilterFn: (e, t, o) => a || !o ? !0 : (z ?? []).some((l) => {
       const s = e.getValue(l);
       return Array.isArray(s) ? s.some(
-        (g) => String(g).toLowerCase().includes(o.toLowerCase())
+        (p) => String(p).toLowerCase().includes(o.toLowerCase())
       ) : String(s).toLowerCase().includes(o.toLowerCase());
     }) ?? !1,
     filterFns: {
@@ -202,21 +204,21 @@ function Nt({
           } : e
         );
     },
-    getPaginationRowModel: gt(),
+    getPaginationRowModel: ft(),
     manualPagination: a,
-    pageCount: a && B ? ke : Le,
+    pageCount: a && B ? je : Ae,
     state: {
       sorting: O,
-      columnFilters: De,
-      columnVisibility: He,
+      columnFilters: Ne,
+      columnVisibility: Oe,
       rowSelection: fe,
-      globalFilter: h,
+      globalFilter: g,
       pagination: a ? n.pagination : E,
       columnOrder: he
     },
     // Prevent implicit resets on data/columns changes so filters/sorting persist
     autoResetPageIndex: !1
-  }, i = Ye(Ee), te = i.getFilteredRowModel();
+  }, i = $e(Je), te = i.getFilteredRowModel();
   N(() => {
     if (a && d) {
       const e = Math.ceil(
@@ -239,26 +241,26 @@ function Nt({
   ]), N(() => {
     if (F) return;
     const e = () => {
-      const w = q.current;
-      if (!w) return;
-      const D = w.querySelector(
+      const R = q.current;
+      if (!R) return;
+      const D = R.querySelector(
         "thead tr"
-      ), r = w.querySelector(
+      ), r = R.querySelector(
         "tbody tr"
-      ), y = D?.getBoundingClientRect().height ?? 40;
+      ), I = D?.getBoundingClientRect().height ?? 40;
       if (!!!r?.querySelector("td")) return;
       const v = r?.getBoundingClientRect().height ?? 32.5;
-      lt(w, {
+      ut(R, {
         rowHeight: v,
-        headerHeight: y,
-        onPageChange: a ? (R, x) => {
+        headerHeight: I,
+        onPageChange: a ? (S, x) => {
           if (d && ue.current) {
             const b = F ? {
               ...n.pagination,
-              pageIndex: R
+              pageIndex: S
             } : {
               ...n.pagination,
-              pageIndex: R,
+              pageIndex: S,
               pageSize: x
             }, re = b.pageIndex === n.pagination.pageIndex, oe = F || b.pageSize === n.pagination.pageSize;
             if (re && oe)
@@ -272,13 +274,13 @@ function Nt({
             };
             k(j), Z.current || L(j);
           }
-        } : (R, x) => {
+        } : (S, x) => {
           G(
-            (b) => F ? { ...b, pageIndex: R } : { pageIndex: R, pageSize: x }
+            (b) => F ? { ...b, pageIndex: S } : { pageIndex: S, pageSize: x }
           );
         },
-        setPagination: (R) => {
-          const x = typeof R == "function" ? R(n.pagination) : R;
+        setPagination: (S) => {
+          const x = typeof S == "function" ? S(n.pagination) : S;
           if (a && d) {
             const b = F ? {
               ...n.pagination,
@@ -307,7 +309,7 @@ function Nt({
             );
         }
       });
-    }, t = it(() => {
+    }, t = lt(() => {
       requestAnimationFrame(() => {
         e();
       });
@@ -319,14 +321,14 @@ function Nt({
     });
     const o = setTimeout(e, 200), l = document.fonts;
     l && typeof l.ready?.then == "function" && l.ready.then(() => e()), window.addEventListener("resize", t);
-    const s = q.current, g = typeof ResizeObserver < "u" ? new ResizeObserver((w) => {
-      const D = w[0];
+    const s = q.current, p = typeof ResizeObserver < "u" ? new ResizeObserver((R) => {
+      const D = R[0];
       if (!D) return;
-      const r = D.contentRect.height, y = me.current;
-      (y === null || Math.abs(r - y) > 0.5) && (me.current = r, t());
+      const r = D.contentRect.height, I = me.current;
+      (I === null || Math.abs(r - I) > 0.5) && (me.current = r, t());
     }) : null;
-    return s && g && g.observe(s), () => {
-      window.removeEventListener("resize", t), clearTimeout(o), g && g.disconnect(), clearTimeout(o);
+    return s && p && p.observe(s), () => {
+      window.removeEventListener("resize", t), clearTimeout(o), p && p.disconnect(), clearTimeout(o);
     };
   }, [
     a,
@@ -340,55 +342,55 @@ function Nt({
       Y(e);
     }
   }, [i, Y, V, fe]);
-  const We = C(() => {
+  const Ke = C(() => {
     const e = i.getHeaderGroups()[0], t = e ? e.headers : [];
-    return (i.getState().sorting || []).map((s) => t.find((g) => g.column.id === s.id)).filter(Boolean);
+    return (i.getState().sorting || []).map((s) => t.find((p) => p.column.id === s.id)).filter(Boolean);
   }, [
     i.getHeaderGroups,
     i.getState().sorting,
     T
-  ]), ne = C(() => i.getHeaderGroups()[0].headers.filter((e) => e.column.columnDef.meta?.sortable), [i.getHeaderGroups, T]), A = C(() => i.getHeaderGroups()[0].headers.filter((e) => e.column.columnDef.meta?.filterable), [i.getHeaderGroups, T]), Je = C(() => U ? A.filter((e) => (e.column.columnDef.header?.toString().toLowerCase() || "").includes(U.toLowerCase())) : A, [A, U]), xe = (e) => {
-    $((t) => [...t, ut(e)]);
-  }, Ke = () => {
-    ee(ct());
-  }, Ue = C(() => I.sort((e, t) => e.value === void 0 || e.value === "" ? 1 : t.value === void 0 || t.value === "" ? -1 : 1), [I]), Ce = p({
+  ]), ne = C(() => i.getHeaderGroups()[0].headers.filter((e) => e.column.columnDef.meta?.sortable), [i.getHeaderGroups, T]), A = C(() => i.getHeaderGroups()[0].headers.filter((e) => e.column.columnDef.meta?.filterable), [i.getHeaderGroups, T]), Ue = C(() => U ? A.filter((e) => (e.column.columnDef.header?.toString().toLowerCase() || "").includes(U.toLowerCase())) : A, [A, U]), xe = (e) => {
+    $((t) => [...t, mt(e)]);
+  }, Xe = () => {
+    ee(dt());
+  }, Qe = C(() => w.sort((e, t) => e.value === void 0 || e.value === "" ? 1 : t.value === void 0 || t.value === "" ? -1 : 1), [w]), Ce = f({
     filterBadges: [],
     advancedFilterBadge: void 0,
     searchbarGlobalFilter: void 0
   });
   N(() => {
-    const e = st(
-      I,
-      S ?? void 0
-    ), t = h && z.length > 0 ? z.length === 1 ? (() => {
+    const e = ct(
+      w,
+      y ?? void 0
+    ), t = g && z.length > 0 ? z.length === 1 ? (() => {
       const r = z[0], H = _.find(
-        (v) => (v.id ?? v.accessorKey) === r
+        (v) => (v.accessorKey ?? v.id) === r
       )?.meta?.type;
       return H === "list_multi_select" || H === "list_single_select" ? {
         [r]: {
           operator: "array_overlap",
-          value: [h]
+          value: [g]
         }
       } : {
         [r]: {
           operator: "like",
-          value: h
+          value: g
         }
       };
     })() : {
       _or: z.map((r) => {
         const H = _.find(
-          (v) => (v.id ?? v.accessorKey) === r
+          (v) => (v.accessorKey ?? v.id) === r
         )?.meta?.type;
         return H === "list_multi_select" || H === "list_single_select" ? {
           [r]: {
             operator: "array_overlap",
-            value: [h]
+            value: [g]
           }
         } : {
           [r]: {
             operator: "like",
-            value: h
+            value: g
           }
         };
       })
@@ -398,94 +400,96 @@ function Nt({
     ], l = o.length === 0 ? {} : o.length === 1 ? o[0] : { _and: o }, s = {
       sort_by: O.map((r) => r.id),
       sort_order: O.map((r) => r.desc ? "desc" : "asc")
-    }, g = Ce.current, w = JSON.stringify(I) !== JSON.stringify(g.filterBadges) || JSON.stringify(S) !== JSON.stringify(g.advancedFilterBadge) || h !== g.searchbarGlobalFilter;
+    }, p = Ce.current, R = JSON.stringify(w) !== JSON.stringify(p.filterBadges) || JSON.stringify(y) !== JSON.stringify(p.advancedFilterBadge) || g !== p.searchbarGlobalFilter;
     Ce.current = {
-      filterBadges: [...I],
-      advancedFilterBadge: S ? { ...S } : void 0,
-      searchbarGlobalFilter: h
+      filterBadges: [...w],
+      advancedFilterBadge: y ? { ...y } : void 0,
+      searchbarGlobalFilter: g
     };
     const D = ce.current;
-    if (qe(l), a && W.current && D) {
+    if (We(l), a && W.current && D) {
       const r = {
         ...n,
         computedFilter: l,
         // Emit only computedSorting. Use empty arrays to signal "no sorting" when cleared.
         computedSorting: s,
         filters: {
-          filterBadges: I,
-          advancedFilterBadge: S,
-          searchbarFilter: h
+          filterBadges: w,
+          advancedFilterBadge: y,
+          searchbarFilter: g
         },
         pagination: {
           ...n.pagination,
           // Only reset pageIndex to 0 when filters actually changed, not when just sorting changed
-          pageIndex: w ? 0 : n.pagination.pageIndex
+          pageIndex: R ? 0 : n.pagination.pageIndex
         }
       };
       k(r);
-      const y = JSON.stringify({
+      const I = JSON.stringify({
         computedFilter: r.computedFilter,
         computedSorting: r.computedSorting,
         filters: r.filters,
         pagination: r.pagination
       });
-      de.current !== y && (de.current = y, L(r));
+      de.current !== I && (de.current = I, L(r));
     } else
-      w && G((r) => ({
+      R && G((r) => ({
         ...r,
         pageIndex: 0
       }));
   }, [
-    I,
-    S,
-    h,
+    w,
+    y,
+    g,
     z,
     _,
     O,
     a
   ]);
-  const we = i.getAllLeafColumns(), Xe = we.filter((e) => e.getIsVisible()), Qe = we.filter((e) => !e.getIsVisible());
+  const we = i.getAllLeafColumns(), Ye = we.filter((e) => e.getIsVisible()), Ze = we.filter((e) => !e.getIsVisible());
   return /* @__PURE__ */ ae(
     "div",
     {
-      className: Ze(
+      className: et(
         "flex h-full max-h-full min-h-[250px] w-full max-w-full min-w-0 flex-col gap-2",
         Se
       ),
       children: [
-        !Be && /* @__PURE__ */ ae("div", { className: "flex w-full items-center justify-between gap-1", children: [
+        !_e && /* @__PURE__ */ ae("div", { className: "flex w-full items-center justify-between gap-1", children: [
           /* @__PURE__ */ ae("div", { className: "flex min-w-0 flex-1 items-center gap-1 overflow-x-auto", children: [
             ne.length > 0 && /* @__PURE__ */ c(
-              at,
+              st,
               {
                 table: i,
-                sortedColumns: We,
+                sortedColumns: Ke,
                 sortableColumns: ne,
-                i18n: f,
+                i18n: h,
                 maxSortedColumns: se
               }
             ),
             ne.length > 0 && A.length > 0 && /* @__PURE__ */ c("div", { className: "border-d-border h-4 min-h-4 w-[1px] border-r" }),
+            ve,
             /* @__PURE__ */ c(
-              nt,
+              ot,
               {
-                advancedFilterBadge: S,
+                advancedFilterBadge: y,
                 setAdvancedFilterBadge: ee,
                 filterableColumns: A,
-                sortedFilterBadges: Ue,
+                sortedFilterBadges: Qe,
                 setFilterBadges: $,
                 filterSearch: U,
-                setFilterSearch: Ve,
-                filteredColumns: Je,
+                setFilterSearch: Ee,
+                filteredColumns: Ue,
                 handleAddFilter: xe,
-                handleAddAdvancedFilter: Ke,
-                i18n: f
+                handleAddAdvancedFilter: Xe,
+                i18n: h
               }
             )
           ] }),
           /* @__PURE__ */ c("div", { className: "border-d-border h-4 min-h-4 w-[1px] border-r" }),
-          (I.length || S) && /* @__PURE__ */ c(
-            $e,
+          Be,
+          (w.length || y) && /* @__PURE__ */ c(
+            tt,
             {
               className: "h-6 text-xs",
               iconLeft: "FunnelX",
@@ -494,49 +498,52 @@ function Nt({
               onClick: () => {
                 $([]), ee(void 0);
               },
-              children: f.reset
+              children: h.reset
             }
           ),
           z.length > 0 && /* @__PURE__ */ c(
-            ot,
+            it,
             {
               debounceMs: 300,
-              onSearch: Oe,
-              i18n: f,
-              initialValue: h ?? "",
+              onSearch: Le,
+              i18n: h,
+              initialValue: g ?? "",
               searchableColumnsHeaders: _.map(
                 (e) => e.header ? e.header.toString() : e.id?.toString() ?? "-"
               )
             }
           ),
           /* @__PURE__ */ c(
-            tt,
+            rt,
             {
               table: i,
-              visibleColumns: Xe,
-              hiddenColumns: Qe,
-              i18n: f
+              visibleColumns: Ye,
+              hiddenColumns: Ze,
+              i18n: h
             }
           ),
-          /* @__PURE__ */ c(dt, { actions: ze, i18n: f })
+          /* @__PURE__ */ c(gt, { actions: ze, i18n: h })
         ] }),
         /* @__PURE__ */ c(
-          et,
+          nt,
           {
             table: i,
             tableContainerRef: q,
             loading: B,
             data: P,
             emptyComponent: Ie,
-            notFoundMessage: f?.notFoundMessage ?? "N/A",
+            notFoundMessage: h?.notFoundMessage ?? "N/A",
             onAddFilter: xe,
             maxSortedColumns: se,
-            i18n: f,
-            isServerSide: a
+            i18n: h,
+            isServerSide: a,
+            filterBadges: w,
+            advancedFilterBadge: y,
+            searchbarGlobalFilter: g
           }
         ),
-        !ve && /* @__PURE__ */ c(
-          rt,
+        !Me && /* @__PURE__ */ c(
+          at,
           {
             table: i,
             isServerSide: a,
@@ -546,7 +553,7 @@ function Nt({
               k(e), L(e);
             } : void 0,
             totalItems: d?.totalItems,
-            i18n: f
+            i18n: h
           }
         )
       ]
@@ -554,5 +561,5 @@ function Nt({
   );
 }
 export {
-  Nt as DataTable
+  Gt as DataTable
 };

package/dist/components/ui/tables/data-table/data-table.service.js

@@ -1,7 +1,7 @@
 "use client";
-import { getListMultiSelectFilterOptions as v, getListSingleSelectFilterOptions as D, getDateTimeFilterOptions as F, getDateFilterOptions as A, getBooleanFilterOptions as b, getNumberFilterOptions as T, getStringFilterOptions as q } from "./data-table-constants.js";
+import { getListMultiSelectFilterOptions as v, getListSingleSelectFilterOptions as D, getDateTimeFilterOptions as A, getDateFilterOptions as F, getBooleanFilterOptions as b, getNumberFilterOptions as T, getStringFilterOptions as q } from "./data-table-constants.js";
 import { defaultDataTableI18n as m } from "./data-table-i18n.js";
-function L(e, a = "string") {
+function O(e, a = "string") {
   const t = (s) => {
     switch (s) {
       case "string":
@@ -11,9 +11,9 @@ function L(e, a = "string") {
       case "boolean":
         return b(m)?.[0]?.value ?? "eq";
       case "date":
-        return A(m)?.[0]?.value ?? "eq";
+        return F(m)?.[0]?.value ?? "eq";
       case "datetime":
-        return F(m)?.[0]?.value ?? "date_time_before";
+        return A(m)?.[0]?.value ?? "date_time_before";
       case "list_single_select":
         return D(m)?.[0]?.value ?? "array_overlap";
       case "list_multi_select":
@@ -26,6 +26,7 @@ function L(e, a = "string") {
     id: crypto.randomUUID(),
     columnId: e?.id || "",
     columnLabel: e?.column.columnDef.header?.toString() || "",
+    columnAccessorKey: (e?.column.columnDef?.accessorKey ?? e?.id) || "",
     columnType: e?.column.columnDef.meta?.type || a,
     operator: t(
       e?.column.columnDef.meta?.type
@@ -33,7 +34,7 @@ function L(e, a = "string") {
     listOptions: e?.column.columnDef.meta?.listOptions
   };
 }
-function O() {
+function I() {
   const e = () => crypto.randomUUID();
   return {
     id: e(),
@@ -44,6 +45,7 @@ function O() {
         {
           id: e(),
           columnId: "",
+          columnAccessorKey: "",
           columnLabel: "",
           columnType: "string",
           operator: "eq",
@@ -58,7 +60,7 @@ function k(e, a) {
   const t = e.filter((n) => n.operator === "eq_null" || n.operator === "n_eq_null" ? !0 : n.value === void 0 || n.value === "" ? !1 : n.columnType === "list_multi_select" ? (Array.isArray(n.value) ? n.value.filter((l) => l !== void 0) : [n.value].filter((l) => l !== void 0)).length > 0 : !0), u = a ? ((n) => {
     const p = (l) => {
       const _ = l.conditions.filter((o) => !o.columnId || !o.operator ? !1 : o.operator === "eq_null" || o.operator === "n_eq_null" ? !0 : o.value === void 0 ? !1 : o.columnType === "list_multi_select" ? (Array.isArray(o.value) ? o.value.filter((y) => y !== void 0) : [o.value].filter((y) => y !== void 0)).length > 0 : !0).map((o) => ({
-        [o.columnId]: {
+        [o.columnAccessorKey]: {
           operator: o.operator,
           value: o.operator === "eq_null" || o.operator === "n_eq_null" ? "" : o.columnType === "list_single_select" ? Array.isArray(o.value) ? o.value.filter((f) => f !== void 0) : [o.value].filter((f) => f !== void 0) : o.value
         }
@@ -71,7 +73,7 @@ function k(e, a) {
     return p(n.rootGroup);
   })(a) : null, c = t.map(
     (n) => ({
-      [n.columnId]: {
+      [n.columnAccessorKey]: {
         operator: n.operator,
         value: n.operator === "eq_null" || n.operator === "n_eq_null" ? "" : n.columnType === "list_single_select" ? Array.isArray(n.value) ? n.value.filter((p) => p !== void 0) : [n.value].filter((p) => p !== void 0) : n.value ?? ""
       }
@@ -246,8 +248,8 @@ export {
   C as applyClientSideFilter,
   h as applySearchFilterToRow,
   k as buildSearchFilter,
-  L as createBadgeFilterFromHeader,
-  O as createDefaultAdvancedFilter,
+  O as createBadgeFilterFromHeader,
+  I as createDefaultAdvancedFilter,
   M as debounce,
   x as getIconFromColumnType,
   H as updatePageSizeFromContainer