Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: custom fields resetting values #626

Merged
merged 1 commit into from Jun 8, 2022
Merged

fix: custom fields resetting values #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/admin/components/utilities/RenderCustomComponent/index.tsx
View file
Open in desktop
@@ -1,14 +1,12 @@
import React from 'react';
import { Props } from './types';
import withCondition from '../../forms/withCondition';

const RenderCustomComponent: React.FC<Props> = (props) => {
const { CustomComponent, DefaultComponent, componentProps } = props;

if (CustomComponent) {
const ConditionalCustomComponent = withCondition(CustomComponent);
return (
<ConditionalCustomComponent {...componentProps} />
<CustomComponent {...componentProps} />
);
}

Expand Down
9 changes: 8 additions & 1 deletion src/fields/config/sanitize.ts
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@ import { baseBlockFields } from '../baseFields/baseBlockFields';
import validations from '../validations';
import { baseIDField } from '../baseFields/baseIDField';
import { Field, fieldAffectsData } from './types';
import withCondition from '../../admin/components/forms/withCondition';

const sanitizeFields = (fields: Field[], validRelationships: string[]): Field[] => {
if (!fields) return [];
Expand Down Expand Up @@ -57,7 +58,13 @@ const sanitizeFields = (fields: Field[], validRelationships: string[]): Field[]
if (!field.access) field.access = {};
}

if (!field.admin) field.admin = {};
if (field.admin) {
if (field.admin.condition && field.admin.components?.Field) {
field.admin.components.Field = withCondition(field.admin.components?.Field);
}
} else {
field.admin = {};
}

if ('fields' in field && field.fields) field.fields = sanitizeFields(field.fields, validRelationships);

Expand Down