@payloadcms/ui 3.0.0-canary.92e4997 → 3.0.0-canary.c13f9ba

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

@@ -1,9 +1,12 @@
-import { ViewDescription } from '@payloadcms/ui/elements/ViewDescription';
-import { isPlainFunction, isReactComponent } from 'payload/utilities';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { isReactComponentOrFunction } from 'payload/utilities';
 import React from 'react';
+import { ViewDescription } from '../../../elements/ViewDescription/index.js';
 import { mapActions } from './actions.js';
 import { mapFields } from './fields.js';
-export const mapCollections = ({ DefaultEditView, DefaultListView, WithServerSideProps, collections, config, i18n, readOnly: readOnlyOverride })=>collections.reduce((acc, collectionConfig)=>{
+export const mapCollections = (args)=>{
+    const { DefaultEditView, DefaultListView, WithServerSideProps, collections, config, i18n, i18n: { t }, readOnly: readOnlyOverride } = args;
+    return collections.reduce((acc, collectionConfig)=>{
         const { slug, fields } = collectionConfig;
         const internalCollections = [
             'payload-preferences',
@@ -14,47 +17,57 @@ export const mapCollections = ({ DefaultEditView, DefaultListView, WithServerSid
         }
         const editViewFromConfig = collectionConfig?.admin?.components?.views?.Edit;
         const listViewFromConfig = collectionConfig?.admin?.components?.views?.List;
-        const CustomEditView = typeof editViewFromConfig === 'function' ? editViewFromConfig : typeof editViewFromConfig === 'object' && typeof editViewFromConfig.Default === 'function' ? editViewFromConfig.Default : typeof editViewFromConfig?.Default === 'object' && 'Component' in editViewFromConfig.Default && typeof editViewFromConfig.Default.Component === 'function' ? editViewFromConfig.Default.Component : undefined;
-        const CustomListView = typeof listViewFromConfig === 'function' ? listViewFromConfig : typeof listViewFromConfig === 'object' && typeof listViewFromConfig.Component === 'function' ? listViewFromConfig.Component : undefined;
+        const CustomEditView = typeof editViewFromConfig === 'function' ? editViewFromConfig : typeof editViewFromConfig === 'object' && isReactComponentOrFunction(editViewFromConfig.Default) ? editViewFromConfig.Default : typeof editViewFromConfig?.Default === 'object' && 'Component' in editViewFromConfig.Default && isReactComponentOrFunction(editViewFromConfig.Default.Component) ? editViewFromConfig.Default.Component : undefined;
+        const CustomListView = typeof listViewFromConfig === 'function' ? listViewFromConfig : typeof listViewFromConfig === 'object' && isReactComponentOrFunction(listViewFromConfig.Component) ? listViewFromConfig.Component : undefined;
         const Edit = CustomEditView || DefaultEditView;
         const List = CustomListView || DefaultListView;
         const SaveButtonComponent = collectionConfig?.admin?.components?.edit?.SaveButton;
-        const SaveButton = SaveButtonComponent ? /*#__PURE__*/ React.createElement(WithServerSideProps, {
+        const SaveButton = SaveButtonComponent ? /*#__PURE__*/ _jsx(WithServerSideProps, {
             Component: SaveButtonComponent
         }) : undefined;
         const SaveDraftButtonComponent = collectionConfig?.admin?.components?.edit?.SaveDraftButton;
-        const SaveDraftButton = SaveDraftButtonComponent ? /*#__PURE__*/ React.createElement(WithServerSideProps, {
+        const SaveDraftButton = SaveDraftButtonComponent ? /*#__PURE__*/ _jsx(WithServerSideProps, {
             Component: SaveDraftButtonComponent
         }) : undefined;
         const PreviewButtonComponent = collectionConfig?.admin?.components?.edit?.PreviewButton;
-        const PreviewButton = PreviewButtonComponent ? /*#__PURE__*/ React.createElement(WithServerSideProps, {
+        const PreviewButton = PreviewButtonComponent ? /*#__PURE__*/ _jsx(WithServerSideProps, {
             Component: PreviewButtonComponent
         }) : undefined;
         const PublishButtonComponent = collectionConfig?.admin?.components?.edit?.PublishButton;
-        const PublishButton = PublishButtonComponent ? /*#__PURE__*/ React.createElement(WithServerSideProps, {
+        const PublishButton = PublishButtonComponent ? /*#__PURE__*/ _jsx(WithServerSideProps, {
             Component: PublishButtonComponent
         }) : undefined;
         const beforeList = collectionConfig?.admin?.components?.BeforeList;
-        const BeforeList = beforeList && Array.isArray(beforeList) && beforeList?.map((Component)=>/*#__PURE__*/ React.createElement(WithServerSideProps, {
+        const BeforeList = beforeList && Array.isArray(beforeList) && beforeList?.map((Component)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
                 Component: Component
             })) || null;
         const beforeListTable = collectionConfig?.admin?.components?.BeforeListTable;
-        const BeforeListTable = beforeListTable && Array.isArray(beforeListTable) && beforeListTable?.map((Component)=>/*#__PURE__*/ React.createElement(WithServerSideProps, {
+        const BeforeListTable = beforeListTable && Array.isArray(beforeListTable) && beforeListTable?.map((Component)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
                 Component: Component
             })) || null;
         const afterList = collectionConfig?.admin?.components?.AfterList;
-        const AfterList = afterList && Array.isArray(afterList) && afterList?.map((Component)=>/*#__PURE__*/ React.createElement(WithServerSideProps, {
+        const AfterList = afterList && Array.isArray(afterList) && afterList?.map((Component)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
                 Component: Component
             })) || null;
         const afterListTable = collectionConfig?.admin?.components?.AfterListTable;
-        const AfterListTable = afterListTable && Array.isArray(afterListTable) && afterListTable?.map((Component)=>/*#__PURE__*/ React.createElement(WithServerSideProps, {
+        const AfterListTable = afterListTable && Array.isArray(afterListTable) && afterListTable?.map((Component)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
                 Component: Component
             })) || null;
+        let description = undefined;
+        if (collectionConfig.admin && 'description' in collectionConfig.admin) {
+            if (typeof collectionConfig.admin?.description === 'string' || typeof collectionConfig.admin?.description === 'object') {
+                description = collectionConfig.admin.description;
+            } else if (typeof collectionConfig.admin?.description === 'function') {
+                description = collectionConfig.admin?.description({
+                    t
+                });
+            }
+        }
         const descriptionProps = {
-            description: collectionConfig.admin && 'description' in collectionConfig.admin && ((typeof collectionConfig.admin?.description === 'string' || typeof collectionConfig.admin?.description === 'object') && collectionConfig.admin.description || typeof collectionConfig.admin?.description === 'function' && isPlainFunction(collectionConfig.admin?.description) && collectionConfig.admin?.description()) || undefined
+            description
         };
-        const DescriptionComponent = collectionConfig.admin && 'description' in collectionConfig.admin && (isReactComponent(collectionConfig.admin.description) && collectionConfig.admin.description || collectionConfig.admin.description && ViewDescription) || undefined;
-        const Description = DescriptionComponent !== undefined ? /*#__PURE__*/ React.createElement(WithServerSideProps, {
+        const DescriptionComponent = collectionConfig.admin?.components?.edit?.Description || (description ? ViewDescription : undefined);
+        const Description = DescriptionComponent !== undefined ? /*#__PURE__*/ _jsx(WithServerSideProps, {
             Component: DescriptionComponent,
             ...descriptionProps || {}
         }) : undefined;
@@ -64,10 +77,10 @@ export const mapCollections = ({ DefaultEditView, DefaultListView, WithServerSid
             BeforeList,
             BeforeListTable,
             Description,
-            Edit: /*#__PURE__*/ React.createElement(Edit, {
+            Edit: /*#__PURE__*/ _jsx(Edit, {
                 collectionSlug: collectionConfig.slug
             }),
-            List: /*#__PURE__*/ React.createElement(List, {
+            List: /*#__PURE__*/ _jsx(List, {
                 collectionSlug: collectionConfig.slug
             }),
             PreviewButton,
@@ -92,5 +105,6 @@ export const mapCollections = ({ DefaultEditView, DefaultListView, WithServerSid
             [slug]: componentMap
         };
     }, {});
+};
 
 //# sourceMappingURL=collections.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/providers/ComponentMap/buildComponentMap/collections.tsx"],"sourcesContent":["import type { I18n } from '@payloadcms/translations'\nimport type { ViewDescriptionProps } from '@payloadcms/ui/elements/ViewDescription'\nimport type {\n  AdminViewProps,\n  EditViewProps,\n  EntityDescriptionComponent,\n  EntityDescriptionFunction,\n  SanitizedCollectionConfig,\n  SanitizedConfig,\n  WithServerSideProps as WithServerSidePropsType,\n} from 'payload/types'\n\nimport { ViewDescription } from '@payloadcms/ui/elements/ViewDescription'\nimport { isPlainFunction, isReactComponent } from 'payload/utilities'\nimport React from 'react'\n\nimport type { CollectionComponentMap } from './types.js'\n\nimport { mapActions } from './actions.js'\nimport { mapFields } from './fields.js'\n\nexport const mapCollections = ({\n  DefaultEditView,\n  DefaultListView,\n  WithServerSideProps,\n  collections,\n  config,\n  i18n,\n  readOnly: readOnlyOverride,\n}: {\n  DefaultEditView: React.FC<EditViewProps>\n  DefaultListView: React.FC<AdminViewProps>\n  WithServerSideProps: WithServerSidePropsType\n  collections: SanitizedCollectionConfig[]\n  config: SanitizedConfig\n  i18n: I18n\n  readOnly?: boolean\n}): {\n  [key: SanitizedCollectionConfig['slug']]: CollectionComponentMap\n} =>\n  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' && typeof editViewFromConfig.Default === 'function'\n          ? editViewFromConfig.Default\n          : typeof editViewFromConfig?.Default === 'object' &&\n              'Component' in editViewFromConfig.Default &&\n              typeof editViewFromConfig.Default.Component === 'function'\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            typeof listViewFromConfig.Component === 'function'\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 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    const descriptionProps: ViewDescriptionProps = {\n      description:\n        (collectionConfig.admin &&\n          'description' in collectionConfig.admin &&\n          (((typeof collectionConfig.admin?.description === 'string' ||\n            typeof collectionConfig.admin?.description === 'object') &&\n            collectionConfig.admin.description) ||\n            (typeof collectionConfig.admin?.description === 'function' &&\n              isPlainFunction<EntityDescriptionFunction>(collectionConfig.admin?.description) &&\n              collectionConfig.admin?.description()))) ||\n        undefined,\n    }\n\n    const DescriptionComponent =\n      (collectionConfig.admin &&\n        'description' in collectionConfig.admin &&\n        ((isReactComponent<EntityDescriptionComponent>(collectionConfig.admin.description) &&\n          collectionConfig.admin.description) ||\n          (collectionConfig.admin.description && ViewDescription))) ||\n      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      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"],"names":["ViewDescription","isPlainFunction","isReactComponent","React","mapActions","mapFields","mapCollections","DefaultEditView","DefaultListView","WithServerSideProps","collections","config","i18n","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","beforeList","BeforeList","Array","isArray","map","beforeListTable","BeforeListTable","afterList","AfterList","afterListTable","AfterListTable","descriptionProps","description","DescriptionComponent","Description","componentMap","collectionSlug","actionsMap","fieldMap","fieldSchema","isPreviewEnabled","preview"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","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/types'\n\nimport { isReactComponentOrFunction } from 'payload/utilities'\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\nimport { ViewDescription } from '../../../elements/ViewDescription/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 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      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","beforeList","BeforeList","Array","isArray","map","beforeListTable","BeforeListTable","afterList","AfterList","afterListTable","AfterListTable","description","descriptionProps","DescriptionComponent","Description","componentMap","collectionSlug","actionsMap","fieldMap","fieldSchema","isPreviewEnabled","preview"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

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

@@ -1,8 +1,9 @@
-import type { I18n } from '@payloadcms/translations';
-import type { Field, FieldWithPath, SanitizedConfig, WithServerSideProps as WithServerSidePropsType } from 'payload/types';
+import type { I18nClient } from '@payloadcms/translations';
+import type { Field, FieldWithPath, SanitizedConfig } from 'payload/types';
+import type { WithServerSidePropsPrePopulated } from './index.js';
 import type { FieldMap } from './types.js';
 export declare const mapFields: (args: {
-    WithServerSideProps: WithServerSidePropsType;
+    WithServerSideProps: WithServerSidePropsPrePopulated;
     config: SanitizedConfig;
     /**
      * If mapFields is used outside of collections, you might not want it to add an id field
@@ -10,7 +11,7 @@ export declare const mapFields: (args: {
     disableAddingID?: boolean;
     fieldSchema: FieldWithPath[];
     filter?: (field: Field) => boolean;
-    i18n: I18n;
+    i18n: I18nClient;
     parentPath?: string;
     readOnly?: boolean;
 }) => FieldMap;

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,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAEpD,OAAO,KAAK,EAIV,KAAK,EAGL,aAAa,EAIb,eAAe,EACf,mBAAmB,IAAI,uBAAuB,EAC/C,MAAM,eAAe,CAAA;AAiCtB,OAAO,KAAK,EAEV,QAAQ,EAIT,MAAM,YAAY,CAAA;AAInB,eAAO,MAAM,SAAS,SAAU;IAC9B,mBAAmB,EAAE,uBAAuB,CAAA;IAC5C,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,IAAI,CAAA;IACV,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,aAsuBA,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;AAE1D,OAAO,KAAK,EAEV,KAAK,EAEL,aAAa,EAGb,eAAe,EAChB,MAAM,eAAe,CAAA;AA0BtB,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,YAAY,CAAA;AACjE,OAAO,KAAK,EAEV,QAAQ,EAIT,MAAM,YAAY,CAAA;AAKnB,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,aAwuBA,CAAA"}

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

@@ -1,14 +1,14 @@
-import { FieldDescription } from '@payloadcms/ui/forms/FieldDescription';
+import { jsx as _jsx } from "react/jsx-runtime";
 import { fieldAffectsData, fieldIsPresentationalOnly } from 'payload/types';
-import { isPlainFunction, isReactComponent } from 'payload/utilities';
 import React, { Fragment } from 'react';
 import { HiddenInput } from '../../../fields/HiddenInput/index.js';
+import { FieldDescription } from '../../../forms/FieldDescription/index.js';
 export const mapFields = (args)=>{
     const { WithServerSideProps, config, disableAddingID, fieldSchema, filter, i18n, i18n: { t }, parentPath, readOnly: readOnlyOverride } = args;
     const result = fieldSchema.reduce((acc, field)=>{
         const fieldIsPresentational = fieldIsPresentationalOnly(field);
         let CustomFieldComponent = field.admin?.components?.Field;
-        const CustomCellComponent = field.admin?.components?.Cell;
+        let CustomCellComponent = field.admin?.components?.Cell;
         const isHidden = field?.admin && 'hidden' in field.admin && field.admin.hidden;
         if (fieldIsPresentational || !field?.hidden && field?.admin?.disabled !== true) {
             if (filter && typeof filter === 'function' && filter(field) || !filter) {
@@ -19,30 +19,56 @@ export const mapFields = (args)=>{
                 }
                 const isFieldAffectingData = fieldAffectsData(field);
                 const path = `${parentPath ? `${parentPath}.` : ''}${field.path || (isFieldAffectingData && 'name' in field ? field.name : '')}`;
-                const AfterInput = 'admin' in field && 'components' in field.admin && 'afterInput' in field.admin.components && Array.isArray(field.admin?.components?.afterInput) && /*#__PURE__*/ React.createElement(Fragment, null, field.admin.components.afterInput.map((Component, i)=>/*#__PURE__*/ React.createElement(WithServerSideProps, {
-                        Component: Component,
-                        key: i
-                    }))) || null;
-                const BeforeInput = 'admin' in field && field.admin?.components && 'beforeInput' in field.admin.components && Array.isArray(field.admin.components.beforeInput) && /*#__PURE__*/ React.createElement(Fragment, null, field.admin.components.beforeInput.map((Component, i)=>/*#__PURE__*/ React.createElement(WithServerSideProps, {
-                        Component: Component,
-                        key: i
-                    }))) || null;
+                const AfterInput = 'admin' in field && 'components' in field.admin && 'afterInput' in field.admin.components && Array.isArray(field.admin?.components?.afterInput) && /*#__PURE__*/ _jsx(Fragment, {
+                    children: field.admin.components.afterInput.map((Component, i)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
+                            Component: Component
+                        }, i))
+                }) || null;
+                const BeforeInput = 'admin' in field && field.admin?.components && 'beforeInput' in field.admin.components && Array.isArray(field.admin.components.beforeInput) && /*#__PURE__*/ _jsx(Fragment, {
+                    children: field.admin.components.beforeInput.map((Component, i)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
+                            Component: Component
+                        }, i))
+                }) || null;
+                let label = undefined;
+                if ('label' in field) {
+                    if (typeof field.label === 'string' || typeof field.label === 'object') {
+                        label = field.label;
+                    } else if (typeof field.label === 'function') {
+                        label = field.label({
+                            t
+                        });
+                    }
+                }
                 const labelProps = {
-                    label: 'label' in field && !isPlainFunction(field.label) && !isReactComponent(field.label) ? field.label : undefined,
+                    label,
                     required: 'required' in field ? field.required : undefined
                 };
                 const CustomLabelComponent = 'admin' in field && field.admin?.components && 'Label' in field.admin.components && field.admin.components?.Label || undefined;
-                const CustomLabel = CustomLabelComponent !== undefined ? /*#__PURE__*/ React.createElement(WithServerSideProps, {
+                // 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: field.admin && 'description' in field.admin && ((typeof field.admin?.description === 'string' || typeof field.admin?.description === 'object') && field.admin.description || typeof field.admin?.description === 'function' && isPlainFunction(field.admin?.description) && field.admin?.description({
-                        t
-                    })) || undefined
+                    description
                 };
-                const CustomDescriptionComponent = field.admin && 'description' in field.admin && (isReactComponent(field.admin.description) && field.admin.description || field.admin.description && FieldDescription) || undefined;
-                const CustomDescription = CustomDescriptionComponent !== undefined ? /*#__PURE__*/ React.createElement(WithServerSideProps, {
+                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;
@@ -50,10 +76,11 @@ export const mapFields = (args)=>{
                     path
                 };
                 const CustomErrorComponent = 'admin' in field && field.admin?.components && 'Error' in field.admin.components && field.admin?.components?.Error || undefined;
-                const CustomError = CustomErrorComponent !== undefined ? /*#__PURE__*/ React.createElement(WithServerSideProps, {
+                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,
@@ -64,7 +91,7 @@ export const mapFields = (args)=>{
                     descriptionProps,
                     disabled: 'admin' in field && 'disabled' in field.admin ? field.admin?.disabled : false,
                     errorProps,
-                    labelProps,
+                    label: labelProps?.label,
                     path,
                     required: 'required' in field ? field.required : undefined
                 };
@@ -75,7 +102,7 @@ export const mapFields = (args)=>{
                         if (typeof option === 'object' && typeof option.label === 'function') {
                             return {
                                 label: option.label({
-                                    t: i18n.t
+                                    t
                                 }),
                                 value: option.value
                             };
@@ -87,19 +114,21 @@ export const mapFields = (args)=>{
                     name: 'name' in field ? field.name : undefined,
                     fieldType: field.type,
                     isFieldAffectingData,
-                    label: 'label' in field && field.label && typeof field.label !== 'function' ? field.label : undefined,
+                    label: labelProps?.label || undefined,
                     labels: 'labels' in field ? field.labels : undefined,
                     options: 'options' in field ? fieldOptions : undefined,
-                    relationTo: 'relationTo' in field ? field.relationTo : undefined
+                    relationTo: 'relationTo' in field ? field.relationTo : undefined,
+                    schemaPath: path
                 };
                 switch(field.type){
                     case 'array':
                         {
                             let CustomRowLabel;
-                            if ('admin' in field && field.admin.components && 'RowLabel' in field.admin.components && field.admin.components.RowLabel && isReactComponent(field.admin.components.RowLabel)) {
+                            if ('admin' in field && field.admin.components && 'RowLabel' in field.admin.components && field.admin.components.RowLabel) {
                                 const CustomRowLabelComponent = field.admin.components.RowLabel;
-                                CustomRowLabel = /*#__PURE__*/ React.createElement(WithServerSideProps, {
-                                    Component: CustomRowLabelComponent
+                                CustomRowLabel = /*#__PURE__*/ _jsx(WithServerSideProps, {
+                                    Component: CustomRowLabelComponent,
+                                    ...labelProps || {}
                                 });
                             }
                             const arrayFieldProps = {
@@ -118,7 +147,6 @@ export const mapFields = (args)=>{
                                     readOnly: readOnlyOverride
                                 }),
                                 isSortable: field.admin?.isSortable,
-                                label: field?.label,
                                 labels: field.labels,
                                 maxRows: field.maxRows,
                                 minRows: field.minRows,
@@ -159,7 +187,6 @@ export const mapFields = (args)=>{
                                 className: field.admin?.className,
                                 disabled: field.admin?.disabled,
                                 isSortable: field.admin?.isSortable,
-                                label: field?.label,
                                 labels: field.labels,
                                 maxRows: field.maxRows,
                                 minRows: field.minRows,
@@ -182,7 +209,6 @@ export const mapFields = (args)=>{
                                 name: field.name,
                                 className: field.admin?.className,
                                 disabled: field.admin?.disabled,
-                                label: field.label,
                                 readOnly: field.admin?.readOnly,
                                 required: field.required,
                                 style: field.admin?.style,
@@ -199,7 +225,6 @@ export const mapFields = (args)=>{
                                 className: field.admin?.className,
                                 disabled: field.admin?.disabled,
                                 editorOptions: field.admin?.editorOptions,
-                                label: field.label,
                                 language: field.admin?.language,
                                 readOnly: field.admin?.readOnly,
                                 required: field.required,
@@ -212,10 +237,11 @@ export const mapFields = (args)=>{
                     case 'collapsible':
                         {
                             let CustomCollapsibleLabel;
-                            if (isReactComponent(field.label) || isPlainFunction(field.label)) {
-                                const CustomCollapsibleLabelComponent = field.label;
-                                CustomCollapsibleLabel = /*#__PURE__*/ React.createElement(WithServerSideProps, {
-                                    Component: CustomCollapsibleLabelComponent
+                            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 = {
@@ -234,7 +260,6 @@ export const mapFields = (args)=>{
                                     readOnly: readOnlyOverride
                                 }),
                                 initCollapsed: field.admin?.initCollapsed,
-                                label: !CustomCollapsibleLabel ? field.label : undefined,
                                 readOnly: field.admin?.readOnly,
                                 required: field.required,
                                 style: field.admin?.style,
@@ -252,7 +277,6 @@ export const mapFields = (args)=>{
                                 className: field.admin?.className,
                                 date: field.admin?.date,
                                 disabled: field.admin?.disabled,
-                                label: field.label,
                                 placeholder: field.admin?.placeholder,
                                 readOnly: field.admin?.readOnly,
                                 required: field.required,
@@ -270,7 +294,6 @@ export const mapFields = (args)=>{
                                 name: field.name,
                                 className: field.admin?.className,
                                 disabled: field.admin?.disabled,
-                                label: field.label,
                                 placeholder: field.admin?.placeholder,
                                 readOnly: field.admin?.readOnly,
                                 required: field.required,
@@ -297,7 +320,6 @@ export const mapFields = (args)=>{
                                     parentPath: path,
                                     readOnly: readOnlyOverride
                                 }),
-                                label: field.label,
                                 readOnly: field.admin?.readOnly,
                                 style: field.admin?.style,
                                 width: field.admin?.width
@@ -314,7 +336,6 @@ export const mapFields = (args)=>{
                                 disabled: field.admin?.disabled,
                                 editorOptions: field.admin?.editorOptions,
                                 jsonSchema: field.jsonSchema,
-                                label: field.label,
                                 readOnly: field.admin?.readOnly,
                                 required: field.required,
                                 style: field.admin?.style,
@@ -331,7 +352,6 @@ export const mapFields = (args)=>{
                                 className: field.admin?.className,
                                 disabled: field.admin?.disabled,
                                 hasMany: field.hasMany,
-                                label: field.label,
                                 max: field.max,
                                 maxRows: field.maxRows,
                                 min: field.min,
@@ -351,7 +371,6 @@ export const mapFields = (args)=>{
                                 name: field.name,
                                 className: field.admin?.className,
                                 disabled: field.admin?.disabled,
-                                label: field.label,
                                 readOnly: field.admin?.readOnly,
                                 required: field.required,
                                 style: field.admin?.style,
@@ -369,7 +388,7 @@ export const mapFields = (args)=>{
                                 className: field.admin?.className,
                                 disabled: field.admin?.disabled,
                                 hasMany: field.hasMany,
-                                label: field.label,
+                                isSortable: field.admin?.isSortable,
                                 readOnly: field.admin?.readOnly,
                                 relationTo: field.relationTo,
                                 required: field.required,
@@ -388,7 +407,6 @@ export const mapFields = (args)=>{
                                 name: field.name,
                                 className: field.admin?.className,
                                 disabled: field.admin?.disabled,
-                                label: field.label,
                                 options: fieldOptions,
                                 readOnly: field.admin?.readOnly,
                                 required: field.required,
@@ -406,7 +424,6 @@ export const mapFields = (args)=>{
                                 name: field.name,
                                 className: field.admin?.className,
                                 disabled: field.admin?.disabled,
-                                label: field.label,
                                 readOnly: field.admin?.readOnly,
                                 required: field.required,
                                 style: field.admin?.style,
@@ -431,9 +448,7 @@ export const mapFields = (args)=>{
                                 CustomFieldComponent = RichTextFieldComponent;
                             }
                             if (RichTextCellComponent) {
-                                cellComponentProps.CellComponentOverride = /*#__PURE__*/ React.createElement(WithServerSideProps, {
-                                    Component: RichTextCellComponent
-                                });
+                                CustomCellComponent = RichTextCellComponent;
                             }
                             fieldComponentProps = richTextField;
                             break;
@@ -505,7 +520,6 @@ export const mapFields = (args)=>{
                                 className: field.admin?.className,
                                 disabled: field.admin?.disabled,
                                 hasMany: field.hasMany,
-                                label: field.label,
                                 maxLength: field.maxLength,
                                 minLength: field.minLength,
                                 placeholder: field.admin?.placeholder,
@@ -524,7 +538,6 @@ export const mapFields = (args)=>{
                                 name: field.name,
                                 className: field.admin?.className,
                                 disabled: field.admin?.disabled,
-                                label: field.label,
                                 maxLength: field.maxLength,
                                 minLength: field.minLength,
                                 placeholder: field.admin?.placeholder,
@@ -550,7 +563,6 @@ export const mapFields = (args)=>{
                                 className: field.admin?.className,
                                 disabled: field.admin?.disabled,
                                 filterOptions: field.filterOptions,
-                                label: field.label,
                                 readOnly: field.admin?.readOnly,
                                 relationTo: field.relationTo,
                                 required: field.required,
@@ -570,7 +582,6 @@ export const mapFields = (args)=>{
                                 disabled: field.admin?.disabled,
                                 hasMany: field.hasMany,
                                 isClearable: field.admin?.isClearable,
-                                label: field.label,
                                 options: fieldOptions,
                                 readOnly: field.admin?.readOnly,
                                 required: field.required,
@@ -589,17 +600,19 @@ export const mapFields = (args)=>{
                 const reducedField = {
                     name: 'name' in field ? field.name : undefined,
                     type: field.type,
-                    CustomCell: CustomCellComponent ? /*#__PURE__*/ React.createElement(WithServerSideProps, {
+                    CustomCell: CustomCellComponent ? /*#__PURE__*/ _jsx(WithServerSideProps, {
                         Component: CustomCellComponent,
                         ...cellComponentProps
                     }) : undefined,
-                    CustomField: CustomFieldComponent ? /*#__PURE__*/ React.createElement(WithServerSideProps, {
+                    CustomField: CustomFieldComponent ? /*#__PURE__*/ _jsx(WithServerSideProps, {
                         Component: CustomFieldComponent,
                         ...fieldComponentProps
                     }) : undefined,
                     cellComponentProps,
                     custom: field?.admin?.custom,
                     disableBulkEdit: 'admin' in field && 'disableBulkEdit' in field.admin && field.admin.disableBulkEdit,
+                    disableListColumn: 'admin' in field && 'disableListColumn' in field.admin && field.admin.disableListColumn,
+                    disableListFilter: 'admin' in field && 'disableListFilter' in field.admin && field.admin.disableListFilter,
                     fieldComponentProps,
                     fieldIsPresentational,
                     isFieldAffectingData,
@@ -621,15 +634,13 @@ export const mapFields = (args)=>{
             type: 'text',
             CustomField: null,
             cellComponentProps: {
-                name: 'id'
+                name: 'id',
+                schemaPath: 'id'
             },
             disableBulkEdit: true,
             fieldComponentProps: {
                 name: 'id',
-                label: 'ID',
-                labelProps: {
-                    label: 'ID'
-                }
+                label: 'ID'
             },
             fieldIsPresentational: false,
             isFieldAffectingData: true,