From b46b2e9ce1acc0af63e0d1593b8698ab46cb4124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Thu, 21 Jul 2022 15:40:22 +0200 Subject: [PATCH 1/2] lib: Update monaco-editor-wrapper --- package-lock.json | 30 +++++++++++++++--------------- package.json | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 70bb6d5..9ad82c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "@codingame/monaco-editor-react", "version": "0.0.0-semantic-release", "dependencies": { - "@codingame/monaco-editor-wrapper": "^2.0.0", + "@codingame/monaco-editor-wrapper": "^2.2.0", "deep-equal": "^2.0.5", "lodash.debounce": "^4.0.8" }, @@ -63,12 +63,12 @@ } }, "node_modules/@codingame/monaco-editor-wrapper": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@codingame/monaco-editor-wrapper/-/monaco-editor-wrapper-2.0.0.tgz", - "integrity": "sha512-lkdq8ih7D7/738t96p3KAVqC7fFVC3do/h3z6qj9M2TIKSZwsMUrVL9aGfT6leaN/F7iBrMWrMh4UZ6O39ftMQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-editor-wrapper/-/monaco-editor-wrapper-2.2.0.tgz", + "integrity": "sha512-A/pDPRH3rLPUv+W9z2SkLPQOsFZbDFMZ5ze8RLl/hrCxnrEWSxiVwQAdOIibVkv4+wZ101OvF/oaVmGVtGUrUw==", "dependencies": { "monaco-editor": "npm:@codingame/monaco-editor@^0.33.6", - "vscode": "npm:@codingame/monaco-vscode-api@~1.67.9", + "vscode": "npm:@codingame/monaco-vscode-api@~1.67.19", "vscode-oniguruma": "^1.6.2" } }, @@ -3012,9 +3012,9 @@ }, "node_modules/vscode": { "name": "@codingame/monaco-vscode-api", - "version": "1.67.11", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.67.11.tgz", - "integrity": "sha512-wN+DU1nowFP59prdEZHYIJeAwFbIVdEMMzIAu+FTVhvrqdMzqMnvz0PDbTgBB9Y+OVcdqTN7meASG0JXRtz6mw==", + "version": "1.67.19", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.67.19.tgz", + "integrity": "sha512-yxX47tUTlX/Vu+jKYQWqJtR0VTGeHgpUE8l/n38/YRfMQi+ggMbXVLHO72O67zG5q0R4HybYfiKiSE1l3VHYhA==", "dependencies": { "monaco-editor": "^0.33.0" } @@ -3125,12 +3125,12 @@ "requires": {} }, "@codingame/monaco-editor-wrapper": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@codingame/monaco-editor-wrapper/-/monaco-editor-wrapper-2.0.0.tgz", - "integrity": "sha512-lkdq8ih7D7/738t96p3KAVqC7fFVC3do/h3z6qj9M2TIKSZwsMUrVL9aGfT6leaN/F7iBrMWrMh4UZ6O39ftMQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@codingame/monaco-editor-wrapper/-/monaco-editor-wrapper-2.2.0.tgz", + "integrity": "sha512-A/pDPRH3rLPUv+W9z2SkLPQOsFZbDFMZ5ze8RLl/hrCxnrEWSxiVwQAdOIibVkv4+wZ101OvF/oaVmGVtGUrUw==", "requires": { "monaco-editor": "npm:@codingame/monaco-editor@^0.33.6", - "vscode": "npm:@codingame/monaco-vscode-api@~1.67.9", + "vscode": "npm:@codingame/monaco-vscode-api@~1.67.19", "vscode-oniguruma": "^1.6.2" } }, @@ -5232,9 +5232,9 @@ "dev": true }, "vscode": { - "version": "npm:@codingame/monaco-vscode-api@1.67.11", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.67.11.tgz", - "integrity": "sha512-wN+DU1nowFP59prdEZHYIJeAwFbIVdEMMzIAu+FTVhvrqdMzqMnvz0PDbTgBB9Y+OVcdqTN7meASG0JXRtz6mw==", + "version": "npm:@codingame/monaco-vscode-api@1.67.19", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.67.19.tgz", + "integrity": "sha512-yxX47tUTlX/Vu+jKYQWqJtR0VTGeHgpUE8l/n38/YRfMQi+ggMbXVLHO72O67zG5q0R4HybYfiKiSE1l3VHYhA==", "requires": { "monaco-editor": "^0.33.0" } diff --git a/package.json b/package.json index 13273ff..e31d282 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ ], "types": "dist/index.d.ts", "dependencies": { - "@codingame/monaco-editor-wrapper": "^2.0.0", + "@codingame/monaco-editor-wrapper": "^2.2.0", "deep-equal": "^2.0.5", "lodash.debounce": "^4.0.8" }, From 3ae49206742d0f2cd3e179f7fe9055c6cfc6bf29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Mangeonjean?= Date: Thu, 21 Jul 2022 15:42:15 +0200 Subject: [PATCH 2/2] feat: Rely on the configuration sync in editor-wrapper --- src/MonacoEditor.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/MonacoEditor.tsx b/src/MonacoEditor.tsx index 6496206..d932cd7 100644 --- a/src/MonacoEditor.tsx +++ b/src/MonacoEditor.tsx @@ -2,7 +2,7 @@ import React, { ForwardedRef, forwardRef, ReactElement, useEffect, useMemo, useR import debounce from 'lodash.debounce' import { monaco, createEditor, getMonacoLanguage, updateEditorKeybindingsMode, registerEditorOpenHandler } from '@codingame/monaco-editor-wrapper' import { IEditorOptions } from 'vscode/service-override/modelEditor' -import { useDeepMemo, useLastValueRef, useLastVersion, useThemeData, useUserConfiguration } from './hooks' +import { useDeepMemo, useLastValueRef, useLastVersion, useThemeData } from './hooks' import './style' const STATUS_BAR_HEIGHT = 20 @@ -122,15 +122,13 @@ function MonacoEditor ({ const statusBarRef = useRef(null) const monacoLanguage = useMemo(() => programmingLanguage != null ? getMonacoLanguage(programmingLanguage) : undefined, [programmingLanguage]) - const userConfiguration = useUserConfiguration(monacoLanguage) const memoizedOptions = useDeepMemo(() => options, [options]) const allOptions = useMemo(() => { return removeKeyBindingsManagedOptions({ - ...userConfiguration, ...memoizedOptions, automaticLayout: true }, keyBindingsMode) - }, [memoizedOptions, userConfiguration, keyBindingsMode]) + }, [memoizedOptions, keyBindingsMode]) const modelUri = useMemo(() => { return fileUri != null ? monaco.Uri.parse(fileUri) : undefined