Use OneDark theme instead of custom theme

chordbook · Mar 21, 2024 · e39923b · e39923b
1 parent d4957c2
commit e39923b
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 56 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,6 +46,7 @@
     "@codemirror/lint": "^6.5.0",
     "@codemirror/search": "^6.5.6",
     "@codemirror/state": "^6.4.1",
+    "@codemirror/theme-one-dark": "^6.1.2",
     "@codemirror/view": "^6.26.0"
   },
   "devDependencies": {

diff --git a/src/extensions/baseTheme.ts b/src/extensions/baseTheme.ts
@@ -0,0 +1,10 @@
+import { EditorView } from "@codemirror/view"
+
+export default EditorView.baseTheme({
+  "&": {
+    minHeight: '100%'
+  },
+  ".cm-editor": {
+    minHeight: '100%'
+  }
+})
diff --git a/src/extensions/highlightStyle.ts b/src/extensions/highlightStyle.ts
diff --git a/src/extensions/index.ts b/src/extensions/index.ts
@@ -6,12 +6,12 @@ import { lintKeymap } from '@codemirror/lint'
 import { highlightSelectionMatches, searchKeymap } from '@codemirror/search'
 import { drawSelection, highlightActiveLine, highlightActiveLineGutter, highlightSpecialChars, keymap, lineNumbers } from '@codemirror/view'
 import { ChordPro } from '@chordbook/codemirror-lang-chordpro'
-import highlightStyle from './highlightStyle'
-import theme from './theme'
+import { oneDark } from '@codemirror/theme-one-dark'
+import baseTheme from './baseTheme'
 
 export default [
-  theme(),
-  highlightStyle,
+  baseTheme,
+  oneDark,
   ChordPro(),
   lineNumbers(),
   highlightActiveLineGutter(),

diff --git a/src/extensions/theme.ts b/src/extensions/theme.ts