CM6: Aligned styling with existing, improved theme handling

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

diff --git a/resources/js/code/setups.js b/resources/js/code/setups.js
index 19f8c6c2e42faf27458d42c4ebf8f0dbd80f6945..842917285656d9ff5f8e2f39d6e5e91857d61c08 100644 (file)
--- a/resources/js/code/setups.js
+++ b/resources/js/code/setups.js
@@ -1,22 +1,34 @@
-

 import {EditorView, keymap, drawSelection, highlightActiveLine, dropCursor,
     rectangularSelection, lineNumbers, highlightActiveLineGutter} from "@codemirror/view"
 import {EditorView, keymap, drawSelection, highlightActiveLine, dropCursor,
     rectangularSelection, lineNumbers, highlightActiveLineGutter} from "@codemirror/view"

-import {syntaxHighlighting, bracketMatching} from "@codemirror/language"
+import {bracketMatching} from "@codemirror/language"

 import {defaultKeymap, history, historyKeymap} from "@codemirror/commands"
 import {EditorState} from "@codemirror/state"
 import {defaultKeymap, history, historyKeymap} from "@codemirror/commands"
 import {EditorState} from "@codemirror/state"

+import {getTheme} from "./themes";

 
 

-import {defaultLight} from "./themes";
-
-export function viewer() {
+/**
+ * @param {Element} parentEl
+ * @return {(Extension[]|{extension: Extension}|readonly Extension[])[]}
+ */
+function common(parentEl) {

     return [
     return [

+        getTheme(parentEl),

         lineNumbers(),
         highlightActiveLineGutter(),
         drawSelection(),
         dropCursor(),
         lineNumbers(),
         highlightActiveLineGutter(),
         drawSelection(),
         dropCursor(),

-        // syntaxHighlighting(defaultLight, {fallback: false}),

         bracketMatching(),
         rectangularSelection(),
         highlightActiveLine(),
         bracketMatching(),
         rectangularSelection(),
         highlightActiveLine(),

+    ];
+}
+
+/**
+ * @param {Element} parentEl
+ * @return {*[]}
+ */
+export function viewer(parentEl) {
+    return [
+        ...common(parentEl),

         keymap.of([
             ...defaultKeymap,
         ]),
         keymap.of([
             ...defaultKeymap,
         ]),


@@ -24,17 +36,14 @@ export function viewer() {
     ];
 }
 
     ];
 }
 

-export function editor(language) {
+/**
+ * @param {Element} parentEl
+ * @return {*[]}
+ */
+export function editor(parentEl) {

     return [
     return [

-        lineNumbers(),
-        highlightActiveLineGutter(),
+        ...common(parentEl),

         history(),
         history(),

-        drawSelection(),
-        dropCursor(),
-        syntaxHighlighting(defaultLight, {fallback: true}),
-        bracketMatching(),
-        rectangularSelection(),
-        highlightActiveLine(),

         keymap.of([
             ...defaultKeymap,
             ...historyKeymap,
         keymap.of([
             ...defaultKeymap,
             ...historyKeymap,