From b12c6952e29978cbaa721c0ebe72ad6045178c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Jablo=C3=B1ski?=
 <43938777+GermanJablo@users.noreply.github.com>
Date: Thu, 17 Oct 2024 09:29:40 -0300
Subject: [PATCH 1/4] save

---
 .../features/blocks/client/component/BlockContent.tsx    | 6 +++---
 .../src/features/blocks/client/component/index.tsx       | 2 +-
 .../features/experimental_table/client/utils/debounce.ts | 3 +++
 .../richtext-lexical/src/lexical/LexicalProvider.tsx     | 9 ++++++++-
 .../plugins/handles/AddBlockHandlePlugin/index.tsx       | 3 ++-
 .../plugins/handles/DraggableBlockPlugin/debounce.ts     | 8 ++++----
 .../src/utilities/fieldsDrawer/DrawerContent.tsx         | 2 +-
 .../richtext-lexical/src/utilities/generateImportMap.tsx | 2 ++
 .../src/utilities/migrateSlateToLexical/index.ts         | 7 ++++---
 packages/richtext-lexical/src/validate/index.ts          | 4 ++--
 10 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/packages/richtext-lexical/src/features/blocks/client/component/BlockContent.tsx b/packages/richtext-lexical/src/features/blocks/client/component/BlockContent.tsx
index 4d3af4a0ffd..ddaad1c26c8 100644
--- a/packages/richtext-lexical/src/features/blocks/client/component/BlockContent.tsx
+++ b/packages/richtext-lexical/src/features/blocks/client/component/BlockContent.tsx
@@ -43,13 +43,13 @@ type Props = {
 // Inside of fields.data however, that sub-blocks blockName property does not exist at all.
 function removeUndefinedAndNullAndEmptyArraysRecursively(obj: object) {
   for (const key in obj) {
-    const value = obj[key]
+    const value = obj[key as keyof object] as unknown
     if (Array.isArray(value) && !value?.length) {
-      delete obj[key]
+      delete obj[key as keyof object]
     } else if (value && typeof value === 'object') {
       removeUndefinedAndNullAndEmptyArraysRecursively(value)
     } else if (value === undefined || value === null) {
-      delete obj[key]
+      delete obj[key as keyof object]
     }
   }
 }
diff --git a/packages/richtext-lexical/src/features/blocks/client/component/index.tsx b/packages/richtext-lexical/src/features/blocks/client/component/index.tsx
index 1f826e7ae31..f5123ec57f3 100644
--- a/packages/richtext-lexical/src/features/blocks/client/component/index.tsx
+++ b/packages/richtext-lexical/src/features/blocks/client/component/index.tsx
@@ -86,7 +86,7 @@ export const BlockComponent: React.FC<Props> = (props) => {
   }, [config.routes.api, config.serverURL, schemaFieldsPath, id]) // DO NOT ADD FORMDATA HERE! Adding formData will kick you out of sub block editors while writing.
 
   const onChange = useCallback(
-    async ({ formState: prevFormState }) => {
+    async ({ formState: prevFormState }: { formState: FormState }) => {
       const { state: formState } = await getFormState({
         apiRoute: config.routes.api,
         body: {
diff --git a/packages/richtext-lexical/src/features/experimental_table/client/utils/debounce.ts b/packages/richtext-lexical/src/features/experimental_table/client/utils/debounce.ts
index 11b3d99ae2a..7a17717832e 100644
--- a/packages/richtext-lexical/src/features/experimental_table/client/utils/debounce.ts
+++ b/packages/richtext-lexical/src/features/experimental_table/client/utils/debounce.ts
@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck - not worth it migrate jsdoc to tsdoc
 'use client'
 // Copied & modified from https://github.com/lodash/lodash/blob/main/src/debounce.ts
 /*
@@ -242,4 +244,5 @@ function debounce(func, wait, options) {
   return debounced
 }
 
+// eslint-disable-next-line no-restricted-exports
 export default debounce
diff --git a/packages/richtext-lexical/src/lexical/LexicalProvider.tsx b/packages/richtext-lexical/src/lexical/LexicalProvider.tsx
index 177464696a2..2e28c73bab6 100644
--- a/packages/richtext-lexical/src/lexical/LexicalProvider.tsx
+++ b/packages/richtext-lexical/src/lexical/LexicalProvider.tsx
@@ -25,7 +25,14 @@ export type LexicalProviderProps = {
   value: SerializedEditorState
 }
 
-const NestProviders = ({ children, providers }) => {
+const NestProviders = ({
+  children,
+  providers,
+}: {
+  children: React.ReactNode
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  providers: any[]
+}) => {
   if (!providers?.length) {
     return children
   }
diff --git a/packages/richtext-lexical/src/lexical/plugins/handles/AddBlockHandlePlugin/index.tsx b/packages/richtext-lexical/src/lexical/plugins/handles/AddBlockHandlePlugin/index.tsx
index 8017c24a18f..84c830291da 100644
--- a/packages/richtext-lexical/src/lexical/plugins/handles/AddBlockHandlePlugin/index.tsx
+++ b/packages/richtext-lexical/src/lexical/plugins/handles/AddBlockHandlePlugin/index.tsx
@@ -126,7 +126,7 @@ function useAddBlockHandle(
   }, [anchorElem, hoveredElement, blockHandleHorizontalOffset])
 
   const handleAddClick = useCallback(
-    (event) => {
+    (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
       let hoveredElementToUse = hoveredElement
       if (!hoveredElementToUse?.node) {
         return
@@ -189,6 +189,7 @@ function useAddBlockHandle(
   return createPortal(
     <React.Fragment>
       <button
+        aria-label="Add block"
         className="icon add-block-menu"
         onClick={(event) => {
           handleAddClick(event)
diff --git a/packages/richtext-lexical/src/lexical/plugins/handles/DraggableBlockPlugin/debounce.ts b/packages/richtext-lexical/src/lexical/plugins/handles/DraggableBlockPlugin/debounce.ts
index 13ff4f6c275..99989e70036 100644
--- a/packages/richtext-lexical/src/lexical/plugins/handles/DraggableBlockPlugin/debounce.ts
+++ b/packages/richtext-lexical/src/lexical/plugins/handles/DraggableBlockPlugin/debounce.ts
@@ -1,10 +1,10 @@
 'use client'
-export function debounce(func: (...args: any[]) => void, wait: number) {
-  let timeout
-  return function (...args: any[]) {
+export function debounce(func: (...args: undefined[]) => void, wait: number) {
+  let timeout: number | string | undefined
+  return function (...args: undefined[]) {
     const later = () => {
       clearTimeout(timeout)
-      timeout = null
+      timeout = undefined
       func(...args)
     }
 
diff --git a/packages/richtext-lexical/src/utilities/fieldsDrawer/DrawerContent.tsx b/packages/richtext-lexical/src/utilities/fieldsDrawer/DrawerContent.tsx
index b62b1d30904..4b2813be592 100644
--- a/packages/richtext-lexical/src/utilities/fieldsDrawer/DrawerContent.tsx
+++ b/packages/richtext-lexical/src/utilities/fieldsDrawer/DrawerContent.tsx
@@ -63,7 +63,7 @@ export const DrawerContent: React.FC<Omit<FieldsDrawerProps, 'drawerSlug' | 'dra
   }, [config.routes.api, config.serverURL, schemaFieldsPath, id, data])
 
   const onChange = useCallback(
-    async ({ formState: prevFormState }) => {
+    async ({ formState: prevFormState }: { formState: FormState }) => {
       const { state } = await getFormState({
         apiRoute: config.routes.api,
         body: {
diff --git a/packages/richtext-lexical/src/utilities/generateImportMap.tsx b/packages/richtext-lexical/src/utilities/generateImportMap.tsx
index 472e201cda1..8b5b4745418 100644
--- a/packages/richtext-lexical/src/utilities/generateImportMap.tsx
+++ b/packages/richtext-lexical/src/utilities/generateImportMap.tsx
@@ -6,6 +6,7 @@ import type { ResolvedServerFeatureMap } from '../features/typesServer.js'
 
 export const getGenerateImportMap =
   (args: { resolvedFeatureMap: ResolvedServerFeatureMap }): RichTextAdapter['generateImportMap'] =>
+  // @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
   ({ addToImportMap, baseDir, config, importMap, imports }) => {
     addToImportMap('@payloadcms/richtext-lexical/client#RichTextCell')
     addToImportMap('@payloadcms/richtext-lexical/client#RichTextField')
@@ -23,6 +24,7 @@ export const getGenerateImportMap =
             imports,
           })
         } else if (resolvedFeature.componentImports?.length) {
+          // @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
           resolvedFeature.componentImports.forEach((component) => {
             addToImportMap(component)
           })
diff --git a/packages/richtext-lexical/src/utilities/migrateSlateToLexical/index.ts b/packages/richtext-lexical/src/utilities/migrateSlateToLexical/index.ts
index 7c22660e684..5440efa28e8 100644
--- a/packages/richtext-lexical/src/utilities/migrateSlateToLexical/index.ts
+++ b/packages/richtext-lexical/src/utilities/migrateSlateToLexical/index.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import type { CollectionConfig, Field, GlobalConfig, Payload } from 'payload'
 
 import { migrateDocumentFieldsRecursively } from './migrateDocumentFieldsRecursively.js'
@@ -15,7 +16,7 @@ import { migrateDocumentFieldsRecursively } from './migrateDocumentFieldsRecursi
 export async function migrateSlateToLexical({ payload }: { payload: Payload }) {
   const collections = payload.config.collections
 
-  const errors = []
+  const errors: unknown[] = []
 
   const allLocales = payload.config.localization ? payload.config.localization.localeCodes : [null]
 
@@ -56,7 +57,7 @@ async function migrateGlobal({
   locale,
   payload,
 }: {
-  errors: any[]
+  errors: unknown[]
   global: GlobalConfig
   locale: null | string
   payload: Payload
@@ -105,7 +106,7 @@ async function migrateCollection({
 }: {
   collection: CollectionConfig
   cur: number
-  errors: any[]
+  errors: unknown[]
   locale: null | string
   max: number
   payload: Payload
diff --git a/packages/richtext-lexical/src/validate/index.ts b/packages/richtext-lexical/src/validate/index.ts
index b4456583e56..1a5f5737107 100644
--- a/packages/richtext-lexical/src/validate/index.ts
+++ b/packages/richtext-lexical/src/validate/index.ts
@@ -1,4 +1,4 @@
-import type { SerializedEditorState, SerializedParagraphNode } from 'lexical'
+import type { SerializedEditorState, SerializedParagraphNode, SerializedTextNode } from 'lexical'
 import type { RichTextField, Validate } from 'payload'
 
 import type { SanitizedServerEditorConfig } from '../lexical/config/types.js'
@@ -31,7 +31,7 @@ export const richTextValidateHOC = ({
           } else if (paragraphNode?.children?.length === 1) {
             const paragraphNodeChild = paragraphNode?.children[0]
             if (paragraphNodeChild.type === 'text') {
-              if (!paragraphNodeChild?.['text']?.length) {
+              if (!(paragraphNodeChild as SerializedTextNode | undefined)?.['text']?.length) {
                 hasOnlyEmptyParagraph = true
               }
             }

From f20de17e460f9bb1adad6063c531f4f2eb3b583f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Jablo=C3=B1ski?=
 <43938777+GermanJablo@users.noreply.github.com>
Date: Thu, 17 Oct 2024 14:26:12 -0300
Subject: [PATCH 2/4] save

---
 .../src/features/upload/client/component/index.tsx   |  4 ++--
 .../src/features/upload/client/drawer/index.tsx      |  4 ++--
 packages/richtext-lexical/src/field/Field.tsx        | 10 ++++++----
 packages/richtext-lexical/src/index.ts               | 12 ++++++++----
 .../src/lexical/config/server/sanitize.ts            |  5 +++--
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/packages/richtext-lexical/src/features/upload/client/component/index.tsx b/packages/richtext-lexical/src/features/upload/client/component/index.tsx
index 61ed73205a5..9acf1dffe09 100644
--- a/packages/richtext-lexical/src/features/upload/client/component/index.tsx
+++ b/packages/richtext-lexical/src/features/upload/client/component/index.tsx
@@ -1,5 +1,5 @@
 'use client'
-import type { ClientCollectionConfig, Data } from 'payload'
+import type { ClientCollectionConfig, Data, FormState, JsonObject } from 'payload'
 
 import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext.js'
 import { useLexicalNodeSelection } from '@lexical/react/useLexicalNodeSelection.js'
@@ -179,7 +179,7 @@ const Component: React.FC<ElementProps> = (props) => {
   ).collections?.[relatedCollection.slug]?.hasExtraFields
 
   const onExtraFieldsDrawerSubmit = useCallback(
-    (_, data) => {
+    (_: FormState, data: JsonObject) => {
       // Update lexical node (with key nodeKey) with new data
       editor.update(() => {
         const uploadNode: null | UploadNode = $getNodeByKey(nodeKey)
diff --git a/packages/richtext-lexical/src/features/upload/client/drawer/index.tsx b/packages/richtext-lexical/src/features/upload/client/drawer/index.tsx
index ae22e96811e..91a0b57655a 100644
--- a/packages/richtext-lexical/src/features/upload/client/drawer/index.tsx
+++ b/packages/richtext-lexical/src/features/upload/client/drawer/index.tsx
@@ -57,7 +57,7 @@ const UploadDrawerComponent: React.FC<Props> = ({ enabledCollectionSlugs }) => {
 
   const [replaceNodeKey, setReplaceNodeKey] = useState<null | string>(null)
 
-  const [ListDrawer, ListDrawerToggler, { closeDrawer, openDrawer }] = useListDrawer({
+  const [ListDrawer, _ListDrawerToggler, { closeDrawer, openDrawer }] = useListDrawer({
     collectionSlugs: enabledCollectionSlugs,
     uploads: true,
   })
@@ -77,7 +77,7 @@ const UploadDrawerComponent: React.FC<Props> = ({ enabledCollectionSlugs }) => {
   }, [editor, openDrawer])
 
   const onSelect = useCallback(
-    ({ collectionSlug, docID }) => {
+    ({ collectionSlug, docID }: { collectionSlug: string; docID: string }) => {
       insertUpload({
         editor,
         relationTo: collectionSlug,
diff --git a/packages/richtext-lexical/src/field/Field.tsx b/packages/richtext-lexical/src/field/Field.tsx
index 46bfa5185b6..91c2830106d 100644
--- a/packages/richtext-lexical/src/field/Field.tsx
+++ b/packages/richtext-lexical/src/field/Field.tsx
@@ -1,5 +1,6 @@
 'use client'
 import type { SerializedEditorState } from 'lexical'
+import type { Validate } from 'payload'
 
 import {
   FieldDescription,
@@ -16,9 +17,9 @@ import type { SanitizedClientEditorConfig } from '../lexical/config/types.js'
 import type { LexicalRichTextFieldProps } from '../types.js'
 
 import { LexicalProvider } from '../lexical/LexicalProvider.js'
+import '../lexical/theme/EditorTheme.scss'
 import './bundled.css'
 import './index.scss'
-import '../lexical/theme/EditorTheme.scss'
 
 const baseClass = 'rich-text-lexical'
 
@@ -47,11 +48,13 @@ const RichTextComponent: React.FC<
   const Label = components?.Label
   const readOnlyFromProps = readOnlyFromTopLevelProps || readOnlyFromAdmin
 
-  const memoizedValidate = useCallback(
+  const memoizedValidate = useCallback<Validate>(
     (value, validationOptions) => {
       if (typeof validate === 'function') {
+        // @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
         return validate(value, { ...validationOptions, props, required })
       }
+      return true
     },
     // Important: do not add props to the dependencies array.
     // This would cause an infinite loop and endless re-rendering.
@@ -62,7 +65,6 @@ const RichTextComponent: React.FC<
 
   const fieldType = useField<SerializedEditorState>({
     path: pathFromContext ?? pathFromProps ?? name,
-    // @ts-expect-error: TODO: Fix this
     validate: memoizedValidate,
   })
 
@@ -128,7 +130,7 @@ const RichTextComponent: React.FC<
   )
 }
 
-function fallbackRender({ error }): React.ReactElement {
+function fallbackRender({ error }: { error: Error }) {
   // Call resetErrorBoundary() to reset the error boundary and retry the render.
 
   return (
diff --git a/packages/richtext-lexical/src/index.ts b/packages/richtext-lexical/src/index.ts
index 75e91b5a649..c3492ab06c8 100644
--- a/packages/richtext-lexical/src/index.ts
+++ b/packages/richtext-lexical/src/index.ts
@@ -67,7 +67,7 @@ export function lexicalEditor(props?: LexicalEditorProps): LexicalRichTextAdapte
       })
     }
 
-    let features: FeatureProviderServer<any, any, any>[] = []
+    let features: FeatureProviderServer<unknown, unknown, unknown>[] = []
     let resolvedFeatureMap: ResolvedServerFeatureMap
 
     let finalSanitizedEditorConfig: SanitizedServerEditorConfig // For server only
@@ -123,12 +123,12 @@ export function lexicalEditor(props?: LexicalEditorProps): LexicalRichTextAdapte
 
     const featureI18n = finalSanitizedEditorConfig.features.i18n
     for (const lang in i18n) {
-      if (!featureI18n[lang]) {
-        featureI18n[lang] = {
+      if (!featureI18n[lang as keyof typeof featureI18n]) {
+        featureI18n[lang as keyof typeof featureI18n] = {
           lexical: {},
         }
       }
-
+      // @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
       featureI18n[lang].lexical.general = i18n[lang]
     }
 
@@ -212,6 +212,8 @@ export function lexicalEditor(props?: LexicalEditorProps): LexicalRichTextAdapte
             ) {
               return value
             }
+            // TO-DO: We should not use context, as it is intended for external use only
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const context: any = _context
             const nodeIDMap: {
               [key: string]: SerializedLexicalNode
@@ -441,6 +443,8 @@ export function lexicalEditor(props?: LexicalEditorProps): LexicalRichTextAdapte
               return value
             }
 
+            // TO-DO: We should not use context, as it is intended for external use only
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const context: any = _context
             const nodeIDMap: {
               [key: string]: SerializedLexicalNode
diff --git a/packages/richtext-lexical/src/lexical/config/server/sanitize.ts b/packages/richtext-lexical/src/lexical/config/server/sanitize.ts
index 7c035ce6701..3fc90029abc 100644
--- a/packages/richtext-lexical/src/lexical/config/server/sanitize.ts
+++ b/packages/richtext-lexical/src/lexical/config/server/sanitize.ts
@@ -69,11 +69,12 @@ export const sanitizeServerFeatures = (
 
     if (feature?.i18n) {
       for (const lang in feature.i18n) {
-        if (!sanitized.i18n[lang]) {
-          sanitized.i18n[lang] = {
+        if (!sanitized.i18n[lang as keyof typeof sanitized.i18n]) {
+          sanitized.i18n[lang as keyof typeof sanitized.i18n] = {
             lexical: {},
           }
         }
+        // @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
         sanitized.i18n[lang].lexical[feature.key] = feature.i18n[lang]
       }
     }

From 3b70fba06bc242f96a7dbc4ac851b006cc22b140 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Jablo=C3=B1ski?=
 <43938777+GermanJablo@users.noreply.github.com>
Date: Thu, 17 Oct 2024 15:08:58 -0300
Subject: [PATCH 3/4] save final

---
 .../src/features/blocks/client/index.tsx      | 25 +++++++++++--------
 .../components/RelationshipComponent.tsx      | 21 +++++++---------
 .../relationship/client/drawer/index.tsx      |  2 +-
 .../toolbars/inline/client/Toolbar/index.tsx  |  2 +-
 packages/richtext-lexical/tsconfig.json       |  1 +
 test/fields/payload-types.ts                  | 18 +++++++++++++
 6 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/packages/richtext-lexical/src/features/blocks/client/index.tsx b/packages/richtext-lexical/src/features/blocks/client/index.tsx
index c11e2537b96..9013864142e 100644
--- a/packages/richtext-lexical/src/features/blocks/client/index.tsx
+++ b/packages/richtext-lexical/src/features/blocks/client/index.tsx
@@ -1,5 +1,6 @@
 'use client'
 
+import type { I18nClient } from '@payloadcms/translations'
 import type { BlocksFieldClient } from 'payload'
 
 import { getTranslation } from '@payloadcms/translations'
@@ -44,8 +45,8 @@ export const BlocksFeatureClient = createClientFeature<BlocksFeatureClientProps>
                   }
 
                   const componentMapRenderedBlockPath = `lexical_internal_feature.blocks.fields.lexical_blocks`
-                  const blocksField: BlocksFieldClient = richTextComponentMap.get(
-                    componentMapRenderedBlockPath,
+                  const blocksField = (
+                    richTextComponentMap.get(componentMapRenderedBlockPath) as BlocksFieldClient[]
                   )?.[0]
 
                   const clientBlock = blocksField.blocks.find((_block) => _block.slug === blockSlug)
@@ -65,7 +66,7 @@ export const BlocksFeatureClient = createClientFeature<BlocksFeatureClientProps>
               } as SlashMenuItem
             }),
             key: 'blocks',
-            label: ({ i18n }) => {
+            label: ({ i18n }: { i18n: I18nClient<object, 'lexical:blocks:label'> }) => {
               return i18n.t('lexical:blocks:label')
             },
           }
@@ -84,8 +85,8 @@ export const BlocksFeatureClient = createClientFeature<BlocksFeatureClientProps>
 
                   const componentMapRenderedBlockPath = `lexical_internal_feature.blocks.fields.lexical_inline_blocks`
 
-                  const blocksField: BlocksFieldClient = richTextComponentMap.get(
-                    componentMapRenderedBlockPath,
+                  const blocksField = (
+                    richTextComponentMap.get(componentMapRenderedBlockPath) as BlocksFieldClient[]
                   )?.[0]
 
                   const clientBlock = blocksField.blocks.find(
@@ -109,7 +110,11 @@ export const BlocksFeatureClient = createClientFeature<BlocksFeatureClientProps>
               } as SlashMenuItem
             }),
             key: 'inlineBlocks',
-            label: ({ i18n }) => {
+            label: ({
+              i18n,
+            }: {
+              i18n: I18nClient<object, 'lexical:blocks:inlineBlocks:label'>
+            }) => {
               return i18n.t('lexical:blocks:inlineBlocks:label')
             },
           }
@@ -132,8 +137,8 @@ export const BlocksFeatureClient = createClientFeature<BlocksFeatureClientProps>
                     return blockSlug
                   }
                   const componentMapRenderedBlockPath = `lexical_internal_feature.blocks.fields.lexical_blocks`
-                  const blocksField: BlocksFieldClient = richTextComponentMap.get(
-                    componentMapRenderedBlockPath,
+                  const blocksField = (
+                    richTextComponentMap.get(componentMapRenderedBlockPath) as BlocksFieldClient[]
                   )?.[0]
 
                   const clientBlock = blocksField.blocks.find((_block) => _block.slug === blockSlug)
@@ -172,8 +177,8 @@ export const BlocksFeatureClient = createClientFeature<BlocksFeatureClientProps>
                   }
 
                   const componentMapRenderedBlockPath = `lexical_internal_feature.blocks.fields.lexical_inline_blocks`
-                  const blocksField: BlocksFieldClient = richTextComponentMap.get(
-                    componentMapRenderedBlockPath,
+                  const blocksField = (
+                    richTextComponentMap.get(componentMapRenderedBlockPath) as BlocksFieldClient[]
                   )?.[0]
 
                   const clientBlock = blocksField.blocks.find(
diff --git a/packages/richtext-lexical/src/features/relationship/client/components/RelationshipComponent.tsx b/packages/richtext-lexical/src/features/relationship/client/components/RelationshipComponent.tsx
index 9fef40dba96..b31002eb789 100644
--- a/packages/richtext-lexical/src/features/relationship/client/components/RelationshipComponent.tsx
+++ b/packages/richtext-lexical/src/features/relationship/client/components/RelationshipComponent.tsx
@@ -84,18 +84,15 @@ const Component: React.FC<Props> = (props) => {
     })
   }, [editor, nodeKey])
 
-  const updateRelationship = React.useCallback(
-    ({ doc }) => {
-      setParams({
-        ...initialParams,
-        cacheBust, // do this to get the usePayloadAPI to re-fetch the data even though the URL string hasn't changed
-      })
-
-      closeDrawer()
-      dispatchCacheBust()
-    },
-    [cacheBust, setParams, closeDrawer],
-  )
+  const updateRelationship = React.useCallback(() => {
+    setParams({
+      ...initialParams,
+      cacheBust, // do this to get the usePayloadAPI to re-fetch the data even though the URL string hasn't changed
+    })
+
+    closeDrawer()
+    dispatchCacheBust()
+  }, [cacheBust, setParams, closeDrawer])
 
   const $onDelete = useCallback(
     (payload: KeyboardEvent) => {
diff --git a/packages/richtext-lexical/src/features/relationship/client/drawer/index.tsx b/packages/richtext-lexical/src/features/relationship/client/drawer/index.tsx
index ac640c16c3c..29ba303d44a 100644
--- a/packages/richtext-lexical/src/features/relationship/client/drawer/index.tsx
+++ b/packages/richtext-lexical/src/features/relationship/client/drawer/index.tsx
@@ -68,7 +68,7 @@ const RelationshipDrawerComponent: React.FC<Props> = ({ enabledCollectionSlugs }
   }, [editor, openDrawer])
 
   const onSelect = useCallback(
-    ({ collectionSlug, docID }) => {
+    ({ collectionSlug, docID }: { collectionSlug: string; docID: string }) => {
       insertRelationship({
         editor,
         relationTo: collectionSlug,
diff --git a/packages/richtext-lexical/src/features/toolbars/inline/client/Toolbar/index.tsx b/packages/richtext-lexical/src/features/toolbars/inline/client/Toolbar/index.tsx
index ee2bba68f5f..7073d9d346c 100644
--- a/packages/richtext-lexical/src/features/toolbars/inline/client/Toolbar/index.tsx
+++ b/packages/richtext-lexical/src/features/toolbars/inline/client/Toolbar/index.tsx
@@ -209,7 +209,7 @@ function InlineToolbar({
     const isLinkEditorVisible =
       possibleLinkEditor !== null &&
       'style' in possibleLinkEditor &&
-      possibleLinkEditor?.style?.['opacity'] === '1'
+      possibleLinkEditor?.style?.['opacity' as keyof typeof possibleLinkEditor.style] === '1'
 
     const rootElement = editor.getRootElement()
     if (
diff --git a/packages/richtext-lexical/tsconfig.json b/packages/richtext-lexical/tsconfig.json
index 79ab3f11ad0..5ab60ad61c4 100644
--- a/packages/richtext-lexical/tsconfig.json
+++ b/packages/richtext-lexical/tsconfig.json
@@ -6,6 +6,7 @@
     "emitDeclarationOnly": true,
     "esModuleInterop": true,
     "strictNullChecks": true,
+    "noImplicitAny": true,
     "outDir": "./dist" /* Specify an output folder for all emitted files. */,
     "rootDir": "./src" /* Specify the root folder within your source files. */,
   },
diff --git a/test/fields/payload-types.ts b/test/fields/payload-types.ts
index 7d60e224225..1d387aae6a9 100644
--- a/test/fields/payload-types.ts
+++ b/test/fields/payload-types.ts
@@ -60,6 +60,7 @@ export interface Config {
     'uploads-multi': UploadsMulti;
     'uploads-poly': UploadsPoly;
     'uploads-multi-poly': UploadsMultiPoly;
+    'uploads-restricted': UploadsRestricted;
     'ui-fields': UiField;
     'payload-locked-documents': PayloadLockedDocument;
     'payload-preferences': PayloadPreference;
@@ -1619,6 +1620,19 @@ export interface UploadsMultiPoly {
   updatedAt: string;
   createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "uploads-restricted".
+ */
+export interface UploadsRestricted {
+  id: string;
+  text?: string | null;
+  uploadWithoutRestriction?: (string | null) | Upload;
+  uploadWithAllowCreateFalse?: (string | null) | Upload;
+  uploadMultipleWithAllowCreateFalse?: (string | Upload)[] | null;
+  updatedAt: string;
+  createdAt: string;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "ui-fields".
@@ -1764,6 +1778,10 @@ export interface PayloadLockedDocument {
         relationTo: 'uploads-multi-poly';
         value: string | UploadsMultiPoly;
       } | null)
+    | ({
+        relationTo: 'uploads-restricted';
+        value: string | UploadsRestricted;
+      } | null)
     | ({
         relationTo: 'ui-fields';
         value: string | UiField;

From 55934511c4a193c75c0b37923584f6c60b8b96d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Jablo=C3=B1ski?=
 <43938777+GermanJablo@users.noreply.github.com>
Date: Fri, 18 Oct 2024 10:45:28 -0300
Subject: [PATCH 4/4] set docId as number | string

---
 .../src/features/relationship/client/drawer/index.tsx           | 2 +-
 .../src/features/upload/client/drawer/index.tsx                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/richtext-lexical/src/features/relationship/client/drawer/index.tsx b/packages/richtext-lexical/src/features/relationship/client/drawer/index.tsx
index 29ba303d44a..93a5d7951fb 100644
--- a/packages/richtext-lexical/src/features/relationship/client/drawer/index.tsx
+++ b/packages/richtext-lexical/src/features/relationship/client/drawer/index.tsx
@@ -68,7 +68,7 @@ const RelationshipDrawerComponent: React.FC<Props> = ({ enabledCollectionSlugs }
   }, [editor, openDrawer])
 
   const onSelect = useCallback(
-    ({ collectionSlug, docID }: { collectionSlug: string; docID: string }) => {
+    ({ collectionSlug, docID }: { collectionSlug: string; docID: number | string }) => {
       insertRelationship({
         editor,
         relationTo: collectionSlug,
diff --git a/packages/richtext-lexical/src/features/upload/client/drawer/index.tsx b/packages/richtext-lexical/src/features/upload/client/drawer/index.tsx
index 91a0b57655a..a1b4ccbf72f 100644
--- a/packages/richtext-lexical/src/features/upload/client/drawer/index.tsx
+++ b/packages/richtext-lexical/src/features/upload/client/drawer/index.tsx
@@ -77,7 +77,7 @@ const UploadDrawerComponent: React.FC<Props> = ({ enabledCollectionSlugs }) => {
   }, [editor, openDrawer])
 
   const onSelect = useCallback(
-    ({ collectionSlug, docID }: { collectionSlug: string; docID: string }) => {
+    ({ collectionSlug, docID }: { collectionSlug: string; docID: number | string }) => {
       insertUpload({
         editor,
         relationTo: collectionSlug,