From b8556eab5f254266c2df8a626492913af8fe2517 Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Tue, 15 Aug 2023 11:32:51 +0300
Subject: [PATCH] [v10.1.x] CodeEditor: Correctly fires onChange handler
 (#73261)

CodeEditor: Correctly fires onChange handler (#73030)

move onChange outside onEditorDidMount condition

(cherry picked from commit 57d8997b86df7a6388dcab01394b971048399fe3)

Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
---
 packages/grafana-ui/src/components/Monaco/CodeEditor.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx b/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx
index b29cd124119..0402aa53c2f 100644
--- a/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx
+++ b/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx
@@ -111,9 +111,12 @@ class UnthemedCodeEditor extends PureComponent<Props> {
 
     const languagePromise = this.loadCustomLanguage();
 
+    if (onChange) {
+      editor.getModel()?.onDidChangeContent(() => onChange(editor.getValue()));
+    }
+
     if (onEditorDidMount) {
       languagePromise.then(() => onEditorDidMount(editor, monaco));
-      editor.getModel()?.onDidChangeContent(() => onChange?.(editor.getValue()));
     }
   };