diff --git a/src/admin/components/forms/FieldDescription/types.ts b/src/admin/components/forms/FieldDescription/types.ts index 98e8c0bdd7..ee90d42ee0 100644 --- a/src/admin/components/forms/FieldDescription/types.ts +++ b/src/admin/components/forms/FieldDescription/types.ts @@ -2,9 +2,9 @@ import React from 'react'; export type DescriptionFunction = (value: unknown) => string -export type DescriptionComponent = React.ComponentType<{value: unknown}> +export type DescriptionComponent = React.ComponentType<{ value: unknown }> -type Description = string | DescriptionFunction | DescriptionComponent +export type Description = string | DescriptionFunction | DescriptionComponent export type Props = { description?: Description diff --git a/src/admin/components/forms/field-types/Array/types.ts b/src/admin/components/forms/field-types/Array/types.ts index 067f45c811..007dbbbf4c 100644 --- a/src/admin/components/forms/field-types/Array/types.ts +++ b/src/admin/components/forms/field-types/Array/types.ts @@ -1,7 +1,8 @@ import { Data } from '../../Form/types'; -import { ArrayField, Labels, Field, Description } from '../../../../../fields/config/types'; +import { ArrayField, Labels, Field } from '../../../../../fields/config/types'; import { FieldTypes } from '..'; import { FieldPermissions } from '../../../../../auth/types'; +import { Description } from '../../FieldDescription/types'; export type Props = Omit & { path?: string diff --git a/src/admin/components/forms/field-types/Blocks/types.ts b/src/admin/components/forms/field-types/Blocks/types.ts index e12683df3a..ee687dee7b 100644 --- a/src/admin/components/forms/field-types/Blocks/types.ts +++ b/src/admin/components/forms/field-types/Blocks/types.ts @@ -1,7 +1,8 @@ import { Data } from '../../Form/types'; -import { BlockField, Labels, Block, Description } from '../../../../../fields/config/types'; +import { BlockField, Labels, Block } from '../../../../../fields/config/types'; import { FieldTypes } from '..'; import { FieldPermissions } from '../../../../../auth/types'; +import { Description } from '../../FieldDescription/types'; export type Props = Omit & { path?: string diff --git a/src/admin/components/forms/field-types/Password/types.ts b/src/admin/components/forms/field-types/Password/types.ts index 214b322c52..3814c63928 100644 --- a/src/admin/components/forms/field-types/Password/types.ts +++ b/src/admin/components/forms/field-types/Password/types.ts @@ -1,5 +1,6 @@ import React from 'react'; -import { Description, Validate } from '../../../../../fields/config/types'; +import { Validate } from '../../../../../fields/config/types'; +import { Description } from '../../FieldDescription/types'; export type Props = { autoComplete?: string diff --git a/src/fields/config/types.ts b/src/fields/config/types.ts index 91c4b4218d..801d69793f 100644 --- a/src/fields/config/types.ts +++ b/src/fields/config/types.ts @@ -4,6 +4,7 @@ import { Editor } from 'slate'; import { PayloadRequest } from '../../express/types'; import { Document } from '../../types'; import { ConditionalDateProps } from '../../admin/components/elements/DatePicker/types'; +import { Description } from '../../admin/components/forms/FieldDescription/types'; export type FieldHook = (args: { value?: unknown, @@ -40,8 +41,6 @@ type Admin = { hidden?: boolean } -export type Description = string | ((value: Record) => string); - export type Labels = { singular: string; plural: string; @@ -302,22 +301,22 @@ export type FieldAffectingData = | PointField export type NonPresentationalField = TextField -| NumberField -| EmailField -| TextareaField -| CheckboxField -| DateField -| BlockField -| GroupField -| RadioField -| RelationshipField -| ArrayField -| RichTextField -| SelectField -| UploadField -| CodeField -| PointField -| RowField; + | NumberField + | EmailField + | TextareaField + | CheckboxField + | DateField + | BlockField + | GroupField + | RadioField + | RelationshipField + | ArrayField + | RichTextField + | SelectField + | UploadField + | CodeField + | PointField + | RowField; export type FieldWithPath = Field & { path?: string