-
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: fixes live preview crash, improves LP rendering
- Loading branch information
1 parent
59449ce
commit c85b4cc
Showing
4 changed files
with
237 additions
and
250 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,226 @@ | ||
/* | ||
* inspired and adapted from https://github.com/blacksmithgu/obsidian-dataview/blob/master/src/main.ts | ||
* | ||
* The original work is MIT-licensed. | ||
* | ||
* MIT License | ||
* | ||
* Copyright (c) 2022 artisticat1 | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in all | ||
* copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
* | ||
* */ | ||
|
||
import { | ||
Decoration, | ||
DecorationSet, | ||
EditorView, | ||
ViewPlugin, | ||
ViewUpdate, | ||
WidgetType | ||
} from "@codemirror/view"; | ||
import { EditorSelection, Range } from "@codemirror/state"; | ||
import { syntaxTree } from "@codemirror/language"; | ||
import { | ||
Component, | ||
editorEditorField, | ||
editorLivePreviewField, | ||
editorViewField | ||
} from "obsidian"; | ||
import Processor from "./processor"; | ||
|
||
function selectionAndRangeOverlap( | ||
selection: EditorSelection, | ||
rangeFrom: number, | ||
rangeTo: number | ||
) { | ||
for (const range of selection.ranges) { | ||
if (range.from <= rangeTo && range.to >= rangeFrom) { | ||
return true; | ||
} | ||
} | ||
|
||
return false; | ||
} | ||
|
||
/* class InlineWidget extends WidgetType { | ||
constructor( | ||
readonly cssClasses: string[], | ||
readonly rawQuery: string, | ||
private el: HTMLElement, | ||
private view: EditorView | ||
) { | ||
super(); | ||
} | ||
// Widgets only get updated when the raw query changes/the element gets focus and loses it | ||
// to prevent redraws when the editor updates. | ||
eq(other: InlineWidget): boolean { | ||
if (other.rawQuery === this.rawQuery) { | ||
// change CSS classes without redrawing the element | ||
for (let value of other.cssClasses) { | ||
if (!this.cssClasses.includes(value)) { | ||
this.el.removeClass(value); | ||
} else { | ||
this.el.addClass(value); | ||
} | ||
} | ||
return true; | ||
} | ||
return false; | ||
} | ||
// Add CSS classes and return HTML element. | ||
// In "complex" cases it will get filled with the correct text/child elements later. | ||
toDOM(view: EditorView): HTMLElement { | ||
this.el.addClasses(this.cssClasses); | ||
return this.el; | ||
} | ||
/* Make queries only editable when shift is pressed (or navigated inside with the keyboard | ||
* or the mouse is placed at the end, but that is always possible regardless of this method). | ||
* Mostly useful for links, and makes results selectable. | ||
* If the widgets should always be expandable, make this always return false. | ||
*/ | ||
/* ignoreEvent(event: MouseEvent | Event): boolean { | ||
// instanceof check does not work in pop-out windows, so check it like this | ||
if (event.type === "mousedown") { | ||
const currentPos = this.view.posAtCoords({ | ||
x: (event as MouseEvent).x, | ||
y: (event as MouseEvent).y | ||
}); | ||
if ((event as MouseEvent).shiftKey) { | ||
// Set the cursor after the element so that it doesn't select starting from the last cursor position. | ||
if (currentPos) { | ||
//@ts-ignore | ||
const { editor } = this.view.state | ||
.field(editorEditorField) | ||
.state.field(editorViewField); | ||
editor.setCursor(editor.offsetToPos(currentPos)); | ||
} | ||
return false; | ||
} | ||
} | ||
return true; | ||
} | ||
} */ | ||
|
||
function inlineRender(view: EditorView) { | ||
// still doesn't work as expected for tables and callouts | ||
|
||
const currentFile = app.workspace.getActiveFile(); | ||
if (!currentFile) return; | ||
|
||
const widgets: Range<Decoration>[] = []; | ||
const selection = view.state.selection; | ||
/* before: | ||
* em for italics | ||
* highlight for highlight | ||
* after: | ||
* strong for bold | ||
* strikethrough for strikethrough | ||
*/ | ||
for (const { from, to } of view.visibleRanges) { | ||
syntaxTree(view.state).iterate({ | ||
from, | ||
to, | ||
enter: ({ node }) => { | ||
const type = node.type; | ||
// markdown formatting symbols | ||
if (type.name.includes("formatting")) return; | ||
|
||
// contains the position of node | ||
const start = node.from; | ||
const end = node.to; | ||
// don't continue if current cursor position and inline code node (including formatting | ||
// symbols) overlap | ||
if (selectionAndRangeOverlap(selection, start - 1, end + 1)) | ||
return; | ||
|
||
const original = view.state.doc.sliceString(start, end).trim(); | ||
if (!Processor.END_RE.test(original)) return; | ||
|
||
/* If the query result is predefined text (e.g. in the case of errors), set innerText to it. | ||
* Otherwise, pass on an empty element and fill it in later. | ||
* This is necessary because {@link InlineWidget.toDOM} is synchronous but some rendering | ||
* asynchronous. | ||
*/ | ||
const parsed = Processor.parse(original) ?? []; | ||
|
||
for (const item of parsed) { | ||
const { attributes, text } = item; | ||
const firstBracket = original | ||
.slice(0, original.indexOf(text)) | ||
.lastIndexOf("{"); | ||
|
||
const lastBracket = original.indexOf( | ||
"}", | ||
original.indexOf(text) | ||
); | ||
|
||
/* const classes = getCssClasses(type.name); */ | ||
/* return; */ | ||
widgets.push( | ||
Decoration.replace({ | ||
/* widget: new InlineWidget(classes, code, el, view), */ | ||
inclusive: false, | ||
block: false | ||
}).range(start + firstBracket, start + lastBracket + 1), | ||
Decoration.mark({ | ||
inclusive: true, | ||
attributes: Object.fromEntries(attributes) | ||
}).range(start, end) | ||
); | ||
} | ||
} | ||
}); | ||
} | ||
|
||
return Decoration.set(widgets, true); | ||
} | ||
|
||
export function inlinePlugin() { | ||
return ViewPlugin.fromClass( | ||
class { | ||
decorations: DecorationSet; | ||
|
||
constructor(view: EditorView) { | ||
this.decorations = inlineRender(view) ?? Decoration.none; | ||
} | ||
|
||
update(update: ViewUpdate) { | ||
// only activate in LP and not source mode | ||
//@ts-ignore | ||
if (!update.state.field(editorLivePreviewField)) { | ||
this.decorations = Decoration.none; | ||
return; | ||
} | ||
if ( | ||
update.docChanged || | ||
update.viewportChanged || | ||
update.selectionSet | ||
) { | ||
this.decorations = | ||
inlineRender(update.view) ?? Decoration.none; | ||
} | ||
} | ||
}, | ||
{ decorations: (v) => v.decorations } | ||
); | ||
} |
Oops, something went wrong.