IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

CodeEditor: making sure we trigger the latest onSave callback provided to the component (#39835)

Browse Source
This commit is contained in:
Marcus Andersson 2021-10-07 08:51:23 +02:00 committed by GitHub
parent d09cdfb844
commit d9ca3c5c5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/grafana-ui/src/components/Monaco/CodeEditor.tsx
View File

@ -86,6 +86,13 @@ class UnthemedCodeEditor extends React.PureComponent<Props> {
} }
}; };
onSave = () => {
const { onSave } = this.props;
if (onSave) {
onSave(this.getEditorValue());
}
};
handleBeforeMount = (monaco: Monaco) => { handleBeforeMount = (monaco: Monaco) => {
this.monaco = monaco; this.monaco = monaco;
const { language, theme, getSuggestions, onBeforeEditorMount } = this.props; const { language, theme, getSuggestions, onBeforeEditorMount } = this.props;
@ -99,15 +106,10 @@ class UnthemedCodeEditor extends React.PureComponent<Props> {
}; };
handleOnMount = (editor: MonacoEditorType, monaco: Monaco) => { handleOnMount = (editor: MonacoEditorType, monaco: Monaco) => {
const { onSave, onEditorDidMount } = this.props; const { onEditorDidMount } = this.props;
this.getEditorValue = () => editor.getValue(); this.getEditorValue = () => editor.getValue();
if (onSave) { editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_S, this.onSave);
editor.addCommand(monaco.KeyMod.CtrlCmd | monaco.KeyCode.KEY_S, () => {
onSave(this.getEditorValue());
});
}
const languagePromise = this.loadCustomLanguage(); const languagePromise = this.loadCustomLanguage();
if (onEditorDidMount) { if (onEditorDidMount) {