renun/obsidian-excalidraw-plugin
1
0
Fork 0
mirror of https://github.com/zsviczian/obsidian-excalidraw-plugin.git synced 2025-08-06 05:46:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

onLinkOpen fix leaf.openFile

Browse Source
This commit is contained in:
Zsolt Viczian
2022-04-10 07:23:43 +02:00
parent fe9a9d6aa2
commit a2f6801e5f
3 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -12,7 +12,7 @@
"author": "",
"license": "MIT",
"dependencies": {
"@zsviczian/excalidraw": "0.11.0-obsidian-8",
"@zsviczian/excalidraw": "0.11.0-obsidian-9",
"monkey-around": "^2.3.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",

19
src/ExcalidrawView.ts
View File

@@ -632,7 +632,7 @@ export default class ExcalidrawView extends TextFileView {
.matchAll(/#([\p{Letter}\p{Emoji_Presentation}\p{Number}\/_-]+)/gu)
.next();
if (!tags.value || tags.value.length < 2) {
new Notice(t("TEXT_ELEMENT_EMPTY"), 4000);
//new Notice(t("TEXT_ELEMENT_EMPTY"), 4000);
return;
}
const search = this.app.workspace.getLeavesOfType("search");
@@ -749,8 +749,7 @@ export default class ExcalidrawView extends TextFileView {
const leaf = ev.shiftKey
? getNewOrAdjacentLeaf(this.plugin, view.leaf)
: view.leaf;
leaf.openFile(file, subpath?{ eState: { subpath } }:undefined); //if file exists open file and jump to reference
//leaf.openFile(file, { eState: { line: lineNum - 1 } }); //if file exists open file and jump to reference
await leaf.openFile(file, subpath?{ eState: { subpath } }:undefined); //if file exists open file and jump to reference
view.app.workspace.setActiveLeaf(leaf, true, true);
} catch (e) {
new Notice(e, 4000);
@@ -2425,7 +2424,7 @@ export default class ExcalidrawView extends TextFileView {
}
return [null, null, null];
},
onLinkOpen: (element: ExcalidrawElement, e: any): void => {
onLinkOpen: async (element: ExcalidrawElement, e: any): Promise<void> => {
e.preventDefault();
if (!element) {
return;
@@ -2443,17 +2442,11 @@ export default class ExcalidrawView extends TextFileView {
}
let linkText = linkMatch.groups.link;
//let lineNum = 0;
let subpath:string = null;
if (linkText.search("#") > -1) {
const linkParts = getLinkParts(linkText, this.file);
subpath = `#${linkParts.isBlockRef?"^":""}${linkParts.ref}`;
linkText = linkParts.path;
//lineNum = (
// await this.excalidrawData.getTransclusion(linkText)
//).lineNum;
//linkText = linkText.substring(0, linkText.search("#"));
}
if (linkText.match(REG_LINKINDEX_INVALIDCHARS)) {
@@ -2466,7 +2459,7 @@ export default class ExcalidrawView extends TextFileView {
this.file.path,
);
const useNewLeaf = event.shift || event[CTRL_OR_CMD];
const useNewLeaf = event.shiftKey || event[CTRL_OR_CMD];
if (useNewLeaf && this.isFullscreen()) {
this.exitFullscreen();
@@ -2491,8 +2484,8 @@ export default class ExcalidrawView extends TextFileView {
const leaf = useNewLeaf
? getNewOrAdjacentLeaf(this.plugin, this.leaf)
: this.leaf;
leaf.openFile(file, subpath?{ eState: { subpath } }:undefined); //if file exists open file and jump to reference
//leaf.openFile(file, { eState: { line: lineNum - 1 } }); //if file exists open file and jump to reference
await leaf.openFile(file, subpath?{ eState: { subpath } }:undefined); //if file exists open file and jump to reference
this.app.workspace.setActiveLeaf(leaf, true, true);
} catch (e) {
new Notice(e, 4000);
}

8
yarn.lock
View File

@@ -2132,10 +2132,10 @@
"resolved" "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"
"version" "4.2.2"
"@zsviczian/excalidraw@0.11.0-obsidian-8":
"integrity" "sha512-LXkg07MAXNOlLGDdzuLhFO3o8vYx7JMlz/bm5LOYJYW6gJF8q7LZ5CnUWo96jK8WVy1tshVtMDrUFJAybUYbVA=="
"resolved" "https://registry.npmjs.org/@zsviczian/excalidraw/-/excalidraw-0.11.0-obsidian-8.tgz"
"version" "0.11.0-obsidian-8"
"@zsviczian/excalidraw@0.11.0-obsidian-9":
"integrity" "sha512-SDrQNkxxzdWHbhTiJSLJ7Wb2/F4jKc69BtnaujCHxxg1AObVTcjmaZMFr2NixVjjn5Rk22BrZSflhnXVUw1eRw=="
"resolved" "https://registry.npmjs.org/@zsviczian/excalidraw/-/excalidraw-0.11.0-obsidian-9.tgz"
"version" "0.11.0-obsidian-9"
dependencies:
"dotenv" "10.0.0"