diff --git a/packages/payload/src/fields/config/client.ts b/packages/payload/src/fields/config/client.ts index ded2b90fe..be2de5426 100644 --- a/packages/payload/src/fields/config/client.ts +++ b/packages/payload/src/fields/config/client.ts @@ -96,25 +96,6 @@ export const createClientField = ({ clientField.label = incomingField.label({ t: i18n.t }) } - if (!(clientField.admin instanceof Object)) { - clientField.admin = {} as AdminClient - } - - if ('admin' in incomingField && 'width' in incomingField.admin) { - clientField.admin.style = { - ...clientField.admin.style, - '--field-width': clientField.admin.width, - } - - delete clientField.admin.style.width // avoid needlessly adding this to the element's style attribute - } else { - if (!(clientField.admin.style instanceof Object)) { - clientField.admin.style = {} - } - - clientField.admin.style.flex = '1 1 auto' - } - switch (incomingField.type) { case 'array': case 'collapsible': diff --git a/packages/richtext-lexical/src/field/Field.tsx b/packages/richtext-lexical/src/field/Field.tsx index d629615d2..64455d543 100644 --- a/packages/richtext-lexical/src/field/Field.tsx +++ b/packages/richtext-lexical/src/field/Field.tsx @@ -2,7 +2,8 @@ import type { EditorState, SerializedEditorState } from 'lexical' import { FieldLabel, useEditDepth, useField, withCondition } from '@payloadcms/ui' -import React, { useCallback } from 'react' +import { mergeFieldStyles } from '@payloadcms/ui/shared' +import React, { useCallback, useMemo } from 'react' import { ErrorBoundary } from 'react-error-boundary' import type { SanitizedClientEditorConfig } from '../lexical/config/types.js' @@ -22,9 +23,10 @@ const RichTextComponent: React.FC< > = (props) => { const { editorConfig, + field, field: { name, - admin: { className, readOnly: readOnlyFromAdmin, style, width } = {}, + admin: { className, readOnly: readOnlyFromAdmin } = {}, label, localized, required, @@ -87,15 +89,10 @@ const RichTextComponent: React.FC< [setValue], ) + const styles = useMemo(() => mergeFieldStyles(field), [field]) + return ( -