1.7.12

README.md

@@ -28,7 +28,7 @@ Please upgrade to Obsidian v0.12.19 or higher to get the latest release.
 - Settings will allow you to customize Excalidraw to your needs:
   - Default folder for new drawings and define custom filename pattern for new drawings.
   - Template for new drawings. The template will restore stroke properties. This means you can set up defaults in your template for stroke color, stroke width, opacity, font family, font size, fill style, stroke style, etc. This also applies to ExcalidrawAutomate.
-  - If portability is important to you: Auto-export SVG and/or PNG files including keep-in-sync feature so you can embed SVG/PNG into your documents instead of embedding excalidraw files.
+  - If portability is important to you: Auto-export SVG and/or PNG files including keep-in-sync feature so you can embed SVG/PNG into your documents instead of embedding excalidraw files. You can override export settings for an individual file by adding the `excalidraw-autoexport` frontmatter key. Valid values for this key are `none`, `both`, `png` and `svg`.
   - Specify the default width of embedded drawings.
   - Compatibility features to auto-export and keep in sync markdown excalidraw files and legacy .excalidraw files.
   - Experimental feature to add custom TAG to file explorer to mark drawing files.

manifest.json

@@ -1,8 +1,8 @@
 {
 	"id": "obsidian-excalidraw-plugin",
 	"name": "Excalidraw",
-	"version": "1.7.11",
-	"minAppVersion": "0.15.7",
+	"version": "1.7.12",
+	"minAppVersion": "0.15.6",
 	"description": "An Obsidian plugin to edit and view Excalidraw drawings",
 	"author": "Zsolt Viczian",
 	"authorUrl": "https://zsolt.blog",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "obsidian-excalidraw-plugin",
-  "version": "1.7.6",
+  "version": "1.7.11",
   "description": "This is an Obsidian.md plugin that lets you view and edit Excalidraw drawings",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -18,7 +18,7 @@
   "license": "MIT",
   "dependencies": {
     "@types/lz-string": "^1.3.34",
-    "@zsviczian/excalidraw": "0.12.0-obsidian-4",
+    "@zsviczian/excalidraw": "0.12.0-obsidian-5",
     "clsx": "^1.1.1",
     "lz-string": "^1.4.4",
     "monkey-around": "^2.3.0",

src/ExcalidrawData.ts

@@ -16,6 +16,7 @@ import {
   REG_BLOCK_REF_CLEAN,
   FRONTMATTER_KEY_LINKBUTTON_OPACITY,
   FRONTMATTER_KEY_ONLOAD_SCRIPT,
+  FRONTMATTER_KEY_AUTOEXPORT,
 } from "./Constants";
 import { _measureText } from "./ExcalidrawAutomate";
 import ExcalidrawPlugin from "./main";
@@ -51,6 +52,14 @@ declare module "obsidian" {
   }
 }
 
+export enum AutoexportPreference {
+  none,
+  both,
+  png,
+  svg,
+  inherit
+}
+
 export const REGEX_LINK = {
   //![[link|alias]] [alias](link){num}
   //      1   2    3           4             5         67         8  9
@@ -224,6 +233,7 @@ export class ExcalidrawData {
   private showLinkBrackets: boolean;
   private linkPrefix: string;
   private urlPrefix: string;
+  public autoexportPreference: AutoexportPreference = AutoexportPreference.inherit;
   private textMode: TextMode = TextMode.raw;
   public loaded: boolean = false;
   private files: Map<FileId, EmbeddedFile> = null; //fileId, path
@@ -401,6 +411,7 @@ export class ExcalidrawData {
     this.setShowLinkBrackets();
     this.setLinkPrefix();
     this.setUrlPrefix();
+    this.setAutoexportPreferences();
 
     this.scene = null;
 
@@ -1320,6 +1331,24 @@ export class ExcalidrawData {
     return urlPrefix != this.urlPrefix;
   }
 
+  private setAutoexportPreferences() {
+    const fileCache = this.app.metadataCache.getFileCache(this.file);
+    if (
+      fileCache?.frontmatter &&
+      fileCache.frontmatter[FRONTMATTER_KEY_AUTOEXPORT] != null
+    ) {
+      switch ((fileCache.frontmatter[FRONTMATTER_KEY_AUTOEXPORT]).toLowerCase()) {
+        case "none": this.autoexportPreference = AutoexportPreference.none; break;
+        case "both": this.autoexportPreference = AutoexportPreference.both; break;
+        case "png": this.autoexportPreference = AutoexportPreference.png; break;
+        case "svg": this.autoexportPreference = AutoexportPreference.svg; break;
+        default: this.autoexportPreference = AutoexportPreference.inherit;
+      };
+    } else {
+      this.autoexportPreference = AutoexportPreference.inherit;
+    }
+  }
+
   private setShowLinkBrackets(): boolean {
     const showLinkBrackets = this.showLinkBrackets;
     const fileCache = this.app.metadataCache.getFileCache(this.file);

src/ExcalidrawView.ts

@@ -48,6 +48,7 @@ import {
   ExcalidrawData,
   REG_LINKINDEX_HYPERLINK,
   REGEX_LINK,
+  AutoexportPreference,
 } from "./ExcalidrawData";
 import {
   checkAndCreateFolder,
@@ -273,7 +274,7 @@ export default class ExcalidrawView extends TextFileView {
 
   preventAutozoom() {
     this.semaphores.preventAutozoom = true;
-    setTimeout(() => (this.semaphores.preventAutozoom = false), 2000);
+    setTimeout(() => (this.semaphores.preventAutozoom = false), 1500);
   }
 
   public saveExcalidraw(scene?: any) {
@@ -487,10 +488,17 @@ export default class ExcalidrawView extends TextFileView {
       }
 
       if (!this.semaphores.autosaving && !this.semaphores.viewunload) {
-        if (this.plugin.settings.autoexportSVG) {
+        const autoexportPreference = this.excalidrawData.autoexportPreference;
+        if (
+          (autoexportPreference === AutoexportPreference.inherit && this.plugin.settings.autoexportSVG) ||
+          autoexportPreference === AutoexportPreference.both || autoexportPreference === AutoexportPreference.svg
+        ) {
           await this.saveSVG();
         }
-        if (this.plugin.settings.autoexportPNG) {
+        if (
+          (autoexportPreference === AutoexportPreference.inherit && this.plugin.settings.autoexportPNG) ||
+          autoexportPreference === AutoexportPreference.both || autoexportPreference === AutoexportPreference.png
+        ) {
           await this.savePNG();
         }
         if (
@@ -1269,7 +1277,9 @@ export default class ExcalidrawView extends TextFileView {
     this.clearDirty();
   }
 
-  zoomToElementId(id: string) {
+  async zoomToElementId(id: string) {
+    let counter = 0;
+    while (!this.excalidrawAPI && counter++<100) await sleep(50); //https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/734
     const api = this.excalidrawAPI;
     if (!api) {
       return;
@@ -1280,10 +1290,8 @@ export default class ExcalidrawView extends TextFileView {
     if (elements.length === 0) {
       return;
     }
-    if (!api.getAppState().viewModeEnabled) {
-      api.selectElements(elements);
-    }
-    api.zoomToFit(elements, this.plugin.settings.zoomToFitMaxLevel, 0.05);
+    this.preventAutozoom();
+    this.zoomToElements(!api.getAppState().viewModeEnabled, elements);
   }
 
   setEphemeralState(state: any): void {
@@ -1322,7 +1330,10 @@ export default class ExcalidrawView extends TextFileView {
     }
 
     if (query) {
-      setTimeout(() => {
+      setTimeout(async () => {
+        let counter = 0;
+        while (!self.excalidrawAPI && counter++<100) await sleep(50); //https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/734
+    
         const api = self.excalidrawAPI;
         if (!api) {
           return;
@@ -1334,7 +1345,7 @@ export default class ExcalidrawView extends TextFileView {
           elements,
           query,
           !api.getAppState().viewModeEnabled,
-          true,
+          state.subpath && state.subpath.length>2 && state.subpath[1]!=="^",
         );
       }, 300);
     }
@@ -3276,7 +3287,7 @@ export default class ExcalidrawView extends TextFileView {
           return m[1] === q.toLowerCase();
         }
         const text = el.rawText.toLowerCase().replaceAll("\n", " ").trim();
-        return text.match(q.toLowerCase()); //to distinguish between "# frame" and "# frame 1"
+        return text.match(q.toLowerCase()); //to distinguish between "# frame" and "# frame 1" https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/530
       }),
     );
     if (match.length === 0) {
@@ -3284,14 +3295,29 @@ export default class ExcalidrawView extends TextFileView {
       return;
     }
 
+    this.zoomToElements(selectResult,match);
+  }
+
+  public zoomToElements(
+    selectResult: boolean,
+    elements: ExcalidrawElement[]
+  ) {
     const api = this.excalidrawAPI;
-    if (!api) {
-      return;
-    }
-    if (selectResult) {
-      api.selectElements(match);
-    }
-    api.zoomToFit(match, this.plugin.settings.zoomToFitMaxLevel, 0.05);
+    if (!api) return;
+
+    const zoomLevel = this.plugin.settings.zoomToFitMaxLevel;
+    const ownerWindow = this.ownerWindow;
+    ownerWindow.requestAnimationFrame(async ()=>{
+      if (selectResult) {
+        api.selectElements(elements);
+        await sleep(100);
+      }
+      ownerWindow.requestAnimationFrame(()=> {
+        api.zoomToFit(elements, zoomLevel, 0.05);
+      });
+    });
+
+
   }
 
   public getViewSelectedElements(): ExcalidrawElement[] {

src/constants.ts

@@ -38,6 +38,7 @@ export const FRONTMATTER_KEY_FONT = "excalidraw-font";
 export const FRONTMATTER_KEY_FONTCOLOR = "excalidraw-font-color";
 export const FRONTMATTER_KEY_BORDERCOLOR = "excalidraw-border-color";
 export const FRONTMATTER_KEY_MD_STYLE = "excalidraw-css";
+export const FRONTMATTER_KEY_AUTOEXPORT = "excalidraw-autoexport"
 export const LOCAL_PROTOCOL = "md://";
 export const VIEW_TYPE_EXCALIDRAW = "excalidraw";
 export const ICON_NAME = "excalidraw-icon";

src/dialogs/Messages.ts

@@ -17,6 +17,19 @@ I develop this plugin as a hobby, spending most of my free time doing this. If y
 
 <div class="ex-coffee-div"><a href="https://ko-fi.com/zsolt"><img src="https://cdn.ko-fi.com/cdn/kofi3.png?v=3" height=45></a></div>
 `,
+"1.7.12": `
+# New from Excalidraw.com:
+- Showing a mid-point for lines and arrows. By touching the mid-point you can easily add an additional point to a two-point line. This is especially helpful when working on a tablet with touch input. ([#5534](https://github.com/excalidraw/excalidraw/pull/5534))
+- Lock angle when editing a line or an arrow with SHIFT pressed. Pressing SHIFT will restrict the edited point to snap to certain discrete angles. ([#5527](https://github.com/excalidraw/excalidraw/pull/5527))
+
+# Fixed:
+- Clicking Obsidian search-results pointing to an element on the canvas works again ([#734](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/734))
+- The feature to allow resizing and rotation of lines and arrows consisting of 3 or more points by showing the bounding box when selected is back ([#5554](https://github.com/excalidraw/excalidraw/pull/5554))
+
+# New
+- You can now use the following frontmatter key to allow/prevent automatic export of PNG/SVG images at a file level. This frontmatter will override export settings for the given file.  ([#732](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/732)
+${String.fromCharCode(96)}excalidraw-autoexport: none|both|svg|png${String.fromCharCode(96)}
+`,
 "1.7.11": `
 # Fixed
 - Markdown files embed into the Excalidraw canvas crashed when the embedded markdown file included a nested Markdown embed with a block reference (i.e. the markdown document you are dropping into Excalidraw included a quote you referenced from another file using a ${String.fromCharCode(96)}[[other-file#^blockref]]${String.fromCharCode(96)} block or section reference. 

src/dialogs/SuggesterInfo.ts

@@ -592,4 +592,11 @@ export const FRONTMATTER_KEYS_INFO: SuggesterInfo[] = [
     desc: "If this key is present it will override the default excalidraw embed and export setting. This only affects export to PNG. Specify the export scale for the image. The typical range is between 0.5 and 5, but you can experiment with other values as well.",
     after: ": 1",
   },
+  {
+    field: "autoexport",
+    code: null,
+    desc: "Override autoexport settings for this file. Valid values are\nnone\nboth\npng\nsvg",
+    after: ": png",
+  },
+  
 ];

src/lang/locale/en.ts

@@ -336,7 +336,9 @@ export default {
     "Automatically create an SVG export of your drawing matching the title of your file. " +
     "The plugin will save the *.SVG file in the same folder as the drawing. " +
     "Embed the .svg file into your documents instead of Excalidraw making you embeds platform independent. " +
-    "While the auto-export switch is on, this file will get updated every time you edit the Excalidraw drawing with the matching name.",
+    "While the auto-export switch is on, this file will get updated every time you edit the Excalidraw drawing with the matching name. " + 
+    "You can override this setting on a file level by adding the <code>excalidraw-autoexport</code> frontmatter key. Valid values for this key are " +
+    "<code>none</code>,<code>both</code>,<code>svg</code>, and <code>png</code>",
   EXPORT_PNG_NAME: "Auto-export PNG",
   EXPORT_PNG_DESC: "Same as the auto-export SVG, but for *.PNG",
   COMPATIBILITY_HEAD: "Compatibility features",

versions.json

@@ -1,5 +1,5 @@
 {
-  "1.7.11": "0.15.6",
+  "1.7.12": "0.15.6",
   "1.7.8": "0.15.5",
   "1.7.7": "0.15.4",
   "1.7.6": "0.15.3",

yarn.lock

@@ -2216,10 +2216,10 @@
   dependencies:
     "@zerollup/ts-helpers" "^1.7.18"
 
-"@zsviczian/excalidraw@0.12.0-obsidian-4":
-  "integrity" "sha512-x16SkkNewR+Mbfn0mULjLDMfvxJ4iXBtwO2T1PWajNcn2QwHnByn4KTFUsuTD0PfQ/ZTgTLeLUztpAZ8cted1w=="
-  "resolved" "https://registry.npmjs.org/@zsviczian/excalidraw/-/excalidraw-0.12.0-obsidian-4.tgz"
-  "version" "0.12.0-obsidian-4"
+"@zsviczian/excalidraw@0.12.0-obsidian-5":
+  "integrity" "sha512-AZQzqlxNbwk+BoKn3R10Xo/V+JoYwJ1mJ9+khUTSsavS7s41xRmA+6k+tKAPa+ce4PSEzZnXg8ZrxTUuNQBxxA=="
+  "resolved" "https://registry.npmjs.org/@zsviczian/excalidraw/-/excalidraw-0.12.0-obsidian-5.tgz"
+  "version" "0.12.0-obsidian-5"
 
 "abab@^2.0.3", "abab@^2.0.5":
   "integrity" "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="