Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/lib/codemirror.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ let loaded = false;

export async function importCodemirrorAll() {

if (typeof window === 'undefined')
return;

if (loaded)
return;

Expand All @@ -11,7 +14,7 @@ export async function importCodemirrorAll() {
(window as any).CodeMirror = CodeMirror.default;

// @ts-ignore
await import('codemirror/addon/display/autorefresh');
await import('codemirror/addon/display/autorefresh');
// @ts-ignore
await import('codemirror/addon/comment/comment');
// @ts-ignore
Expand All @@ -28,8 +31,8 @@ export async function importCodemirrorAll() {
await import('codemirror/lib/codemirror.css');
// @ts-ignore
await import('codemirror/theme/solarized.css');


// default languages

// @ts-ignore
Expand Down
3 changes: 1 addition & 2 deletions src/lib/nodeviews/nodeview-codeblock.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// @ts-nocheck
import CodeMirror from 'codemirror'; // eslint-disable-line
import { exitCode, joinBackward } from 'prosemirror-commands';
import { undo, redo } from 'prosemirror-history';
import { TextSelection, Selection } from 'prosemirror-state';
Expand Down Expand Up @@ -31,7 +30,7 @@ export default class CodeBlockNodeView implements NodeView {
this.dom.appendChild(codemirrorWrap);

// Create a CodeMirror instance
this.cm = new CodeMirror(codemirrorWrap, {
this.cm = new (window as any).CodeMirror(codemirrorWrap, {
value: this.node.textContent,
lineNumbers: true,
lineWrapping: true,
Expand Down
12 changes: 5 additions & 7 deletions src/lib/nodeviews/nodeview-custom-html.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// @ts-ignore
import CodeMirror from 'codemirror';
import { exitCode } from 'prosemirror-commands';
import { undo, redo } from 'prosemirror-history';
import { TextSelection, Selection } from 'prosemirror-state';
Expand All @@ -8,7 +6,7 @@ import { Node } from 'prosemirror-model';
import { EditorView } from 'prosemirror-view';

export default class CustomHtmlNodeView {
private cm: CodeMirror.Editor;
private cm: any;

private node: Node;
private view: EditorView;
Expand Down Expand Up @@ -37,7 +35,7 @@ export default class CustomHtmlNodeView {
this.dom.appendChild(codemirrorWrap);

// Create a CodeMirror instance
this.cm = CodeMirror(codemirrorWrap, {
this.cm = (window as any).CodeMirror(codemirrorWrap, {
value: this.node.textContent,
lineNumbers: true,
lineWrapping: true,
Expand Down Expand Up @@ -137,7 +135,7 @@ export default class CustomHtmlNodeView {
if (exitCode(view.state, view.dispatch)) view.focus();
}

return CodeMirror.normalizeKeyMap({
return (window as any).CodeMirror.normalizeKeyMap({
Up: () => this.maybeEscape('line', -1),
Left: () => this.maybeEscape('char', -1),
Down: () => this.maybeEscape('line', 1),
Expand All @@ -155,7 +153,7 @@ export default class CustomHtmlNodeView {
view.focus();
return;
}
return CodeMirror.Pass;
return (window as any).CodeMirror.Pass;
}
});
}
Expand All @@ -167,7 +165,7 @@ export default class CustomHtmlNodeView {
pos.line != (dir < 0 ? this.cm.firstLine() : this.cm.lastLine()) ||
(unit == 'char' && pos.ch != (dir < 0 ? 0 : this.cm.getLine(pos.line).length))
)
return CodeMirror.Pass;
return (window as any).CodeMirror.Pass;
this.view.focus();
let targetPos = this.getPos() + (dir < 0 ? 0 : this.node.nodeSize);
let selection = Selection.near(this.view.state.doc.resolve(targetPos), dir);
Expand Down