@typefox/monaco-editor-react 7.0.0-next.0 → 7.0.0-next.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +18 -3
- package/README.md +4 -2
- package/lib/index.d.ts +2 -2
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +4 -4
- package/lib/index.js.map +1 -1
- package/package.json +2 -2
- package/src/index.tsx +7 -7
package/CHANGELOG.md
CHANGED
|
@@ -2,10 +2,25 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to npm module [@typefox/monaco-editor-react](https://www.npmjs.com/package/@typefox/monaco-editor-react) are documented in this file.
|
|
4
4
|
|
|
5
|
-
## [7.0.0
|
|
5
|
+
## [7.0.0] - unreleased
|
|
6
6
|
|
|
7
|
-
- Updated to `monaco-languageclient@10.0.0-next.
|
|
8
|
-
-
|
|
7
|
+
- Updated to `monaco-languageclient@10.0.0-next.1`.
|
|
8
|
+
- Dropped `monaco-editor-wrapper`.
|
|
9
|
+
|
|
10
|
+
## [6.12.0] - 2025-08-21
|
|
11
|
+
|
|
12
|
+
- Updated to `monaco-languageclient@9.11.0` and `monaco-editor-wrapper@6.12.0`.
|
|
13
|
+
- Updated all `@codingame/monaco-vscode` packages to `20.2.1`.
|
|
14
|
+
|
|
15
|
+
## [6.11.0] - 2025-08-14
|
|
16
|
+
|
|
17
|
+
- Updated to `monaco-languageclient@9.10.0` and `monaco-editor-wrapper@6.11.0`.
|
|
18
|
+
- Updated all `@codingame/monaco-vscode` packages to `20.1.1`.
|
|
19
|
+
|
|
20
|
+
## [6.10.0] - 2025-08-11
|
|
21
|
+
|
|
22
|
+
- Updated to `monaco-languageclient@9.9.0` and `monaco-editor-wrapper@6.10.0`.
|
|
23
|
+
- Updated all `@codingame/monaco-vscode` packages to `19.1.4`.
|
|
9
24
|
|
|
10
25
|
## [6.9.0] - 2025-06-24
|
|
11
26
|
|
package/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# React component for Monaco-Editor and Monaco Languageclient
|
|
2
2
|
|
|
3
|
-
This packages provides a React component that
|
|
3
|
+
This packages provides a React component that wraps the functionality of [monaco-languageclient](https://www.npmjs.com/package/monaco-languageclient). It behaves nearly the same way as the monaco editor, with the primary difference being that you interact with it through a React component.
|
|
4
4
|
|
|
5
5
|
The [monaco-languageclient](https://github.com/TypeFox/monaco-languageclient) can be activated to connect to a language server either via jsonrpc over a websocket to an exernal server process, or via the Language Server Protocol for the browser where the language server runs in a web worker.
|
|
6
6
|
|
|
@@ -14,7 +14,9 @@ This is npm package is part of the [monaco-languageclient mono repo](https://git
|
|
|
14
14
|
|
|
15
15
|
## Usage
|
|
16
16
|
|
|
17
|
-
You can import the monaco react component for easy use in an existing React project. Below you can see a quick example of a fully functional implementation in TypeScript. The react component uses the same
|
|
17
|
+
You can import the monaco react component for easy use in an existing React project. Below you can see a quick example of a fully functional implementation in TypeScript. The react component uses the same config object approach like `monaco-languageclient`.
|
|
18
|
+
|
|
19
|
+
TODO: Update Example
|
|
18
20
|
|
|
19
21
|
```tsx
|
|
20
22
|
import React from 'react';
|
package/lib/index.d.ts
CHANGED
|
@@ -11,11 +11,11 @@ export type MonacoEditorProps = {
|
|
|
11
11
|
languageClientConfigs?: LanguageClientConfigs;
|
|
12
12
|
onVscodeApiInitDone?: (monacoVscodeApiManager: MonacoVscodeApiWrapper) => void;
|
|
13
13
|
onEditorStartDone?: (editorApp?: EditorApp) => void;
|
|
14
|
-
|
|
14
|
+
onLanguageClientsStartDone?: (lcsManager?: LanguageClientsManager) => void;
|
|
15
15
|
onTextChanged?: (textChanges: TextContents) => void;
|
|
16
16
|
onError?: (error: Error) => void;
|
|
17
17
|
onDisposeEditor?: () => void;
|
|
18
|
-
|
|
18
|
+
onDisposeLanguageClients?: () => void;
|
|
19
19
|
modifiedTextValue?: string;
|
|
20
20
|
originalTextValue?: string;
|
|
21
21
|
};
|
package/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACrG,OAAO,EAAE,KAAK,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACrG,OAAO,EAAgC,KAAK,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAC1I,OAAO,KAAK,EAAE,EAAE,KAAK,aAAa,EAA+B,MAAM,OAAO,CAAC;AAE/E,MAAM,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;AAElE,MAAM,MAAM,iBAAiB,GAAG;IAC5B,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,qBAAqB,CAAC;IACvC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAC9C,mBAAmB,CAAC,EAAE,CAAC,sBAAsB,EAAE,sBAAsB,KAAK,IAAI,CAAC;IAC/E,iBAAiB,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,SAAS,KAAK,IAAI,CAAC;IACpD,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,KAAK,eAAe,EAAE,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACrG,OAAO,EAAE,KAAK,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACrG,OAAO,EAAgC,KAAK,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAC1I,OAAO,KAAK,EAAE,EAAE,KAAK,aAAa,EAA+B,MAAM,OAAO,CAAC;AAE/E,MAAM,MAAM,SAAS,GAAG,CAAC,KAAK,EAAE,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;AAElE,MAAM,MAAM,iBAAiB,GAAG;IAC5B,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,qBAAqB,CAAC;IACvC,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,qBAAqB,CAAC,EAAE,qBAAqB,CAAC;IAC9C,mBAAmB,CAAC,EAAE,CAAC,sBAAsB,EAAE,sBAAsB,KAAK,IAAI,CAAC;IAC/E,iBAAiB,CAAC,EAAE,CAAC,SAAS,CAAC,EAAE,SAAS,KAAK,IAAI,CAAC;IACpD,0BAA0B,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,sBAAsB,KAAK,IAAI,CAAC;IAC3E,aAAa,CAAC,EAAE,CAAC,WAAW,EAAE,YAAY,KAAK,IAAI,CAAC;IACpD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,eAAe,CAAC,EAAE,MAAM,IAAI,CAAC;IAC7B,wBAAwB,CAAC,EAAE,MAAM,IAAI,CAAC;IACtC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAA;AAED,eAAO,MAAM,qBAAqB,EAAE,KAAK,CAAC,EAAE,CAAC,iBAAiB,CAyL7D,CAAC"}
|
package/lib/index.js
CHANGED
|
@@ -7,7 +7,7 @@ import { LanguageClientsManager } from 'monaco-languageclient/lcwrapper';
|
|
|
7
7
|
import { getEnhancedMonacoEnvironment, MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
|
|
8
8
|
import React, { useEffect, useRef, useState } from 'react';
|
|
9
9
|
export const MonacoEditorReactComp = (props) => {
|
|
10
|
-
const { style, className, vscodeApiConfig, editorAppConfig, languageClientConfigs, onVscodeApiInitDone, onEditorStartDone,
|
|
10
|
+
const { style, className, vscodeApiConfig, editorAppConfig, languageClientConfigs, onVscodeApiInitDone, onEditorStartDone, onLanguageClientsStartDone, onTextChanged, onError, onDisposeEditor, onDisposeLanguageClients, modifiedTextValue, originalTextValue } = props;
|
|
11
11
|
const apiWrapperRef = useRef(new MonacoVscodeApiWrapper(vscodeApiConfig));
|
|
12
12
|
const haveEditorService = useRef(true);
|
|
13
13
|
const editorAppRef = useRef(null);
|
|
@@ -49,7 +49,7 @@ export const MonacoEditorReactComp = (props) => {
|
|
|
49
49
|
}
|
|
50
50
|
const envEnhanced = getEnhancedMonacoEnvironment();
|
|
51
51
|
// init will only performed once
|
|
52
|
-
if (
|
|
52
|
+
if (envEnhanced.vscodeApiInitialising !== true) {
|
|
53
53
|
(async () => {
|
|
54
54
|
apiWrapperRef.current.getLogger().debug('GLOBAL INIT');
|
|
55
55
|
await apiWrapperRef.current.init({
|
|
@@ -117,7 +117,7 @@ export const MonacoEditorReactComp = (props) => {
|
|
|
117
117
|
}
|
|
118
118
|
await lcsManagerRef.current.setConfigs(languageClientConfigs);
|
|
119
119
|
await lcsManagerRef.current.start();
|
|
120
|
-
|
|
120
|
+
onLanguageClientsStartDone?.(lcsManagerRef.current);
|
|
121
121
|
apiWrapperRef.current.getLogger().debug('INIT LC DONE');
|
|
122
122
|
}
|
|
123
123
|
catch (error) {
|
|
@@ -138,7 +138,7 @@ export const MonacoEditorReactComp = (props) => {
|
|
|
138
138
|
onDisposeEditor?.();
|
|
139
139
|
if (languageClientConfigs?.enforceDispose === true) {
|
|
140
140
|
lcsManagerRef.current?.dispose();
|
|
141
|
-
|
|
141
|
+
onDisposeLanguageClients?.();
|
|
142
142
|
}
|
|
143
143
|
}
|
|
144
144
|
catch (error) {
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"AAAA;;;+FAG+F;AAE/F,OAAO,EAAE,SAAS,EAA2C,MAAM,iCAAiC,CAAC;AACrG,OAAO,EAA8B,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACrG,OAAO,EAAE,4BAA4B,EAA8B,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAC1I,OAAO,KAAK,EAAE,EAAsB,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAqB/E,MAAM,CAAC,MAAM,qBAAqB,GAAgC,CAAC,KAAK,EAAE,EAAE;IACxE,MAAM,EACF,KAAK,EACL,SAAS,EACT,eAAe,EACf,eAAe,EACf,qBAAqB,EACrB,mBAAmB,EACnB,iBAAiB,EACjB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typefox/monaco-editor-react",
|
|
3
|
-
"version": "7.0.0-next.
|
|
3
|
+
"version": "7.0.0-next.1",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "React component for Monaco-Editor and Monaco Languageclient",
|
|
6
6
|
"keywords": [
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
"npm": "10.9.2"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@codingame/monaco-vscode-editor-api": "~
|
|
49
|
+
"@codingame/monaco-vscode-editor-api": "~20.2.1",
|
|
50
50
|
"react": ">=18.0.0 || <20.0.0"
|
|
51
51
|
},
|
|
52
52
|
"repository": {
|
package/src/index.tsx
CHANGED
|
@@ -18,11 +18,11 @@ export type MonacoEditorProps = {
|
|
|
18
18
|
languageClientConfigs?: LanguageClientConfigs;
|
|
19
19
|
onVscodeApiInitDone?: (monacoVscodeApiManager: MonacoVscodeApiWrapper) => void;
|
|
20
20
|
onEditorStartDone?: (editorApp?: EditorApp) => void;
|
|
21
|
-
|
|
21
|
+
onLanguageClientsStartDone?: (lcsManager?: LanguageClientsManager) => void;
|
|
22
22
|
onTextChanged?: (textChanges: TextContents) => void;
|
|
23
23
|
onError?: (error: Error) => void;
|
|
24
24
|
onDisposeEditor?: () => void;
|
|
25
|
-
|
|
25
|
+
onDisposeLanguageClients?: () => void;
|
|
26
26
|
modifiedTextValue?: string;
|
|
27
27
|
originalTextValue?: string;
|
|
28
28
|
}
|
|
@@ -36,11 +36,11 @@ export const MonacoEditorReactComp: React.FC<MonacoEditorProps> = (props) => {
|
|
|
36
36
|
languageClientConfigs,
|
|
37
37
|
onVscodeApiInitDone,
|
|
38
38
|
onEditorStartDone,
|
|
39
|
-
|
|
39
|
+
onLanguageClientsStartDone,
|
|
40
40
|
onTextChanged,
|
|
41
41
|
onError,
|
|
42
42
|
onDisposeEditor,
|
|
43
|
-
|
|
43
|
+
onDisposeLanguageClients,
|
|
44
44
|
modifiedTextValue,
|
|
45
45
|
originalTextValue
|
|
46
46
|
} = props;
|
|
@@ -91,7 +91,7 @@ export const MonacoEditorReactComp: React.FC<MonacoEditorProps> = (props) => {
|
|
|
91
91
|
const envEnhanced = getEnhancedMonacoEnvironment();
|
|
92
92
|
|
|
93
93
|
// init will only performed once
|
|
94
|
-
if (
|
|
94
|
+
if (envEnhanced.vscodeApiInitialising !== true) {
|
|
95
95
|
|
|
96
96
|
(async () => {
|
|
97
97
|
apiWrapperRef.current.getLogger().debug('GLOBAL INIT');
|
|
@@ -172,7 +172,7 @@ export const MonacoEditorReactComp: React.FC<MonacoEditorProps> = (props) => {
|
|
|
172
172
|
await lcsManagerRef.current.setConfigs(languageClientConfigs);
|
|
173
173
|
await lcsManagerRef.current.start();
|
|
174
174
|
|
|
175
|
-
|
|
175
|
+
onLanguageClientsStartDone?.(lcsManagerRef.current);
|
|
176
176
|
apiWrapperRef.current.getLogger().debug('INIT LC DONE');
|
|
177
177
|
} catch (error) {
|
|
178
178
|
performErrorHandling(error as Error);
|
|
@@ -195,7 +195,7 @@ export const MonacoEditorReactComp: React.FC<MonacoEditorProps> = (props) => {
|
|
|
195
195
|
|
|
196
196
|
if (languageClientConfigs?.enforceDispose === true) {
|
|
197
197
|
lcsManagerRef.current?.dispose();
|
|
198
|
-
|
|
198
|
+
onDisposeLanguageClients?.();
|
|
199
199
|
}
|
|
200
200
|
} catch (error) {
|
|
201
201
|
// The language client may throw an error during disposal, but we want to continue anyway
|