Skip to content

Commit 787e42c

Browse files
upgrade Monaco Editor/ Monaco-editor/react
1 parent 7a12034 commit 787e42c

File tree

3 files changed

+98
-42
lines changed

3 files changed

+98
-42
lines changed

Web/ClientApp/package-lock.json

Lines changed: 85 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Web/ClientApp/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@monaco-editor/react": "^3.8.3",
6+
"@monaco-editor/react": "^4.1.3",
77
"axios": "^0.21.1",
88
"bootstrap": "^4.6.0",
9-
"monaco-editor": "^0.21.3",
9+
"monaco-editor": "^0.24.0",
1010
"prop-types": "^15.7.2",
1111
"react": "^17.0.0",
1212
"react-dom": "^17.0.0",
@@ -17,7 +17,7 @@
1717
"rimraf": "^2.6.2"
1818
},
1919
"devDependencies": {
20-
"@babel/core": "^7.9.0",
20+
"@babel/core": "^7.14.3",
2121
"@babel/preset-react": "^7.9.0",
2222
"@types/history": "4.7.3",
2323
"@types/jest": "24.0.19",

Web/ClientApp/src/components/Home.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useState, useRef } from "react";
22
import axios from "axios";
33
import ClientSettings from "../ClientSettings.json"
4-
import { ControlledEditor } from "@monaco-editor/react";
4+
import Editor from "@monaco-editor/react";
55
import * as monacoEditor from "monaco-editor";
66

77
export const Home = () => {
@@ -28,10 +28,10 @@ export const Home = () => {
2828
}
2929
});
3030
};
31-
const setDefaultInput = (conversionType: string) => {
32-
setConversionType(conversionType);
31+
const setDefaultInput = (type: string) => {
32+
setConversionType(type);
3333
if (!inputCode || inputCode === defaultVbCode || inputCode === defaultCsCode) {
34-
setInputCode(conversionType === vbNetToCsId ? defaultVbCode : defaultCsCode);
34+
setInputCode(type === vbNetToCsId ? defaultVbCode : defaultCsCode);
3535
setConvertedCode("");
3636
} else if (convertedCode) {
3737
setInputCode(convertedCode);
@@ -100,11 +100,11 @@ export const Home = () => {
100100
<div id="app">
101101
<div className="form-group">
102102
<label>Input code ({conversionIsFromVb ? "VB.NET" : "C#"})</label>
103-
<ControlledEditor
103+
<Editor
104104
className="code-editor"
105105
value={inputCode} language={conversionIsFromVb ? "vb" : "csharp"}
106-
onChange={(ev, code) => setInputCode(code || "")}
107-
editorDidMount={ (_, editor) => { inputEditor.current = editor; selectAndFocus(inputEditor); } }
106+
onChange={( code, _) => setInputCode(code || "")}
107+
onMount={ ( editor,_) => { inputEditor.current = editor; selectAndFocus(inputEditor); } }
108108
height="30vh"
109109
options={{ ...commonEditorOptions }}
110110
/>
@@ -126,12 +126,12 @@ export const Home = () => {
126126
</div>
127127
<div className="form-group">
128128
<label>Converted code ({conversionIsFromVb ? "C#" : "VB.NET"})</label>
129-
<ControlledEditor
129+
<Editor
130130
className="code-editor"
131131
value={convertedCode}
132132
language={conversionIsFromVb ? "csharp" : "vb"}
133-
onChange={(ev, code) => setConvertedCode(code || "")}
134-
editorDidMount={(_, editor) => outputEditor.current = editor}
133+
onChange={(code, _) => setConvertedCode(code || "")}
134+
onMount={(editor, _) => outputEditor.current = editor}
135135
height="30vh"
136136
options={{ ...commonEditorOptions, readOnly: true }}
137137
/>

0 commit comments

Comments
 (0)