({
- create: getCursorTooltips,
+const cursorTooltipField = (plugin: MakeMDPlugin) => StateField.define
({
+ create: getCursorTooltips(plugin),
update(tooltips, tr) {
if (!tr.docChanged && !tr.selection) return tooltips;
- return getCursorTooltips(tr.state);
+ return getCursorTooltips(plugin)(tr.state);
},
provide: (f) => showTooltip.computeN([f], (state) => state.field(f)),
@@ -19,8 +19,9 @@ import { EditorState } from "@codemirror/state";
import { InlineMenuComponent } from "cm-extensions/inlineStylerView/InlineMenu";
import { oMarks } from "cm-extensions/markSans/obsidianSyntax";
import { rangeIsMark, expandRange } from "./marks";
+import MakeMDPlugin from "main";
-function getCursorTooltips(state: EditorState): readonly Tooltip[] {
+const getCursorTooltips = (plugin: MakeMDPlugin) => (state: EditorState): readonly Tooltip[] => {
return state.selection.ranges
.filter((range) => !range.empty)
.map((range) => {
@@ -41,6 +42,7 @@ function getCursorTooltips(state: EditorState): readonly Tooltip[] {
reactElement.render(
<>
{
+ let evt = new CustomEvent(eventTypes.loadPortal, {
+ detail: { id, el, view },
+ });
+ activeWindow.dispatchEvent(evt);
+}
+
export const focusFlowEditor = (id: string, top: boolean) => {
let evt = new CustomEvent(eventTypes.focusPortal, {
detail: { id, parent: false, top },
diff --git a/src/main.ts b/src/main.ts
index fb5f0ce..085edc2 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -28,6 +28,7 @@ import {
import {
eventTypes,
FocusPortalEvent,
+ LoadPortalEvent,
OpenFilePortalEvent,
SpawnPortalEvent,
VaultChange,
@@ -42,6 +43,7 @@ import "css/makerMode.css";
import { cmExtensions } from "cm-extensions/cmExtensions";
import {
focusPortal,
+ loadFlowEditorByDOM,
loadFlowEditorsForLeaf,
openFileFromPortal,
spawnNewPortal,
@@ -175,6 +177,7 @@ export default class MakeMDPlugin extends Plugin {
});
window.addEventListener(eventTypes.spawnPortal, this.spawnPortal);
+ window.addEventListener(eventTypes.loadPortal, this.loadPortal);
window.addEventListener(eventTypes.focusPortal, this.focusPortal);
window.addEventListener(
eventTypes.openFilePortal,
@@ -211,10 +214,9 @@ export default class MakeMDPlugin extends Plugin {
this.registerEditorSuggest(new MakeMenu(this.app, this));
this.registerEditorSuggest(new StickerMenu(this.app, this));
if (platformIsMobile() && this.settings.mobileMakeBar)
- loadStylerIntoContainer(app.mobileToolbar.containerEl);
+ loadStylerIntoContainer(app.mobileToolbar.containerEl, this);
}
async onload() {
- window.make = this;
addIcon("mk-logo", mkLogo);
console.log("Loading Make.md");
// Load Settings
@@ -230,6 +232,9 @@ export default class MakeMDPlugin extends Plugin {
openFileFromPortal(e: OpenFilePortalEvent) {
openFileFromPortal(this, e);
}
+ loadPortal(e: LoadPortalEvent) {
+ loadFlowEditorByDOM(this, e.detail.el, e.detail.view, e.detail.id);
+ }
spawnPortal(e: SpawnPortalEvent) {
spawnNewPortal(this, e);
}
@@ -299,6 +304,7 @@ export default class MakeMDPlugin extends Plugin {
onunload() {
console.log("Unloading Make.md");
window.removeEventListener(eventTypes.spawnPortal, this.spawnPortal);
+ window.removeEventListener(eventTypes.loadPortal, this.loadPortal);
window.removeEventListener(eventTypes.focusPortal, this.focusPortal);
window.removeEventListener(
eventTypes.openFilePortal,
diff --git a/src/types/types.ts b/src/types/types.ts
index 44e7076..c7b7407 100644
--- a/src/types/types.ts
+++ b/src/types/types.ts
@@ -1,5 +1,6 @@
import { TFolder, TFile } from "obsidian";
import { UniqueIdentifier } from "@dnd-kit/core";
+import { EditorView } from '@codemirror/view'
export interface SectionTree {
section: string;
@@ -37,6 +38,7 @@ export const eventTypes = {
updateSections: "mkmd-update-sections",
settingsChanged: "mkmd-settings-changed",
spawnPortal: "mkmd-portal-spawn",
+ loadPortal: "mkmd-portal-load",
openFilePortal: "mkmd-portal-file",
focusPortal: "mkmd-portal-focus",
};
@@ -57,6 +59,14 @@ export class CustomVaultChangeEvent extends Event {
};
}
+export class LoadPortalEvent extends Event {
+ detail: {
+ el: HTMLElement;
+ view: EditorView;
+ id: string;
+ };
+}
+
export class SpawnPortalEvent extends Event {
detail: {
el: HTMLElement;
diff --git a/src/utils/flowEditor.ts b/src/utils/flowEditor.ts
index 9783173..c163c8c 100644
--- a/src/utils/flowEditor.ts
+++ b/src/utils/flowEditor.ts
@@ -46,7 +46,7 @@ export const getFileFromString = (url: string, source: string) => {
const getLineRangeFromRef = (
file: TFile,
ref: string | undefined,
- app: App
+ plugin: MakeMDPlugin
): [number | undefined, number | undefined] => {
if (!ref) {
return [undefined, undefined];
@@ -70,7 +70,7 @@ const getLineRangeFromRef = (
);
const start =
- window.make.settings.editorFlowStyle == "classic"
+ plugin.settings.editorFlowStyle == "classic"
? heading.position.start.line + 1
: heading.position.start.line + 2;
if (index < headings.length - 1 && nextIndex != -1) {
@@ -82,9 +82,11 @@ const getLineRangeFromRef = (
};
export const loadFlowEditorByDOM = (
+ make: MakeMDPlugin,
el: HTMLElement,
view: EditorView,
- id: string
+ id: string,
+
) => {
setTimeout(async () => {
//wait for el to be attached to the displayed document
@@ -114,7 +116,7 @@ export const loadFlowEditorByDOM = (
//@ts-ignore
const cm = leaf.view.editor?.cm as EditorView;
if (cm && view.dom == cm.dom) {
- loadFlowEditorsForLeafForID(cm, leaf, app, id);
+ loadFlowEditorsForLeafForID(cm, leaf, make, id);
}
}, app.workspace["rootSplit"]!);
});
@@ -123,27 +125,27 @@ export const loadFlowEditorByDOM = (
export const loadFlowEditorsForLeafForID = (
cm: EditorView,
leaf: WorkspaceLeaf,
- app: App,
+ make: MakeMDPlugin,
id: string
) => {
const stateField = cm.state.field(flowEditorInfo, false);
if (!stateField) return;
const flowInfo = stateField.find((f) => f.id == id);
if (flowInfo && flowInfo.expandedState == 2) {
- loadFlowEditor(cm, flowInfo, leaf, app);
+ loadFlowEditor(cm, flowInfo, leaf, make);
}
};
export const loadFlowEditorsForLeaf = (
cm: EditorView,
leaf: WorkspaceLeaf,
- app: App
+ make: MakeMDPlugin,
) => {
const stateField = cm.state.field(flowEditorInfo, false);
if (!stateField) return;
for (let flowInfo of stateField) {
if (flowInfo.expandedState == 2 && flowInfo.embed <= 1) {
- loadFlowEditor(cm, flowInfo, leaf, app);
+ loadFlowEditor(cm, flowInfo, leaf, make);
}
}
};
@@ -152,7 +154,7 @@ export const loadFlowEditor = (
cm: EditorView,
flowEditorInfo: FlowEditorInfo,
leaf: WorkspaceLeaf,
- app: App
+ make: MakeMDPlugin,
) => {
const dom = cm.dom.querySelector(
"#mk-flow-" + flowEditorInfo.id
@@ -163,7 +165,7 @@ export const loadFlowEditor = (
const file = getFileFromString(link, source);
if (dom) {
if (file) {
- const selectiveRange = getLineRangeFromRef(file, ref, app);
+ const selectiveRange = getLineRangeFromRef(file, ref, make);
if (!dom.hasAttribute("ready")) {
// dom.empty();
dom.setAttribute("ready", "");
@@ -185,7 +187,7 @@ export const loadFlowEditor = (
e.stopImmediatePropagation();
//@ts-ignore
await app.fileManager.createNewMarkdownFile(app.vault.getRoot(), link);
- loadFlowEditor(cm, flowEditorInfo, leaf, app);
+ loadFlowEditor(cm, flowEditorInfo, leaf, make);
};
createDiv.setText(`"${link}" ` + t.labels.noFile);
createDiv.addEventListener("click", createFile);
diff --git a/src/utils/icons.ts b/src/utils/icons.ts
index 873e34c..d009a78 100644
--- a/src/utils/icons.ts
+++ b/src/utils/icons.ts
@@ -187,3 +187,10 @@ export const markIconSet: Record = {
`,
};
+
+/**
+ * Some UI Icons based on
+ * Hero Icons
+ * https://github.com/tailwindlabs/heroicons
+ * tailwindlabs
+ **/