Opensearch: Fixed XML declaration when php short tags enabled

[bookstack] / resources / js / code / views.js

diff --git a/resources/js/code/views.js b/resources/js/code/views.js
index e877189399ce091275e92e9559727c4988e248f2..5599c35ddbe6751b9c9d70181a042bfe95c630fb 100644 (file)
--- a/resources/js/code/views.js
+++ b/resources/js/code/views.js
@@ -1,23 +1,37 @@
-import {getLanguageExtension} from "./languages";
-import {Compartment} from "@codemirror/state"
-import {EditorView} from "@codemirror/view"
+import {Compartment, EditorState} from '@codemirror/state';
+import {EditorView} from '@codemirror/view';
+import {getLanguageExtension} from './languages';
 
 const viewLangCompartments = new WeakMap();
 
 /**
  * Create a new editor view.
  *
- * @param {Object} config
+ * @param {String} usageType
+ * @param {{parent: Element, doc: String, extensions: Array}} config
  * @returns {EditorView}
  */
-export function createView(config) {
+export function createView(usageType, config) {
     const langCompartment = new Compartment();
     config.extensions.push(langCompartment.of([]));
 
-    const ev = new EditorView(config);
+    const commonEventData = {
+        usage: usageType,
+        editorViewConfig: config,
+        libEditorView: EditorView,
+        libEditorState: EditorState,
+        libCompartment: Compartment,
+    };
+
+    // Emit a pre-init public event so the user can tweak the config before instance creation
+    window.$events.emitPublic(config.parent, 'library-cm6::pre-init', commonEventData);
 
+    const ev = new EditorView(config);
     viewLangCompartments.set(ev, langCompartment);
 
+    // Emit a post-init public event so the user can gain a reference to the EditorView
+    window.$events.emitPublic(config.parent, 'library-cm6::post-init', {editorView: ev, ...commonEventData});
+
     return ev;
 }
 
@@ -28,11 +42,11 @@ export function createView(config) {
  * @param {string} modeSuggestion
  * @param {string} content
  */
-export function updateViewLanguage(ev, modeSuggestion, content) {
+export async function updateViewLanguage(ev, modeSuggestion, content) {
     const compartment = viewLangCompartments.get(ev);
-    const language = getLanguageExtension(modeSuggestion, content);
+    const language = await getLanguageExtension(modeSuggestion, content);
 
     ev.dispatch({
-        effects: compartment.reconfigure(language ? language : [])
-    })
-}
\ No newline at end of file
+        effects: compartment.reconfigure(language || []),
+    });
+}