@payloadcms/ui 3.0.0-canary.b8dd0db → 3.0.0-canary.bb00d64

package/dist/elements/Table/index.scss

@@ -1,54 +1,106 @@
 @import '../../scss/styles.scss';
 
-.table {
-  margin-bottom: $baseline;
-  overflow: auto;
-  max-width: 100%;
+@layer payload-default {
+  .table {
+    margin-bottom: $baseline;
+    overflow: auto;
+    max-width: 100%;
 
-  thead {
-    color: var(--theme-elevation-400);
+    table {
+      min-width: 100%;
+    }
+
+    thead {
+      color: var(--theme-elevation-400);
 
-    th {
-      font-weight: normal;
-      text-align: left;
-      [dir='rtl'] & {
-        text-align: right;
+      th {
+        font-weight: normal;
+        text-align: left;
+        [dir='rtl'] & {
+          text-align: right;
+        }
       }
     }
-  }
 
-  th,
-  td {
-    padding: base(0.8) base(0.6);
-    min-width: 150px;
+    th,
+    td {
+      vertical-align: top;
+      padding: base(0.8) base(0.6);
+      min-width: 150px;
+
+      &:first-child {
+        padding-inline-start: base(0.8);
+      }
 
-    &:first-child {
-      padding-inline-start: base(0.8);
+      &:last-child {
+        padding-inline-end: base(0.8);
+      }
     }
 
-    &:last-child {
-      padding-inline-end: base(0.8);
+    tbody {
+      tr {
+        &:nth-child(odd) {
+          background: var(--theme-elevation-50);
+          border-radius: $style-radius-s;
+        }
+      }
+    }
+
+    a:focus-visible {
+      outline: var(--accessibility-outline);
+      outline-offset: var(--accessibility-outline-offset);
     }
-  }
 
-  tbody {
-    tr {
-      &:nth-child(odd) {
+    &--appearance-condensed {
+      thead {
+        th:first-child {
+          border-top-left-radius: $style-radius-s;
+        }
+
+        th:last-child {
+          border-top-right-radius: $style-radius-s;
+        }
+
         background: var(--theme-elevation-50);
-        border-radius: $style-radius-s;
       }
-    }
-  }
 
-  a:focus-visible {
-    outline: var(--accessibility-outline);
-    outline-offset: var(--accessibility-outline-offset);
-  }
+      tbody {
+        tr {
+          &:nth-child(odd) {
+            background: transparent;
+            border-radius: 0;
+          }
+        }
+      }
 
-  @include mid-break {
-    th,
-    td {
-      max-width: 70vw;
+      th,
+      td {
+        padding: base(0.3) base(0.3);
+
+        &:first-child {
+          padding-inline-start: base(0.6);
+        }
+
+        &:last-child {
+          padding-inline-end: base(0.6);
+        }
+      }
+
+      th {
+        padding: base(0.3);
+      }
+
+      tr td,
+      th {
+        border: 0.5px solid var(--theme-elevation-100);
+      }
+    }
+
+    @include mid-break {
+      th,
+      td {
+        max-width: 70vw;
+      }
     }
   }
 }

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

@@ -0,0 +1,11 @@
+import type { DefaultCellComponentProps } from 'payload';
+import React from 'react';
+import './index.scss';
+export declare const useCellProps: () => DefaultCellComponentProps | null;
+export declare const RenderDefaultCell: React.FC<{
+    clientProps: DefaultCellComponentProps;
+    columnIndex: number;
+    enableRowSelections?: boolean;
+    isLinkedColumn?: boolean;
+}>;
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/elements/TableColumns/RenderDefaultCell/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAA;AAExD,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,OAAO,cAAc,CAAA;AAMrB,eAAO,MAAM,YAAY,QAAO,yBAAyB,GAAG,IACxB,CAAA;AAEpC,eAAO,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC;IACvC,WAAW,EAAE,yBAAyB,CAAA;IACtC,WAAW,EAAE,MAAM,CAAA;IACnB,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAwBA,CAAA"}

package/dist/elements/TableColumns/RenderDefaultCell/index.js

@@ -0,0 +1,77 @@
+'use client';
+
+import { c as _c } from "react/compiler-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
+import React from 'react';
+import { useListDrawerContext } from '../../../elements/ListDrawer/Provider.js';
+import { DefaultCell } from '../../Table/DefaultCell/index.js';
+import { useTableColumns } from '../index.js';
+import './index.scss';
+const baseClass = 'default-cell';
+const CellPropsContext = /*#__PURE__*/React.createContext(null);
+export const useCellProps = () => {
+  return React.useContext(CellPropsContext);
+};
+export const RenderDefaultCell = t0 => {
+  const $ = _c(9);
+  const {
+    clientProps,
+    columnIndex,
+    isLinkedColumn
+  } = t0;
+  const {
+    drawerSlug,
+    onSelect
+  } = useListDrawerContext();
+  const {
+    LinkedCellOverride
+  } = useTableColumns();
+  let t1;
+  if ($[0] !== clientProps || $[1] !== columnIndex || $[2] !== isLinkedColumn || $[3] !== drawerSlug || $[4] !== onSelect || $[5] !== LinkedCellOverride) {
+    const propsToPass = {
+      ...clientProps,
+      columnIndex
+    };
+    if (isLinkedColumn && drawerSlug) {
+      propsToPass.className = `${baseClass}__first-cell`;
+      propsToPass.link = false;
+      let t2;
+      if ($[7] !== onSelect) {
+        t2 = t3 => {
+          const {
+            collectionSlug: rowColl,
+            rowData
+          } = t3;
+          if (typeof onSelect === "function") {
+            onSelect({
+              collectionSlug: rowColl,
+              docID: rowData.id
+            });
+          }
+        };
+        $[7] = onSelect;
+        $[8] = t2;
+      } else {
+        t2 = $[8];
+      }
+      propsToPass.onClick = t2;
+    }
+    t1 = _jsx(CellPropsContext.Provider, {
+      value: propsToPass,
+      children: isLinkedColumn && LinkedCellOverride ? LinkedCellOverride : _jsx(DefaultCell, {
+        ...propsToPass
+      })
+    });
+    $[0] = clientProps;
+    $[1] = columnIndex;
+    $[2] = isLinkedColumn;
+    $[3] = drawerSlug;
+    $[4] = onSelect;
+    $[5] = LinkedCellOverride;
+    $[6] = t1;
+  } else {
+    t1 = $[6];
+  }
+  return t1;
+};
+//# sourceMappingURL=index.js.map

package/dist/elements/TableColumns/RenderDefaultCell/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","names":["c","_c","React","useListDrawerContext","DefaultCell","useTableColumns","baseClass","CellPropsContext","createContext","useCellProps","useContext","RenderDefaultCell","t0","$","clientProps","columnIndex","isLinkedColumn","drawerSlug","onSelect","LinkedCellOverride","t1","propsToPass","className","link","t2","t3","collectionSlug","rowColl","rowData","docID","id","onClick","_jsx","Provider","value","children"],"sources":["../../../../src/elements/TableColumns/RenderDefaultCell/index.tsx"],"sourcesContent":["'use client'\nimport type { DefaultCellComponentProps } from 'payload'\n\nimport React from 'react'\n\nimport { useListDrawerContext } from '../../../elements/ListDrawer/Provider.js'\nimport { DefaultCell } from '../../Table/DefaultCell/index.js'\nimport { useTableColumns } from '../index.js'\nimport './index.scss'\n\nconst baseClass = 'default-cell'\n\nconst CellPropsContext = React.createContext<DefaultCellComponentProps | null>(null)\n\nexport const useCellProps = (): DefaultCellComponentProps | null =>\n  React.useContext(CellPropsContext)\n\nexport const RenderDefaultCell: React.FC<{\n  clientProps: DefaultCellComponentProps\n  columnIndex: number\n  enableRowSelections?: boolean\n  isLinkedColumn?: boolean\n}> = ({ clientProps, columnIndex, isLinkedColumn }) => {\n  const { drawerSlug, onSelect } = useListDrawerContext()\n  const { LinkedCellOverride } = useTableColumns()\n\n  const propsToPass = { ...clientProps, columnIndex }\n\n  if (isLinkedColumn && drawerSlug) {\n    propsToPass.className = `${baseClass}__first-cell`\n    propsToPass.link = false\n    propsToPass.onClick = ({ collectionSlug: rowColl, rowData }) => {\n      if (typeof onSelect === 'function') {\n        onSelect({\n          collectionSlug: rowColl,\n          docID: rowData.id as string,\n        })\n      }\n    }\n  }\n\n  return (\n    <CellPropsContext.Provider value={propsToPass}>\n      {isLinkedColumn && LinkedCellOverride ? LinkedCellOverride : <DefaultCell {...propsToPass} />}\n    </CellPropsContext.Provider>\n  )\n}\n"],"mappings":"AAAA;;AAAA,SAAAA,CAAA,IAAAC,EAAA;;AAGA,OAAOC,KAAA,MAAW;AAElB,SAASC,oBAAoB,QAAQ;AACrC,SAASC,WAAW,QAAQ;AAC5B,SAASC,eAAe,QAAQ;AAChC,OAAO;AAEP,MAAMC,SAAA,GAAY;AAElB,MAAMC,gBAAA,gBAAmBL,KAAA,CAAMM,aAAa,CAAmC;AAE/E,OAAO,MAAMC,YAAA,GAAeA,CAAA;EAAA,OAC1BP,KAAA,CAAAQ,UAAA,CAAAH,gBAAiB;AAAA;AAEnB,OAAO,MAAMI,iBAAA,GAKRC,EAAA;EAAA,MAAAC,CAAA,GAAAZ,EAAA;EAAC;IAAAa,WAAA;IAAAC,WAAA;IAAAC;EAAA,IAAAJ,EAA4C;EAChD;IAAAK,UAAA;IAAAC;EAAA,IAAiCf,oBAAA;EACjC;IAAAgB;EAAA,IAA+Bd,eAAA;EAAA,IAAAe,EAAA;EAAA,IAAAP,CAAA,QAAAC,WAAA,IAAAD,CAAA,QAAAE,WAAA,IAAAF,CAAA,QAAAG,cAAA,IAAAH,CAAA,QAAAI,UAAA,IAAAJ,CAAA,QAAAK,QAAA,IAAAL,CAAA,QAAAM,kBAAA;IAE/B,MAAAE,WAAA;MAAA,GAAyBP,WAAW;MAAAC;IAAA;IAAc,IAE9CC,cAAA,IAAkBC,UAAA;MACpBI,WAAA,CAAAC,SAAA,GAAwB,GAAAhB,SAAA,cAA0B;MAClDe,WAAA,CAAAE,IAAA;MAAA,IAAAC,EAAA;MAAA,IAAAX,CAAA,QAAAK,QAAA;QACsBM,EAAA,GAAAC,EAAA;UAAC;YAAAC,cAAA,EAAAC,OAAA;YAAAC;UAAA,IAAAH,EAAoC;UAAA,IACrD,OAAOP,QAAA,KAAa;YACtBA,QAAA;cAAAQ,cAAA,EACkBC,OAAA;cAAAE,KAAA,EACTD,OAAA,CAAAE;YAAA,CACT;UAAA;QAAA;QAEJjB,CAAA,MAAAK,QAAA;QAAAL,CAAA,MAAAW,EAAA;MAAA;QAAAA,EAAA,GAAAX,CAAA;MAAA;MAPAQ,WAAA,CAAAU,OAAA,GAAsBP,EAOtB;IAAA;IAIAJ,EAAA,GAAAY,IAAA,CAAAzB,gBAAA,CAAA0B,QAAA;MAAAC,KAAA,EAAkCb,WAAA;MAAAc,QAAA,EAC/BnB,cAAA,IAAkBG,kBAAA,GAAqBA,kBAAA,GAAqBa,IAAA,CAAA5B,WAAA;QAAA,GAAiBiB;MAAW,C;;;;;;;;;;;;SAD3FD,E;CAIJ","ignoreList":[]}

package/dist/elements/TableColumns/RenderDefaultCell/index.scss

@@ -0,0 +1,15 @@
+@import '../../../scss/styles.scss';
+
+@layer payload-default {
+  .default-cell {
+    &__first-cell {
+      border: 0;
+      background-color: transparent;
+      padding: 0;
+      cursor: pointer;
+      text-decoration: underline;
+      text-align: left;
+      white-space: nowrap;
+    }
+  }
+}

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

@@ -1,12 +1,21 @@
-import type { CellComponentProps, ClientField, SanitizedCollectionConfig } from 'payload';
-import type { ColumnPreferences } from '../../providers/ListInfo/index.js';
+import type { I18nClient } from '@payloadcms/translations';
+import { type ClientCollectionConfig, type DefaultCellComponentProps, type Field, type PaginatedDocs, type Payload, type SanitizedCollectionConfig } from 'payload';
+import type { ColumnPreferences } from '../../providers/ListQuery/index.js';
+import type { SortColumnProps } from '../SortColumn/index.js';
 import type { Column } from '../Table/index.js';
 type Args = {
-    cellProps: Partial<CellComponentProps>[];
+    beforeRows?: Column[];
+    collectionConfig: ClientCollectionConfig;
     columnPreferences: ColumnPreferences;
     columns?: ColumnPreferences;
+    customCellProps: DefaultCellComponentProps['customCellProps'];
+    docs: PaginatedDocs['docs'];
     enableRowSelections: boolean;
-    fields: ClientField[];
+    enableRowTypes?: boolean;
+    fields: Field[];
+    i18n: I18nClient;
+    payload: Payload;
+    sortColumnProps?: Partial<SortColumnProps>;
     useAsTitle: SanitizedCollectionConfig['admin']['useAsTitle'];
 };
 export declare const buildColumnState: (args: Args) => Column[];

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

@@ -1 +1 @@
-{"version":3,"file":"buildColumnState.d.ts","sourceRoot":"","sources":["../../../src/elements/TableColumns/buildColumnState.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,kBAAkB,EAClB,WAAW,EACX,yBAAyB,EAE1B,MAAM,SAAS,CAAA;AAIhB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAA;AAC1E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAS/C,KAAK,IAAI,GAAG;IACV,SAAS,EAAE,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAA;IACxC,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,OAAO,CAAC,EAAE,iBAAiB,CAAA;IAC3B,mBAAmB,EAAE,OAAO,CAAA;IAC5B,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,UAAU,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAA;CAC7D,CAAA;AAED,eAAO,MAAM,gBAAgB,SAAU,IAAI,KAAG,MAAM,EA2InD,CAAA"}
+{"version":3,"file":"buildColumnState.d.ts","sourceRoot":"","sources":["../../../src/elements/TableColumns/buildColumnState.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAE1D,OAAO,EACL,KAAK,sBAAsB,EAC3B,KAAK,yBAAyB,EAC9B,KAAK,KAAK,EAEV,KAAK,aAAa,EAClB,KAAK,OAAO,EAEZ,KAAK,yBAAyB,EAE/B,MAAM,SAAS,CAAA;AAIhB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAA;AAC3E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAa/C,KAAK,IAAI,GAAG;IACV,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,gBAAgB,EAAE,sBAAsB,CAAA;IACxC,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,OAAO,CAAC,EAAE,iBAAiB,CAAA;IAC3B,eAAe,EAAE,yBAAyB,CAAC,iBAAiB,CAAC,CAAA;IAC7D,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;IAC3B,mBAAmB,EAAE,OAAO,CAAA;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,eAAe,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;IAC1C,UAAU,EAAE,yBAAyB,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAA;CAC7D,CAAA;AAED,eAAO,MAAM,gBAAgB,SAAU,IAAI,KAAG,MAAM,EAyPnD,CAAA"}

package/dist/elements/TableColumns/buildColumnState.js

@@ -1,27 +1,34 @@
-'use client';
-
 import { jsx as _jsx } from "react/jsx-runtime";
+import { MissingEditorProp } from 'payload';
+import { deepCopyObjectSimple, fieldIsPresentationalOnly } from 'payload/shared';
 import React from 'react';
-import { FieldLabel } from '../../fields/FieldLabel/index.js';
+import { RenderCustomComponent, RenderDefaultCell, SelectAll, SelectRow, SortColumn } from '../../exports/client/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';
+import { RenderServerComponent } from '../RenderServerComponent/index.js';
 export const buildColumnState = args => {
   const {
-    cellProps,
+    beforeRows,
+    collectionConfig,
     columnPreferences,
     columns,
+    customCellProps,
+    docs,
     enableRowSelections,
     fields,
+    i18n,
+    payload,
+    sortColumnProps,
     useAsTitle
   } = args;
-  let sortedFieldMap = flattenFieldMap(fields);
+  const clientFields = collectionConfig.fields;
+  // clientFields contains the fake `id` column
+  let sortedFieldMap = flattenFieldMap(clientFields);
+  let _sortedFieldMap = flattenFieldMap(fields) // TODO: think of a way to avoid this additional flatten
+  ;
   // 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 => 'name' in 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);
@@ -32,88 +39,152 @@ export const buildColumnState = args => {
     sortedFieldMap.unshift(useAsTitleField);
   }
   const sortTo = columnPreferences || columns;
+  const sortFieldMap = (fieldMap, sortTo) => fieldMap?.sort((a, b) => {
+    const aIndex = sortTo.findIndex(column => 'name' in a && column.accessor === a.name);
+    const bIndex = sortTo.findIndex(column => 'name' in b && column.accessor === b.name);
+    if (aIndex === -1 && bIndex === -1) {
+      return 0;
+    }
+    if (aIndex === -1) {
+      return 1;
+    }
+    if (bIndex === -1) {
+      return -1;
+    }
+    return aIndex - bIndex;
+  });
   if (sortTo) {
     // sort the fields to the order of `defaultColumns` or `columnPreferences`
-    sortedFieldMap = sortedFieldMap.sort((a, b) => {
-      const aIndex = sortTo.findIndex(column => 'name' in a && column.accessor === a.name);
-      const bIndex = sortTo.findIndex(column => 'name' in b && column.accessor === b.name);
-      if (aIndex === -1 && bIndex === -1) return 0;
-      if (aIndex === -1) return 1;
-      if (bIndex === -1) return -1;
-      return aIndex - bIndex;
-    });
+    sortedFieldMap = sortFieldMap(sortedFieldMap, sortTo);
+    _sortedFieldMap = sortFieldMap(_sortedFieldMap, sortTo) // TODO: think of a way to avoid this additional sort
+    ;
   }
   const activeColumnsIndices = [];
-  const sorted = sortedFieldMap.reduce((acc, field, index) => {
-    const columnPreference = columnPreferences?.find(preference => 'name' in field && preference.accessor === field.name);
+  const sorted = sortedFieldMap?.reduce((acc, field, index) => {
+    const _field = _sortedFieldMap.find(f => 'name' in field && 'name' in f && f.name === field.name);
+    const columnPreference = columnPreferences?.find(preference => field && 'name' in field && preference.accessor === field.name);
     let active = false;
     if (columnPreference) {
       active = columnPreference.active;
     } else if (columns && Array.isArray(columns) && columns.length > 0) {
-      active = columns.find(column => 'name' in field && column.accessor === field.name)?.active;
+      active = columns.find(column => field && 'name' in field && column.accessor === field.name)?.active;
     } else if (activeColumnsIndices.length < 4) {
       active = true;
     }
     if (active && !activeColumnsIndices.includes(index)) {
       activeColumnsIndices.push(index);
     }
-    const isFirstActiveColumn = activeColumnsIndices[0] === index;
-    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,
-      field: field,
-      label: 'label' in field ? field.label : undefined,
-      unstyled: true
-    });
+    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 CustomLabel = CustomLabelToRender ? /*#__PURE__*/_jsx(RenderServerComponent, {
+      Component: CustomLabelToRender,
+      importMap: payload.importMap
+    }) : undefined;
     const fieldAffectsDataSubFields = field && field.type && (field.type === 'array' || field.type === 'group' || field.type === 'blocks');
     const Heading = /*#__PURE__*/_jsx(SortColumn, {
-      Label: Label,
-      disable: fieldAffectsDataSubFields || field?._isPresentational || undefined,
-      label: 'label' in field ? field.label : undefined,
-      name: 'name' in field ? field.name : undefined
+      disable: fieldAffectsDataSubFields || fieldIsPresentationalOnly(field) || undefined,
+      Label: CustomLabel,
+      label: field && 'label' in field ? field.label : undefined,
+      name: 'name' in field ? field.name : undefined,
+      ...(sortColumnProps || {})
     });
-    if (field) {
-      const column = {
-        Label,
-        accessor: 'name' in field ? field.name : undefined,
-        active,
-        cellProps: {
-          field: {
-            ...(field || {}),
-            ...(cellProps?.[index]?.field || {})
-          },
-          ...cellProps?.[index],
-          link: isFirstActiveColumn
-        },
-        components: {
-          Cell: field.admin?.components?.Cell || {
-            type: 'client',
-            Component: DefaultCell,
-            RenderedComponent: null
-          },
-          Heading
+    const baseCellClientProps = {
+      cellData: undefined,
+      collectionConfig: deepCopyObjectSimple(collectionConfig),
+      customCellProps,
+      field,
+      rowData: undefined
+    };
+    const serverProps = {
+      field: _field,
+      i18n,
+      payload
+    };
+    const column = {
+      accessor: 'name' in field ? field.name : undefined,
+      active,
+      CustomLabel,
+      field,
+      Heading,
+      renderedCells: active ? docs.map((doc, i) => {
+        const isLinkedColumn = index === activeColumnsIndices[0];
+        const cellClientProps = {
+          ...baseCellClientProps,
+          cellData: 'name' in field ? doc[field.name] : undefined,
+          link: isLinkedColumn,
+          rowData: doc
+        };
+        let CustomCell = null;
+        if (_field?.type === 'richText') {
+          if (!_field?.editor) {
+            throw new MissingEditorProp(_field) // while we allow disabling editor functionality, you should not have any richText fields defined if you do not have an editor
+            ;
+          }
+          if (typeof _field?.editor === 'function') {
+            throw new Error('Attempted to access unsanitized rich text editor.');
+          }
+          if (!_field.admin) {
+            _field.admin = {};
+          }
+          if (!_field.admin.components) {
+            _field.admin.components = {};
+          }
+          /**
+          * We have to deep copy all the props we send to the client (= CellComponent.clientProps).
+          * That way, every editor's field / cell props we send to the client have their own object references.
+          *
+          * If we send the same object reference to the client twice (e.g. through some configurations where 2 or more fields
+          * reference the same editor object, like the root editor), the admin panel may hang indefinitely. This has been happening since
+          * a newer Next.js update that made it break when sending the same object reference to the client twice.
+          *
+          * We can use deepCopyObjectSimple as client props should be JSON-serializable.
+          */
+          const CellComponent = _field.editor.CellComponent;
+          if (typeof CellComponent === 'object' && CellComponent.clientProps) {
+            CellComponent.clientProps = deepCopyObjectSimple(CellComponent.clientProps);
+          }
+          CustomCell = /*#__PURE__*/_jsx(RenderServerComponent, {
+            clientProps: cellClientProps,
+            Component: CellComponent,
+            importMap: payload.importMap,
+            serverProps: serverProps
+          });
+        } else {
+          CustomCell = _field?.admin && 'components' in _field.admin && _field.admin.components?.Cell ? /*#__PURE__*/_jsx(RenderServerComponent, {
+            clientProps: cellClientProps,
+            Component: _field?.admin && 'components' in _field.admin && _field.admin.components?.Cell,
+            importMap: payload.importMap,
+            serverProps: serverProps
+          }) : undefined;
         }
-      };
-      acc.push(column);
-    }
+        return /*#__PURE__*/_jsx(RenderCustomComponent, {
+          CustomComponent: CustomCell,
+          Fallback: /*#__PURE__*/_jsx(RenderDefaultCell, {
+            clientProps: cellClientProps,
+            columnIndex: index,
+            enableRowSelections: enableRowSelections,
+            isLinkedColumn: isLinkedColumn
+          })
+        }, `${i}-${index}`);
+      }) : []
+    };
+    acc.push(column);
     return acc;
   }, []);
   if (enableRowSelections) {
-    sorted.unshift({
-      Label: null,
+    sorted?.unshift({
       accessor: '_select',
       active: true,
-      components: {
-        Cell: {
-          type: 'client',
-          Component: null,
-          RenderedComponent: /*#__PURE__*/_jsx(SelectRow, {})
-        },
-        Heading: /*#__PURE__*/_jsx(SelectAll, {})
-      }
+      field: null,
+      Heading: /*#__PURE__*/_jsx(SelectAll, {}),
+      renderedCells: docs.map((_, i) => /*#__PURE__*/_jsx(SelectRow, {
+        rowData: docs[i]
+      }, i))
     });
   }
+  if (beforeRows) {
+    sorted.unshift(...beforeRows);
+  }
   return sorted;
 };
 //# sourceMappingURL=buildColumnState.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"buildColumnState.js","names":["React","FieldLabel","flattenFieldMap","SelectAll","SelectRow","SortColumn","DefaultCell","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","_jsx","label","unstyled","fieldAffectsDataSubFields","type","Heading","disable","_isPresentational","link","Cell","Component","RenderedComponent"],"sources":["../../../src/elements/TableColumns/buildColumnState.tsx"],"sourcesContent":["'use client'\nimport type {\n  CellComponentProps,\n  ClientField,\n  SanitizedCollectionConfig,\n  StaticLabel,\n} from 'payload'\n\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'\nimport { DefaultCell } from '../Table/DefaultCell/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        field={field}\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"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"buildColumnState.js","names":["MissingEditorProp","deepCopyObjectSimple","fieldIsPresentationalOnly","React","RenderCustomComponent","RenderDefaultCell","SelectAll","SelectRow","SortColumn","flattenFieldMap","RenderServerComponent","buildColumnState","args","beforeRows","collectionConfig","columnPreferences","columns","customCellProps","docs","enableRowSelections","fields","i18n","payload","sortColumnProps","useAsTitle","clientFields","sortedFieldMap","_sortedFieldMap","idFieldIndex","findIndex","field","name","idField","splice","unshift","useAsTitleFieldIndex","useAsTitleField","sortTo","sortFieldMap","fieldMap","sort","a","b","aIndex","column","accessor","bIndex","activeColumnsIndices","sorted","reduce","acc","index","_field","find","f","columnPreference","preference","active","Array","isArray","length","includes","push","CustomLabelToRender","admin","components","Label","undefined","CustomLabel","_jsx","Component","importMap","fieldAffectsDataSubFields","type","Heading","disable","label","baseCellClientProps","cellData","rowData","serverProps","renderedCells","map","doc","i","isLinkedColumn","cellClientProps","link","CustomCell","editor","Error","CellComponent","clientProps","Cell","CustomComponent","Fallback","columnIndex","_"],"sources":["../../../src/elements/TableColumns/buildColumnState.tsx"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\n\nimport {\n  type ClientCollectionConfig,\n  type DefaultCellComponentProps,\n  type Field,\n  MissingEditorProp,\n  type PaginatedDocs,\n  type Payload,\n  type PayloadComponent,\n  type SanitizedCollectionConfig,\n  type StaticLabel,\n} from 'payload'\nimport { deepCopyObjectSimple, fieldIsPresentationalOnly } from 'payload/shared'\nimport React from 'react'\n\nimport type { ColumnPreferences } from '../../providers/ListQuery/index.js'\nimport type { SortColumnProps } from '../SortColumn/index.js'\nimport type { Column } from '../Table/index.js'\n\nimport {\n  RenderCustomComponent,\n  RenderDefaultCell,\n  SelectAll,\n  SelectRow,\n  SortColumn,\n  // eslint-disable-next-line payload/no-imports-from-exports-dir\n} from '../../exports/client/index.js'\nimport { flattenFieldMap } from '../../utilities/flattenFieldMap.js'\nimport { RenderServerComponent } from '../RenderServerComponent/index.js'\n\ntype Args = {\n  beforeRows?: Column[]\n  collectionConfig: ClientCollectionConfig\n  columnPreferences: ColumnPreferences\n  columns?: ColumnPreferences\n  customCellProps: DefaultCellComponentProps['customCellProps']\n  docs: PaginatedDocs['docs']\n  enableRowSelections: boolean\n  enableRowTypes?: boolean\n  fields: Field[]\n  i18n: I18nClient\n  payload: Payload\n  sortColumnProps?: Partial<SortColumnProps>\n  useAsTitle: SanitizedCollectionConfig['admin']['useAsTitle']\n}\n\nexport const buildColumnState = (args: Args): Column[] => {\n  const {\n    beforeRows,\n    collectionConfig,\n    columnPreferences,\n    columns,\n    customCellProps,\n    docs,\n    enableRowSelections,\n    fields,\n    i18n,\n    payload,\n    sortColumnProps,\n    useAsTitle,\n  } = args\n\n  const clientFields = collectionConfig.fields\n\n  // clientFields contains the fake `id` column\n  let sortedFieldMap = flattenFieldMap(clientFields)\n  let _sortedFieldMap = flattenFieldMap(fields) // TODO: think of a way to avoid this additional flatten\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  const sortFieldMap = (fieldMap, sortTo) =>\n    fieldMap?.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\n      if (aIndex === -1 && bIndex === -1) {\n        return 0\n      }\n\n      if (aIndex === -1) {\n        return 1\n      }\n\n      if (bIndex === -1) {\n        return -1\n      }\n\n      return aIndex - bIndex\n    })\n\n  if (sortTo) {\n    // sort the fields to the order of `defaultColumns` or `columnPreferences`\n    sortedFieldMap = sortFieldMap(sortedFieldMap, sortTo)\n    _sortedFieldMap = sortFieldMap(_sortedFieldMap, sortTo) // TODO: think of a way to avoid this additional sort\n  }\n\n  const activeColumnsIndices = []\n\n  const sorted: Column[] = sortedFieldMap?.reduce((acc, field, index) => {\n    const _field = _sortedFieldMap.find(\n      (f) => 'name' in field && 'name' in f && f.name === field.name,\n    )\n\n    const columnPreference = columnPreferences?.find(\n      (preference) => field && '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(\n        (column) => field && 'name' in field && column.accessor === field.name,\n      )?.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 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 CustomLabel = CustomLabelToRender ? (\n      <RenderServerComponent Component={CustomLabelToRender} importMap={payload.importMap} />\n    ) : undefined\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        disable={fieldAffectsDataSubFields || fieldIsPresentationalOnly(field) || undefined}\n        Label={CustomLabel}\n        label={field && 'label' in field ? (field.label as StaticLabel) : undefined}\n        name={'name' in field ? field.name : undefined}\n        {...(sortColumnProps || {})}\n      />\n    )\n\n    const baseCellClientProps: DefaultCellComponentProps = {\n      cellData: undefined,\n      collectionConfig: deepCopyObjectSimple(collectionConfig),\n      customCellProps,\n      field,\n      rowData: undefined,\n    }\n\n    const serverProps = {\n      field: _field,\n      i18n,\n      payload,\n    }\n\n    const column: Column = {\n      accessor: 'name' in field ? field.name : undefined,\n      active,\n      CustomLabel,\n      field,\n      Heading,\n      renderedCells: active\n        ? docs.map((doc, i) => {\n            const isLinkedColumn = index === activeColumnsIndices[0]\n\n            const cellClientProps: DefaultCellComponentProps = {\n              ...baseCellClientProps,\n              cellData: 'name' in field ? doc[field.name] : undefined,\n              link: isLinkedColumn,\n              rowData: doc,\n            }\n\n            let CustomCell = null\n\n            if (_field?.type === 'richText') {\n              if (!_field?.editor) {\n                throw new MissingEditorProp(_field) // while we allow disabling editor functionality, you should not have any richText fields defined if you do not have an editor\n              }\n\n              if (typeof _field?.editor === 'function') {\n                throw new Error('Attempted to access unsanitized rich text editor.')\n              }\n\n              if (!_field.admin) {\n                _field.admin = {}\n              }\n\n              if (!_field.admin.components) {\n                _field.admin.components = {}\n              }\n\n              /**\n               * We have to deep copy all the props we send to the client (= CellComponent.clientProps).\n               * That way, every editor's field / cell props we send to the client have their own object references.\n               *\n               * If we send the same object reference to the client twice (e.g. through some configurations where 2 or more fields\n               * reference the same editor object, like the root editor), the admin panel may hang indefinitely. This has been happening since\n               * a newer Next.js update that made it break when sending the same object reference to the client twice.\n               *\n               * We can use deepCopyObjectSimple as client props should be JSON-serializable.\n               */\n              const CellComponent: PayloadComponent = _field.editor.CellComponent\n              if (typeof CellComponent === 'object' && CellComponent.clientProps) {\n                CellComponent.clientProps = deepCopyObjectSimple(CellComponent.clientProps)\n              }\n\n              CustomCell = (\n                <RenderServerComponent\n                  clientProps={cellClientProps}\n                  Component={CellComponent}\n                  importMap={payload.importMap}\n                  serverProps={serverProps}\n                />\n              )\n            } else {\n              CustomCell =\n                _field?.admin && 'components' in _field.admin && _field.admin.components?.Cell ? (\n                  <RenderServerComponent\n                    clientProps={cellClientProps}\n                    Component={\n                      _field?.admin && 'components' in _field.admin && _field.admin.components?.Cell\n                    }\n                    importMap={payload.importMap}\n                    serverProps={serverProps}\n                  />\n                ) : undefined\n            }\n\n            return (\n              <RenderCustomComponent\n                CustomComponent={CustomCell}\n                Fallback={\n                  <RenderDefaultCell\n                    clientProps={cellClientProps}\n                    columnIndex={index}\n                    enableRowSelections={enableRowSelections}\n                    isLinkedColumn={isLinkedColumn}\n                  />\n                }\n                key={`${i}-${index}`}\n              />\n            )\n          })\n        : [],\n    }\n\n    acc.push(column)\n\n    return acc\n  }, [])\n\n  if (enableRowSelections) {\n    sorted?.unshift({\n      accessor: '_select',\n      active: true,\n      field: null,\n      Heading: <SelectAll />,\n      renderedCells: docs.map((_, i) => <SelectRow key={i} rowData={docs[i]} />),\n    })\n  }\n\n  if (beforeRows) {\n    sorted.unshift(...beforeRows)\n  }\n\n  return sorted\n}\n"],"mappings":"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","ignoreList":[]}

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

@@ -1,3 +1,3 @@
-import type { ClientField } from 'payload';
-export declare const filterFields: (incomingFields: ClientField[]) => ClientField[];
+import type { ClientField, Field } from 'payload';
+export declare const filterFields: <T extends ClientField | Field>(incomingFields: T[]) => T[];
 //# 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":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAI1C,eAAO,MAAM,YAAY,mBAAoB,WAAW,EAAE,KAAG,WAAW,EAyBvE,CAAA"}
+{"version":3,"file":"filterFields.d.ts","sourceRoot":"","sources":["../../../src/elements/TableColumns/filterFields.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAIjD,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,WAAW,GAAG,KAAK,kBAAkB,CAAC,EAAE,KAAG,CAAC,EAyBlF,CAAA"}

package/dist/elements/TableColumns/filterFields.js

@@ -1,10 +1,8 @@
-'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 = incomingFields => {
   const shouldSkipField = field => field.type !== 'ui' && field.admin?.disabled === true || field?.admin?.disableListColumn === true;
-  const fields = incomingFields.reduce((formatted, field) => {
+  const fields = incomingFields?.reduce((formatted, field) => {
     if (shouldSkipField(field)) {
       return formatted;
     }