archive-gh-me/monaco-react
1
0
Fork 0
mirror of https://github.com/suren-atoyan/monaco-react.git synced 2026-01-25 16:02:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/suren-atoyan/monaco-react

Browse Source
This commit is contained in:
Suren Atoyan 2021-10-03 16:43:34 +04:00
commit 2dc9bbba9c
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/DiffEditor/DiffEditor.js
View File

@ -5,7 +5,7 @@ import loader from '@monaco-editor/loader';
import MonacoContainer from '../MonacoContainer';
import useMount from '../hooks/useMount';
import useUpdate from '../hooks/useUpdate';
import { noop } from '../utils';
import { noop, getOrCreateModel } from '../utils';
function DiffEditor ({
original,
@ -87,19 +87,19 @@ function DiffEditor ({
const setModels = useCallback(() => {
beforeMountRef.current(monacoRef.current);
const originalModel = monacoRef.current.editor
.createModel(
original,
originalLanguage || language,
originalModelPath && monacoRef.current.Uri.parse(originalModelPath),
);
const originalModel = getOrCreateModel(
monacoRef.current,
original,
originalLanguage || language,
originalModelPath,
);
const modifiedModel = monacoRef.current.editor
.createModel(
modified,
modifiedLanguage || language,
modifiedModelPath && monacoRef.current.Uri.parse(modifiedModelPath),
);
const modifiedModel = getOrCreateModel(
monacoRef.current,
modified,
modifiedLanguage || language,
modifiedModelPath,
);
editorRef.current.setModel({ original: originalModel, modified: modifiedModel });
}, [language, modified, modifiedLanguage, original, originalLanguage, originalModelPath, modifiedModelPath]);

6
src/utils/index.js
View File

@ -7,16 +7,16 @@ function getOrCreateModel(monaco, value, language, path) {
function getModel(monaco, path) {
return monaco
.editor
.getModel(crateModelUri(monaco, path));
.getModel(createModelUri(monaco, path));
}
function createModel(monaco, value, language, path) {
return monaco
.editor
.createModel(value, language, path && crateModelUri(monaco, path));
.createModel(value, language, path && createModelUri(monaco, path));
}
function crateModelUri(monaco, path) {
function createModelUri(monaco, path) {
return monaco.Uri.parse(path);
}