@payloadcms/ui 3.0.0-canary.92e4997 → 3.0.0-canary.93a7bbd

package/dist/elements/TableColumns/buildColumnState.js

@@ -1,23 +1,24 @@
-import { FieldLabel } from '@payloadcms/ui/forms/FieldLabel';
+'use client';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { DefaultCell } from '@payloadcms/ui';
 import React from 'react';
+import { FieldLabel } from '../../fields/FieldLabel/index.js';
 import { flattenFieldMap } from '../../utilities/flattenFieldMap.js';
 import { SelectAll } from '../SelectAll/index.js';
 import { SelectRow } from '../SelectRow/index.js';
 import { SortColumn } from '../SortColumn/index.js';
-import { DefaultCell } from '../Table/DefaultCell/index.js';
-const fieldIsPresentationalOnly = (field)=>field.type === 'ui';
 export const buildColumnState = (args)=>{
-    const { cellProps, columnPreferences, columns, enableRowSelections, fieldMap, useAsTitle } = args;
-    let sortedFieldMap = flattenFieldMap(fieldMap);
+    const { cellProps, columnPreferences, columns, enableRowSelections, fields, useAsTitle } = args;
+    let sortedFieldMap = flattenFieldMap(fields);
     // place the `ID` field first, if it exists
     // do the same for the `useAsTitle` field with precedence over the `ID` field
     // then sort the rest of the fields based on the `defaultColumns` or `columnPreferences`
-    const idFieldIndex = sortedFieldMap.findIndex((field)=>field.name === 'id');
+    const idFieldIndex = sortedFieldMap.findIndex((field)=>'name' in field && field.name === 'id');
     if (idFieldIndex > -1) {
         const idField = sortedFieldMap.splice(idFieldIndex, 1)[0];
         sortedFieldMap.unshift(idField);
     }
-    const useAsTitleFieldIndex = useAsTitle ? sortedFieldMap.findIndex((field)=>field.name === useAsTitle) : -1;
+    const useAsTitleFieldIndex = useAsTitle ? sortedFieldMap.findIndex((field)=>'name' in field && field.name === useAsTitle) : -1;
     if (useAsTitleFieldIndex > -1) {
         const useAsTitleField = sortedFieldMap.splice(useAsTitleFieldIndex, 1)[0];
         sortedFieldMap.unshift(useAsTitleField);
@@ -41,7 +42,7 @@ export const buildColumnState = (args)=>{
         if (columnPreference) {
             active = columnPreference.active;
         } else if (columns && Array.isArray(columns) && columns.length > 0) {
-            active = columns.find((column)=>column.accessor === field.name)?.active;
+            active = columns.find((column)=>'name' in field && column.accessor === field.name)?.active;
         } else if (activeColumnsIndices.length < 4) {
             active = true;
         }
@@ -49,36 +50,39 @@ export const buildColumnState = (args)=>{
             activeColumnsIndices.push(index);
         }
         const isFirstActiveColumn = activeColumnsIndices[0] === index;
-        const name = 'name' in field ? field.name : undefined;
-        const Cell = field.CustomCell !== undefined ? field.CustomCell : /*#__PURE__*/ React.createElement(DefaultCell, field.cellComponentProps);
-        const CustomLabelToRender = field && 'fieldComponentProps' in field && 'CustomLabel' in field.fieldComponentProps && field.fieldComponentProps.CustomLabel !== undefined ? field.fieldComponentProps.CustomLabel : undefined;
-        const Label = /*#__PURE__*/ React.createElement(FieldLabel, {
-            CustomLabel: CustomLabelToRender,
-            ...field.fieldComponentProps?.labelProps,
+        const CustomLabelToRender = field && 'admin' in field && 'components' in field.admin && 'Label' in field.admin.components && field.admin.components.Label !== undefined // let it return `null`
+         ? field.admin.components.Label : undefined;
+        const Label = /*#__PURE__*/ _jsx(FieldLabel, {
+            Label: CustomLabelToRender,
+            label: 'label' in field ? field.label : undefined,
             unstyled: true
         });
-        const Heading = /*#__PURE__*/ React.createElement(SortColumn, {
+        const fieldAffectsDataSubFields = field && field.type && (field.type === 'array' || field.type === 'group' || field.type === 'blocks');
+        const Heading = /*#__PURE__*/ _jsx(SortColumn, {
             Label: Label,
-            disable: 'disableSort' in field && Boolean(field.disableSort) || fieldIsPresentationalOnly(field) || undefined,
-            // eslint-disable-next-line react/jsx-no-duplicate-props
-            label: 'fieldComponentProps' in field && 'label' in field.fieldComponentProps ? field.fieldComponentProps.label : undefined,
+            disable: fieldAffectsDataSubFields || field?._isPresentational || undefined,
+            label: 'label' in field ? field.label : undefined,
             name: 'name' in field ? field.name : undefined
         });
         if (field) {
             const column = {
-                name,
-                type: field.type,
                 Label,
-                accessor: name,
+                accessor: 'name' in field ? field.name : undefined,
                 active,
                 cellProps: {
-                    ...field.cellComponentProps,
+                    field: {
+                        ...field || {},
+                        ...cellProps?.[index]?.field || {}
+                    },
                     ...cellProps?.[index],
-                    link: isFirstActiveColumn,
-                    relationTo: field.type === 'relationship' && 'relationTo' in field.fieldComponentProps ? field.fieldComponentProps.relationTo : undefined
+                    link: isFirstActiveColumn
                 },
                 components: {
-                    Cell,
+                    Cell: field.admin?.components?.Cell || {
+                        type: 'client',
+                        Component: DefaultCell,
+                        RenderedComponent: null
+                    },
                     Heading
                 }
             };
@@ -88,14 +92,17 @@ export const buildColumnState = (args)=>{
     }, []);
     if (enableRowSelections) {
         sorted.unshift({
-            name: '',
+            Label: null,
             accessor: '_select',
             active: true,
             components: {
-                Cell: /*#__PURE__*/ React.createElement(SelectRow, null),
-                Heading: /*#__PURE__*/ React.createElement(SelectAll, null)
-            },
-            label: null
+                Cell: {
+                    type: 'client',
+                    Component: null,
+                    RenderedComponent: /*#__PURE__*/ _jsx(SelectRow, {})
+                },
+                Heading: /*#__PURE__*/ _jsx(SelectAll, {})
+            }
         });
     }
     return sorted;

package/dist/elements/TableColumns/buildColumnState.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/TableColumns/buildColumnState.tsx"],"sourcesContent":["import { FieldLabel } from '@payloadcms/ui/forms/FieldLabel'\nimport { type CellComponentProps, type SanitizedCollectionConfig } from 'payload/types'\nimport React from 'react'\n\nimport type { FieldMap, MappedField } from '../../providers/ComponentMap/buildComponentMap/types.js'\nimport type { ColumnPreferences } from '../../providers/ListInfo/index.js'\nimport type { Column } from '../Table/index.js'\n\nimport { flattenFieldMap } from '../../utilities/flattenFieldMap.js'\nimport { SelectAll } from '../SelectAll/index.js'\nimport { SelectRow } from '../SelectRow/index.js'\nimport { SortColumn } from '../SortColumn/index.js'\nimport { DefaultCell } from '../Table/DefaultCell/index.js'\n\nconst fieldIsPresentationalOnly = (field: MappedField): boolean => field.type === 'ui'\n\ntype Args = {\n  cellProps: Partial<CellComponentProps>[]\n  columnPreferences: ColumnPreferences\n  columns?: ColumnPreferences\n  enableRowSelections: boolean\n  fieldMap: FieldMap\n  useAsTitle: SanitizedCollectionConfig['admin']['useAsTitle']\n}\nexport const buildColumnState = (args: Args): Column[] => {\n  const { cellProps, columnPreferences, columns, enableRowSelections, fieldMap, useAsTitle } = args\n\n  let sortedFieldMap = flattenFieldMap(fieldMap)\n\n  // place the `ID` field first, if it exists\n  // do the same for the `useAsTitle` field with precedence over the `ID` field\n  // then sort the rest of the fields based on the `defaultColumns` or `columnPreferences`\n  const idFieldIndex = sortedFieldMap.findIndex((field) => field.name === 'id')\n\n  if (idFieldIndex > -1) {\n    const idField = sortedFieldMap.splice(idFieldIndex, 1)[0]\n    sortedFieldMap.unshift(idField)\n  }\n\n  const useAsTitleFieldIndex = useAsTitle\n    ? sortedFieldMap.findIndex((field) => field.name === useAsTitle)\n    : -1\n\n  if (useAsTitleFieldIndex > -1) {\n    const useAsTitleField = sortedFieldMap.splice(useAsTitleFieldIndex, 1)[0]\n    sortedFieldMap.unshift(useAsTitleField)\n  }\n\n  const sortTo = columnPreferences || columns\n\n  if (sortTo) {\n    // sort the fields to the order of `defaultColumns` or `columnPreferences`\n    sortedFieldMap = sortedFieldMap.sort((a, b) => {\n      const aIndex = sortTo.findIndex((column) => 'name' in a && column.accessor === a.name)\n      const bIndex = sortTo.findIndex((column) => 'name' in b && column.accessor === b.name)\n      if (aIndex === -1 && bIndex === -1) return 0\n      if (aIndex === -1) return 1\n      if (bIndex === -1) return -1\n      return aIndex - bIndex\n    })\n  }\n\n  const activeColumnsIndices = []\n\n  const sorted = sortedFieldMap.reduce((acc, field, index) => {\n    const columnPreference = columnPreferences?.find(\n      (preference) => 'name' in field && preference.accessor === field.name,\n    )\n\n    let active = false\n\n    if (columnPreference) {\n      active = columnPreference.active\n    } else if (columns && Array.isArray(columns) && columns.length > 0) {\n      active = columns.find((column) => column.accessor === field.name)?.active\n    } else if (activeColumnsIndices.length < 4) {\n      active = true\n    }\n\n    if (active && !activeColumnsIndices.includes(index)) {\n      activeColumnsIndices.push(index)\n    }\n\n    const isFirstActiveColumn = activeColumnsIndices[0] === index\n\n    const name = 'name' in field ? field.name : undefined\n\n    const Cell =\n      field.CustomCell !== undefined ? (\n        field.CustomCell\n      ) : (\n        <DefaultCell {...field.cellComponentProps} />\n      )\n\n    const CustomLabelToRender =\n      field &&\n      'fieldComponentProps' in field &&\n      'CustomLabel' in field.fieldComponentProps &&\n      field.fieldComponentProps.CustomLabel !== undefined\n        ? field.fieldComponentProps.CustomLabel\n        : undefined\n\n    const Label = (\n      <FieldLabel\n        CustomLabel={CustomLabelToRender}\n        {...field.fieldComponentProps?.labelProps}\n        unstyled\n      />\n    )\n\n    const Heading = (\n      <SortColumn\n        Label={Label}\n        disable={\n          ('disableSort' in field && Boolean(field.disableSort)) ||\n          fieldIsPresentationalOnly(field) ||\n          undefined\n        }\n        // eslint-disable-next-line react/jsx-no-duplicate-props\n        label={\n          'fieldComponentProps' in field && 'label' in field.fieldComponentProps\n            ? field.fieldComponentProps.label\n            : undefined\n        }\n        name={'name' in field ? field.name : undefined}\n      />\n    )\n\n    if (field) {\n      const column: Column = {\n        name,\n        type: field.type,\n        Label,\n        accessor: name,\n        active,\n        cellProps: {\n          ...field.cellComponentProps,\n          ...cellProps?.[index],\n          link: isFirstActiveColumn,\n          relationTo:\n            field.type === 'relationship' && 'relationTo' in field.fieldComponentProps\n              ? field.fieldComponentProps.relationTo\n              : undefined,\n        },\n        components: {\n          Cell,\n          Heading,\n        },\n      }\n\n      acc.push(column)\n    }\n\n    return acc\n  }, [])\n\n  if (enableRowSelections) {\n    sorted.unshift({\n      name: '',\n      accessor: '_select',\n      active: true,\n      components: {\n        Cell: <SelectRow />,\n        Heading: <SelectAll />,\n      },\n      label: null,\n    })\n  }\n\n  return sorted\n}\n"],"names":["FieldLabel","React","flattenFieldMap","SelectAll","SelectRow","SortColumn","DefaultCell","fieldIsPresentationalOnly","field","type","buildColumnState","args","cellProps","columnPreferences","columns","enableRowSelections","fieldMap","useAsTitle","sortedFieldMap","idFieldIndex","findIndex","name","idField","splice","unshift","useAsTitleFieldIndex","useAsTitleField","sortTo","sort","a","b","aIndex","column","accessor","bIndex","activeColumnsIndices","sorted","reduce","acc","index","columnPreference","find","preference","active","Array","isArray","length","includes","push","isFirstActiveColumn","undefined","Cell","CustomCell","cellComponentProps","CustomLabelToRender","fieldComponentProps","CustomLabel","Label","labelProps","unstyled","Heading","disable","Boolean","disableSort","label","link","relationTo","components"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../../src/elements/TableColumns/buildColumnState.tsx"],"sourcesContent":["'use client'\nimport type {\n  CellComponentProps,\n  ClientField,\n  SanitizedCollectionConfig,\n  StaticLabel,\n} from 'payload'\n\nimport { DefaultCell } from '@payloadcms/ui'\nimport React from 'react'\n\nimport type { ColumnPreferences } from '../../providers/ListInfo/index.js'\nimport type { Column } from '../Table/index.js'\n\nimport { FieldLabel } from '../../fields/FieldLabel/index.js'\nimport { flattenFieldMap } from '../../utilities/flattenFieldMap.js'\nimport { SelectAll } from '../SelectAll/index.js'\nimport { SelectRow } from '../SelectRow/index.js'\nimport { SortColumn } from '../SortColumn/index.js'\n\ntype Args = {\n  cellProps: Partial<CellComponentProps>[]\n  columnPreferences: ColumnPreferences\n  columns?: ColumnPreferences\n  enableRowSelections: boolean\n  fields: ClientField[]\n  useAsTitle: SanitizedCollectionConfig['admin']['useAsTitle']\n}\n\nexport const buildColumnState = (args: Args): Column[] => {\n  const { cellProps, columnPreferences, columns, enableRowSelections, fields, useAsTitle } = args\n\n  let sortedFieldMap = flattenFieldMap(fields)\n\n  // place the `ID` field first, if it exists\n  // do the same for the `useAsTitle` field with precedence over the `ID` field\n  // then sort the rest of the fields based on the `defaultColumns` or `columnPreferences`\n  const idFieldIndex = sortedFieldMap.findIndex((field) => 'name' in field && field.name === 'id')\n\n  if (idFieldIndex > -1) {\n    const idField = sortedFieldMap.splice(idFieldIndex, 1)[0]\n    sortedFieldMap.unshift(idField)\n  }\n\n  const useAsTitleFieldIndex = useAsTitle\n    ? sortedFieldMap.findIndex((field) => 'name' in field && field.name === useAsTitle)\n    : -1\n\n  if (useAsTitleFieldIndex > -1) {\n    const useAsTitleField = sortedFieldMap.splice(useAsTitleFieldIndex, 1)[0]\n    sortedFieldMap.unshift(useAsTitleField)\n  }\n\n  const sortTo = columnPreferences || columns\n\n  if (sortTo) {\n    // sort the fields to the order of `defaultColumns` or `columnPreferences`\n    sortedFieldMap = sortedFieldMap.sort((a, b) => {\n      const aIndex = sortTo.findIndex((column) => 'name' in a && column.accessor === a.name)\n      const bIndex = sortTo.findIndex((column) => 'name' in b && column.accessor === b.name)\n      if (aIndex === -1 && bIndex === -1) return 0\n      if (aIndex === -1) return 1\n      if (bIndex === -1) return -1\n      return aIndex - bIndex\n    })\n  }\n\n  const activeColumnsIndices = []\n\n  const sorted: Column[] = sortedFieldMap.reduce((acc, field, index) => {\n    const columnPreference = columnPreferences?.find(\n      (preference) => 'name' in field && preference.accessor === field.name,\n    )\n\n    let active = false\n\n    if (columnPreference) {\n      active = columnPreference.active\n    } else if (columns && Array.isArray(columns) && columns.length > 0) {\n      active = columns.find((column) => 'name' in field && column.accessor === field.name)?.active\n    } else if (activeColumnsIndices.length < 4) {\n      active = true\n    }\n\n    if (active && !activeColumnsIndices.includes(index)) {\n      activeColumnsIndices.push(index)\n    }\n\n    const isFirstActiveColumn = activeColumnsIndices[0] === index\n\n    const CustomLabelToRender =\n      field &&\n      'admin' in field &&\n      'components' in field.admin &&\n      'Label' in field.admin.components &&\n      field.admin.components.Label !== undefined // let it return `null`\n        ? field.admin.components.Label\n        : undefined\n\n    const Label = (\n      <FieldLabel\n        Label={CustomLabelToRender}\n        label={'label' in field ? (field.label as StaticLabel) : undefined}\n        unstyled\n      />\n    )\n\n    const fieldAffectsDataSubFields =\n      field &&\n      field.type &&\n      (field.type === 'array' || field.type === 'group' || field.type === 'blocks')\n\n    const Heading = (\n      <SortColumn\n        Label={Label}\n        disable={fieldAffectsDataSubFields || field?._isPresentational || undefined}\n        label={'label' in field ? (field.label as StaticLabel) : undefined}\n        name={'name' in field ? field.name : undefined}\n      />\n    )\n\n    if (field) {\n      const column: Column = {\n        Label,\n        accessor: 'name' in field ? field.name : undefined,\n        active,\n        cellProps: {\n          field: {\n            ...(field || ({} as ClientField)),\n            ...(cellProps?.[index]?.field || ({} as ClientField)),\n          } as ClientField,\n          ...cellProps?.[index],\n          link: isFirstActiveColumn,\n        },\n        components: {\n          Cell: field.admin?.components?.Cell || {\n            type: 'client',\n            Component: DefaultCell,\n            RenderedComponent: null,\n          },\n          Heading,\n        },\n      }\n\n      acc.push(column)\n    }\n\n    return acc\n  }, [])\n\n  if (enableRowSelections) {\n    sorted.unshift({\n      Label: null,\n      accessor: '_select',\n      active: true,\n      components: {\n        Cell: {\n          type: 'client',\n          Component: null,\n          RenderedComponent: <SelectRow />,\n        },\n        Heading: <SelectAll />,\n      },\n    })\n  }\n\n  return sorted\n}\n"],"names":["DefaultCell","React","FieldLabel","flattenFieldMap","SelectAll","SelectRow","SortColumn","buildColumnState","args","cellProps","columnPreferences","columns","enableRowSelections","fields","useAsTitle","sortedFieldMap","idFieldIndex","findIndex","field","name","idField","splice","unshift","useAsTitleFieldIndex","useAsTitleField","sortTo","sort","a","b","aIndex","column","accessor","bIndex","activeColumnsIndices","sorted","reduce","acc","index","columnPreference","find","preference","active","Array","isArray","length","includes","push","isFirstActiveColumn","CustomLabelToRender","admin","components","Label","undefined","label","unstyled","fieldAffectsDataSubFields","type","Heading","disable","_isPresentational","link","Cell","Component","RenderedComponent"],"mappings":"AAAA;;AAQA,SAASA,WAAW,QAAQ,iBAAgB;AAC5C,OAAOC,WAAW,QAAO;AAKzB,SAASC,UAAU,QAAQ,mCAAkC;AAC7D,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,SAAS,QAAQ,wBAAuB;AACjD,SAASC,SAAS,QAAQ,wBAAuB;AACjD,SAASC,UAAU,QAAQ,yBAAwB;AAWnD,OAAO,MAAMC,mBAAmB,CAACC;IAC/B,MAAM,EAAEC,SAAS,EAAEC,iBAAiB,EAAEC,OAAO,EAAEC,mBAAmB,EAAEC,MAAM,EAAEC,UAAU,EAAE,GAAGN;IAE3F,IAAIO,iBAAiBZ,gBAAgBU;IAErC,2CAA2C;IAC3C,6EAA6E;IAC7E,wFAAwF;IACxF,MAAMG,eAAeD,eAAeE,SAAS,CAAC,CAACC,QAAU,UAAUA,SAASA,MAAMC,IAAI,KAAK;IAE3F,IAAIH,eAAe,CAAC,GAAG;QACrB,MAAMI,UAAUL,eAAeM,MAAM,CAACL,cAAc,EAAE,CAAC,EAAE;QACzDD,eAAeO,OAAO,CAACF;IACzB;IAEA,MAAMG,uBAAuBT,aACzBC,eAAeE,SAAS,CAAC,CAACC,QAAU,UAAUA,SAASA,MAAMC,IAAI,KAAKL,cACtE,CAAC;IAEL,IAAIS,uBAAuB,CAAC,GAAG;QAC7B,MAAMC,kBAAkBT,eAAeM,MAAM,CAACE,sBAAsB,EAAE,CAAC,EAAE;QACzER,eAAeO,OAAO,CAACE;IACzB;IAEA,MAAMC,SAASf,qBAAqBC;IAEpC,IAAIc,QAAQ;QACV,0EAA0E;QAC1EV,iBAAiBA,eAAeW,IAAI,CAAC,CAACC,GAAGC;YACvC,MAAMC,SAASJ,OAAOR,SAAS,CAAC,CAACa,SAAW,UAAUH,KAAKG,OAAOC,QAAQ,KAAKJ,EAAER,IAAI;YACrF,MAAMa,SAASP,OAAOR,SAAS,CAAC,CAACa,SAAW,UAAUF,KAAKE,OAAOC,QAAQ,KAAKH,EAAET,IAAI;YACrF,IAAIU,WAAW,CAAC,KAAKG,WAAW,CAAC,GAAG,OAAO;YAC3C,IAAIH,WAAW,CAAC,GAAG,OAAO;YAC1B,IAAIG,WAAW,CAAC,GAAG,OAAO,CAAC;YAC3B,OAAOH,SAASG;QAClB;IACF;IAEA,MAAMC,uBAAuB,EAAE;IAE/B,MAAMC,SAAmBnB,eAAeoB,MAAM,CAAC,CAACC,KAAKlB,OAAOmB;QAC1D,MAAMC,mBAAmB5B,mBAAmB6B,KAC1C,CAACC,aAAe,UAAUtB,SAASsB,WAAWT,QAAQ,KAAKb,MAAMC,IAAI;QAGvE,IAAIsB,SAAS;QAEb,IAAIH,kBAAkB;YACpBG,SAASH,iBAAiBG,MAAM;QAClC,OAAO,IAAI9B,WAAW+B,MAAMC,OAAO,CAAChC,YAAYA,QAAQiC,MAAM,GAAG,GAAG;YAClEH,SAAS9B,QAAQ4B,IAAI,CAAC,CAACT,SAAW,UAAUZ,SAASY,OAAOC,QAAQ,KAAKb,MAAMC,IAAI,GAAGsB;QACxF,OAAO,IAAIR,qBAAqBW,MAAM,GAAG,GAAG;YAC1CH,SAAS;QACX;QAEA,IAAIA,UAAU,CAACR,qBAAqBY,QAAQ,CAACR,QAAQ;YACnDJ,qBAAqBa,IAAI,CAACT;QAC5B;QAEA,MAAMU,sBAAsBd,oBAAoB,CAAC,EAAE,KAAKI;QAExD,MAAMW,sBACJ9B,SACA,WAAWA,SACX,gBAAgBA,MAAM+B,KAAK,IAC3B,WAAW/B,MAAM+B,KAAK,CAACC,UAAU,IACjChC,MAAM+B,KAAK,CAACC,UAAU,CAACC,KAAK,KAAKC,UAAU,uBAAuB;WAC9DlC,MAAM+B,KAAK,CAACC,UAAU,CAACC,KAAK,GAC5BC;QAEN,MAAMD,sBACJ,KAACjD;YACCiD,OAAOH;YACPK,OAAO,WAAWnC,QAASA,MAAMmC,KAAK,GAAmBD;YACzDE,QAAQ;;QAIZ,MAAMC,4BACJrC,SACAA,MAAMsC,IAAI,IACTtC,CAAAA,MAAMsC,IAAI,KAAK,WAAWtC,MAAMsC,IAAI,KAAK,WAAWtC,MAAMsC,IAAI,KAAK,QAAO;QAE7E,MAAMC,wBACJ,KAACnD;YACC6C,OAAOA;YACPO,SAASH,6BAA6BrC,OAAOyC,qBAAqBP;YAClEC,OAAO,WAAWnC,QAASA,MAAMmC,KAAK,GAAmBD;YACzDjC,MAAM,UAAUD,QAAQA,MAAMC,IAAI,GAAGiC;;QAIzC,IAAIlC,OAAO;YACT,MAAMY,SAAiB;gBACrBqB;gBACApB,UAAU,UAAUb,QAAQA,MAAMC,IAAI,GAAGiC;gBACzCX;gBACAhC,WAAW;oBACTS,OAAO;wBACL,GAAIA,SAAU,CAAC,CAAiB;wBAChC,GAAIT,WAAW,CAAC4B,MAAM,EAAEnB,SAAU,CAAC,CAAiB;oBACtD;oBACA,GAAGT,WAAW,CAAC4B,MAAM;oBACrBuB,MAAMb;gBACR;gBACAG,YAAY;oBACVW,MAAM3C,MAAM+B,KAAK,EAAEC,YAAYW,QAAQ;wBACrCL,MAAM;wBACNM,WAAW9D;wBACX+D,mBAAmB;oBACrB;oBACAN;gBACF;YACF;YAEArB,IAAIU,IAAI,CAAChB;QACX;QAEA,OAAOM;IACT,GAAG,EAAE;IAEL,IAAIxB,qBAAqB;QACvBsB,OAAOZ,OAAO,CAAC;YACb6B,OAAO;YACPpB,UAAU;YACVU,QAAQ;YACRS,YAAY;gBACVW,MAAM;oBACJL,MAAM;oBACNM,WAAW;oBACXC,iCAAmB,KAAC1D;gBACtB;gBACAoD,uBAAS,KAACrD;YACZ;QACF;IACF;IAEA,OAAO8B;AACT,EAAC"}

package/dist/elements/TableColumns/filterFields.d.ts

@@ -1,3 +1,3 @@
-import type { FieldMap } from '../../providers/ComponentMap/buildComponentMap/types.js';
-export declare const filterFields: (fieldMap: FieldMap) => FieldMap;
+import type { ClientField } from 'payload';
+export declare const filterFields: (incomingFields: ClientField[]) => ClientField[];
 //# sourceMappingURL=filterFields.d.ts.map

package/dist/elements/TableColumns/filterFields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filterFields.d.ts","sourceRoot":"","sources":["../../../src/elements/TableColumns/filterFields.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAe,MAAM,yDAAyD,CAAA;AAIpG,eAAO,MAAM,YAAY,kCA2BxB,CAAA"}
+{"version":3,"file":"filterFields.d.ts","sourceRoot":"","sources":["../../../src/elements/TableColumns/filterFields.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAI1C,eAAO,MAAM,YAAY,mBAAoB,WAAW,EAAE,KAAG,WAAW,EAyBvE,CAAA"}

package/dist/elements/TableColumns/filterFields.js

@@ -1,20 +1,18 @@
+'use client';
 // 1. Skips fields that are hidden, disabled, or presentational-only (i.e. `ui` fields)
 // 2. Maps through top-level `tabs` fields and filters out the same
-export const filterFields = (fieldMap)=>{
-    const shouldSkipField = (field)=>field.type !== 'ui' && field.disabled === true;
-    const fields = fieldMap.reduce((formatted, field)=>{
+export const filterFields = (incomingFields)=>{
+    const shouldSkipField = (field)=>field.type !== 'ui' && field.admin?.disabled === true || field?.admin?.disableListColumn === true;
+    const fields = incomingFields.reduce((formatted, field)=>{
         if (shouldSkipField(field)) {
             return formatted;
         }
-        const formattedField = field.type === 'tabs' && 'tabs' in field.fieldComponentProps ? {
+        const formattedField = field.type === 'tabs' && 'tabs' in field ? {
             ...field,
-            fieldComponentProps: {
-                ...field.fieldComponentProps,
-                tabs: field.fieldComponentProps.tabs.map((tab)=>({
-                        ...tab,
-                        fieldMap: tab.fieldMap.filter((tabField)=>!shouldSkipField(tabField))
-                    }))
-            }
+            tabs: field.tabs.map((tab)=>({
+                    ...tab,
+                    fields: tab.fields.filter((tabField)=>!shouldSkipField(tabField))
+                }))
         } : field;
         return [
             ...formatted,

package/dist/elements/TableColumns/filterFields.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/TableColumns/filterFields.tsx"],"sourcesContent":["import type { FieldMap, MappedField } from '../../providers/ComponentMap/buildComponentMap/types.js'\n\n// 1. Skips fields that are hidden, disabled, or presentational-only (i.e. `ui` fields)\n// 2. Maps through top-level `tabs` fields and filters out the same\nexport const filterFields = (fieldMap: FieldMap): FieldMap => {\n  const shouldSkipField = (field: MappedField): boolean =>\n    field.type !== 'ui' && field.disabled === true\n\n  const fields: FieldMap = fieldMap.reduce((formatted, field) => {\n    if (shouldSkipField(field)) {\n      return formatted\n    }\n\n    const formattedField: MappedField =\n      field.type === 'tabs' && 'tabs' in field.fieldComponentProps\n        ? {\n            ...field,\n            fieldComponentProps: {\n              ...field.fieldComponentProps,\n              tabs: field.fieldComponentProps.tabs.map((tab) => ({\n                ...tab,\n                fieldMap: tab.fieldMap.filter((tabField) => !shouldSkipField(tabField)),\n              })),\n            },\n          }\n        : field\n\n    return [...formatted, formattedField]\n  }, [])\n\n  return fields\n}\n"],"names":["filterFields","fieldMap","shouldSkipField","field","type","disabled","fields","reduce","formatted","formattedField","fieldComponentProps","tabs","map","tab","filter","tabField"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA,uFAAuF;AACvF,mEAAmE;AACnE,OAAO,MAAMA,eAAe,CAACC;IAC3B,MAAMC,kBAAkB,CAACC,QACvBA,MAAMC,IAAI,KAAK,QAAQD,MAAME,QAAQ,KAAK;IAE5C,MAAMC,SAAmBL,SAASM,MAAM,CAAC,CAACC,WAAWL;QACnD,IAAID,gBAAgBC,QAAQ;YAC1B,OAAOK;QACT;QAEA,MAAMC,iBACJN,MAAMC,IAAI,KAAK,UAAU,UAAUD,MAAMO,mBAAmB,GACxD;YACE,GAAGP,KAAK;YACRO,qBAAqB;gBACnB,GAAGP,MAAMO,mBAAmB;gBAC5BC,MAAMR,MAAMO,mBAAmB,CAACC,IAAI,CAACC,GAAG,CAAC,CAACC,MAAS,CAAA;wBACjD,GAAGA,GAAG;wBACNZ,UAAUY,IAAIZ,QAAQ,CAACa,MAAM,CAAC,CAACC,WAAa,CAACb,gBAAgBa;oBAC/D,CAAA;YACF;QACF,IACAZ;QAEN,OAAO;eAAIK;YAAWC;SAAe;IACvC,GAAG,EAAE;IAEL,OAAOH;AACT,EAAC"}
+{"version":3,"sources":["../../../src/elements/TableColumns/filterFields.tsx"],"sourcesContent":["'use client'\n\nimport type { ClientField } from 'payload'\n\n// 1. Skips fields that are hidden, disabled, or presentational-only (i.e. `ui` fields)\n// 2. Maps through top-level `tabs` fields and filters out the same\nexport const filterFields = (incomingFields: ClientField[]): ClientField[] => {\n  const shouldSkipField = (field: ClientField): boolean =>\n    (field.type !== 'ui' && field.admin?.disabled === true) ||\n    field?.admin?.disableListColumn === true\n\n  const fields: ClientField[] = incomingFields.reduce((formatted, field) => {\n    if (shouldSkipField(field)) {\n      return formatted\n    }\n\n    const formattedField: ClientField =\n      field.type === 'tabs' && 'tabs' in field\n        ? {\n            ...field,\n            tabs: field.tabs.map((tab) => ({\n              ...tab,\n              fields: tab.fields.filter((tabField) => !shouldSkipField(tabField)),\n            })),\n          }\n        : field\n\n    return [...formatted, formattedField]\n  }, [])\n\n  return fields\n}\n"],"names":["filterFields","incomingFields","shouldSkipField","field","type","admin","disabled","disableListColumn","fields","reduce","formatted","formattedField","tabs","map","tab","filter","tabField"],"mappings":"AAAA;AAIA,uFAAuF;AACvF,mEAAmE;AACnE,OAAO,MAAMA,eAAe,CAACC;IAC3B,MAAMC,kBAAkB,CAACC,QACvB,AAACA,MAAMC,IAAI,KAAK,QAAQD,MAAME,KAAK,EAAEC,aAAa,QAClDH,OAAOE,OAAOE,sBAAsB;IAEtC,MAAMC,SAAwBP,eAAeQ,MAAM,CAAC,CAACC,WAAWP;QAC9D,IAAID,gBAAgBC,QAAQ;YAC1B,OAAOO;QACT;QAEA,MAAMC,iBACJR,MAAMC,IAAI,KAAK,UAAU,UAAUD,QAC/B;YACE,GAAGA,KAAK;YACRS,MAAMT,MAAMS,IAAI,CAACC,GAAG,CAAC,CAACC,MAAS,CAAA;oBAC7B,GAAGA,GAAG;oBACNN,QAAQM,IAAIN,MAAM,CAACO,MAAM,CAAC,CAACC,WAAa,CAACd,gBAAgBc;gBAC3D,CAAA;QACF,IACAb;QAEN,OAAO;eAAIO;YAAWC;SAAe;IACvC,GAAG,EAAE;IAEL,OAAOH;AACT,EAAC"}

package/dist/elements/TableColumns/getInitialColumns.d.ts

@@ -1,5 +1,4 @@
-import type { FieldMap, MappedField } from '../../providers/ComponentMap/buildComponentMap/types.js';
+import type { ClientField } from 'payload';
 import type { ColumnPreferences } from '../../providers/ListInfo/index.js';
-export declare function fieldAffectsData(field: MappedField): boolean;
-export declare const getInitialColumns: (fieldMap: FieldMap, useAsTitle: string, defaultColumns: string[]) => ColumnPreferences;
+export declare const getInitialColumns: (fields: ClientField[], useAsTitle: string, defaultColumns: string[]) => ColumnPreferences;
 //# sourceMappingURL=getInitialColumns.d.ts.map

package/dist/elements/TableColumns/getInitialColumns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getInitialColumns.d.ts","sourceRoot":"","sources":["../../../src/elements/TableColumns/getInitialColumns.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,yDAAyD,CAAA;AACpG,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AAE1E,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAE5D;AA4BD,eAAO,MAAM,iBAAiB,mCAEhB,MAAM,kBACF,MAAM,EAAE,sBAqBzB,CAAA"}
+{"version":3,"file":"getInitialColumns.d.ts","sourceRoot":"","sources":["../../../src/elements/TableColumns/getInitialColumns.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAI1C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AA4B1E,eAAO,MAAM,iBAAiB,WACpB,WAAW,EAAE,cACT,MAAM,kBACF,MAAM,EAAE,KACvB,iBAoBF,CAAA"}

package/dist/elements/TableColumns/getInitialColumns.js

@@ -1,24 +1,22 @@
-export function fieldAffectsData(field) {
-    return 'name' in field && field.type !== 'ui';
-}
-const getRemainingColumns = (fieldMap, useAsTitle)=>fieldMap.reduce((remaining, field)=>{
+import { fieldAffectsData } from 'payload/shared';
+const getRemainingColumns = (fields, useAsTitle)=>fields.reduce((remaining, field)=>{
         if (fieldAffectsData(field) && field.name === useAsTitle) {
             return remaining;
         }
-        if (!fieldAffectsData(field) && 'fieldMap' in field.fieldComponentProps) {
+        if (!fieldAffectsData(field) && 'fields' in field) {
             return [
                 ...remaining,
-                ...getRemainingColumns(field.fieldComponentProps.fieldMap, useAsTitle)
+                ...getRemainingColumns(field.fields, useAsTitle)
             ];
         }
-        if (field.type === 'tabs' && 'tabs' in field.fieldComponentProps) {
+        if (field.type === 'tabs' && 'tabs' in field) {
             return [
                 ...remaining,
-                ...field.fieldComponentProps.tabs.reduce((tabFieldColumns, tab)=>[
+                ...field.tabs.reduce((tabFieldColumns, tab)=>[
                         ...tabFieldColumns,
                         ...'name' in tab ? [
                             tab.name
-                        ] : getRemainingColumns(tab.fieldMap, useAsTitle)
+                        ] : getRemainingColumns(tab.fields, useAsTitle)
                     ], [])
             ];
         }
@@ -27,7 +25,7 @@ const getRemainingColumns = (fieldMap, useAsTitle)=>fieldMap.reduce((remaining,
             field.name
         ];
     }, []);
-export const getInitialColumns = (fieldMap, useAsTitle, defaultColumns)=>{
+export const getInitialColumns = (fields, useAsTitle, defaultColumns)=>{
     let initialColumns = [];
     if (Array.isArray(defaultColumns) && defaultColumns.length >= 1) {
         initialColumns = defaultColumns;
@@ -35,7 +33,7 @@ export const getInitialColumns = (fieldMap, useAsTitle, defaultColumns)=>{
         if (useAsTitle) {
             initialColumns.push(useAsTitle);
         }
-        const remainingColumns = getRemainingColumns(fieldMap, useAsTitle);
+        const remainingColumns = getRemainingColumns(fields, useAsTitle);
         initialColumns = initialColumns.concat(remainingColumns);
         initialColumns = initialColumns.slice(0, 4);
     }

package/dist/elements/TableColumns/getInitialColumns.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/TableColumns/getInitialColumns.ts"],"sourcesContent":["import type { FieldMap, MappedField } from '../../providers/ComponentMap/buildComponentMap/types.js'\nimport type { ColumnPreferences } from '../../providers/ListInfo/index.js'\n\nexport function fieldAffectsData(field: MappedField): boolean {\n  return 'name' in field && field.type !== 'ui'\n}\n\nconst getRemainingColumns = (fieldMap: FieldMap, useAsTitle: string): ColumnPreferences =>\n  fieldMap.reduce((remaining, field) => {\n    if (fieldAffectsData(field) && field.name === useAsTitle) {\n      return remaining\n    }\n\n    if (!fieldAffectsData(field) && 'fieldMap' in field.fieldComponentProps) {\n      return [...remaining, ...getRemainingColumns(field.fieldComponentProps.fieldMap, useAsTitle)]\n    }\n\n    if (field.type === 'tabs' && 'tabs' in field.fieldComponentProps) {\n      return [\n        ...remaining,\n        ...field.fieldComponentProps.tabs.reduce(\n          (tabFieldColumns, tab) => [\n            ...tabFieldColumns,\n            ...('name' in tab ? [tab.name] : getRemainingColumns(tab.fieldMap, useAsTitle)),\n          ],\n          [],\n        ),\n      ]\n    }\n\n    return [...remaining, field.name]\n  }, [])\n\nexport const getInitialColumns = (\n  fieldMap: FieldMap,\n  useAsTitle: string,\n  defaultColumns: string[],\n): ColumnPreferences => {\n  let initialColumns = []\n\n  if (Array.isArray(defaultColumns) && defaultColumns.length >= 1) {\n    initialColumns = defaultColumns\n  } else {\n    if (useAsTitle) {\n      initialColumns.push(useAsTitle)\n    }\n\n    const remainingColumns = getRemainingColumns(fieldMap, useAsTitle)\n\n    initialColumns = initialColumns.concat(remainingColumns)\n    initialColumns = initialColumns.slice(0, 4)\n  }\n\n  return initialColumns.map((column) => ({\n    accessor: column,\n    active: true,\n  }))\n}\n"],"names":["fieldAffectsData","field","type","getRemainingColumns","fieldMap","useAsTitle","reduce","remaining","name","fieldComponentProps","tabs","tabFieldColumns","tab","getInitialColumns","defaultColumns","initialColumns","Array","isArray","length","push","remainingColumns","concat","slice","map","column","accessor","active"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,OAAO,SAASA,iBAAiBC,KAAkB;IACjD,OAAO,UAAUA,SAASA,MAAMC,IAAI,KAAK;AAC3C;AAEA,MAAMC,sBAAsB,CAACC,UAAoBC,aAC/CD,SAASE,MAAM,CAAC,CAACC,WAAWN;QAC1B,IAAID,iBAAiBC,UAAUA,MAAMO,IAAI,KAAKH,YAAY;YACxD,OAAOE;QACT;QAEA,IAAI,CAACP,iBAAiBC,UAAU,cAAcA,MAAMQ,mBAAmB,EAAE;YACvE,OAAO;mBAAIF;mBAAcJ,oBAAoBF,MAAMQ,mBAAmB,CAACL,QAAQ,EAAEC;aAAY;QAC/F;QAEA,IAAIJ,MAAMC,IAAI,KAAK,UAAU,UAAUD,MAAMQ,mBAAmB,EAAE;YAChE,OAAO;mBACFF;mBACAN,MAAMQ,mBAAmB,CAACC,IAAI,CAACJ,MAAM,CACtC,CAACK,iBAAiBC,MAAQ;2BACrBD;2BACC,UAAUC,MAAM;4BAACA,IAAIJ,IAAI;yBAAC,GAAGL,oBAAoBS,IAAIR,QAAQ,EAAEC;qBACpE,EACD,EAAE;aAEL;QACH;QAEA,OAAO;eAAIE;YAAWN,MAAMO,IAAI;SAAC;IACnC,GAAG,EAAE;AAEP,OAAO,MAAMK,oBAAoB,CAC/BT,UACAC,YACAS;IAEA,IAAIC,iBAAiB,EAAE;IAEvB,IAAIC,MAAMC,OAAO,CAACH,mBAAmBA,eAAeI,MAAM,IAAI,GAAG;QAC/DH,iBAAiBD;IACnB,OAAO;QACL,IAAIT,YAAY;YACdU,eAAeI,IAAI,CAACd;QACtB;QAEA,MAAMe,mBAAmBjB,oBAAoBC,UAAUC;QAEvDU,iBAAiBA,eAAeM,MAAM,CAACD;QACvCL,iBAAiBA,eAAeO,KAAK,CAAC,GAAG;IAC3C;IAEA,OAAOP,eAAeQ,GAAG,CAAC,CAACC,SAAY,CAAA;YACrCC,UAAUD;YACVE,QAAQ;QACV,CAAA;AACF,EAAC"}
+{"version":3,"sources":["../../../src/elements/TableColumns/getInitialColumns.ts"],"sourcesContent":["import type { ClientField } from 'payload'\n\nimport { fieldAffectsData } from 'payload/shared'\n\nimport type { ColumnPreferences } from '../../providers/ListInfo/index.js'\n\nconst getRemainingColumns = (fields: ClientField[], useAsTitle: string): ColumnPreferences =>\n  fields.reduce((remaining, field) => {\n    if (fieldAffectsData(field) && field.name === useAsTitle) {\n      return remaining\n    }\n\n    if (!fieldAffectsData(field) && 'fields' in field) {\n      return [...remaining, ...getRemainingColumns(field.fields, useAsTitle)]\n    }\n\n    if (field.type === 'tabs' && 'tabs' in field) {\n      return [\n        ...remaining,\n        ...field.tabs.reduce(\n          (tabFieldColumns, tab) => [\n            ...tabFieldColumns,\n            ...('name' in tab ? [tab.name] : getRemainingColumns(tab.fields, useAsTitle)),\n          ],\n          [],\n        ),\n      ]\n    }\n\n    return [...remaining, field.name]\n  }, [])\n\nexport const getInitialColumns = (\n  fields: ClientField[],\n  useAsTitle: string,\n  defaultColumns: string[],\n): ColumnPreferences => {\n  let initialColumns = []\n\n  if (Array.isArray(defaultColumns) && defaultColumns.length >= 1) {\n    initialColumns = defaultColumns\n  } else {\n    if (useAsTitle) {\n      initialColumns.push(useAsTitle)\n    }\n\n    const remainingColumns = getRemainingColumns(fields, useAsTitle)\n\n    initialColumns = initialColumns.concat(remainingColumns)\n    initialColumns = initialColumns.slice(0, 4)\n  }\n\n  return initialColumns.map((column) => ({\n    accessor: column,\n    active: true,\n  }))\n}\n"],"names":["fieldAffectsData","getRemainingColumns","fields","useAsTitle","reduce","remaining","field","name","type","tabs","tabFieldColumns","tab","getInitialColumns","defaultColumns","initialColumns","Array","isArray","length","push","remainingColumns","concat","slice","map","column","accessor","active"],"mappings":"AAEA,SAASA,gBAAgB,QAAQ,iBAAgB;AAIjD,MAAMC,sBAAsB,CAACC,QAAuBC,aAClDD,OAAOE,MAAM,CAAC,CAACC,WAAWC;QACxB,IAAIN,iBAAiBM,UAAUA,MAAMC,IAAI,KAAKJ,YAAY;YACxD,OAAOE;QACT;QAEA,IAAI,CAACL,iBAAiBM,UAAU,YAAYA,OAAO;YACjD,OAAO;mBAAID;mBAAcJ,oBAAoBK,MAAMJ,MAAM,EAAEC;aAAY;QACzE;QAEA,IAAIG,MAAME,IAAI,KAAK,UAAU,UAAUF,OAAO;YAC5C,OAAO;mBACFD;mBACAC,MAAMG,IAAI,CAACL,MAAM,CAClB,CAACM,iBAAiBC,MAAQ;2BACrBD;2BACC,UAAUC,MAAM;4BAACA,IAAIJ,IAAI;yBAAC,GAAGN,oBAAoBU,IAAIT,MAAM,EAAEC;qBAClE,EACD,EAAE;aAEL;QACH;QAEA,OAAO;eAAIE;YAAWC,MAAMC,IAAI;SAAC;IACnC,GAAG,EAAE;AAEP,OAAO,MAAMK,oBAAoB,CAC/BV,QACAC,YACAU;IAEA,IAAIC,iBAAiB,EAAE;IAEvB,IAAIC,MAAMC,OAAO,CAACH,mBAAmBA,eAAeI,MAAM,IAAI,GAAG;QAC/DH,iBAAiBD;IACnB,OAAO;QACL,IAAIV,YAAY;YACdW,eAAeI,IAAI,CAACf;QACtB;QAEA,MAAMgB,mBAAmBlB,oBAAoBC,QAAQC;QAErDW,iBAAiBA,eAAeM,MAAM,CAACD;QACvCL,iBAAiBA,eAAeO,KAAK,CAAC,GAAG;IAC3C;IAEA,OAAOP,eAAeQ,GAAG,CAAC,CAACC,SAAY,CAAA;YACrCC,UAAUD;YACVE,QAAQ;QACV,CAAA;AACF,EAAC"}

package/dist/elements/TableColumns/index.d.ts

@@ -1,11 +1,9 @@
-import type { CellComponentProps } from 'payload/types';
+import type { CellComponentProps } from 'payload';
 import React from 'react';
 import type { ColumnPreferences } from '../../providers/ListInfo/index.js';
 import type { Column } from '../Table/index.js';
-import type { Action } from './columnReducer.js';
 export interface ITableColumns {
     columns: Column[];
-    dispatchTableColumns: React.Dispatch<Action>;
     moveColumn: (args: {
         fromIndex: number;
         toIndex: number;
@@ -19,12 +17,12 @@ export type ListPreferences = {
     columns: ColumnPreferences;
 };
 type Props = {
-    cellProps?: Partial<CellComponentProps>[];
-    children: React.ReactNode;
-    collectionSlug: string;
-    enableRowSelections?: boolean;
-    listPreferences?: ListPreferences;
-    preferenceKey: string;
+    readonly cellProps?: Partial<CellComponentProps>[];
+    readonly children: React.ReactNode;
+    readonly collectionSlug: string;
+    readonly enableRowSelections?: boolean;
+    readonly listPreferences?: ListPreferences;
+    readonly preferenceKey: string;
 };
 export declare const TableColumnsProvider: React.FC<Props>;
 export {};

package/dist/elements/TableColumns/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/TableColumns/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAEvD,OAAO,KAQN,MAAM,OAAO,CAAA;AAEd,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAUhD,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,oBAAoB,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IAC5C,UAAU,EAAE,CAAC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAA;IAClE,gBAAgB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;IAC7C,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;CACvC;AAED,eAAO,MAAM,kBAAkB,8BAAoD,CAAA;AAEnF,eAAO,MAAM,eAAe,QAAO,aAA+C,CAAA;AAElF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,iBAAiB,CAAA;CAC3B,CAAA;AAED,KAAK,KAAK,GAAG;IACX,SAAS,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAA;IACzC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,cAAc,EAAE,MAAM,CAAA;IACtB,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,aAAa,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAmKhD,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/TableColumns/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAA6B,MAAM,SAAS,CAAA;AAE5E,OAAO,KAA2D,MAAM,OAAO,CAAA;AAE/E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAQ/C,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,UAAU,EAAE,CAAC,IAAI,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAA;IAClE,gBAAgB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,IAAI,CAAA;IAC7C,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;CACvC;AAED,eAAO,MAAM,kBAAkB,8BAAoD,CAAA;AAEnF,eAAO,MAAM,eAAe,QAAO,aAA+C,CAAA;AAElF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,iBAAiB,CAAA;CAC3B,CAAA;AAED,KAAK,KAAK,GAAG;IACX,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAA;IAClD,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IAClC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAA;IAC/B,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAA;IACtC,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe,CAAA;IAC1C,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;CAC/B,CAAA;AAED,eAAO,MAAM,oBAAoB,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CA8KhD,CAAA"}

package/dist/elements/TableColumns/index.js

@@ -1,57 +1,114 @@
 'use client';
-import React, { createContext, useCallback, useContext, useEffect, useReducer, useRef, useState } from 'react';
-import { useComponentMap } from '../../providers/ComponentMap/index.js';
+import { jsx as _jsx } from "react/jsx-runtime";
+import React, { createContext, useCallback, useContext, useState } from 'react';
 import { useConfig } from '../../providers/Config/index.js';
 import { usePreferences } from '../../providers/Preferences/index.js';
 import { buildColumnState } from './buildColumnState.js';
-import { columnReducer } from './columnReducer.js';
 import { filterFields } from './filterFields.js';
 import { getInitialColumns } from './getInitialColumns.js';
 export const TableColumnContext = /*#__PURE__*/ createContext({});
 export const useTableColumns = ()=>useContext(TableColumnContext);
 export const TableColumnsProvider = ({ cellProps, children, collectionSlug, enableRowSelections = false, listPreferences, preferenceKey })=>{
-    const config = useConfig();
-    const { componentMap } = useComponentMap();
-    const { fieldMap } = componentMap.collections[collectionSlug];
-    const collectionConfig = config.collections.find((collectionConfig)=>collectionConfig.slug === collectionSlug);
-    const { admin: { defaultColumns, useAsTitle } } = collectionConfig;
-    const prevCollection = useRef(collectionSlug);
-    const hasInitialized = useRef(false);
+    const { config: { collections } } = useConfig();
+    const collectionConfig = collections.find((collectionConfig)=>collectionConfig.slug === collectionSlug);
+    const { admin: { defaultColumns, useAsTitle }, fields } = collectionConfig;
+    const prevCollection = React.useRef(collectionSlug);
     const { getPreference, setPreference } = usePreferences();
-    const [initialColumns] = useState(()=>getInitialColumns(filterFields(fieldMap), useAsTitle, defaultColumns));
-    const [tableColumns, dispatchTableColumns] = useReducer(columnReducer, {}, ()=>{
-        return buildColumnState({
+    const [initialColumns] = useState(()=>getInitialColumns(filterFields(fields), useAsTitle, defaultColumns));
+    const [tableColumns, setTableColumns] = React.useState(()=>buildColumnState({
             cellProps,
             columnPreferences: listPreferences?.columns,
             columns: initialColumns,
             enableRowSelections,
-            fieldMap,
+            fields,
             useAsTitle
+        }));
+    const updateColumnPreferences = React.useCallback((newColumns)=>{
+        const columns = newColumns.map((c)=>({
+                accessor: c?.accessor,
+                active: c?.active
+            }));
+        void setPreference(preferenceKey, {
+            columns
+        }, true);
+    }, [
+        preferenceKey,
+        setPreference
+    ]);
+    const reassignLinkColumn = (columns)=>{
+        let foundFirstActive = false;
+        const newColumns = columns.map((col)=>{
+            const linkColumn = col.active && !foundFirstActive && col.accessor !== '_select';
+            if (linkColumn) foundFirstActive = true;
+            return {
+                ...col,
+                cellProps: {
+                    ...col.cellProps,
+                    link: linkColumn
+                }
+            };
         });
-    });
-    // /////////////////////////////////////
-    // Get preferences on collection change
-    // /////////////////////////////////////
-    useEffect(()=>{
+        return newColumns;
+    };
+    const moveColumn = useCallback((args)=>{
+        const { fromIndex, toIndex } = args;
+        const withMovedColumn = [
+            ...tableColumns
+        ];
+        const [columnToMove] = withMovedColumn.splice(fromIndex, 1);
+        withMovedColumn.splice(toIndex, 0, columnToMove);
+        const newColumns = reassignLinkColumn(withMovedColumn);
+        setTableColumns(newColumns);
+        updateColumnPreferences(newColumns);
+    }, [
+        tableColumns,
+        updateColumnPreferences
+    ]);
+    const toggleColumn = useCallback((column)=>{
+        const toggledColumns = tableColumns.map((col)=>{
+            return {
+                ...col,
+                active: col?.cellProps?.field && 'name' in col.cellProps.field && col?.cellProps?.field?.name === column ? !col.active : col.active
+            };
+        });
+        const newColumns = reassignLinkColumn(toggledColumns);
+        setTableColumns(newColumns);
+        updateColumnPreferences(newColumns);
+    }, [
+        tableColumns,
+        updateColumnPreferences
+    ]);
+    const setActiveColumns = React.useCallback((activeColumnAccessors)=>{
+        const activeColumns = tableColumns.map((col)=>{
+            return {
+                ...col,
+                active: activeColumnAccessors.includes(col.accessor)
+            };
+        });
+        const newColumns = reassignLinkColumn(activeColumns);
+        updateColumnPreferences(newColumns);
+    }, [
+        tableColumns,
+        updateColumnPreferences
+    ]);
+    // //////////////////////////////////////////////
+    // Get preferences on collection change (drawers)
+    // //////////////////////////////////////////////
+    React.useEffect(()=>{
         const sync = async ()=>{
             const collectionHasChanged = prevCollection.current !== collectionSlug;
             if (collectionHasChanged || !listPreferences) {
                 const currentPreferences = await getPreference(preferenceKey);
                 prevCollection.current = collectionSlug;
                 if (currentPreferences?.columns) {
-                    dispatchTableColumns({
-                        type: 'set',
-                        payload: {
-                            columns: buildColumnState({
-                                cellProps,
-                                columnPreferences: currentPreferences?.columns,
-                                columns: initialColumns,
-                                enableRowSelections: true,
-                                fieldMap,
-                                useAsTitle
-                            })
-                        }
-                    });
+                    setTableColumns(buildColumnState({
+                        cellProps,
+                        columnPreferences: currentPreferences?.columns,
+                        columns: initialColumns,
+                        enableRowSelections: true,
+                        fields,
+                        useAsTitle
+                    }));
                 }
             }
         };
@@ -60,82 +117,22 @@ export const TableColumnsProvider = ({ cellProps, children, collectionSlug, enab
         preferenceKey,
         getPreference,
         collectionSlug,
-        fieldMap,
+        fields,
         cellProps,
         defaultColumns,
         useAsTitle,
         listPreferences,
         initialColumns
     ]);
-    // /////////////////////////////////////
-    // Set preferences on column change
-    // /////////////////////////////////////
-    useEffect(()=>{
-        if (!hasInitialized.current) {
-            hasInitialized.current = true;
-            return;
-        }
-        const columns = tableColumns.map((c)=>({
-                accessor: c?.accessor,
-                active: c?.active
-            }));
-        void setPreference(preferenceKey, {
-            columns
-        }, true);
-    }, [
-        tableColumns,
-        preferenceKey,
-        setPreference
-    ]);
-    const setActiveColumns = useCallback((columns)=>{
-    // dispatchTableColumns({
-    //   type: 'set',
-    //   payload: {
-    //     // onSelect,
-    //     cellProps,
-    //     collection: { ...collectionConfig, fields: formatFields(collectionConfig) },
-    //     columns: columns.map((column) => ({
-    //       accessor: column,
-    //       active: true,
-    //     })),
-    //     i18n,
-    //   },
-    // })
-    }, [
-        collectionConfig,
-        cellProps
-    ]);
-    const moveColumn = useCallback((args)=>{
-        const { fromIndex, toIndex } = args;
-        dispatchTableColumns({
-            type: 'move',
-            payload: {
-                fromIndex,
-                toIndex
-            }
-        });
-    }, [
-        dispatchTableColumns
-    ]);
-    const toggleColumn = useCallback((column)=>{
-        dispatchTableColumns({
-            type: 'toggle',
-            payload: {
-                column
-            }
-        });
-    }, [
-        dispatchTableColumns
-    ]);
-    return /*#__PURE__*/ React.createElement(TableColumnContext.Provider, {
+    return /*#__PURE__*/ _jsx(TableColumnContext.Provider, {
         value: {
             columns: tableColumns,
-            dispatchTableColumns,
             moveColumn,
             setActiveColumns,
             toggleColumn
-        }
-    }, children);
+        },
+        children: children
+    });
 };
 
 //# sourceMappingURL=index.js.map