Cherry-pick changes react-monaco-editor from #3201

Author: Gio Lodi <[email protected]>
Date: Fri May 31 13:41:40 2024 +1000
Co-authored-by: Kat Hagan <[email protected]>

Author: codebykat

lib/note-content-editor.tsx

@@ -186,23 +186,6 @@ class NoteContentEditor extends Component<Props> {
 
   componentDidMount() {
     const { noteId } = this.props;
-    this.bootTimer = setTimeout(() => {
-      if (noteId === this.props.noteId) {
-        this.setState({
-          editor: 'full',
-          content: withCheckboxCharacters(this.props.note.content),
-        });
-        const position = getNotePosition(noteId);
-        if (position) {
-          this.editor?.setScrollPosition({
-            scrollTop: position,
-          });
-        }
-      }
-    }, SPEED_DELAY);
-    this.focusEditor();
-    this.props.storeFocusEditor(this.focusEditor);
-    this.props.storeHasFocus(this.hasFocus);
     window.addEventListener('resize', clearNotePositions);
     window.addEventListener('toggleChecklist', this.handleChecklist, true);
     this.toggleShortcuts(true);
@@ -613,6 +596,19 @@ class NoteContentEditor extends Component<Props> {
   editorReady: EditorDidMount = (editor, monaco) => {
     this.editor = editor;
 
+    this.focusEditor();
+    this.props.storeFocusEditor(this.focusEditor);
+    this.props.storeHasFocus(this.hasFocus);
+
+    this.bootTimer = setTimeout(() => {
+      const position = getNotePosition(this.props.noteId);
+      if (position) {
+        this.editor?.setScrollPosition({
+          scrollTop: position,
+        });
+      }
+    }, SPEED_DELAY);
+
     monaco.languages.registerLinkProvider('plaintext', {
       provideLinks: (model) => {
         const matches = model.findMatches(

package-lock.json

@@ -147,7 +147,7 @@
     "react-dom": "17.0.2",
     "react-dropzone": "11.7.1",
     "react-modal": "3.16.1",
-    "react-monaco-editor": "0.50.1",
+    "react-monaco-editor": "0.55.0",
     "react-overlays": "5.2.1",
     "react-redux": "8.1.3",
     "react-sortable-hoc": "2.0.0",