chore(richtext-*): roll-back richtext adapter change

packages/payload/src/admin/components/forms/field-types/RichText/index.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react'
+import React from 'react'
 
 import type { RichTextField } from '../../../../../fields/config/types'
 import type { RichTextAdapter } from './types'
@@ -7,11 +7,7 @@ const RichText: React.FC<RichTextField> = (fieldprops) => {
   const editor: RichTextAdapter = fieldprops.editor
   const { FieldComponent } = editor
 
-  const FieldComponentImpl: React.FC<any> = useMemo(() => {
+  return <FieldComponent {...fieldprops} />
-    return FieldComponent()
-  }, [FieldComponent])
-
-  return <FieldComponentImpl {...fieldprops} />
 }
 
 export default RichText

packages/payload/src/admin/components/forms/field-types/RichText/types.ts

@@ -18,10 +18,10 @@ export type RichTextAdapter<
   AdapterProps = any,
   ExtraFieldProperties = {},
 > = {
-  CellComponent: () => React.FC<
+  CellComponent: React.FC<
     CellComponentProps<RichTextField<Value, AdapterProps, ExtraFieldProperties>>
   >
-  FieldComponent: () => React.FC<RichTextFieldProps<Value, AdapterProps, ExtraFieldProperties>>
+  FieldComponent: React.FC<RichTextFieldProps<Value, AdapterProps, ExtraFieldProperties>>
   afterReadPromise?: ({
     field,
     incomingEditorState,

packages/payload/src/admin/components/views/collections/List/Cell/field-types/Richtext/index.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react'
+import React from 'react'
 
 import type { RichTextField } from '../../../../../../../../fields/config/types'
 import type { RichTextAdapter } from '../../../../../../forms/field-types/RichText/types'
@@ -9,11 +9,7 @@ const RichTextCell: React.FC<CellComponentProps<RichTextField>> = (props) => {
   const editor: RichTextAdapter = props.field.editor
   const { CellComponent } = editor
 
-  const CellComponentImpl: React.FC<any> = useMemo(() => {
+  return <CellComponent {...props} />
-    return CellComponent()
-  }, [CellComponent])
-
-  return <CellComponentImpl {...props} />
 }
 
 export default RichTextCell

packages/richtext-lexical/src/index.ts

@@ -57,13 +57,11 @@ export function lexicalEditor(props?: LexicalEditorProps): LexicalRichTextAdapte
   }
 
   return {
-    CellComponent: () =>
+    CellComponent: withMergedProps({
-      withMergedProps({
       Component: RichTextCell,
       toMergeIntoProps: { editorConfig: finalSanitizedEditorConfig },
     }),
-    FieldComponent: () =>
+    FieldComponent: withMergedProps({
-      withMergedProps({
       Component: RichTextField,
       toMergeIntoProps: { editorConfig: finalSanitizedEditorConfig },
     }),

packages/richtext-slate/src/index.ts

@@ -13,13 +13,11 @@ export function slateEditor(
   args: AdapterArguments,
 ): RichTextAdapter<any[], AdapterArguments, AdapterArguments> {
   return {
-    CellComponent: () =>
+    CellComponent: withMergedProps({
-      withMergedProps({
       Component: RichTextCell,
       toMergeIntoProps: args,
     }),
-    FieldComponent: () =>
+    FieldComponent: withMergedProps({
-      withMergedProps({
       Component: RichTextField,
       toMergeIntoProps: args,
     }),