refactor: note editor relationships (#1821)

packages/web/src/javascripts/Components/ChangeEditor/ChangeEditorMenu.tsx

@@ -9,6 +9,7 @@ import {
   ComponentArea,
   ItemMutator,
   NoteMutator,
+  NoteType,
   PrefKey,
   SNComponent,
   SNNote,
@@ -19,10 +20,6 @@ import { EditorMenuGroup } from '@/Components/NotesOptions/EditorMenuGroup'
 import { EditorMenuItem } from '@/Components/NotesOptions/EditorMenuItem'
 import { createEditorMenuGroups } from './createEditorMenuGroups'
 import { PLAIN_EDITOR_NAME } from '@/Constants/Constants'
-import {
-  transactionForAssociateComponentWithCurrentNote,
-  transactionForDisassociateComponentWithCurrentNote,
-} from '../NoteView/TransactionFunctions'
 import { reloadFont } from '../NoteView/FontFunctions'
 import { PremiumFeatureIconClass, PremiumFeatureIconName } from '../Icon/PremiumFeatureIcon'
 
@@ -97,42 +94,28 @@ const ChangeEditorMenu: FunctionComponent<ChangeEditorMenuProps> = ({
       }
 
       if (!component) {
-        if (!note.prefersPlainEditor) {
-          transactions.push({
-            itemUuid: note.uuid,
-            mutate: (m: ItemMutator) => {
-              const noteMutator = m as NoteMutator
-              noteMutator.prefersPlainEditor = true
-            },
-          })
-        }
-        const currentEditor = application.componentManager.editorForNote(note)
-        if (currentEditor?.isExplicitlyEnabledForItem(note.uuid)) {
-          transactions.push(transactionForDisassociateComponentWithCurrentNote(currentEditor, note))
-        }
+        transactions.push({
+          itemUuid: note.uuid,
+          mutate: (m: ItemMutator) => {
+            const noteMutator = m as NoteMutator
+            noteMutator.noteType = NoteType.Plain
+            noteMutator.editorIdentifier = undefined
+          },
+        })
         reloadFont(application.getPreference(PrefKey.EditorMonospaceEnabled))
-      } else if (component.area === ComponentArea.Editor) {
-        const currentEditor = application.componentManager.editorForNote(note)
-        if (currentEditor && component.uuid !== currentEditor.uuid) {
-          transactions.push(transactionForDisassociateComponentWithCurrentNote(currentEditor, note))
-        }
-        const prefersPlain = note.prefersPlainEditor
-        if (prefersPlain) {
-          transactions.push({
-            itemUuid: note.uuid,
-            mutate: (m: ItemMutator) => {
-              const noteMutator = m as NoteMutator
-              noteMutator.prefersPlainEditor = false
-            },
-          })
-        }
-        transactions.push(transactionForAssociateComponentWithCurrentNote(component, note))
+      } else {
+        transactions.push({
+          itemUuid: note.uuid,
+          mutate: (m: ItemMutator) => {
+            const noteMutator = m as NoteMutator
+            noteMutator.noteType = component.noteType
+            noteMutator.editorIdentifier = component.identifier
+          },
+        })
       }
 
       await application.mutator.runTransactionalMutations(transactions)
-      /** Dirtying can happen above */
       application.sync.sync().catch(console.error)
-
       setCurrentEditor(application.componentManager.editorForNote(note))
     },
     [application],

packages/web/src/javascripts/Components/ChangeEditor/createEditorMenuGroups.ts

@@ -12,15 +12,13 @@ import { EditorMenuGroup } from '@/Components/NotesOptions/EditorMenuGroup'
 import { EditorMenuItem } from '@/Components/NotesOptions/EditorMenuItem'
 import { PLAIN_EDITOR_NAME } from '@/Constants/Constants'
 
-type EditorGroup = NoteType | 'plain' | 'others'
+type EditorGroup = NoteType | 'others'
 
 const getEditorGroup = (featureDescription: FeatureDescription): EditorGroup => {
   if (featureDescription.note_type) {
     return featureDescription.note_type
   } else if (featureDescription.file_type) {
     switch (featureDescription.file_type) {
-      case 'txt':
-        return 'plain'
       case 'html':
         return NoteType.RichText
       case 'md':
@@ -34,7 +32,7 @@ const getEditorGroup = (featureDescription: FeatureDescription): EditorGroup =>
 
 export const createEditorMenuGroups = (application: WebApplication, editors: SNComponent[]) => {
   const editorItems: Record<EditorGroup, EditorMenuItem[]> = {
-    plain: [
+    'plain-text': [
       {
         name: PLAIN_EDITOR_NAME,
         isEntitled: true,
@@ -79,7 +77,7 @@ export const createEditorMenuGroups = (application: WebApplication, editors: SNC
       icon: 'plain-text',
       iconClassName: 'text-accessory-tint-1',
       title: 'Plain text',
-      items: editorItems.plain,
+      items: editorItems['plain-text'],
     },
     {
       icon: 'rich-text',