tabshift/payloadcms
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/alpha' into alpha

Browse Source
This commit is contained in:
Alessio Gravili
2024-03-18 16:24:52 -04:00
parent 28d7d2544e decc56e54d
commit 4d95c824f3
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/ui/src/forms/RenderFields/RenderField.tsx
View File

@@ -67,7 +67,7 @@ export const RenderField: React.FC<Props> = ({
const DefaultField = isHidden ? HiddenInput : fieldComponents[type]
if (!CustomField && !DefaultField) {
if (CustomField === undefined && !DefaultField) {
return null
}
@@ -79,7 +79,7 @@ export const RenderField: React.FC<Props> = ({
schemaPath={schemaPath}
siblingPermissions={siblingPermissions}
>
{CustomField || <DefaultField {...fieldComponentProps} />}
{CustomField !== undefined ? CustomField : <DefaultField {...fieldComponentProps} />}
</FieldPropsProvider>
)
}

4
packages/ui/src/utilities/buildComponentMap/mapFields.tsx
View File

@@ -63,7 +63,9 @@ export const mapFields = (args: {
const result: FieldMap = fieldSchema.reduce((acc, field): FieldMap => {
const fieldIsPresentational = fieldIsPresentationalOnly(field)
let CustomFieldComponent: React.ComponentType<FieldComponentProps>
let CustomFieldComponent: React.ComponentType<FieldComponentProps> =
field.admin?.components?.Field
const CustomCellComponent = field.admin?.components?.Cell
const isHidden = field?.admin && 'hidden' in field.admin && field.admin.hidden