Rich/MD and list continuation

README.md

@@ -75,7 +75,7 @@ The editor used is [CodeMirror 6](https://codemirror.net/) with the following co
 
 ### Field input mode
 
-- Configurable default state for editor fields (`rich text` or `markdown`, default `rich text`).
+- Configurable default state for editor fields (`rich text`, `markdown` or `rich text/markdown`, default `rich text`).
 - Configurable behaviour of "field input mode" shortcut, cycle between rich text and Markdown (`true`) or just toggle Markdown input (`false`). (default `true`)
 - Configurable shortcut to toggle rich text input. (default `Ctrl+Alt+X`)
 - Configurable shortcuts to move to next/previous input (since tab is a valid Markdown character it will not work to "tab out" of a markdown input). (default `Ctrl+PgDown` and `Ctrl+PgUp`)
@@ -181,3 +181,4 @@ Functionality split into different classes to facilitate reuse:
 - 2023-03-11: Restructuring of code to allow modularity with other projects and easier maintenance.
 - 2023-03-12: Change "dialog mode" to "window mode" and inherit QMainWindow rather than QDialog. Add option to edit complete note in window mode, improve CSS styling of editor, now done from separate CSS file. Modify default styling (based on VS Code styles) to suit both light and dark mode. Fix anyoing eating of trailing spaces when focusing to another window. Add option to hide editor toolbar when focusing a Markdown field.
 - 2023-04-26: Improve logic to fix anoying eating of trailing spaces, change search/replace dialog placement so that it is visible without having to scroll.
+- 2023-05-04: Add `rich text/markdown` field default configuration option, add list continuation thanks to [David C.](https://github.com/d-k-bo).

src/py/__init__.py

@@ -9,7 +9,7 @@
 config = mw.addonManager.getConfig(__name__)
 
 CVER = get_version()
-NVER = "2.2.1"
+NVER = "2.2.2"
 
 msgs = []
 if strvercmp(CVER, '2.2.0') < 0:

src/ts/editor.ts

@@ -5,8 +5,8 @@ import {defaultKeymap, historyKeymap, indentWithTab, history} from "@codemirror/
 import {closeBrackets, closeBracketsKeymap} from "@codemirror/autocomplete"
 import {highlightSelectionMatches, search} from "search"
 import {autocompletion, completionKeymap} from "@codemirror/autocomplete"
-import {markdown, markdownKeymap, markdownLanguage } from "@codemirror/lang-markdown"
-import {ankiImagePaste } from "./CodeMirror.extensions/ankiImagePaste"
+import {markdown, markdownKeymap, markdownLanguage} from "@codemirror/lang-markdown"
+import {ankiImagePaste} from "./CodeMirror.extensions/ankiImagePaste"
 import {classHighlighter} from '@lezer/highlight'
 import {Subscript, Superscript, Strikethrough, Table} from "@lezer/markdown"
 

src/ts/field_input.ts

@@ -11,6 +11,7 @@ const MD = '<!--?xml version="1.0" encoding="UTF-8"?--><svg xmlns="http://www.w3
 
 let _config
 let _converter
+let _editor_count
 
 /////////////////////////////////////////////////////////////////////////////
 // Non-arrow function (for `this` use) to instantiate an editor instance
@@ -79,7 +80,20 @@ function onadd() {
   if (_config[FIELD_INPUT]?.[FIELD_DEFAULT]?.toLowerCase() === 'markdown') {
     this.toggle()
     this.toggle_rich()
+  } else if (_config[FIELD_INPUT]?.[FIELD_DEFAULT]?.toLowerCase() === 'rich text/markdown') {
+    this.toggle()
+    // Ugly temporary hack to focus first Markdown input initially
+    if(!_editor_count) {
+      window.requestAnimationFrame(() =>
+        window.requestAnimationFrame(() =>
+          window.requestAnimationFrame(() =>
+            this.editor.cm.focus()
+          )
+        )
+      )
+    }
   }
+  _editor_count++
 }
 
 /////////////////////////////////////////////////////////////////////////////
@@ -98,6 +112,7 @@ function init(cfg: Configuration) {
     onadd: onadd,
     badge: MD
   })
+  _editor_count = 0
 }
 
 /////////////////////////////////////////////////////////////////////////////