@payloadcms/ui 3.0.0-canary.926cbeb → 3.0.0-canary.95fcd13

package/dist/providers/ComponentMap/buildComponentMap/actions.js

@@ -18,7 +18,7 @@ export const mapActions = (args)=>{
                             ...result[key] || [],
                             /*#__PURE__*/ _jsx(WithServerSideProps, {
                                 Component: Action
-                            })
+                            }, key)
                         ];
                     }
                 });
@@ -26,7 +26,7 @@ export const mapActions = (args)=>{
         });
     }
     if (listActions) {
-        listActions.forEach((action)=>{
+        listActions.forEach((action, i)=>{
             const Action = action;
             if (typeof Action === 'function') {
                 // eslint-disable-next-line @typescript-eslint/no-floating-promises
@@ -34,7 +34,7 @@ export const mapActions = (args)=>{
                     ...result.List,
                     /*#__PURE__*/ _jsx(WithServerSideProps, {
                         Component: Action
-                    })
+                    }, i)
                 ];
             }
         });

package/dist/providers/ComponentMap/buildComponentMap/actions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/providers/ComponentMap/buildComponentMap/actions.tsx"],"sourcesContent":["import type { SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload'\n\nimport React from 'react'\n\nimport type { WithServerSidePropsPrePopulated } from './index.js'\nimport type { ActionMap } from './types.js'\n\nexport const mapActions = (args: {\n  WithServerSideProps: WithServerSidePropsPrePopulated\n  collectionConfig?: SanitizedCollectionConfig\n  globalConfig?: SanitizedGlobalConfig\n}): ActionMap => {\n  const { WithServerSideProps, collectionConfig, globalConfig } = args\n\n  const editViews = (collectionConfig || globalConfig)?.admin?.components?.views?.Edit\n\n  const listActions =\n    typeof collectionConfig?.admin?.components?.views?.List === 'object'\n      ? collectionConfig?.admin?.components?.views?.List?.actions\n      : undefined\n\n  const result: ActionMap = {\n    Edit: {},\n    List: [],\n  }\n\n  if (editViews) {\n    Object.entries(editViews).forEach(([key, view]) => {\n      if (typeof view === 'object' && 'actions' in view) {\n        view.actions.forEach((action) => {\n          const Action = action\n          if (typeof Action === 'function') {\n            result.Edit[key] = [...(result[key] || []), <WithServerSideProps Component={Action} />]\n          }\n        })\n      }\n    })\n  }\n\n  if (listActions) {\n    listActions.forEach((action) => {\n      const Action = action\n      if (typeof Action === 'function') {\n        // eslint-disable-next-line @typescript-eslint/no-floating-promises\n        result.List = [...result.List, <WithServerSideProps Component={Action} />]\n      }\n    })\n  }\n\n  return result\n}\n"],"names":["React","mapActions","args","WithServerSideProps","collectionConfig","globalConfig","editViews","admin","components","views","Edit","listActions","List","actions","undefined","result","Object","entries","forEach","key","view","action","Action","Component"],"mappings":";AAEA,OAAOA,WAAW,QAAO;AAKzB,OAAO,MAAMC,aAAa,CAACC;IAKzB,MAAM,EAAEC,mBAAmB,EAAEC,gBAAgB,EAAEC,YAAY,EAAE,GAAGH;IAEhE,MAAMI,YAAaF,CAAAA,oBAAoBC,YAAW,GAAIE,OAAOC,YAAYC,OAAOC;IAEhF,MAAMC,cACJ,OAAOP,kBAAkBG,OAAOC,YAAYC,OAAOG,SAAS,WACxDR,kBAAkBG,OAAOC,YAAYC,OAAOG,MAAMC,UAClDC;IAEN,MAAMC,SAAoB;QACxBL,MAAM,CAAC;QACPE,MAAM,EAAE;IACV;IAEA,IAAIN,WAAW;QACbU,OAAOC,OAAO,CAACX,WAAWY,OAAO,CAAC,CAAC,CAACC,KAAKC,KAAK;YAC5C,IAAI,OAAOA,SAAS,YAAY,aAAaA,MAAM;gBACjDA,KAAKP,OAAO,CAACK,OAAO,CAAC,CAACG;oBACpB,MAAMC,SAASD;oBACf,IAAI,OAAOC,WAAW,YAAY;wBAChCP,OAAOL,IAAI,CAACS,IAAI,GAAG;+BAAKJ,MAAM,CAACI,IAAI,IAAI,EAAE;0CAAG,KAAChB;gCAAoBoB,WAAWD;;yBAAW;oBACzF;gBACF;YACF;QACF;IACF;IAEA,IAAIX,aAAa;QACfA,YAAYO,OAAO,CAAC,CAACG;YACnB,MAAMC,SAASD;YACf,IAAI,OAAOC,WAAW,YAAY;gBAChC,mEAAmE;gBACnEP,OAAOH,IAAI,GAAG;uBAAIG,OAAOH,IAAI;kCAAE,KAACT;wBAAoBoB,WAAWD;;iBAAW;YAC5E;QACF;IACF;IAEA,OAAOP;AACT,EAAC"}
+{"version":3,"sources":["../../../../src/providers/ComponentMap/buildComponentMap/actions.tsx"],"sourcesContent":["import type { SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload'\n\nimport React from 'react'\n\nimport type { WithServerSidePropsPrePopulated } from './index.js'\nimport type { ActionMap } from './types.js'\n\nexport const mapActions = (args: {\n  WithServerSideProps: WithServerSidePropsPrePopulated\n  collectionConfig?: SanitizedCollectionConfig\n  globalConfig?: SanitizedGlobalConfig\n}): ActionMap => {\n  const { WithServerSideProps, collectionConfig, globalConfig } = args\n\n  const editViews = (collectionConfig || globalConfig)?.admin?.components?.views?.Edit\n\n  const listActions =\n    typeof collectionConfig?.admin?.components?.views?.List === 'object'\n      ? collectionConfig?.admin?.components?.views?.List?.actions\n      : undefined\n\n  const result: ActionMap = {\n    Edit: {},\n    List: [],\n  }\n\n  if (editViews) {\n    Object.entries(editViews).forEach(([key, view]) => {\n      if (typeof view === 'object' && 'actions' in view) {\n        view.actions.forEach((action) => {\n          const Action = action\n          if (typeof Action === 'function') {\n            result.Edit[key] = [\n              ...(result[key] || []),\n              <WithServerSideProps Component={Action} key={key} />,\n            ]\n          }\n        })\n      }\n    })\n  }\n\n  if (listActions) {\n    listActions.forEach((action, i) => {\n      const Action = action\n      if (typeof Action === 'function') {\n        // eslint-disable-next-line @typescript-eslint/no-floating-promises\n        result.List = [...result.List, <WithServerSideProps Component={Action} key={i} />]\n      }\n    })\n  }\n\n  return result\n}\n"],"names":["React","mapActions","args","WithServerSideProps","collectionConfig","globalConfig","editViews","admin","components","views","Edit","listActions","List","actions","undefined","result","Object","entries","forEach","key","view","action","Action","Component","i"],"mappings":";AAEA,OAAOA,WAAW,QAAO;AAKzB,OAAO,MAAMC,aAAa,CAACC;IAKzB,MAAM,EAAEC,mBAAmB,EAAEC,gBAAgB,EAAEC,YAAY,EAAE,GAAGH;IAEhE,MAAMI,YAAaF,CAAAA,oBAAoBC,YAAW,GAAIE,OAAOC,YAAYC,OAAOC;IAEhF,MAAMC,cACJ,OAAOP,kBAAkBG,OAAOC,YAAYC,OAAOG,SAAS,WACxDR,kBAAkBG,OAAOC,YAAYC,OAAOG,MAAMC,UAClDC;IAEN,MAAMC,SAAoB;QACxBL,MAAM,CAAC;QACPE,MAAM,EAAE;IACV;IAEA,IAAIN,WAAW;QACbU,OAAOC,OAAO,CAACX,WAAWY,OAAO,CAAC,CAAC,CAACC,KAAKC,KAAK;YAC5C,IAAI,OAAOA,SAAS,YAAY,aAAaA,MAAM;gBACjDA,KAAKP,OAAO,CAACK,OAAO,CAAC,CAACG;oBACpB,MAAMC,SAASD;oBACf,IAAI,OAAOC,WAAW,YAAY;wBAChCP,OAAOL,IAAI,CAACS,IAAI,GAAG;+BACbJ,MAAM,CAACI,IAAI,IAAI,EAAE;0CACrB,KAAChB;gCAAoBoB,WAAWD;+BAAaH;yBAC9C;oBACH;gBACF;YACF;QACF;IACF;IAEA,IAAIR,aAAa;QACfA,YAAYO,OAAO,CAAC,CAACG,QAAQG;YAC3B,MAAMF,SAASD;YACf,IAAI,OAAOC,WAAW,YAAY;gBAChC,mEAAmE;gBACnEP,OAAOH,IAAI,GAAG;uBAAIG,OAAOH,IAAI;kCAAE,KAACT;wBAAoBoB,WAAWD;uBAAaE;iBAAM;YACpF;QACF;IACF;IAEA,OAAOT;AACT,EAAC"}

package/dist/providers/ComponentMap/buildComponentMap/collections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collections.d.ts","sourceRoot":"","sources":["../../../../src/providers/ComponentMap/buildComponentMap/collections.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,yBAAyB,EACzB,eAAe,EAChB,MAAM,SAAS,CAAA;AAGhB,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,YAAY,CAAA;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAQxD,eAAO,MAAM,cAAc,SAAU;IACnC,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAAC,CAAA;IACxC,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,CAAA;IACzC,mBAAmB,EAAE,+BAA+B,CAAA;IACpD,WAAW,EAAE,yBAAyB,EAAE,CAAA;IACxC,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,UAAU,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,KAAG;IACF,CAAC,GAAG,EAAE,yBAAyB,CAAC,MAAM,CAAC,GAAG,sBAAsB,CAAA;CAuKjE,CAAA"}
+{"version":3,"file":"collections.d.ts","sourceRoot":"","sources":["../../../../src/providers/ComponentMap/buildComponentMap/collections.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,yBAAyB,EACzB,eAAe,EAChB,MAAM,SAAS,CAAA;AAGhB,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,YAAY,CAAA;AACjE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAA;AAQxD,eAAO,MAAM,cAAc,SAAU;IACnC,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAAC,CAAA;IACxC,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAAC,CAAA;IACzC,mBAAmB,EAAE,+BAA+B,CAAA;IACpD,WAAW,EAAE,yBAAyB,EAAE,CAAA;IACxC,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,UAAU,CAAA;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,KAAG;IACF,CAAC,GAAG,EAAE,yBAAyB,CAAC,MAAM,CAAC,GAAG,sBAAsB,CAAA;CA2KjE,CAAA"}

package/dist/providers/ComponentMap/buildComponentMap/collections.js

@@ -44,21 +44,21 @@ export const mapCollections = (args)=>{
             Component: UploadComponent
         }) : undefined;
         const beforeList = collectionConfig?.admin?.components?.beforeList;
-        const BeforeList = beforeList && Array.isArray(beforeList) && beforeList?.map((Component)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
+        const BeforeList = beforeList && Array.isArray(beforeList) && beforeList?.map((Component, i)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
                 Component: Component
-            })) || null;
+            }, i)) || null;
         const beforeListTable = collectionConfig?.admin?.components?.beforeListTable;
-        const BeforeListTable = beforeListTable && Array.isArray(beforeListTable) && beforeListTable?.map((Component)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
+        const BeforeListTable = beforeListTable && Array.isArray(beforeListTable) && beforeListTable?.map((Component, i)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
                 Component: Component
-            })) || null;
+            }, i)) || null;
         const afterList = collectionConfig?.admin?.components?.afterList;
-        const AfterList = afterList && Array.isArray(afterList) && afterList?.map((Component)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
+        const AfterList = afterList && Array.isArray(afterList) && afterList?.map((Component, i)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
                 Component: Component
-            })) || null;
+            }, i)) || null;
         const afterListTable = collectionConfig?.admin?.components?.afterListTable;
-        const AfterListTable = afterListTable && Array.isArray(afterListTable) && afterListTable?.map((Component)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
+        const AfterListTable = afterListTable && Array.isArray(afterListTable) && afterListTable?.map((Component, i)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
                 Component: Component
-            })) || null;
+            }, i)) || null;
         let description = undefined;
         if (collectionConfig.admin && 'description' in collectionConfig.admin) {
             if (typeof collectionConfig.admin?.description === 'string' || typeof collectionConfig.admin?.description === 'object') {

package/dist/providers/ComponentMap/buildComponentMap/collections.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/providers/ComponentMap/buildComponentMap/collections.tsx"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type {\n  AdminViewProps,\n  EditViewProps,\n  SanitizedCollectionConfig,\n  SanitizedConfig,\n} from 'payload'\n\nimport { isReactComponentOrFunction } from 'payload/shared'\nimport React from 'react'\n\nimport type { ViewDescriptionProps } from '../../../elements/ViewDescription/index.js'\nimport type { WithServerSidePropsPrePopulated } from './index.js'\nimport type { CollectionComponentMap } from './types.js'\n\n// Need to import from client barrel file\n// eslint-disable-next-line payload/no-imports-from-exports-dir\nimport { ViewDescription } from '../../../exports/client/index.js'\nimport { mapActions } from './actions.js'\nimport { mapFields } from './fields.js'\n\nexport const mapCollections = (args: {\n  DefaultEditView: React.FC<EditViewProps>\n  DefaultListView: React.FC<AdminViewProps>\n  WithServerSideProps: WithServerSidePropsPrePopulated\n  collections: SanitizedCollectionConfig[]\n  config: SanitizedConfig\n  i18n: I18nClient\n  readOnly?: boolean\n}): {\n  [key: SanitizedCollectionConfig['slug']]: CollectionComponentMap\n} => {\n  const {\n    DefaultEditView,\n    DefaultListView,\n    WithServerSideProps,\n    collections,\n    config,\n    i18n,\n    i18n: { t },\n    readOnly: readOnlyOverride,\n  } = args\n\n  return collections.reduce((acc, collectionConfig) => {\n    const { slug, fields } = collectionConfig\n\n    const internalCollections = ['payload-preferences', 'payload-migrations']\n\n    if (internalCollections.includes(slug)) {\n      return acc\n    }\n\n    const editViewFromConfig = collectionConfig?.admin?.components?.views?.Edit\n\n    const listViewFromConfig = collectionConfig?.admin?.components?.views?.List\n\n    const CustomEditView =\n      typeof editViewFromConfig === 'function'\n        ? editViewFromConfig\n        : typeof editViewFromConfig === 'object' &&\n            isReactComponentOrFunction(editViewFromConfig.Default)\n          ? editViewFromConfig.Default\n          : typeof editViewFromConfig?.Default === 'object' &&\n              'Component' in editViewFromConfig.Default &&\n              isReactComponentOrFunction(editViewFromConfig.Default.Component)\n            ? (editViewFromConfig.Default.Component as React.FC<EditViewProps>)\n            : undefined\n\n    const CustomListView =\n      typeof listViewFromConfig === 'function'\n        ? listViewFromConfig\n        : typeof listViewFromConfig === 'object' &&\n            isReactComponentOrFunction(listViewFromConfig.Component)\n          ? listViewFromConfig.Component\n          : undefined\n\n    const Edit = (CustomEditView as React.FC<EditViewProps>) || DefaultEditView\n\n    const List = CustomListView || DefaultListView\n\n    const SaveButtonComponent = collectionConfig?.admin?.components?.edit?.SaveButton\n\n    const SaveButton = SaveButtonComponent ? (\n      <WithServerSideProps Component={SaveButtonComponent} />\n    ) : undefined\n\n    const SaveDraftButtonComponent = collectionConfig?.admin?.components?.edit?.SaveDraftButton\n\n    const SaveDraftButton = SaveDraftButtonComponent ? (\n      <WithServerSideProps Component={SaveDraftButtonComponent} />\n    ) : undefined\n\n    const PreviewButtonComponent = collectionConfig?.admin?.components?.edit?.PreviewButton\n\n    const PreviewButton = PreviewButtonComponent ? (\n      <WithServerSideProps Component={PreviewButtonComponent} />\n    ) : undefined\n\n    const PublishButtonComponent = collectionConfig?.admin?.components?.edit?.PublishButton\n\n    const PublishButton = PublishButtonComponent ? (\n      <WithServerSideProps Component={PublishButtonComponent} />\n    ) : undefined\n\n    const UploadComponent = collectionConfig?.admin?.components?.edit?.Upload\n\n    const Upload = UploadComponent ? <WithServerSideProps Component={UploadComponent} /> : undefined\n\n    const beforeList = collectionConfig?.admin?.components?.beforeList\n\n    const BeforeList =\n      (beforeList &&\n        Array.isArray(beforeList) &&\n        beforeList?.map((Component) => <WithServerSideProps Component={Component} />)) ||\n      null\n\n    const beforeListTable = collectionConfig?.admin?.components?.beforeListTable\n\n    const BeforeListTable =\n      (beforeListTable &&\n        Array.isArray(beforeListTable) &&\n        beforeListTable?.map((Component) => <WithServerSideProps Component={Component} />)) ||\n      null\n\n    const afterList = collectionConfig?.admin?.components?.afterList\n\n    const AfterList =\n      (afterList &&\n        Array.isArray(afterList) &&\n        afterList?.map((Component) => <WithServerSideProps Component={Component} />)) ||\n      null\n\n    const afterListTable = collectionConfig?.admin?.components?.afterListTable\n\n    const AfterListTable =\n      (afterListTable &&\n        Array.isArray(afterListTable) &&\n        afterListTable?.map((Component) => <WithServerSideProps Component={Component} />)) ||\n      null\n\n    let description = undefined\n    if (collectionConfig.admin && 'description' in collectionConfig.admin) {\n      if (\n        typeof collectionConfig.admin?.description === 'string' ||\n        typeof collectionConfig.admin?.description === 'object'\n      ) {\n        description = collectionConfig.admin.description\n      } else if (typeof collectionConfig.admin?.description === 'function') {\n        description = collectionConfig.admin?.description({ t })\n      }\n    }\n\n    const descriptionProps: ViewDescriptionProps = {\n      description,\n    }\n\n    const DescriptionComponent =\n      collectionConfig.admin?.components?.edit?.Description ||\n      (description ? ViewDescription : undefined)\n\n    const Description =\n      DescriptionComponent !== undefined ? (\n        <WithServerSideProps Component={DescriptionComponent} {...(descriptionProps || {})} />\n      ) : undefined\n\n    const componentMap: CollectionComponentMap = {\n      AfterList,\n      AfterListTable,\n      BeforeList,\n      BeforeListTable,\n      Description,\n      Edit: <Edit collectionSlug={collectionConfig.slug} />,\n      List: <List collectionSlug={collectionConfig.slug} />,\n      PreviewButton,\n      PublishButton,\n      SaveButton,\n      SaveDraftButton,\n      Upload,\n      actionsMap: mapActions({\n        WithServerSideProps,\n        collectionConfig,\n      }),\n      fieldMap: mapFields({\n        WithServerSideProps,\n        config,\n        fieldSchema: fields,\n        i18n,\n        readOnly: readOnlyOverride,\n      }),\n      isPreviewEnabled: !!collectionConfig?.admin?.preview,\n    }\n\n    return {\n      ...acc,\n      [slug]: componentMap,\n    }\n  }, {})\n}\n"],"names":["isReactComponentOrFunction","React","ViewDescription","mapActions","mapFields","mapCollections","args","DefaultEditView","DefaultListView","WithServerSideProps","collections","config","i18n","t","readOnly","readOnlyOverride","reduce","acc","collectionConfig","slug","fields","internalCollections","includes","editViewFromConfig","admin","components","views","Edit","listViewFromConfig","List","CustomEditView","Default","Component","undefined","CustomListView","SaveButtonComponent","edit","SaveButton","SaveDraftButtonComponent","SaveDraftButton","PreviewButtonComponent","PreviewButton","PublishButtonComponent","PublishButton","UploadComponent","Upload","beforeList","BeforeList","Array","isArray","map","beforeListTable","BeforeListTable","afterList","AfterList","afterListTable","AfterListTable","description","descriptionProps","DescriptionComponent","Description","componentMap","collectionSlug","actionsMap","fieldMap","fieldSchema","isPreviewEnabled","preview"],"mappings":"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"}
+{"version":3,"sources":["../../../../src/providers/ComponentMap/buildComponentMap/collections.tsx"],"sourcesContent":["import type { I18nClient } from '@payloadcms/translations'\nimport type {\n  AdminViewProps,\n  EditViewProps,\n  SanitizedCollectionConfig,\n  SanitizedConfig,\n} from 'payload'\n\nimport { isReactComponentOrFunction } from 'payload/shared'\nimport React from 'react'\n\nimport type { ViewDescriptionProps } from '../../../elements/ViewDescription/index.js'\nimport type { WithServerSidePropsPrePopulated } from './index.js'\nimport type { CollectionComponentMap } from './types.js'\n\n// Need to import from client barrel file\n// eslint-disable-next-line payload/no-imports-from-exports-dir\nimport { ViewDescription } from '../../../exports/client/index.js'\nimport { mapActions } from './actions.js'\nimport { mapFields } from './fields.js'\n\nexport const mapCollections = (args: {\n  DefaultEditView: React.FC<EditViewProps>\n  DefaultListView: React.FC<AdminViewProps>\n  WithServerSideProps: WithServerSidePropsPrePopulated\n  collections: SanitizedCollectionConfig[]\n  config: SanitizedConfig\n  i18n: I18nClient\n  readOnly?: boolean\n}): {\n  [key: SanitizedCollectionConfig['slug']]: CollectionComponentMap\n} => {\n  const {\n    DefaultEditView,\n    DefaultListView,\n    WithServerSideProps,\n    collections,\n    config,\n    i18n,\n    i18n: { t },\n    readOnly: readOnlyOverride,\n  } = args\n\n  return collections.reduce((acc, collectionConfig) => {\n    const { slug, fields } = collectionConfig\n\n    const internalCollections = ['payload-preferences', 'payload-migrations']\n\n    if (internalCollections.includes(slug)) {\n      return acc\n    }\n\n    const editViewFromConfig = collectionConfig?.admin?.components?.views?.Edit\n\n    const listViewFromConfig = collectionConfig?.admin?.components?.views?.List\n\n    const CustomEditView =\n      typeof editViewFromConfig === 'function'\n        ? editViewFromConfig\n        : typeof editViewFromConfig === 'object' &&\n            isReactComponentOrFunction(editViewFromConfig.Default)\n          ? editViewFromConfig.Default\n          : typeof editViewFromConfig?.Default === 'object' &&\n              'Component' in editViewFromConfig.Default &&\n              isReactComponentOrFunction(editViewFromConfig.Default.Component)\n            ? (editViewFromConfig.Default.Component as React.FC<EditViewProps>)\n            : undefined\n\n    const CustomListView =\n      typeof listViewFromConfig === 'function'\n        ? listViewFromConfig\n        : typeof listViewFromConfig === 'object' &&\n            isReactComponentOrFunction(listViewFromConfig.Component)\n          ? listViewFromConfig.Component\n          : undefined\n\n    const Edit = (CustomEditView as React.FC<EditViewProps>) || DefaultEditView\n\n    const List = CustomListView || DefaultListView\n\n    const SaveButtonComponent = collectionConfig?.admin?.components?.edit?.SaveButton\n\n    const SaveButton = SaveButtonComponent ? (\n      <WithServerSideProps Component={SaveButtonComponent} />\n    ) : undefined\n\n    const SaveDraftButtonComponent = collectionConfig?.admin?.components?.edit?.SaveDraftButton\n\n    const SaveDraftButton = SaveDraftButtonComponent ? (\n      <WithServerSideProps Component={SaveDraftButtonComponent} />\n    ) : undefined\n\n    const PreviewButtonComponent = collectionConfig?.admin?.components?.edit?.PreviewButton\n\n    const PreviewButton = PreviewButtonComponent ? (\n      <WithServerSideProps Component={PreviewButtonComponent} />\n    ) : undefined\n\n    const PublishButtonComponent = collectionConfig?.admin?.components?.edit?.PublishButton\n\n    const PublishButton = PublishButtonComponent ? (\n      <WithServerSideProps Component={PublishButtonComponent} />\n    ) : undefined\n\n    const UploadComponent = collectionConfig?.admin?.components?.edit?.Upload\n\n    const Upload = UploadComponent ? <WithServerSideProps Component={UploadComponent} /> : undefined\n\n    const beforeList = collectionConfig?.admin?.components?.beforeList\n\n    const BeforeList =\n      (beforeList &&\n        Array.isArray(beforeList) &&\n        beforeList?.map((Component, i) => <WithServerSideProps Component={Component} key={i} />)) ||\n      null\n\n    const beforeListTable = collectionConfig?.admin?.components?.beforeListTable\n\n    const BeforeListTable =\n      (beforeListTable &&\n        Array.isArray(beforeListTable) &&\n        beforeListTable?.map((Component, i) => (\n          <WithServerSideProps Component={Component} key={i} />\n        ))) ||\n      null\n\n    const afterList = collectionConfig?.admin?.components?.afterList\n\n    const AfterList =\n      (afterList &&\n        Array.isArray(afterList) &&\n        afterList?.map((Component, i) => <WithServerSideProps Component={Component} key={i} />)) ||\n      null\n\n    const afterListTable = collectionConfig?.admin?.components?.afterListTable\n\n    const AfterListTable =\n      (afterListTable &&\n        Array.isArray(afterListTable) &&\n        afterListTable?.map((Component, i) => (\n          <WithServerSideProps Component={Component} key={i} />\n        ))) ||\n      null\n\n    let description = undefined\n    if (collectionConfig.admin && 'description' in collectionConfig.admin) {\n      if (\n        typeof collectionConfig.admin?.description === 'string' ||\n        typeof collectionConfig.admin?.description === 'object'\n      ) {\n        description = collectionConfig.admin.description\n      } else if (typeof collectionConfig.admin?.description === 'function') {\n        description = collectionConfig.admin?.description({ t })\n      }\n    }\n\n    const descriptionProps: ViewDescriptionProps = {\n      description,\n    }\n\n    const DescriptionComponent =\n      collectionConfig.admin?.components?.edit?.Description ||\n      (description ? ViewDescription : undefined)\n\n    const Description =\n      DescriptionComponent !== undefined ? (\n        <WithServerSideProps Component={DescriptionComponent} {...(descriptionProps || {})} />\n      ) : undefined\n\n    const componentMap: CollectionComponentMap = {\n      AfterList,\n      AfterListTable,\n      BeforeList,\n      BeforeListTable,\n      Description,\n      Edit: <Edit collectionSlug={collectionConfig.slug} />,\n      List: <List collectionSlug={collectionConfig.slug} />,\n      PreviewButton,\n      PublishButton,\n      SaveButton,\n      SaveDraftButton,\n      Upload,\n      actionsMap: mapActions({\n        WithServerSideProps,\n        collectionConfig,\n      }),\n      fieldMap: mapFields({\n        WithServerSideProps,\n        config,\n        fieldSchema: fields,\n        i18n,\n        readOnly: readOnlyOverride,\n      }),\n      isPreviewEnabled: !!collectionConfig?.admin?.preview,\n    }\n\n    return {\n      ...acc,\n      [slug]: componentMap,\n    }\n  }, {})\n}\n"],"names":["isReactComponentOrFunction","React","ViewDescription","mapActions","mapFields","mapCollections","args","DefaultEditView","DefaultListView","WithServerSideProps","collections","config","i18n","t","readOnly","readOnlyOverride","reduce","acc","collectionConfig","slug","fields","internalCollections","includes","editViewFromConfig","admin","components","views","Edit","listViewFromConfig","List","CustomEditView","Default","Component","undefined","CustomListView","SaveButtonComponent","edit","SaveButton","SaveDraftButtonComponent","SaveDraftButton","PreviewButtonComponent","PreviewButton","PublishButtonComponent","PublishButton","UploadComponent","Upload","beforeList","BeforeList","Array","isArray","map","i","beforeListTable","BeforeListTable","afterList","AfterList","afterListTable","AfterListTable","description","descriptionProps","DescriptionComponent","Description","componentMap","collectionSlug","actionsMap","fieldMap","fieldSchema","isPreviewEnabled","preview"],"mappings":"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"}

package/dist/providers/ComponentMap/buildComponentMap/fields.d.ts

@@ -1,7 +1,6 @@
 import type { I18nClient } from '@payloadcms/translations';
-import type { Field, FieldWithPath, SanitizedConfig } from 'payload';
+import type { Field, FieldMap, FieldWithPath, SanitizedConfig } from 'payload';
 import type { WithServerSidePropsPrePopulated } from './index.js';
-import type { FieldMap } from './types.js';
 export declare const mapFields: (args: {
     WithServerSideProps: WithServerSidePropsPrePopulated;
     config: SanitizedConfig;

package/dist/providers/ComponentMap/buildComponentMap/fields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fields.d.ts","sourceRoot":"","sources":["../../../../src/providers/ComponentMap/buildComponentMap/fields.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EAGV,KAAK,EAEL,aAAa,EAGb,eAAe,EAChB,MAAM,SAAS,CAAA;AA2BhB,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,YAAY,CAAA;AACjE,OAAO,KAAK,EAEV,QAAQ,EAIT,MAAM,YAAY,CAAA;AAkBnB,eAAO,MAAM,SAAS,SAAU;IAC9B,mBAAmB,EAAE,+BAA+B,CAAA;IACpD,MAAM,EAAE,eAAe,CAAA;IACvB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,WAAW,EAAE,aAAa,EAAE,CAAA;IAC5B,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAA;IAClC,IAAI,EAAE,UAAU,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,KAAG,QA8uBH,CAAA"}
+{"version":3,"file":"fields.d.ts","sourceRoot":"","sources":["../../../../src/providers/ComponentMap/buildComponentMap/fields.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAA;AAC1D,OAAO,KAAK,EAUV,KAAK,EAGL,QAAQ,EACR,aAAa,EAeb,eAAe,EAMhB,MAAM,SAAS,CAAA;AAMhB,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,YAAY,CAAA;AAgBjE,eAAO,MAAM,SAAS,SAAU;IAC9B,mBAAmB,EAAE,+BAA+B,CAAA;IACpD,MAAM,EAAE,eAAe,CAAA;IACvB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,WAAW,EAAE,aAAa,EAAE,CAAA;IAC5B,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAA;IAClC,IAAI,EAAE,UAAU,CAAA;IAChB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,KAAG,QAmxBH,CAAA"}

package/dist/providers/ComponentMap/buildComponentMap/fields.js

@@ -3,9 +3,7 @@ import { MissingEditorProp } from 'payload';
 import { fieldAffectsData, fieldIsPresentationalOnly } from 'payload/shared';
 import React, { Fragment } from 'react';
 // eslint-disable-next-line payload/no-imports-from-exports-dir
-import { FieldDescription } from '../../../exports/client/index.js';
-// eslint-disable-next-line payload/no-imports-from-exports-dir
-import { HiddenField } from '../../../exports/client/index.js';
+import { FieldDescription, HiddenField } from '../../../exports/client/index.js';
 function generateFieldPath(parentPath, name) {
     let tabPath = parentPath || '';
     if (parentPath && name) {
@@ -51,64 +49,17 @@ export const mapFields = (args)=>{
                         });
                     }
                 }
-                const labelProps = {
-                    label,
-                    required: 'required' in field ? field.required : undefined,
-                    schemaPath: path
-                };
-                const CustomLabelComponent = 'admin' in field && field.admin?.components && 'Label' in field.admin.components && field.admin.components?.Label || undefined;
-                // If we return undefined here (so if no CUSTOM label component is set), the field client component is responsible for falling back to the default label
-                const CustomLabel = CustomLabelComponent !== undefined ? /*#__PURE__*/ _jsx(WithServerSideProps, {
-                    Component: CustomLabelComponent,
-                    ...labelProps || {}
-                }) : undefined;
-                let description = undefined;
-                if (field.admin && 'description' in field.admin) {
-                    if (typeof field.admin?.description === 'string' || typeof field.admin?.description === 'object') {
-                        description = field.admin.description;
-                    } else if (typeof field.admin?.description === 'function') {
-                        description = field.admin?.description({
-                            t
-                        });
-                    }
-                }
-                const descriptionProps = {
-                    description
-                };
-                let CustomDescriptionComponent = undefined;
-                if (field.admin?.components && 'Description' in field.admin.components && field.admin.components?.Description) {
-                    CustomDescriptionComponent = field.admin.components.Description;
-                } else if (description) {
-                    CustomDescriptionComponent = FieldDescription;
-                }
-                const CustomDescription = CustomDescriptionComponent !== undefined ? /*#__PURE__*/ _jsx(WithServerSideProps, {
-                    Component: CustomDescriptionComponent,
-                    ...descriptionProps || {}
-                }) : undefined;
-                const errorProps = {
-                    path
-                };
-                const CustomErrorComponent = 'admin' in field && field.admin?.components && 'Error' in field.admin.components && field.admin?.components?.Error || undefined;
-                const CustomError = CustomErrorComponent !== undefined ? /*#__PURE__*/ _jsx(WithServerSideProps, {
-                    Component: CustomErrorComponent,
-                    ...errorProps || {}
-                }) : undefined;
                 // These fields are shared across all field types even if they are not used in the default field, as the custom field component can use them
                 const baseFieldProps = {
                     AfterInput,
                     BeforeInput,
-                    CustomDescription,
-                    CustomError,
-                    CustomLabel,
                     custom: 'admin' in field && 'custom' in field.admin ? field.admin?.custom : undefined,
-                    descriptionProps,
                     disabled: 'admin' in field && 'disabled' in field.admin ? field.admin?.disabled : false,
-                    errorProps,
-                    label: labelProps?.label,
+                    label,
                     path,
                     required: 'required' in field ? field.required : undefined
                 };
-                let fieldComponentProps;
+                let fieldComponentPropsBase;
                 let fieldOptions;
                 if ('options' in field) {
                     fieldOptions = field.options.map((option)=>{
@@ -127,7 +78,7 @@ export const mapFields = (args)=>{
                     name: 'name' in field ? field.name : undefined,
                     fieldType: field.type,
                     isFieldAffectingData,
-                    label: labelProps?.label || undefined,
+                    label,
                     labels: 'labels' in field ? field.labels : undefined,
                     options: 'options' in field ? fieldOptions : undefined,
                     relationTo: 'relationTo' in field ? field.relationTo : undefined,
@@ -136,18 +87,9 @@ export const mapFields = (args)=>{
                 switch(field.type){
                     case 'array':
                         {
-                            let CustomRowLabel;
-                            if ('admin' in field && field.admin.components && 'RowLabel' in field.admin.components && field.admin.components.RowLabel) {
-                                const CustomRowLabelComponent = field.admin.components.RowLabel;
-                                CustomRowLabel = /*#__PURE__*/ _jsx(WithServerSideProps, {
-                                    Component: CustomRowLabelComponent,
-                                    ...labelProps || {}
-                                });
-                            }
                             const arrayFieldProps = {
                                 ...baseFieldProps,
                                 name: field.name,
-                                CustomRowLabel,
                                 className: field.admin?.className,
                                 disabled: field.admin?.disabled,
                                 fieldMap: mapFields({
@@ -168,7 +110,7 @@ export const mapFields = (args)=>{
                                 style: field.admin?.style,
                                 width: field.admin?.width
                             };
-                            fieldComponentProps = arrayFieldProps;
+                            fieldComponentPropsBase = arrayFieldProps;
                             break;
                         }
                     case 'blocks':
@@ -185,6 +127,7 @@ export const mapFields = (args)=>{
                                 });
                                 const reducedBlock = {
                                     slug: block.slug,
+                                    LabelComponent: block.admin?.components?.Label,
                                     custom: block.admin?.custom,
                                     fieldMap: blockFieldMap,
                                     imageAltText: block.imageAltText,
@@ -208,7 +151,7 @@ export const mapFields = (args)=>{
                                 style: field.admin?.style,
                                 width: field.admin?.width
                             };
-                            fieldComponentProps = blocksField;
+                            fieldComponentPropsBase = blocksField;
                             cellComponentProps.blocks = field.blocks.map((b)=>({
                                     slug: b.slug,
                                     labels: b.labels
@@ -227,7 +170,7 @@ export const mapFields = (args)=>{
                                 style: field.admin?.style,
                                 width: field.admin?.width
                             };
-                            fieldComponentProps = checkboxField;
+                            fieldComponentPropsBase = checkboxField;
                             break;
                         }
                     case 'code':
@@ -244,22 +187,13 @@ export const mapFields = (args)=>{
                                 style: field.admin?.style,
                                 width: field.admin?.width
                             };
-                            fieldComponentProps = codeField;
+                            fieldComponentPropsBase = codeField;
                             break;
                         }
                     case 'collapsible':
                         {
-                            let CustomCollapsibleLabel;
-                            if (field?.admin?.components && 'RowLabel' in field.admin.components && field?.admin?.components?.RowLabel) {
-                                const CustomCollapsibleLabelComponent = field.admin.components.RowLabel;
-                                CustomCollapsibleLabel = /*#__PURE__*/ _jsx(WithServerSideProps, {
-                                    Component: CustomCollapsibleLabelComponent,
-                                    ...labelProps || {}
-                                });
-                            }
                             const collapsibleField = {
                                 ...baseFieldProps,
-                                CustomLabel: CustomCollapsibleLabel,
                                 className: field.admin?.className,
                                 disabled: field.admin?.disabled,
                                 fieldMap: mapFields({
@@ -278,7 +212,7 @@ export const mapFields = (args)=>{
                                 style: field.admin?.style,
                                 width: field.admin?.width
                             };
-                            fieldComponentProps = collapsibleField // TODO: dunno why this is needed
+                            fieldComponentPropsBase = collapsibleField // TODO: dunno why this is needed
                             ;
                             break;
                         }
@@ -296,7 +230,7 @@ export const mapFields = (args)=>{
                                 style: field.admin?.style,
                                 width: field.admin?.width
                             };
-                            fieldComponentProps = dateField;
+                            fieldComponentPropsBase = dateField;
                             cellComponentProps.dateDisplayFormat = field.admin?.date?.displayFormat;
                             break;
                         }
@@ -305,6 +239,7 @@ export const mapFields = (args)=>{
                             const emailField = {
                                 ...baseFieldProps,
                                 name: field.name,
+                                autoComplete: field.admin?.autoComplete,
                                 className: field.admin?.className,
                                 disabled: field.admin?.disabled,
                                 placeholder: field.admin?.placeholder,
@@ -313,7 +248,7 @@ export const mapFields = (args)=>{
                                 style: field.admin?.style,
                                 width: field.admin?.width
                             };
-                            fieldComponentProps = emailField;
+                            fieldComponentPropsBase = emailField;
                             break;
                         }
                     case 'group':
@@ -338,7 +273,7 @@ export const mapFields = (args)=>{
                                 style: field.admin?.style,
                                 width: field.admin?.width
                             };
-                            fieldComponentProps = groupField;
+                            fieldComponentPropsBase = groupField;
                             break;
                         }
                     case 'json':
@@ -355,7 +290,7 @@ export const mapFields = (args)=>{
                                 style: field.admin?.style,
                                 width: field.admin?.width
                             };
-                            fieldComponentProps = jsonField;
+                            fieldComponentPropsBase = jsonField;
                             break;
                         }
                     case 'number':
@@ -375,7 +310,7 @@ export const mapFields = (args)=>{
                                 style: field.admin?.style,
                                 width: field.admin?.width
                             };
-                            fieldComponentProps = numberField;
+                            fieldComponentPropsBase = numberField;
                             break;
                         }
                     case 'point':
@@ -390,7 +325,7 @@ export const mapFields = (args)=>{
                                 style: field.admin?.style,
                                 width: field.admin?.width
                             };
-                            fieldComponentProps = pointField;
+                            fieldComponentPropsBase = pointField;
                             break;
                         }
                     case 'relationship':
@@ -411,7 +346,7 @@ export const mapFields = (args)=>{
                                 width: field.admin?.width
                             };
                             cellComponentProps.relationTo = field.relationTo;
-                            fieldComponentProps = relationshipField;
+                            fieldComponentPropsBase = relationshipField;
                             break;
                         }
                     case 'radio':
@@ -421,6 +356,7 @@ export const mapFields = (args)=>{
                                 name: field.name,
                                 className: field.admin?.className,
                                 disabled: field.admin?.disabled,
+                                layout: field.admin?.layout,
                                 options: fieldOptions,
                                 readOnly: field.admin?.readOnly,
                                 required: field.required,
@@ -428,7 +364,7 @@ export const mapFields = (args)=>{
                                 width: field.admin?.width
                             };
                             cellComponentProps.options = fieldOptions;
-                            fieldComponentProps = radioField;
+                            fieldComponentPropsBase = radioField;
                             break;
                         }
                     case 'richText':
@@ -468,7 +404,7 @@ export const mapFields = (args)=>{
                             if (RichTextCellComponent) {
                                 CustomCellComponent = RichTextCellComponent;
                             }
-                            fieldComponentProps = richTextField;
+                            fieldComponentPropsBase = richTextField;
                             break;
                         }
                     case 'row':
@@ -492,7 +428,7 @@ export const mapFields = (args)=>{
                                 style: field.admin?.style,
                                 width: field.admin?.width
                             };
-                            fieldComponentProps = rowField;
+                            fieldComponentPropsBase = rowField;
                             break;
                         }
                     case 'tabs':
@@ -527,7 +463,7 @@ export const mapFields = (args)=>{
                                 tabs,
                                 width: field.admin?.width
                             };
-                            fieldComponentProps = tabsField;
+                            fieldComponentPropsBase = tabsField;
                             break;
                         }
                     case 'text':
@@ -546,7 +482,7 @@ export const mapFields = (args)=>{
                                 style: field.admin?.style,
                                 width: field.admin?.width
                             };
-                            fieldComponentProps = textField;
+                            fieldComponentPropsBase = textField;
                             break;
                         }
                     case 'textarea':
@@ -565,12 +501,12 @@ export const mapFields = (args)=>{
                                 style: field.admin?.style,
                                 width: field.admin?.width
                             };
-                            fieldComponentProps = textareaField;
+                            fieldComponentPropsBase = textareaField;
                             break;
                         }
                     case 'ui':
                         {
-                            fieldComponentProps = baseFieldProps;
+                            fieldComponentPropsBase = baseFieldProps;
                             break;
                         }
                     case 'upload':
@@ -588,7 +524,8 @@ export const mapFields = (args)=>{
                                 width: field.admin?.width
                             };
                             cellComponentProps.relationTo = field.relationTo;
-                            fieldComponentProps = uploadField;
+                            cellComponentProps.displayPreview = field.displayPreview;
+                            fieldComponentPropsBase = uploadField;
                             break;
                         }
                     case 'select':
@@ -607,7 +544,7 @@ export const mapFields = (args)=>{
                                 width: field.admin?.width
                             };
                             cellComponentProps.options = fieldOptions;
-                            fieldComponentProps = selectField;
+                            fieldComponentPropsBase = selectField;
                             break;
                         }
                     default:
@@ -615,6 +552,92 @@ export const mapFields = (args)=>{
                             break;
                         }
                 }
+                const labelProps = {
+                    type: field.type,
+                    label,
+                    required: 'required' in field ? field.required : undefined,
+                    schemaPath: path
+                };
+                const CustomLabelComponent = 'admin' in field && field.admin?.components && 'Label' in field.admin.components && field.admin.components?.Label || undefined;
+                // If we return undefined here (so if no CUSTOM label component is set),
+                // the field client component is responsible for falling back to the default label
+                let CustomLabel = CustomLabelComponent !== undefined ? /*#__PURE__*/ _jsx(WithServerSideProps, {
+                    Component: CustomLabelComponent,
+                    ...labelProps || {}
+                }) : undefined;
+                switch(field.type){
+                    case 'array':
+                        {
+                            let CustomRowLabel;
+                            if ('admin' in field && field.admin.components && 'RowLabel' in field.admin.components && field.admin.components.RowLabel) {
+                                const CustomRowLabelComponent = field.admin.components.RowLabel;
+                                CustomRowLabel = /*#__PURE__*/ _jsx(WithServerSideProps, {
+                                    Component: CustomRowLabelComponent,
+                                    ...labelProps || {}
+                                });
+                            }
+                            // @ts-expect-error
+                            fieldComponentPropsBase.CustomRowLabel = CustomRowLabel;
+                            break;
+                        }
+                    case 'collapsible':
+                        {
+                            let CustomCollapsibleLabel;
+                            if (field?.admin?.components && 'RowLabel' in field.admin.components && field?.admin?.components?.RowLabel) {
+                                const CustomCollapsibleLabelComponent = field.admin.components.RowLabel;
+                                CustomCollapsibleLabel = /*#__PURE__*/ _jsx(WithServerSideProps, {
+                                    Component: CustomCollapsibleLabelComponent,
+                                    ...labelProps || {}
+                                });
+                            }
+                            CustomLabel = CustomCollapsibleLabel;
+                            break;
+                        }
+                    default:
+                        break;
+                }
+                let description = undefined;
+                if (field.admin && 'description' in field.admin) {
+                    if (typeof field.admin?.description === 'string' || typeof field.admin?.description === 'object') {
+                        description = field.admin.description;
+                    } else if (typeof field.admin?.description === 'function') {
+                        description = field.admin?.description({
+                            t
+                        });
+                    }
+                }
+                const descriptionProps = {
+                    type: field.type,
+                    description
+                };
+                let CustomDescriptionComponent = undefined;
+                if (field.admin?.components && 'Description' in field.admin.components && field.admin.components?.Description) {
+                    CustomDescriptionComponent = field.admin.components.Description;
+                } else if (description) {
+                    CustomDescriptionComponent = FieldDescription;
+                }
+                const CustomDescription = CustomDescriptionComponent !== undefined ? /*#__PURE__*/ _jsx(WithServerSideProps, {
+                    Component: CustomDescriptionComponent,
+                    ...descriptionProps || {}
+                }) : undefined;
+                const errorProps = {
+                    path
+                };
+                const CustomErrorComponent = 'admin' in field && field.admin?.components && 'Error' in field.admin.components && field.admin?.components?.Error || undefined;
+                const CustomError = CustomErrorComponent !== undefined ? /*#__PURE__*/ _jsx(WithServerSideProps, {
+                    Component: CustomErrorComponent,
+                    ...errorProps || {}
+                }) : undefined;
+                const fieldComponentProps = {
+                    ...fieldComponentPropsBase,
+                    type: undefined,
+                    CustomDescription,
+                    CustomError,
+                    CustomLabel,
+                    descriptionProps,
+                    errorProps,
+                    labelProps
+                };
                 const reducedField = {
                     name: 'name' in field ? field.name : undefined,
                     type: field.type,
@@ -624,7 +647,7 @@ export const mapFields = (args)=>{
                     }) : undefined,
                     CustomField: CustomFieldComponent ? /*#__PURE__*/ _jsx(WithServerSideProps, {
                         Component: CustomFieldComponent,
-                        ...fieldComponentProps
+                        ...fieldComponentPropsBase
                     }) : undefined,
                     cellComponentProps,
                     custom: field?.admin?.custom,
@@ -646,7 +669,7 @@ export const mapFields = (args)=>{
     }, []);
     const hasID = result.findIndex((f)=>'name' in f && f.isFieldAffectingData && f.name === 'id') > -1;
     if (!disableAddingID && !hasID) {
-        // TODO: For all fields (not just this one) we need to add the name to both .fieldComponentProps.name AND .name. This can probably be improved
+        // TODO: For all fields (not just this one) we need to add the name to both .fieldComponentPropsBase.name AND .name. This can probably be improved
         result.push({
             name: 'id',
             type: 'text',
@@ -658,6 +681,7 @@ export const mapFields = (args)=>{
             disableBulkEdit: true,
             fieldComponentProps: {
                 name: 'id',
+                type: undefined,
                 label: 'ID'
             },
             fieldIsPresentational: false,