From bdd2f0b91fa1921289450c6953845ae8758391aa Mon Sep 17 00:00:00 2001
From: Kai Salmen <kai.salmen@typefox.io>
Date: Thu, 9 Nov 2023 10:38:42 +0100
Subject: [PATCH] Move question of re-init to function isReInitRequired

---
 package-lock.json                           | 14 ++++----
 packages/examples/package.json              |  6 ++--
 packages/monaco-editor-react/package.json   |  6 ++--
 packages/monaco-editor-react/src/index.tsx  | 37 +++++++++++++--------
 packages/monaco-editor-wrapper/package.json |  2 +-
 5 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 83f1c97..9d25ea2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7564,20 +7564,20 @@
     },
     "packages/examples": {
       "name": "monaco-editor-wrapper-examples",
-      "version": "3.4.0-next.2",
+      "version": "3.4.0-next.3",
       "dependencies": {
         "@codingame/monaco-vscode-configuration-service-override": "~1.83.5",
         "@codingame/monaco-vscode-editor-service-override": "~1.83.5",
         "@codingame/monaco-vscode-json-default-extension": "~1.83.5",
         "@codingame/monaco-vscode-keybindings-service-override": "~1.83.5",
         "@codingame/monaco-vscode-python-default-extension": "~1.83.5",
-        "@typefox/monaco-editor-react": "~2.4.0-next.2",
+        "@typefox/monaco-editor-react": "~2.4.0-next.3",
         "http-server": "~14.1.1",
         "langium": "~2.1.1",
         "langium-statemachine-dsl": "~2.1.0",
         "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
         "monaco-editor-workers": "~0.44.0",
-        "monaco-editor-wrapper": "~3.4.0-next.2",
+        "monaco-editor-wrapper": "~3.4.0-next.3",
         "monaco-languageclient": "~7.0.0",
         "monaco-languageclient-examples": "~7.0.0",
         "react": "~18.2.0",
@@ -7632,11 +7632,11 @@
     },
     "packages/monaco-editor-react": {
       "name": "@typefox/monaco-editor-react",
-      "version": "2.4.0-next.2",
+      "version": "2.4.0-next.3",
       "license": "MIT",
       "dependencies": {
         "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
-        "monaco-editor-wrapper": "~3.4.0-next.2",
+        "monaco-editor-wrapper": "~3.4.0-next.3",
         "react": "~18.2.0",
         "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0"
       },
@@ -7644,7 +7644,7 @@
         "@types/react": "~18.2.37"
       },
       "peerDependencies": {
-        "monaco-editor-wrapper": "~3.4.0-next.2"
+        "monaco-editor-wrapper": "~3.4.0-next.3"
       }
     },
     "packages/monaco-editor-react/node_modules/@types/react": {
@@ -7659,7 +7659,7 @@
       }
     },
     "packages/monaco-editor-wrapper": {
-      "version": "3.4.0-next.2",
+      "version": "3.4.0-next.3",
       "license": "MIT",
       "dependencies": {
         "@codingame/monaco-vscode-configuration-service-override": "~1.83.5",
diff --git a/packages/examples/package.json b/packages/examples/package.json
index e99bb56..c5d18f1 100644
--- a/packages/examples/package.json
+++ b/packages/examples/package.json
@@ -1,7 +1,7 @@
 {
   "name": "monaco-editor-wrapper-examples",
   "private": true,
-  "version": "3.4.0-next.2",
+  "version": "3.4.0-next.3",
   "type": "module",
   "dependencies": {
     "@codingame/monaco-vscode-configuration-service-override": "~1.83.5",
@@ -9,13 +9,13 @@
     "@codingame/monaco-vscode-json-default-extension": "~1.83.5",
     "@codingame/monaco-vscode-keybindings-service-override": "~1.83.5",
     "@codingame/monaco-vscode-python-default-extension": "~1.83.5",
-    "@typefox/monaco-editor-react": "~2.4.0-next.2",
+    "@typefox/monaco-editor-react": "~2.4.0-next.3",
     "http-server": "~14.1.1",
     "langium": "~2.1.1",
     "langium-statemachine-dsl": "~2.1.0",
     "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
     "monaco-editor-workers": "~0.44.0",
-    "monaco-editor-wrapper": "~3.4.0-next.2",
+    "monaco-editor-wrapper": "~3.4.0-next.3",
     "monaco-languageclient": "~7.0.0",
     "monaco-languageclient-examples": "~7.0.0",
     "react": "~18.2.0",
diff --git a/packages/monaco-editor-react/package.json b/packages/monaco-editor-react/package.json
index 39a3db3..21b1f53 100644
--- a/packages/monaco-editor-react/package.json
+++ b/packages/monaco-editor-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typefox/monaco-editor-react",
-  "version": "2.4.0-next.2",
+  "version": "2.4.0-next.3",
   "license": "MIT",
   "description": "React component for Monaco-Editor and Monaco Languageclient",
   "keywords": [
@@ -51,12 +51,12 @@
   },
   "dependencies": {
     "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
-    "monaco-editor-wrapper": "~3.4.0-next.2",
+    "monaco-editor-wrapper": "~3.4.0-next.3",
     "react": "~18.2.0",
     "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0"
   },
   "peerDependencies": {
-    "monaco-editor-wrapper": "~3.4.0-next.2"
+    "monaco-editor-wrapper": "~3.4.0-next.3"
   },
   "devDependencies": {
     "@types/react": "~18.2.37"
diff --git a/packages/monaco-editor-react/src/index.tsx b/packages/monaco-editor-react/src/index.tsx
index 95af043..42d0ab8 100644
--- a/packages/monaco-editor-react/src/index.tsx
+++ b/packages/monaco-editor-react/src/index.tsx
@@ -35,6 +35,28 @@ export class MonacoEditorReactComp<T extends MonacoEditorProps = MonacoEditorPro
     }
 
     override async componentDidUpdate(prevProps: T) {
+        const { userConfig } = this.props;
+        const { wrapper } = this;
+
+        const mustReInit = this.isReInitRequired(prevProps);
+
+        if (mustReInit) {
+            await this.handleReinit();
+        } else {
+            // the function now ensure a model update is only required if something else than the code changed
+            this.wrapper.updateModel(userConfig.wrapperConfig.editorAppConfig);
+
+            const config = userConfig.wrapperConfig.editorAppConfig;
+            const prevConfig = prevProps.userConfig.wrapperConfig.editorAppConfig;
+            if (prevConfig.$type === 'classic' && config.$type === 'classic') {
+                if (prevConfig.editorOptions !== config.editorOptions) {
+                    (wrapper.getMonacoEditorApp() as EditorAppClassic).updateMonacoEditorOptions(config.editorOptions ?? {});
+                }
+            }
+        }
+    }
+
+    protected isReInitRequired(prevProps: T) {
         const { className, userConfig } = this.props;
         const { wrapper } = this;
 
@@ -43,8 +65,8 @@ export class MonacoEditorReactComp<T extends MonacoEditorProps = MonacoEditorPro
         }
 
         let mustReInit = false;
-        const prevConfig = prevProps.userConfig.wrapperConfig.editorAppConfig;
         const config = userConfig.wrapperConfig.editorAppConfig;
+        const prevConfig = prevProps.userConfig.wrapperConfig.editorAppConfig;
         const prevWorkerOptions = prevProps.userConfig.languageClientConfig?.options;
         const currentWorkerOptions = userConfig.languageClientConfig?.options;
         const prevIsWorker = (prevWorkerOptions?.$type === 'WorkerDirect');
@@ -69,18 +91,7 @@ export class MonacoEditorReactComp<T extends MonacoEditorProps = MonacoEditorPro
             mustReInit = (wrapper?.getMonacoEditorApp() as EditorAppExtended).isAppConfigDifferent(prevConfig, config, false) === true;
         }
 
-        if (mustReInit) {
-            await this.handleReinit();
-        } else {
-            // the function now ensure a model update is only required if something else than the code changed
-            this.wrapper.updateModel(userConfig.wrapperConfig.editorAppConfig);
-
-            if (prevConfig.$type === 'classic' && config.$type === 'classic') {
-                if (prevConfig.editorOptions !== config.editorOptions) {
-                    (wrapper.getMonacoEditorApp() as EditorAppClassic).updateMonacoEditorOptions(config.editorOptions ?? {});
-                }
-            }
-        }
+        return mustReInit;
     }
 
     override componentWillUnmount() {
diff --git a/packages/monaco-editor-wrapper/package.json b/packages/monaco-editor-wrapper/package.json
index 0a3b94b..d47f83a 100644
--- a/packages/monaco-editor-wrapper/package.json
+++ b/packages/monaco-editor-wrapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monaco-editor-wrapper",
-  "version": "3.4.0-next.2",
+  "version": "3.4.0-next.3",
   "license": "MIT",
   "description": "Monaco-Editor and Monaco Languageclient Wrapper",
   "keywords": [