diff --git a/packages/codemirror/src/index.ts b/packages/codemirror/src/index.ts index cbb268170..3188f20ac 100644 --- a/packages/codemirror/src/index.ts +++ b/packages/codemirror/src/index.ts @@ -1,4 +1,4 @@ -import { defaultKeymap, history, historyKeymap, indentWithTab } from "@codemirror/commands"; +import { defaultKeymap, history, historyKeymap } from "@codemirror/commands"; import { EditorView, highlightActiveLine, keymap, lineNumbers, placeholder, ViewUpdate, type EditorViewConfig } from "@codemirror/view"; import { defaultHighlightStyle, StreamLanguage, syntaxHighlighting, indentUnit, bracketMatching, foldGutter } from "@codemirror/language"; import { Compartment, type Extension } from "@codemirror/state"; @@ -9,7 +9,8 @@ import smartIndentWithTab from "./extensions/custom_tab.js"; type ContentChangedListener = () => void; -export interface EditorConfig extends EditorViewConfig { +export interface EditorConfig { + parent: HTMLElement; placeholder?: string; lineWrapping?: boolean; vimKeybindings?: boolean; @@ -50,10 +51,6 @@ export default class CodeMirror extends EditorView { ]) ] - if (Array.isArray(config.extensions)) { - extensions = [...extensions, ...config.extensions]; - } - if (config.placeholder) { extensions.push(placeholder(config.placeholder)); } @@ -67,7 +64,7 @@ export default class CodeMirror extends EditorView { } super({ - ...config, + parent: config.parent, extensions }); this.config = config; diff --git a/packages/codemirror/tsconfig.lib.json b/packages/codemirror/tsconfig.lib.json index f46b85d22..f3f86f56f 100644 --- a/packages/codemirror/tsconfig.lib.json +++ b/packages/codemirror/tsconfig.lib.json @@ -9,6 +9,9 @@ "forceConsistentCasingInFileNames": true, "noImplicitOverride": true, "noImplicitReturns": true, + "lib": [ + "DOM" + ], "types": [ "node", "vite/client"