Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: onMount prop conflict with ReactMonacoEditor component #359

Merged
merged 1 commit into from
Nov 21, 2024
Merged

fix: onMount prop conflict with ReactMonacoEditor component #359

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/components/Monaco/ReactMonacoEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useTheme } from '@/hooks/useTheme'
import { Editor, EditorProps, loader } from '@monaco-editor/react'
import { Editor, EditorProps, loader, Monaco } from '@monaco-editor/react'
import * as monaco from 'monaco-editor'
import { EditorToolbar, ToolbarState } from './EditorToolbar'
import { useMemo, useState } from 'react'
Expand Down Expand Up @@ -56,6 +56,17 @@ export function ReactMonacoEditor({
return true
}, [editor])

const handleEditorMount = (
editor: monaco.editor.IStandaloneCodeEditor,
monaco: Monaco
) => {
setEditor(editor)

if (props.onMount) {
props.onMount(editor, monaco)
}
Comment on lines +65 to +67
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now we're setting the instance of editor here but still respecting what the parent component is doing.

}

return (
<Flex height="100%" width="100%" direction="column">
{showToolbar && (
Expand All @@ -71,7 +82,7 @@ export function ReactMonacoEditor({
...props.options,
wordWrap: toolbarState.wordWrap,
}}
onMount={(editor) => setEditor(editor)}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was overriding the onMount prop declared in the CodeEditor component:

k6-studio/src/components/Monaco/CodeEditor.tsx

Lines 20 to 40 in 0678c9b

useEffect(() => {
if (!editor) return
const position = editor.getPosition()
editor.setValue(value)
if (position) {
editor.setPosition(position)
}
}, [editor, value])
const handleEditorMount = (editor: monaco.editor.IStandaloneCodeEditor) => {
setEditor(editor)
}
return (
<ReactMonacoEditor
showToolbar
defaultLanguage="javascript"
options={{ readOnly }}
defaultValue={value}
onChange={onChange}
onMount={handleEditorMount}

This prevented the content of script preview from being set.

onMount={handleEditorMount}
theme={theme === 'dark' ? 'vs-dark' : 'k6-studio-light'}
/>
</Flex>
Expand Down
Loading