web: replace codemirror theme

BeryJu · Dec 30, 2024 · 2287586 · 2287586
1 parent 07cc922
commit 2287586
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 24 deletions.
diff --git a/web/package-lock.json b/web/package-lock.json
diff --git a/web/package.json b/web/package.json
@@ -14,7 +14,8 @@
         "@codecov/rollup-plugin": "^1.6.0",
         "@codemirror/lang-javascript": "^6.2.2",
         "@codemirror/legacy-modes": "^6.4.2",
-        "@codemirror/theme-one-dark": "^6.1.2",
+        "@fsegurai/codemirror-theme-vscode-dark": "^6.1.1",
+        "@fsegurai/codemirror-theme-vscode-light": "^6.1.1",
         "@patternfly/patternfly": "^6.1.0",
         "@rollup/plugin-commonjs": "^28.0.2",
         "@rollup/plugin-json": "^6.1.0",

diff --git a/web/src/elements/CodeMirror.ts b/web/src/elements/CodeMirror.ts
@@ -8,8 +8,9 @@ import {
 } from "@codemirror/language";
 import * as yamlMode from "@codemirror/legacy-modes/mode/yaml";
 import { Compartment, EditorState, Extension } from "@codemirror/state";
-import { oneDark } from "@codemirror/theme-one-dark";
 import { EditorView, drawSelection, keymap, lineNumbers } from "@codemirror/view";
+import { vsCodeDark } from "@fsegurai/codemirror-theme-vscode-dark";
+import { vsCodeLight } from "@fsegurai/codemirror-theme-vscode-light";
 import YAML from "yaml";
 
 import { customElement, property } from "lit/decorators.js";
@@ -80,15 +81,8 @@ export class CodeMirrorTextarea extends AKElement {
     constructor() {
         super();
         this.theme = new Compartment();
-        this.themeLight = EditorView.theme(
-            {
-                "&": {
-                    backgroundColor: "var(--pf-global--BackgroundColor--light-300)",
-                },
-            },
-            { dark: false },
-        );
-        this.themeDark = oneDark;
+        this.themeLight = vsCodeLight;
+        this.themeDark = vsCodeDark;
     }
 
     private getInnerValue(): string {