diff --git a/packages/richtext-lexical/src/field/Field.tsx b/packages/richtext-lexical/src/field/Field.tsx index 38bb24946..22110e439 100644 --- a/packages/richtext-lexical/src/field/Field.tsx +++ b/packages/richtext-lexical/src/field/Field.tsx @@ -40,7 +40,7 @@ const RichTextComponent: React.FC< readOnly: readOnlyFromAdmin, style, width, - }, + } = {}, label, required, }, diff --git a/packages/richtext-lexical/src/field/index.tsx b/packages/richtext-lexical/src/field/index.tsx index 2080287b5..3e4e18cd7 100644 --- a/packages/richtext-lexical/src/field/index.tsx +++ b/packages/richtext-lexical/src/field/index.tsx @@ -17,7 +17,7 @@ const RichTextEditor = lazy(() => export const RichTextField: React.FC = (props) => { const { - admin, + admin = {}, field: { richTextComponentMap }, lexicalEditorConfig, } = props diff --git a/packages/richtext-slate/src/field/RichText.tsx b/packages/richtext-slate/src/field/RichText.tsx index 379c22e9c..d86a2d98a 100644 --- a/packages/richtext-slate/src/field/RichText.tsx +++ b/packages/richtext-slate/src/field/RichText.tsx @@ -64,7 +64,7 @@ const RichTextField: React.FC = (props) => { readOnly: readOnlyFromAdmin, style, width, - }, + } = {}, label, required, }, diff --git a/packages/ui/src/fields/Array/index.tsx b/packages/ui/src/fields/Array/index.tsx index abbe4745f..491862bf1 100644 --- a/packages/ui/src/fields/Array/index.tsx +++ b/packages/ui/src/fields/Array/index.tsx @@ -43,7 +43,7 @@ export const ArrayFieldComponent: React.FC = (props) => { description, isSortable = true, readOnly: readOnlyFromAdmin, - }, + } = {}, fields, label, localized, diff --git a/packages/ui/src/fields/Blocks/index.tsx b/packages/ui/src/fields/Blocks/index.tsx index a5167abf2..674312cce 100644 --- a/packages/ui/src/fields/Blocks/index.tsx +++ b/packages/ui/src/fields/Blocks/index.tsx @@ -42,7 +42,7 @@ const BlocksFieldComponent: React.FC = (props) => { field: { name, _path: pathFromProps, - admin: { className, description, isSortable = true, readOnly: readOnlyFromAdmin }, + admin: { className, description, isSortable = true, readOnly: readOnlyFromAdmin } = {}, blocks, label, labels: labelsFromProps, diff --git a/packages/ui/src/fields/Code/index.tsx b/packages/ui/src/fields/Code/index.tsx index 911eecde8..2f199d189 100644 --- a/packages/ui/src/fields/Code/index.tsx +++ b/packages/ui/src/fields/Code/index.tsx @@ -37,7 +37,7 @@ const CodeFieldComponent: React.FC = (props) => { readOnly: readOnlyFromAdmin, style, width, - }, + } = {}, label, required, }, diff --git a/packages/ui/src/fields/Collapsible/index.tsx b/packages/ui/src/fields/Collapsible/index.tsx index 911cce228..47f19f76c 100644 --- a/packages/ui/src/fields/Collapsible/index.tsx +++ b/packages/ui/src/fields/Collapsible/index.tsx @@ -27,7 +27,7 @@ const CollapsibleFieldComponent: React.FC = (props) => { field, field: { _path: pathFromProps, - admin: { className, description, initCollapsed = false, readOnly: readOnlyFromAdmin }, + admin: { className, description, initCollapsed = false, readOnly: readOnlyFromAdmin } = {}, fields, label, }, diff --git a/packages/ui/src/fields/DateTime/index.tsx b/packages/ui/src/fields/DateTime/index.tsx index 960ea0b50..c67a92f83 100644 --- a/packages/ui/src/fields/DateTime/index.tsx +++ b/packages/ui/src/fields/DateTime/index.tsx @@ -35,7 +35,7 @@ const DateTimeFieldComponent: React.FC = (props) => { readOnly: readOnlyFromAdmin, style, width, - }, + } = {}, label, required, }, diff --git a/packages/ui/src/fields/Group/index.tsx b/packages/ui/src/fields/Group/index.tsx index 106e486a2..293441497 100644 --- a/packages/ui/src/fields/Group/index.tsx +++ b/packages/ui/src/fields/Group/index.tsx @@ -32,7 +32,7 @@ export const GroupFieldComponent: React.FC = (props) => { descriptionProps, field, field: { - admin: { className, description, hideGutter, readOnly: readOnlyFromAdmin, style, width }, + admin: { className, description, hideGutter, readOnly: readOnlyFromAdmin, style, width } = {}, fields, label, }, diff --git a/packages/ui/src/fields/JSON/index.tsx b/packages/ui/src/fields/JSON/index.tsx index a70e1da4a..260171bb6 100644 --- a/packages/ui/src/fields/JSON/index.tsx +++ b/packages/ui/src/fields/JSON/index.tsx @@ -25,7 +25,14 @@ const JSONFieldComponent: React.FC = (props) => { field: { name, _path: pathFromProps, - admin: { className, description, editorOptions, readOnly: readOnlyFromAdmin, style, width }, + admin: { + className, + description, + editorOptions, + readOnly: readOnlyFromAdmin, + style, + width, + } = {}, jsonSchema, label, required, diff --git a/packages/ui/src/fields/Point/index.tsx b/packages/ui/src/fields/Point/index.tsx index cc8f144c8..cd0851955 100644 --- a/packages/ui/src/fields/Point/index.tsx +++ b/packages/ui/src/fields/Point/index.tsx @@ -34,7 +34,7 @@ export const PointFieldComponent: React.FC = (props) => { step, style, width, - }, + } = {}, label, required, }, diff --git a/packages/ui/src/fields/Relationship/index.tsx b/packages/ui/src/fields/Relationship/index.tsx index 57ff92628..bc3f6d509 100644 --- a/packages/ui/src/fields/Relationship/index.tsx +++ b/packages/ui/src/fields/Relationship/index.tsx @@ -50,7 +50,7 @@ const RelationshipFieldComponent: React.FC = (props) => sortOptions, style, width, - }, + } = {}, hasMany, label, relationTo, diff --git a/packages/ui/src/fields/Row/index.tsx b/packages/ui/src/fields/Row/index.tsx index c93b494e5..1e6185d51 100644 --- a/packages/ui/src/fields/Row/index.tsx +++ b/packages/ui/src/fields/Row/index.tsx @@ -16,10 +16,7 @@ const baseClass = 'row' const RowFieldComponent: React.FC = (props) => { const { - field: { - admin: { className }, - fields, - }, + field: { admin: { className } = {}, fields }, forceRender = false, } = props diff --git a/packages/ui/src/fields/Tabs/index.tsx b/packages/ui/src/fields/Tabs/index.tsx index 667c4e78b..afd8c76a7 100644 --- a/packages/ui/src/fields/Tabs/index.tsx +++ b/packages/ui/src/fields/Tabs/index.tsx @@ -27,7 +27,7 @@ const TabsFieldComponent: React.FC = (props) => { field, field: { _path: pathFromProps, - admin: { className, readOnly: readOnlyFromAdmin }, + admin: { className, readOnly: readOnlyFromAdmin } = {}, tabs = [], }, forceRender = false, diff --git a/packages/ui/src/fields/Text/index.tsx b/packages/ui/src/fields/Text/index.tsx index 6dbce3c37..bcefd7c56 100644 --- a/packages/ui/src/fields/Text/index.tsx +++ b/packages/ui/src/fields/Text/index.tsx @@ -31,7 +31,7 @@ const TextFieldComponent: React.FC = (props) => { rtl, style, width, - }, + } = {}, hasMany, label, localized, diff --git a/packages/ui/src/fields/Textarea/index.tsx b/packages/ui/src/fields/Textarea/index.tsx index eab32e140..92f0807a6 100644 --- a/packages/ui/src/fields/Textarea/index.tsx +++ b/packages/ui/src/fields/Textarea/index.tsx @@ -32,7 +32,7 @@ const TextareaFieldComponent: React.FC = (props) => { rtl, style, width, - }, + } = {}, label, localized, maxLength, diff --git a/packages/ui/src/fields/Upload/index.tsx b/packages/ui/src/fields/Upload/index.tsx index 6a1512cef..1e735087b 100644 --- a/packages/ui/src/fields/Upload/index.tsx +++ b/packages/ui/src/fields/Upload/index.tsx @@ -22,7 +22,7 @@ const UploadComponent: React.FC = (props) => { field, field: { _path: pathFromProps, - admin: { className, readOnly: readOnlyFromAdmin, style, width }, + admin: { className, readOnly: readOnlyFromAdmin, style, width } = {}, label, relationTo, required, diff --git a/tsconfig.json b/tsconfig.json index 43c43289e..ae27597fb 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -37,7 +37,7 @@ ], "paths": { "@payload-config": [ - "./test/fields/config.ts" + "./test/_community/config.ts" ], "@payloadcms/live-preview": [ "./packages/live-preview/src"