@tsed/react-formio 3.0.0-rc.14 → 3.0.0-rc.15

package/dist/molecules/table/utils/mapFormToColumns.d.ts

@@ -1,3 +1,7 @@
 import { ColumnDef, ColumnDefResolved } from '@tanstack/react-table';
 import { FormType } from '../../../interfaces';
-export declare function mapFormToColumns<Data = any>(form: FormType, columns?: ColumnDefResolved<Data, any>[]): ColumnDef<Data, any>[];
+export declare function mapFormToColumns<Data = any>({ form, columns, prefix }: {
+    form: FormType;
+    columns?: ColumnDefResolved<Data, any>[];
+    prefix?: string;
+}): ColumnDef<Data, any>[];

package/dist/molecules/table/utils/mapFormToColumns.js

@@ -1,50 +1,66 @@
-import { createColumnHelper as s } from "@tanstack/react-table";
-import { c as p } from "../../../chunks/cloneDeep.js";
-import { g as u } from "../../../chunks/_commonjsHelpers.js";
-import { r as i } from "../../../chunks/get.js";
-import { getComponent as d } from "../../../registries/components.js";
-var f = i();
-const y = /* @__PURE__ */ u(f), C = {
+import { createColumnHelper as f } from "@tanstack/react-table";
+import { c as y } from "../../../chunks/cloneDeep.js";
+import { g as C } from "../../../chunks/_commonjsHelpers.js";
+import { r as g } from "../../../chunks/get.js";
+import { getComponent as b } from "../../../registries/components.js";
+var x = g();
+const h = /* @__PURE__ */ C(x), K = {
   number: "range",
   currency: "range",
   checkbox: "boolean"
-}, b = {
+}, k = {
   date: "date",
   datetime: "date",
   number: "number",
   currency: "currency",
   checkbox: "boolean"
 };
-function P(a, m = []) {
-  const c = s(), r = p(m);
-  return a.components.flatMap((e) => e.type === "tabs" ? e.components?.flatMap((t) => t.components) : [e]).filter((e) => e?.tableView).map((e) => {
-    const t = e, o = r.findIndex(({ accessorKey: l }) => l === `data.${t.key}`);
-    let n = r[o];
-    return n && r.splice(o, 1), c.accessor(`data.${t.key}`, {
+function m(r) {
+  if ("id" in r && typeof r.id == "string")
+    return r.id;
+  if ("accessorKey" in r && typeof r.accessorKey == "string")
+    return r.accessorKey;
+}
+function S({
+  form: r,
+  columns: p = [],
+  prefix: l = "data."
+}) {
+  const d = f(), n = y(p);
+  return [...r.components.flatMap((e) => e.type === "tabs" ? e.components?.flatMap((t) => t.components) : [e]).filter((e) => e?.tableView).map((e) => {
+    const t = e, o = `${l}${t.key}`, a = /* @__PURE__ */ new Set([t.key, o]), i = n.findIndex((u) => {
+      const c = m(u);
+      return c ? a.has(c) : !1;
+    });
+    let s = n[i];
+    return s && n.splice(i, 1), d.accessor(o, {
       header: (t.label || t.title || t.key)?.replace(/:/, ""),
       meta: {
-        type: b[t.type] || t.type,
+        type: k[t.type] || t.type,
         filter: {
-          ...n?.meta?.filter,
-          variant: C[t.type] || "text"
+          ...s?.meta?.filter,
+          variant: K[t.type] || "text"
         },
-        ...n?.meta || {}
+        ...s?.meta || {}
       },
-      ...n || {}
+      ...s || {}
     });
-  }).concat(r).map((e, t) => {
-    const o = d([`Cell.${e.id}`, `Cell.${e.meta?.type}`, "Cell"]);
+  }), ...n].reduce((e, t) => {
+    const o = m(t);
+    return o && e.some((a) => m(a) === o) || e.push(t), e;
+  }, []).map((e, t) => {
+    const o = b([`Cell.${e.id}`, `Cell.${e.meta?.type}`, "Cell"]);
     return {
       ...e,
       meta: {
         ...e?.meta,
-        order: y(e, "meta.order", t * 10)
+        order: h(e, "meta.order", t * 10)
       },
       cell: e.cell || o
     };
   }).sort((e, t) => e.meta.order > t.meta.order ? 1 : -1);
 }
 export {
-  P as mapFormToColumns
+  S as mapFormToColumns
 };
 //# sourceMappingURL=mapFormToColumns.js.map

package/dist/molecules/table/utils/mapFormToColumns.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapFormToColumns.js","sources":["../../../../src/molecules/table/utils/mapFormToColumns.tsx"],"sourcesContent":["import \"../interfaces/extends\";\n\nimport { ColumnDef, ColumnDefResolved, createColumnHelper } from \"@tanstack/react-table\";\nimport cloneDeep from \"lodash/cloneDeep\";\nimport get from \"lodash/get\";\n\nimport type { ComponentType, FormType } from \"../../../interfaces\";\nimport { getComponent } from \"../../../registries/components\";\nimport type { DefaultCell } from \"../components/DefaultCell\";\nimport type { FilterVariants } from \"../filters/Filters.js\";\n\nconst MAP_FILTER_TYPES: Record<string, FilterVariants> = {\n  number: \"range\",\n  currency: \"range\",\n  checkbox: \"boolean\"\n} as const;\n\nconst MAP_TYPES = {\n  date: \"date\",\n  datetime: \"date\",\n  number: \"number\",\n  currency: \"currency\",\n  checkbox: \"boolean\"\n} as const;\n\nexport function mapFormToColumns<Data = any>(form: FormType, columns: ColumnDefResolved<Data, any>[] = []): ColumnDef<Data, any>[] {\n  const columnHelper = createColumnHelper<Data>();\n  const columnsToKeep = cloneDeep(columns);\n\n  const columnsFromComponents = form.components\n    .flatMap((component) => {\n      if (component.type === \"tabs\") {\n        return component.components?.flatMap((subComponent: ComponentType) => subComponent.components);\n      }\n\n      return [component];\n    })\n    .filter((component) => component?.tableView)\n    .map((c) => {\n      const component = c as ComponentType;\n\n      const columnIndex = columnsToKeep.findIndex(({ accessorKey }) => {\n        return accessorKey === `data.${component.key}`;\n      });\n\n      let column = columnsToKeep[columnIndex];\n\n      if (column) {\n        columnsToKeep.splice(columnIndex, 1);\n      }\n\n      return columnHelper.accessor(`data.${component.key}` as any, {\n        header: (component.label || component.title || component.key)?.replace(/:/, \"\"),\n        meta: {\n          type: MAP_TYPES[component.type as keyof typeof MAP_TYPES] || component.type,\n          filter: {\n            ...column?.meta?.filter,\n            variant: MAP_FILTER_TYPES[component.type!] || \"text\"\n          },\n          ...(column?.meta || {})\n        },\n        ...(column || {})\n      });\n    });\n\n  const mergedColumns = columnsFromComponents.concat(columnsToKeep as any[]).map((column, index) => {\n    const Cell = getComponent<typeof DefaultCell>([`Cell.${column.id}`, `Cell.${column.meta?.type}`, \"Cell\"]);\n\n    return {\n      ...column,\n      meta: {\n        ...column?.meta,\n        order: get(column, \"meta.order\", index * 10)\n      },\n      cell: column.cell || Cell\n    };\n  });\n\n  return mergedColumns.sort((a, b) => (a.meta.order > b.meta.order ? 1 : -1)) as ColumnDef<Data, any>[];\n}\n"],"names":["MAP_FILTER_TYPES","MAP_TYPES","mapFormToColumns","form","columns","columnHelper","createColumnHelper","columnsToKeep","cloneDeep","component","subComponent","c","columnIndex","accessorKey","column","index","Cell","getComponent","get","a","b"],"mappings":";;;;;;gCAWMA,IAAmD;AAAA,EACvD,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,UAAU;AACZ,GAEMC,IAAY;AAAA,EAChB,MAAM;AAAA,EACN,UAAU;AAAA,EACV,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,UAAU;AACZ;AAEO,SAASC,EAA6BC,GAAgBC,IAA0C,IAA4B;AACjI,QAAMC,IAAeC,EAAA,GACfC,IAAgBC,EAAUJ,CAAO;AAmDvC,SAjD8BD,EAAK,WAChC,QAAQ,CAACM,MACJA,EAAU,SAAS,SACdA,EAAU,YAAY,QAAQ,CAACC,MAAgCA,EAAa,UAAU,IAGxF,CAACD,CAAS,CAClB,EACA,OAAO,CAACA,MAAcA,GAAW,SAAS,EAC1C,IAAI,CAACE,MAAM;AACV,UAAMF,IAAYE,GAEZC,IAAcL,EAAc,UAAU,CAAC,EAAE,aAAAM,QACtCA,MAAgB,QAAQJ,EAAU,GAAG,EAC7C;AAED,QAAIK,IAASP,EAAcK,CAAW;AAEtC,WAAIE,KACFP,EAAc,OAAOK,GAAa,CAAC,GAG9BP,EAAa,SAAS,QAAQI,EAAU,GAAG,IAAW;AAAA,MAC3D,SAASA,EAAU,SAASA,EAAU,SAASA,EAAU,MAAM,QAAQ,KAAK,EAAE;AAAA,MAC9E,MAAM;AAAA,QACJ,MAAMR,EAAUQ,EAAU,IAA8B,KAAKA,EAAU;AAAA,QACvE,QAAQ;AAAA,UACN,GAAGK,GAAQ,MAAM;AAAA,UACjB,SAASd,EAAiBS,EAAU,IAAK,KAAK;AAAA,QAAA;AAAA,QAEhD,GAAIK,GAAQ,QAAQ,CAAA;AAAA,MAAC;AAAA,MAEvB,GAAIA,KAAU,CAAA;AAAA,IAAC,CAChB;AAAA,EACH,CAAC,EAEyC,OAAOP,CAAsB,EAAE,IAAI,CAACO,GAAQC,MAAU;AAChG,UAAMC,IAAOC,EAAiC,CAAC,QAAQH,EAAO,EAAE,IAAI,QAAQA,EAAO,MAAM,IAAI,IAAI,MAAM,CAAC;AAExG,WAAO;AAAA,MACL,GAAGA;AAAA,MACH,MAAM;AAAA,QACJ,GAAGA,GAAQ;AAAA,QACX,OAAOI,EAAIJ,GAAQ,cAAcC,IAAQ,EAAE;AAAA,MAAA;AAAA,MAE7C,MAAMD,EAAO,QAAQE;AAAA,IAAA;AAAA,EAEzB,CAAC,EAEoB,KAAK,CAACG,GAAGC,MAAOD,EAAE,KAAK,QAAQC,EAAE,KAAK,QAAQ,IAAI,EAAG;AAC5E;"}
+{"version":3,"file":"mapFormToColumns.js","sources":["../../../../src/molecules/table/utils/mapFormToColumns.tsx"],"sourcesContent":["import \"../interfaces/extends\";\n\nimport { ColumnDef, ColumnDefResolved, createColumnHelper } from \"@tanstack/react-table\";\nimport cloneDeep from \"lodash/cloneDeep\";\nimport get from \"lodash/get\";\n\nimport type { ComponentType, FormType } from \"../../../interfaces\";\nimport { getComponent } from \"../../../registries/components\";\nimport type { DefaultCell } from \"../components/DefaultCell\";\nimport type { FilterVariants } from \"../filters/Filters.js\";\n\nconst MAP_FILTER_TYPES: Record<string, FilterVariants> = {\n  number: \"range\",\n  currency: \"range\",\n  checkbox: \"boolean\"\n} as const;\n\nconst MAP_TYPES = {\n  date: \"date\",\n  datetime: \"date\",\n  number: \"number\",\n  currency: \"currency\",\n  checkbox: \"boolean\"\n} as const;\n\nfunction getColumnIdentity<Data>(column: ColumnDef<Data, any> | ColumnDefResolved<Data, any>) {\n  if (\"id\" in column && typeof column.id === \"string\") {\n    return column.id;\n  }\n\n  if (\"accessorKey\" in column && typeof column.accessorKey === \"string\") {\n    return column.accessorKey;\n  }\n\n  return undefined;\n}\n\nexport function mapFormToColumns<Data = any>({\n  form,\n  columns = [],\n  prefix = \"data.\"\n}: {\n  form: FormType;\n  columns?: ColumnDefResolved<Data, any>[];\n  prefix?: string;\n}): ColumnDef<Data, any>[] {\n  const columnHelper = createColumnHelper<Data>();\n  const columnsToKeep = cloneDeep(columns);\n\n  const columnsFromComponents = form.components\n    .flatMap((component) => {\n      if (component.type === \"tabs\") {\n        return component.components?.flatMap((subComponent: ComponentType) => subComponent.components);\n      }\n\n      return [component];\n    })\n    .filter((component) => component?.tableView)\n    .map((c) => {\n      const component = c as ComponentType;\n      const componentColumnKey = `${prefix}${component.key}`;\n      const matchingKeys = new Set([component.key, componentColumnKey]);\n\n      const columnIndex = columnsToKeep.findIndex((column) => {\n        const identity = getColumnIdentity(column);\n\n        return identity ? matchingKeys.has(identity) : false;\n      });\n\n      let column = columnsToKeep[columnIndex];\n\n      if (column) {\n        columnsToKeep.splice(columnIndex, 1);\n      }\n\n      return columnHelper.accessor(componentColumnKey as any, {\n        header: (component.label || component.title || component.key)?.replace(/:/, \"\"),\n        meta: {\n          type: (MAP_TYPES[component.type as keyof typeof MAP_TYPES] || component.type) as any,\n          filter: {\n            ...column?.meta?.filter,\n            variant: MAP_FILTER_TYPES[component.type as keyof typeof MAP_FILTER_TYPES] || \"text\"\n          },\n          ...(column?.meta || {})\n        },\n        ...(column || {})\n      });\n    });\n\n  const dedupedColumns = [...columnsFromComponents, ...(columnsToKeep as any[])].reduce<ColumnDef<Data, any>[]>((acc, column) => {\n    const identity = getColumnIdentity(column);\n\n    if (identity && acc.some((existingColumn) => getColumnIdentity(existingColumn) === identity)) {\n      return acc;\n    }\n\n    acc.push(column);\n    return acc;\n  }, []);\n\n  const mergedColumns = dedupedColumns.map((column, index) => {\n    const Cell = getComponent<typeof DefaultCell>([`Cell.${column.id}`, `Cell.${column.meta?.type}`, \"Cell\"]);\n\n    return {\n      ...column,\n      meta: {\n        ...column?.meta,\n        order: get(column, \"meta.order\", index * 10)\n      },\n      cell: column.cell || Cell\n    };\n  });\n\n  return mergedColumns.sort((a, b) => (a.meta.order > b.meta.order ? 1 : -1)) as ColumnDef<Data, any>[];\n}\n"],"names":["MAP_FILTER_TYPES","MAP_TYPES","getColumnIdentity","column","mapFormToColumns","form","columns","prefix","columnHelper","createColumnHelper","columnsToKeep","cloneDeep","component","subComponent","c","componentColumnKey","matchingKeys","columnIndex","identity","acc","existingColumn","index","Cell","getComponent","get","a","b"],"mappings":";;;;;;gCAWMA,IAAmD;AAAA,EACvD,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,UAAU;AACZ,GAEMC,IAAY;AAAA,EAChB,MAAM;AAAA,EACN,UAAU;AAAA,EACV,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,UAAU;AACZ;AAEA,SAASC,EAAwBC,GAA6D;AAC5F,MAAI,QAAQA,KAAU,OAAOA,EAAO,MAAO;AACzC,WAAOA,EAAO;AAGhB,MAAI,iBAAiBA,KAAU,OAAOA,EAAO,eAAgB;AAC3D,WAAOA,EAAO;AAIlB;AAEO,SAASC,EAA6B;AAAA,EAC3C,MAAAC;AAAA,EACA,SAAAC,IAAU,CAAA;AAAA,EACV,QAAAC,IAAS;AACX,GAI2B;AACzB,QAAMC,IAAeC,EAAA,GACfC,IAAgBC,EAAUL,CAAO;AAkEvC,SAxBuB,CAAC,GAxCMD,EAAK,WAChC,QAAQ,CAACO,MACJA,EAAU,SAAS,SACdA,EAAU,YAAY,QAAQ,CAACC,MAAgCA,EAAa,UAAU,IAGxF,CAACD,CAAS,CAClB,EACA,OAAO,CAACA,MAAcA,GAAW,SAAS,EAC1C,IAAI,CAACE,MAAM;AACV,UAAMF,IAAYE,GACZC,IAAqB,GAAGR,CAAM,GAAGK,EAAU,GAAG,IAC9CI,IAAe,oBAAI,IAAI,CAACJ,EAAU,KAAKG,CAAkB,CAAC,GAE1DE,IAAcP,EAAc,UAAU,CAACP,MAAW;AACtD,YAAMe,IAAWhB,EAAkBC,CAAM;AAEzC,aAAOe,IAAWF,EAAa,IAAIE,CAAQ,IAAI;AAAA,IACjD,CAAC;AAED,QAAIf,IAASO,EAAcO,CAAW;AAEtC,WAAId,KACFO,EAAc,OAAOO,GAAa,CAAC,GAG9BT,EAAa,SAASO,GAA2B;AAAA,MACtD,SAASH,EAAU,SAASA,EAAU,SAASA,EAAU,MAAM,QAAQ,KAAK,EAAE;AAAA,MAC9E,MAAM;AAAA,QACJ,MAAOX,EAAUW,EAAU,IAA8B,KAAKA,EAAU;AAAA,QACxE,QAAQ;AAAA,UACN,GAAGT,GAAQ,MAAM;AAAA,UACjB,SAASH,EAAiBY,EAAU,IAAqC,KAAK;AAAA,QAAA;AAAA,QAEhF,GAAIT,GAAQ,QAAQ,CAAA;AAAA,MAAC;AAAA,MAEvB,GAAIA,KAAU,CAAA;AAAA,IAAC,CAChB;AAAA,EACH,CAAC,GAE+C,GAAIO,CAAuB,EAAE,OAA+B,CAACS,GAAKhB,MAAW;AAC7H,UAAMe,IAAWhB,EAAkBC,CAAM;AAEzC,WAAIe,KAAYC,EAAI,KAAK,CAACC,MAAmBlB,EAAkBkB,CAAc,MAAMF,CAAQ,KAI3FC,EAAI,KAAKhB,CAAM,GACRgB;AAAA,EACT,GAAG,CAAA,CAAE,EAEgC,IAAI,CAAChB,GAAQkB,MAAU;AAC1D,UAAMC,IAAOC,EAAiC,CAAC,QAAQpB,EAAO,EAAE,IAAI,QAAQA,EAAO,MAAM,IAAI,IAAI,MAAM,CAAC;AAExG,WAAO;AAAA,MACL,GAAGA;AAAA,MACH,MAAM;AAAA,QACJ,GAAGA,GAAQ;AAAA,QACX,OAAOqB,EAAIrB,GAAQ,cAAckB,IAAQ,EAAE;AAAA,MAAA;AAAA,MAE7C,MAAMlB,EAAO,QAAQmB;AAAA,IAAA;AAAA,EAEzB,CAAC,EAEoB,KAAK,CAACG,GAAGC,MAAOD,EAAE,KAAK,QAAQC,EAAE,KAAK,QAAQ,IAAI,EAAG;AAC5E;"}

package/dist/organisms/table/submissions/SubmissionsTable.js

@@ -2,7 +2,7 @@ import { jsx as n } from "react/jsx-runtime";
 import { Table as s } from "../../../molecules/table/Table.js";
 import { mapFormToColumns as t } from "../../../molecules/table/utils/mapFormToColumns.js";
 function e({ form: o, ...m }) {
-  const r = o && t(o);
+  const r = o && t({ form: o });
   return /* @__PURE__ */ n(s, { ...m, columns: r });
 }
 export {

package/dist/organisms/table/submissions/SubmissionsTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"SubmissionsTable.js","sources":["../../../../src/organisms/table/submissions/SubmissionsTable.tsx"],"sourcesContent":["import type { FormType, SubmissionType } from \"../../../interfaces\";\nimport type { JSONRecord } from \"../../../interfaces/JSONRecord\";\nimport { Table, type TableProps } from \"../../../molecules/table/Table\";\nimport { mapFormToColumns } from \"../../../molecules/table/utils/mapFormToColumns.js\";\n\nexport type SubmissionsTableProps<Data extends object = JSONRecord> = Omit<TableProps<SubmissionType<Data>>, \"columns\"> & {\n  form?: FormType;\n};\n\nexport function SubmissionsTable<Data extends object = JSONRecord>({ form, ...props }: SubmissionsTableProps<Data>) {\n  const columns: any[] | undefined = form && mapFormToColumns(form);\n\n  return <Table {...(props as any)} columns={columns!} />;\n}\n"],"names":["SubmissionsTable","form","props","columns","mapFormToColumns","jsx","Table"],"mappings":";;;AASO,SAASA,EAAmD,EAAE,MAAAC,GAAM,GAAGC,KAAsC;AAClH,QAAMC,IAA6BF,KAAQG,EAAiBH,CAAI;AAEhE,SAAO,gBAAAI,EAACC,GAAA,EAAO,GAAIJ,GAAe,SAAAC,EAAA,CAAmB;AACvD;"}
+{"version":3,"file":"SubmissionsTable.js","sources":["../../../../src/organisms/table/submissions/SubmissionsTable.tsx"],"sourcesContent":["import type { FormType, SubmissionType } from \"../../../interfaces\";\nimport type { JSONRecord } from \"../../../interfaces/JSONRecord\";\nimport { Table, type TableProps } from \"../../../molecules/table/Table\";\nimport { mapFormToColumns } from \"../../../molecules/table/utils/mapFormToColumns.js\";\n\nexport type SubmissionsTableProps<Data extends object = JSONRecord> = Omit<TableProps<SubmissionType<Data>>, \"columns\"> & {\n  form?: FormType;\n};\n\nexport function SubmissionsTable<Data extends object = JSONRecord>({ form, ...props }: SubmissionsTableProps<Data>) {\n  const columns: any[] | undefined = form && mapFormToColumns({ form: form });\n\n  return <Table {...(props as any)} columns={columns!} />;\n}\n"],"names":["SubmissionsTable","form","props","columns","mapFormToColumns","jsx","Table"],"mappings":";;;AASO,SAASA,EAAmD,EAAE,MAAAC,GAAM,GAAGC,KAAsC;AAClH,QAAMC,IAA6BF,KAAQG,EAAiB,EAAE,MAAAH,GAAY;AAE1E,SAAO,gBAAAI,EAACC,GAAA,EAAO,GAAIJ,GAAe,SAAAC,EAAA,CAAmB;AACvD;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/react-formio",
-  "version": "3.0.0-rc.14",
+  "version": "3.0.0-rc.15",
   "description": "Provide a react formio wrapper. Written in TypeScript.",
   "type": "module",
   "main": "./dist/index.js",
@@ -44,8 +44,8 @@
   },
   "devDependencies": {
     "@tanstack/react-table": ">=8.20.6",
-    "@tsed/tailwind-formio": "3.0.0-rc.14",
-    "@tsed/typescript": "3.0.0-rc.14",
+    "@tsed/tailwind-formio": "3.0.0-rc.15",
+    "@tsed/typescript": "3.0.0-rc.15",
     "microbundle": "0.13.0",
     "vite": "7.1.5",
     "vitest": "3.2.4"

package/src/molecules/table/Table.stories.tsx

@@ -74,7 +74,7 @@ type Story = StoryObj<typeof Table<ProductSubmission>>;
 export const Usage: Story = {
   args: {
     data: formSubmissions as unknown as ProductSubmission[],
-    columns: mapFormToColumns(FormType as any),
+    columns: mapFormToColumns({ form: FormType as any }),
     operations: [
       {
         title: "Edit",
@@ -183,17 +183,20 @@ export const Usage: Story = {
 export const WithFilters: Story = {
   args: {
     data: formSubmissions as unknown as ProductSubmission[],
-    columns: mapFormToColumns(FormType as any, [
-      {
-        accessorKey: "data.id",
-        meta: {
-          filter: {
-            variant: "select",
-            layout: "react"
+    columns: mapFormToColumns({
+      form: FormType as any,
+      columns: [
+        {
+          accessorKey: "data.id",
+          meta: {
+            filter: {
+              variant: "select",
+              layout: "react"
+            }
           }
         }
-      }
-    ]),
+      ]
+    }),
     operations: [
       {
         title: "Edit",
@@ -220,7 +223,7 @@ export const WithFilters: Story = {
 export const WithPaginationOptions: Story = {
   args: {
     data: formSubmissions as unknown as ProductSubmission[],
-    columns: mapFormToColumns(FormType as any),
+    columns: mapFormToColumns({ form: FormType as any }),
     operations: [
       {
         title: "Edit",
@@ -246,67 +249,70 @@ export const WithPaginationOptions: Story = {
 export const WithCustomCell: Story = {
   args: {
     data: formSubmissions as unknown as ProductSubmission[],
-    columns: mapFormToColumns<ProductSubmission>(FormType as any, [
-      {
-        accessorKey: "data.id",
-        meta: {
-          filter: {
-            variant: "select",
-            layout: "react"
+    columns: mapFormToColumns<ProductSubmission>({
+      form: FormType as any,
+      columns: [
+        {
+          accessorKey: "data.id",
+          meta: {
+            filter: {
+              variant: "select",
+              layout: "react"
+            },
+            cellProps: {
+              colSpan: 2
+            }
           },
-          cellProps: {
-            colSpan: 2
+          cell: (context) => {
+            return (
+              <div className='flex space-x-4 align-items-center'>
+                <div className='max-w-[80px]'>
+                  <img className='max-w-[80px] rounded-md' src={context.row.original.data.image} alt={context.row.original.data.label} />
+                </div>
+                <div>
+                  <div className='text-lg text-primary'>{context.row.original.data.label}</div>
+                  <div className='text-xs'>{context.getValue()}</div>
+                </div>
+              </div>
+            );
           }
         },
-        cell: (context) => {
-          return (
-            <div className='flex space-x-4 align-items-center'>
-              <div className='max-w-[80px]'>
-                <img className='max-w-[80px] rounded-md' src={context.row.original.data.image} alt={context.row.original.data.label} />
-              </div>
-              <div>
-                <div className='text-lg text-primary'>{context.row.original.data.label}</div>
-                <div className='text-xs'>{context.getValue()}</div>
-              </div>
-            </div>
-          );
-        }
-      },
-      {
-        accessorKey: "data.label",
-        meta: {
-          hidden: true
-        }
-      },
-      {
-        accessorKey: "data.description",
-        meta: {
-          filter: {
-            variant: "text",
-            disableDatalist: true
+        {
+          accessorKey: "data.label",
+          meta: {
+            hidden: true
           }
-        }
-      },
-      {
-        accessorKey: "data.price",
-        cell: (context) => {
-          const value = context.getValue();
-
-          if (value === undefined) {
-            return "-";
+        },
+        {
+          accessorKey: "data.description",
+          meta: {
+            filter: {
+              variant: "text",
+              disableDatalist: true
+            }
+          }
+        },
+        {
+          accessorKey: "data.price",
+          cell: (context) => {
+            const value = context.getValue();
+
+            if (value === undefined) {
+              return "-";
+            }
+
+            return (
+              <div className='text-right'>
+                {Intl.NumberFormat("fr-FR", {
+                  style: "currency",
+                  currency: context.row.original.data.currency
+                }).format(context.getValue())}
+              </div>
+            );
           }
-
-          return (
-            <div className='text-right'>
-              {Intl.NumberFormat("fr-FR", {
-                style: "currency",
-                currency: context.row.original.data.currency
-              }).format(context.getValue())}
-            </div>
-          );
         }
-      }
-    ]),
+      ]
+    }),
     operations: [
       {
         title: "Edit",

package/src/molecules/table/utils/mapFormToColumns.spec.tsx

@@ -1,9 +1,10 @@
+import { DefaultCellBoolean } from "../components/DefaultBooleanCell";
 import { DefaultCell } from "../components/DefaultCell";
 import { DefaultDateCell } from "../components/DefaultDateCell";
 import { mapFormToColumns } from "./mapFormToColumns";
 
 describe("mapFormToColumns", () => {
-  it("should use DefaultCell for mapped table columns", () => {
+  it("should use DefaultCellBoolean for mapped checkbox table columns", () => {
     const form = {
       components: [
         {
@@ -15,12 +16,13 @@ describe("mapFormToColumns", () => {
       ]
     } as any;
 
-    const [column] = mapFormToColumns(form) as any[];
+    const [column] = mapFormToColumns({ form: form }) as any[];
 
     expect(column.accessorKey).toEqual("data.enabled");
     expect(column.header).toEqual("Enabled");
+    expect(column.meta.type).toEqual("boolean");
     expect(column.meta.filter.variant).toEqual("boolean");
-    expect(column.cell).toBe(DefaultCell);
+    expect(column.cell).toBe(DefaultCellBoolean);
   });
 
   it("should fallback to DefaultCell for kept columns without a cell renderer", () => {
@@ -28,12 +30,45 @@ describe("mapFormToColumns", () => {
       components: []
     } as any;
 
-    const [column] = mapFormToColumns(form, [{ accessorKey: "data.other", header: "Other" } as any]) as any[];
+    const [column] = mapFormToColumns({ form: form, columns: [{ accessorKey: "data.other", header: "Other" } as any] }) as any[];
 
     expect(column.accessorKey).toEqual("data.other");
     expect(column.cell).toBe(DefaultCell);
   });
 
+  it("should merge a kept column matched by component key", () => {
+    const form = {
+      components: [
+        {
+          type: "textfield",
+          key: "name",
+          label: "Name:",
+          tableView: true
+        }
+      ]
+    } as any;
+
+    const [column] = mapFormToColumns({
+      form: form,
+      columns: [
+        {
+          id: "name",
+          header: "Custom name",
+          meta: {
+            order: 5,
+            filter: {
+              variant: "text"
+            }
+          }
+        } as any
+      ]
+    }) as any[];
+
+    expect(column.accessorKey).toEqual("data.name");
+    expect(column.header).toEqual("Custom name");
+    expect(column.meta.order).toEqual(5);
+  });
+
   it("should use DefaultDateCell for mapped datetime columns", () => {
     const form = {
       components: [
@@ -46,10 +81,36 @@ describe("mapFormToColumns", () => {
       ]
     } as any;
 
-    const [column] = mapFormToColumns(form) as any[];
+    const [column] = mapFormToColumns({ form: form }) as any[];
 
     expect(column.accessorKey).toEqual("data.createdAt");
     expect(column.meta.type).toEqual("date");
     expect(column.cell).toBe(DefaultDateCell);
   });
+
+  it("should dedupe columns when a kept column matches a mapped accessor key", () => {
+    const form = {
+      components: [
+        {
+          type: "textfield",
+          key: "email",
+          label: "Email:",
+          tableView: true
+        }
+      ]
+    } as any;
+
+    const columns = mapFormToColumns({
+      form: form,
+      columns: [
+        {
+          accessorKey: "data.email",
+          header: "Email"
+        } as any
+      ]
+    }) as any[];
+
+    expect(columns).toHaveLength(1);
+    expect(columns[0].accessorKey).toEqual("data.email");
+  });
 });

package/src/molecules/table/utils/mapFormToColumns.tsx

@@ -23,7 +23,27 @@ const MAP_TYPES = {
   checkbox: "boolean"
 } as const;
 
-export function mapFormToColumns<Data = any>(form: FormType, columns: ColumnDefResolved<Data, any>[] = []): ColumnDef<Data, any>[] {
+function getColumnIdentity<Data>(column: ColumnDef<Data, any> | ColumnDefResolved<Data, any>) {
+  if ("id" in column && typeof column.id === "string") {
+    return column.id;
+  }
+
+  if ("accessorKey" in column && typeof column.accessorKey === "string") {
+    return column.accessorKey;
+  }
+
+  return undefined;
+}
+
+export function mapFormToColumns<Data = any>({
+  form,
+  columns = [],
+  prefix = "data."
+}: {
+  form: FormType;
+  columns?: ColumnDefResolved<Data, any>[];
+  prefix?: string;
+}): ColumnDef<Data, any>[] {
   const columnHelper = createColumnHelper<Data>();
   const columnsToKeep = cloneDeep(columns);
 
@@ -38,9 +58,13 @@ export function mapFormToColumns<Data = any>(form: FormType, columns: ColumnDefR
     .filter((component) => component?.tableView)
     .map((c) => {
       const component = c as ComponentType;
+      const componentColumnKey = `${prefix}${component.key}`;
+      const matchingKeys = new Set([component.key, componentColumnKey]);
 
-      const columnIndex = columnsToKeep.findIndex(({ accessorKey }) => {
-        return accessorKey === `data.${component.key}`;
+      const columnIndex = columnsToKeep.findIndex((column) => {
+        const identity = getColumnIdentity(column);
+
+        return identity ? matchingKeys.has(identity) : false;
       });
 
       let column = columnsToKeep[columnIndex];
@@ -49,13 +73,13 @@ export function mapFormToColumns<Data = any>(form: FormType, columns: ColumnDefR
         columnsToKeep.splice(columnIndex, 1);
       }
 
-      return columnHelper.accessor(`data.${component.key}` as any, {
+      return columnHelper.accessor(componentColumnKey as any, {
         header: (component.label || component.title || component.key)?.replace(/:/, ""),
         meta: {
-          type: MAP_TYPES[component.type as keyof typeof MAP_TYPES] || component.type,
+          type: (MAP_TYPES[component.type as keyof typeof MAP_TYPES] || component.type) as any,
           filter: {
             ...column?.meta?.filter,
-            variant: MAP_FILTER_TYPES[component.type!] || "text"
+            variant: MAP_FILTER_TYPES[component.type as keyof typeof MAP_FILTER_TYPES] || "text"
           },
           ...(column?.meta || {})
         },
@@ -63,7 +87,18 @@ export function mapFormToColumns<Data = any>(form: FormType, columns: ColumnDefR
       });
     });
 
-  const mergedColumns = columnsFromComponents.concat(columnsToKeep as any[]).map((column, index) => {
+  const dedupedColumns = [...columnsFromComponents, ...(columnsToKeep as any[])].reduce<ColumnDef<Data, any>[]>((acc, column) => {
+    const identity = getColumnIdentity(column);
+
+    if (identity && acc.some((existingColumn) => getColumnIdentity(existingColumn) === identity)) {
+      return acc;
+    }
+
+    acc.push(column);
+    return acc;
+  }, []);
+
+  const mergedColumns = dedupedColumns.map((column, index) => {
     const Cell = getComponent<typeof DefaultCell>([`Cell.${column.id}`, `Cell.${column.meta?.type}`, "Cell"]);
 
     return {

package/src/organisms/table/submissions/SubmissionsTable.tsx

@@ -8,7 +8,7 @@ export type SubmissionsTableProps<Data extends object = JSONRecord> = Omit<Table
 };
 
 export function SubmissionsTable<Data extends object = JSONRecord>({ form, ...props }: SubmissionsTableProps<Data>) {
-  const columns: any[] | undefined = form && mapFormToColumns(form);
+  const columns: any[] | undefined = form && mapFormToColumns({ form: form });
 
   return <Table {...(props as any)} columns={columns!} />;
 }