fix(site): dispose Monaco diff models on unmount (#28503) - #28806
Merged
Conversation
Backport of #28503 to release/2.34. Opening template versions leaked Monaco text models: each changed file rendered a `DiffEditor` with `keepCurrentOriginalModel` / `keepCurrentModifiedModel`, so `@monaco-editor/react` never disposed the underlying models and navigating between versions accumulated them until the tab ran out of memory. Move the diff editor into a `DiffFile` component that captures the original/modified models in `onMount` and disposes them when it unmounts, including when a file switches diff to plain while `SyntaxHighlighter` stays mounted. Disposal is deferred with `queueMicrotask` so it runs after the diff widget teardown, which otherwise throws "TextModel got disposed before DiffEditorWidget model got reset". Adds `SyntaxHighlighter.stories.tsx` with a `DisposesModelsOnDiffToggle` play test that asserts the live model count returns to its baseline across diff/plain toggles. (cherry picked from commit 5008603)
jakehwll
marked this pull request as ready for review
September 1, 2026 07:30
Codex Review SummaryThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
mtojek
self-requested a review
September 1, 2026 07:49
mtojek
approved these changes
Sep 1, 2026
mtojek
self-requested a review
September 1, 2026 07:50
mtojek
approved these changes
Sep 1, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #28503 to
release/2.34.Refs DEVEX-736. This carries the Monaco diff-model lifecycle cleanup and Storybook regression coverage into 2.34, preventing template-version navigation from retaining models until the editor becomes unusable.
The cherry-pick conflict was limited to theme imports. This keeps the release branch's existing
@emotion/reactintegration while applying the original functional fix.