Skip to content

fix(richtext-lexical): prevent TS CodeBlocks from sharing Monaco model (useId) #14351

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

Merged
merged 2 commits into from
Oct 25, 2025
Merged

fix(richtext-lexical): prevent TS CodeBlocks from sharing Monaco model (useId) #14351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f662f2f
fix(richtext-lexical code block): generate unique defaultPath for Typ…
technicaldirector Oct 25, 2025
bd37995
fix(richtext-lexical): export HorizontalRule client node
technicaldirector Oct 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/richtext-lexical/src/exports/client/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,12 @@ export {
InlineBlockNode,
} from '../../features/blocks/client/nodes/InlineBlocksNode.js'

export {
$createHorizontalRuleNode,
$isHorizontalRuleNode,
HorizontalRuleNode,
} from '../../features/horizontalRule/client/nodes/HorizontalRuleNode.js'

export { FieldsDrawer } from '../../utilities/fieldsDrawer/Drawer.js'
export { useLexicalDocumentDrawer } from '../../utilities/fieldsDrawer/useLexicalDocumentDrawer.js'
export { useLexicalDrawer } from '../../utilities/fieldsDrawer/useLexicalDrawer.js'
Expand Down
13 changes: 9 additions & 4 deletions packages/richtext-lexical/src/features/blocks/premade/CodeBlock/Component/Code.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import type { CodeFieldClient, CodeFieldClientProps } from 'payload'

import { CodeField, useFormFields } from '@payloadcms/ui'
import React, { useMemo } from 'react'
import React, { useId, useMemo } from 'react'

import { defaultLanguages } from './defaultLanguages.js'

Expand Down Expand Up @@ -78,6 +78,10 @@ export const CodeComponent: React.FC<AdditionalCodeComponentProps & CodeFieldCli
const language: string =
(languageField?.value as string) || (languageField?.initialValue as string) || 'typescript'

// unique id per component instance to ensure Monaco creates a distinct model
// for each TypeScript code block. Using React's useId is SSR-safe and builtin.
const instanceId = useId()

const label = languages[language]

const props: CodeFieldClient = useMemo<CodeFieldClient>(
Expand All @@ -89,13 +93,14 @@ export const CodeComponent: React.FC<AdditionalCodeComponentProps & CodeFieldCli
editorOptions: {},
editorProps: {
// If typescript is set, @monaco-editor/react needs to set the URI to a .ts or .tsx file when it calls createModel().
// This is done through the `defaultPath` prop.
defaultPath: language === 'ts' ? 'file.tsx' : undefined,
// Provide a unique defaultPath per instance so Monaco doesn't reuse the same model
// across multiple code block instances. We use field.name + instanceId for debugability.
defaultPath: language === 'ts' ? `file-${field.name}-${instanceId}.tsx` : undefined,
},
language,
},
}),
[field, language],
[field, language, instanceId],
)

const key = `${field.name}-${language}-${label}`
Expand Down
Loading