Deps: Updated PHP composer dependancy versions, fixed test namespaces

[bookstack] / resources / js / markdown / index.mts

diff --git a/resources/js/markdown/index.mts b/resources/js/markdown/index.mts
index b983285d90785f17efd4246e12bd1027ec0d579b..0a6e974b74a7d76ed490a2bb6e740ba4f78e82ea 100644 (file)
--- a/resources/js/markdown/index.mts
+++ b/resources/js/markdown/index.mts
@@ -4,9 +4,11 @@ import {Actions} from './actions';
 import {Settings} from './settings';
 import {listenToCommonEvents} from './common-events';
 import {init as initCodemirror} from './codemirror';
-import {EditorView} from "@codemirror/view";
-import {importVersioned} from "../services/util";
-import {CodeModule} from "../global";
+import {MarkdownEditorInput} from "./inputs/interface";
+import {CodemirrorInput} from "./inputs/codemirror";
+import {TextareaInput} from "./inputs/textarea";
+import {provideShortcutMap} from "./shortcuts";
+import {getMarkdownDomEventHandlers} from "./dom-handlers";
 
 export interface MarkdownEditorConfig {
     pageId: string;
@@ -23,7 +25,7 @@ export interface MarkdownEditor {
     display: Display;
     markdown: Markdown;
     actions: Actions;
-    cm: EditorView;
+    input: MarkdownEditorInput;
     settings: Settings;
 }
 
@@ -31,8 +33,6 @@ export interface MarkdownEditor {
  * Initiate a new Markdown editor instance.
  */
 export async function init(config: MarkdownEditorConfig): Promise<MarkdownEditor> {
-    const Code = await window.importVersioned('code') as CodeModule;
-
     const editor: MarkdownEditor = {
         config,
         markdown: new Markdown(),
@@ -41,7 +41,27 @@ export async function init(config: MarkdownEditorConfig): Promise<MarkdownEditor
 
     editor.actions = new Actions(editor);
     editor.display = new Display(editor);
-    editor.cm = initCodemirror(editor, Code);
+
+    const eventHandlers = getMarkdownDomEventHandlers(editor);
+    const shortcuts = provideShortcutMap(editor);
+    const onInputChange = () => editor.actions.updateAndRender();
+
+    const initCodemirrorInput: () => Promise<MarkdownEditorInput> = async () => {
+        const codeMirror = await initCodemirror(config.inputEl, shortcuts, eventHandlers, onInputChange);
+        return new CodemirrorInput(codeMirror);
+    };
+    const initTextAreaInput: () => Promise<MarkdownEditorInput> = async () => {
+        return new TextareaInput(config.inputEl, shortcuts, eventHandlers, onInputChange);
+    };
+
+    const isPlainEditor = Boolean(editor.settings.get('plainEditor'));
+    editor.input = await (isPlainEditor ? initTextAreaInput() : initCodemirrorInput());
+    editor.settings.onChange('plainEditor', async (value) => {
+        const isPlain = Boolean(value);
+        const newInput = await (isPlain ? initTextAreaInput() : initCodemirrorInput());
+        editor.input.teardown();
+        editor.input = newInput;
+    });
 
     listenToCommonEvents(editor);