From 0fd46a1bd35089d1591204df48d1258e432f9df9 Mon Sep 17 00:00:00 2001 From: Josh Hunt Date: Thu, 29 Feb 2024 11:40:11 +0000 Subject: [PATCH] Revert "CodeEditor: Ensure latest onChange callback is called" (#83677) Revert "CodeEditor: Ensure latest onChange callback is called (#83599)" This reverts commit 3363e3f2d35a6da3474151febe26c50c3746956f. --- .../src/components/Monaco/CodeEditor.tsx | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx b/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx index fa3ea3d7e18..7ab4854ec2c 100644 --- a/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx +++ b/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx @@ -102,7 +102,7 @@ class UnthemedCodeEditor extends PureComponent { }; handleOnMount = (editor: MonacoEditorType, monaco: Monaco) => { - const { getSuggestions, language, onEditorDidMount } = this.props; + const { getSuggestions, language, onChange, onEditorDidMount } = this.props; this.modelId = editor.getModel()?.id; this.getEditorValue = () => editor.getValue(); @@ -119,21 +119,15 @@ class UnthemedCodeEditor extends PureComponent { } }); - editor.getModel()?.onDidChangeContent(this.handleChangeContent); + if (onChange) { + editor.getModel()?.onDidChangeContent(() => onChange(editor.getValue())); + } if (onEditorDidMount) { onEditorDidMount(editor, monaco); } }; - handleChangeContent = () => { - const { onChange } = this.props; - - if (onChange) { - onChange(this.getEditorValue()); - } - }; - render() { const { theme, language, width, height, showMiniMap, showLineNumbers, readOnly, monacoOptions } = this.props; const { alwaysConsumeMouseWheel, ...restMonacoOptions } = monacoOptions ?? {};