Skip to content

fix: prevent SourceEditor recreation on every keystroke #624

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

Open
hobostay wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: prevent SourceEditor recreation on every keystroke #624

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 20 additions & 3 deletions packages/studio/src/components/editor/SourceEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useRef, useCallback, memo } from "react";
import { useRef, useCallback, useEffect, memo } from "react";
import {
EditorView,
keymap,
Expand Down Expand Up @@ -69,6 +69,9 @@ export const SourceEditor = memo(function SourceEditor({
const onChangeRef = useRef(onChange);
onChangeRef.current = onChange;

const contentRef = useRef(content);
contentRef.current = content;

const mountEditor = useCallback(
(node: HTMLDivElement | null) => {
if (editorRef.current) {
Expand All @@ -87,7 +90,7 @@ export const SourceEditor = memo(function SourceEditor({
});

const state = EditorState.create({
doc: content,
doc: contentRef.current,
extensions: [
lineNumbers(),
highlightActiveLine(),
Expand All @@ -112,8 +115,22 @@ export const SourceEditor = memo(function SourceEditor({

editorRef.current = new EditorView({ state, parent: node });
},
[content, filePath, language, readOnly],
[filePath, language, readOnly],
);

// Sync external content changes into the editor without recreating it.
// Only applies when the new content differs from the current document
// (e.g. file switch or server refresh), not on every keystroke.
useEffect(() => {
const view = editorRef.current;
if (!view) return;
const current = view.state.doc.toString();
if (current !== content) {
view.dispatch({
changes: { from: 0, to: current.length, insert: content },
});
}
}, [content]);

return <div ref={mountEditor} className="h-full w-full overflow-hidden" />;
});
Loading