Update code based on review

Update intention of checkboxUpdate -> refocusEditorAndCursor
Move scroll editor into line method to codemirror util
Refactor initial cursor method call for refocus

Author: Komediruzecki

src/components/atoms/CustomizedMarkdownPreviewer.tsx

@@ -9,7 +9,7 @@ interface CustomizedMarkdownPreviewer {
   attachmentMap?: ObjectMap<Attachment>
   updateContent?: (
     newContentOrUpdater: string | ((newValue: string) => string),
-    checkboxUpdate?: boolean
+    refocusEditorAndCursor?: boolean
   ) => void
 }
 

src/components/atoms/MarkdownPreviewer.tsx

@@ -70,7 +70,7 @@ interface MarkdownPreviewerProps {
   attachmentMap?: ObjectMap<Attachment>
   updateContent?: (
     newContentOrUpdater: string | ((newValue: string) => string),
-    checkboxUpdate?: boolean
+    refocusEditorAndCursor?: boolean
   ) => void
 }
 

src/components/atoms/markdown/MarkdownCheckbox.tsx

@@ -5,7 +5,7 @@ interface MarkdownCheckboxProps {
   checked?: boolean
   updateContent?: (
     newValueOrUpdater: string | ((prevValue: string) => string),
-    checkboxUpdate?: boolean
+    refocusEditorAndCursor?: boolean
   ) => void
 }
 

src/components/organisms/LocalSearch.tsx

@@ -32,6 +32,7 @@ import { compareEventKeyWithKeymap } from '../../lib/keymap'
 import { usePreferences } from '../../lib/preferences'
 import styled from '../../shared/lib/styled'
 import Icon from '../../shared/components/atoms/Icon'
+import { scrollEditorToLine } from '../../shared/lib/codemirror/util'
 
 const LOCAL_SEARCH_MAX_RESULTS = 10000
 
@@ -51,15 +52,6 @@ interface LocalSearchProps {
 
 export type SearchResultNavigationDirection = 'next' | 'previous'
 
-export function scrollEditorToLine(
-  editor: CodeMirror.EditorFromTextArea,
-  lineNumber: number
-) {
-  const t = editor.charCoords({ line: lineNumber, ch: 0 }, 'local').top
-  const middleHeight = editor.getScrollerElement().offsetHeight / 2
-  editor.scrollTo(null, t - middleHeight - 5)
-}
-
 const LocalSearch = ({
   searchQuery,
   replaceQuery,

src/components/organisms/NoteDetail.tsx

@@ -20,7 +20,7 @@ import EditorThemeSelect from '../molecules/EditorThemeSelect'
 import EditorKeyMapSelect from '../molecules/EditorKeyMapSelect'
 import { addIpcListener, removeIpcListener } from '../../lib/electronOnly'
 import { MarkerRange } from 'codemirror'
-import LocalSearch, { scrollEditorToLine } from './LocalSearch'
+import LocalSearch from './LocalSearch'
 import { SearchReplaceOptions } from '../../lib/search/search'
 import {
   borderTop,
@@ -29,6 +29,7 @@ import {
 } from '../../shared/lib/styled/styleFunctions'
 import styled from '../../shared/lib/styled'
 import EditorToolbar, { formatCodeMirrorText } from './editor/EditorToolbar'
+import { scrollEditorToLine } from '../../shared/lib/codemirror/util'
 
 type NoteDetailProps = {
   note: NoteDoc
@@ -164,6 +165,10 @@ class NoteDetail extends React.Component<NoteDetailProps, NoteDetailState> {
   }
 
   setInitialCursor() {
+    this.setCursorToLastPositionOrInit()
+  }
+
+  setCursorToLastPositionOrInit() {
     if (this.codeMirror == null) {
       return
     }
@@ -223,7 +228,7 @@ class NoteDetail extends React.Component<NoteDetailProps, NoteDetailState> {
 
   updateContent = (
     newValueOrUpdater: string | ((prevValue: string) => string),
-    checkboxUpdate = false
+    refocusEditorAndCursor = false
   ) => {
     const updater =
       typeof newValueOrUpdater === 'string'
@@ -236,9 +241,9 @@ class NoteDetail extends React.Component<NoteDetailProps, NoteDetailState> {
         }
       },
       () => {
-        if (this.codeMirror != null && checkboxUpdate) {
+        if (this.codeMirror != null && refocusEditorAndCursor) {
           this.codeMirror.focus()
-          this.setInitialCursor()
+          this.setCursorToLastPositionOrInit()
         }
         this.queueToSave()
       }

src/shared/lib/codemirror/util.ts

@@ -41,3 +41,12 @@ export function loadMode(_CodeMirror: any) {
     return modeObj
   }
 }
+
+export function scrollEditorToLine(
+  editor: CodeMirror.EditorFromTextArea,
+  lineNumber: number
+) {
+  const t = editor.charCoords({ line: lineNumber, ch: 0 }, 'local').top
+  const middleHeight = editor.getScrollerElement().offsetHeight / 2
+  editor.scrollTo(null, t - middleHeight - 5)
+}