archive-gh-me/monaco-react
1
0
Fork 0
mirror of https://github.com/suren-atoyan/monaco-react.git synced 2026-01-18 15:54:45 +00:00
Code Issues Projects Releases Wiki Activity

DiffEditor fix: set correct model before value update (#479)

Browse Source 
* DiffEditor fix: set correct model before value update

* Revert "DiffEditor fix: set correct model before value update"

This reverts commit ca00f9bc46846d8997159197c20b6c7888b1fe6e.

* Updated code provided by suren-atoyan  https://github.com/suren-atoyan/monaco-react/pull/479#issuecomment-1518988140
This commit is contained in:
Stefan Hayden 2023-04-28 01:41:31 -04:00 committed by GitHub
parent 89ef656d8a
commit 6970e4528b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/DiffEditor/DiffEditor.tsx
View File

@ -165,6 +165,46 @@ function DiffEditor({
!isMonacoMounting && !isEditorReady && createEditor();
}, [isMonacoMounting, isEditorReady, createEditor]);
useUpdate(
() => {
if (editorRef.current && monacoRef.current) {
const originalEditor = editorRef.current.getOriginalEditor();
const model = getOrCreateModel(
monacoRef.current,
original || '',
originalLanguage || language || 'text',
originalModelPath || '',
);
if (model !== originalEditor.getModel()) {
originalEditor.setModel(model);
}
}
},
[originalModelPath],
isEditorReady,
);
useUpdate(
() => {
if (editorRef.current && monacoRef.current) {
const modifiedEditor = editorRef.current.getModifiedEditor();
const model = getOrCreateModel(
monacoRef.current,
modified || '',
modifiedLanguage || language || 'text',
modifiedModelPath || '',
);
if (model !== modifiedEditor.getModel()) {
modifiedEditor.setModel(model);
}
}
},
[modifiedModelPath],
isEditorReady,
);
function disposeEditor() {
const models = editorRef.current?.getModel();