2.4.0

save on window blur

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,85 @@
+name: Bug report
+description: When something is clearly broken. Everything else is a feature request.
+title: "BUG: "
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ⚠️ **Important: Please Read Before Submitting a Bug Report** ⚠️
+
+        I am a one-person team working on this plugin as a part-time hobby. I cannot handle a flood of poorly documented issues. **To ensure your report is considered, you must follow these guidelines**. If you don't, I will close the issue without review.
+
+        Before creating a bug report, please:
+        1. **Review recent [release notes](https://github.com/zsviczian/obsidian-excalidraw-plugin/releases)** – maybe there is already an answer.
+        2. **[Search issues](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues) (including closed ones)** to see if there is anything similar.
+
+  - type: markdown
+    attributes:
+      value: |
+        Please help by providing the following details. Bugs reported without the required information may be closed without review.
+
+  - type: markdown
+    attributes:
+      value: |
+        ---
+
+  - type: checkboxes
+    id: search_existing_issues
+    attributes:
+      label: Have you searched for existing issues (including closed ones)?
+      description: Please confirm that you have searched the issue tracker before reporting a new issue.
+      options:
+        - label: Yes, I have searched the existing issues.
+    
+  - type: checkboxes
+    id: verify_bug
+    attributes:
+      label: Does this bug persist in a new vault with only Excalidraw installed?
+      description: Please confirm that you have tested this issue in an empty Obsidian vault with no other plugins or themes installed.
+      options:
+        - label: Yes, I have verified the issue persists.
+
+  - type: textarea
+    id: environment
+    attributes:
+      label: "Your environment"
+      description: "Run `Command Palette/Show Debug info` in Obsidian and paste the result here."
+      placeholder: "Paste your Obsidian debug info here..."
+
+  - type: textarea
+    id: bug_description
+    attributes:
+      label: "Describe the bug"
+      description: "A clear and concise description of what the bug is."
+      placeholder: "Provide a detailed description of the issue..."
+
+  - type: textarea
+    id: steps_to_reproduce
+    attributes:
+      label: "Steps to reproduce"
+      description: "List the steps to reproduce the behavior."
+      placeholder: |
+        1. Go to '...'
+        2. Click on '...'
+        3. See error
+
+  - type: textarea
+    id: expected_behavior
+    attributes:
+      label: "Expected behavior"
+      description: "A clear and concise description of what you expected to happen."
+      placeholder: "Describe what you expected to happen..."
+
+  - type: textarea
+    id: additional_context
+    attributes:
+      label: "Additional context"
+      description: "Add any other context about the problem here."
+      placeholder: "Include any other information that may be helpful..."
+
+  - type: markdown
+    attributes:
+      value: |
+        **Attachments:**
+        If applicable, please attach any screenshots, screen recordings, or files by dragging and dropping them into the comment area or directly into any of the text fields above. 
+

.nvmrc

@@ -1 +1 @@
-16
+18

README-BUILD.md

@@ -2,31 +2,3 @@ The project runs with `node 18`.
 
 After running `npm -i` you'll need to make two manual changes:
 
-## postprocess
-postprocess is used in rollup.config.js.
-However, the version available on npmjs does not work, after installing packages you need this update: 
-`npm install brettz9/rollup-plugin-postprocess#update --save-dev``
-
-More info here: https://github.com/developit/rollup-plugin-postprocess/issues/10
-
-## colormaster
-1.2.1 misses 3 plugin references after installing the package you need to update
-`node_modules/colormaster/package.json` adding the following to the `exports:` section:
-```typescript
-,
-    "./plugins/luv": {
-      "import": "./plugins/luv.mjs",
-      "require": "./plugins/luv.js",
-      "default": "./plugins/luv.mjs"
-    },
-    "./plugins/uvw": {
-      "import": "./plugins/uvw.mjs",
-      "require": "./plugins/uvw.js",
-      "default": "./plugins/uvw.mjs"
-    },
-    "./plugins/ryb": {
-      "import": "./plugins/ryb.mjs",
-      "require": "./plugins/ryb.js",
-      "default": "./plugins/ryb.mjs"
-    }
-```

manifest-beta.json

@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-excalidraw-plugin",
 	"name": "Excalidraw",
-	"version": "2.4.0-beta-10",
+	"version": "2.4.0",
 	"minAppVersion": "1.1.6",
 	"description": "An Obsidian plugin to edit and view Excalidraw drawings",
 	"author": "Zsolt Viczian",

manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "obsidian-excalidraw-plugin",
   "name": "Excalidraw",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "minAppVersion": "1.1.6",
   "description": "An Obsidian plugin to edit and view Excalidraw drawings",
   "author": "Zsolt Viczian",

package.json

@@ -19,28 +19,32 @@
   "license": "MIT",
   "dependencies": {
     "@popperjs/core": "^2.11.8",
-    "@zsviczian/excalidraw": "0.17.1-obsidian-43",
+    "@zsviczian/excalidraw": "0.17.1-obsidian-46",
     "chroma-js": "^2.4.2",
     "clsx": "^2.0.0",
-    "colormaster": "^1.2.1",
+    "@zsviczian/colormaster": "^1.2.2",
     "gl-matrix": "^3.4.3",
+    "js-yaml": "^4.1.0",
     "lucide-react": "^0.263.1",
     "mathjax-full": "^3.2.2",
     "monkey-around": "^2.3.0",
     "nanoid": "^4.0.2",
+    "opentype.js": "^1.3.4",
     "polybooljs": "^1.2.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "roughjs": "^4.5.2",
-    "js-yaml": "^4.1.0",
-    "opentype.js": "^1.3.4",
     "woff2sfnt-sfnt2woff": "^1.0.0"
   },
   "devDependencies": {
-    "dotenv": "^16.4.5",
     "@babel/core": "^7.22.9",
     "@babel/preset-env": "^7.22.10",
     "@babel/preset-react": "^7.22.5",
+    "@codemirror/commands": "^6.3.3",
+    "@codemirror/language": "^6.10.0",
+    "@codemirror/search": "^6.5.5",
+    "@codemirror/state": "^6.4.0",
+    "@codemirror/view": "^6.23.0",
     "@excalidraw/eslint-config": "^1.0.3",
     "@excalidraw/prettier-config": "^1.0.2",
     "@rollup/plugin-babel": "^6.0.3",
@@ -50,14 +54,15 @@
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/chroma-js": "^2.4.0",
     "@types/js-beautify": "^1.14.0",
+    "@types/js-yaml": "^4.0.9",
     "@types/node": "^20.10.5",
+    "@types/opentype.js": "^1.3.8",
     "@types/react": "^18.2.45",
     "@types/react-dom": "^18.2.18",
-    "@types/js-yaml": "^4.0.9",
-    "@types/opentype.js": "^1.3.8",
     "@zerollup/ts-transform-paths": "^1.7.18",
     "cross-env": "^7.0.3",
     "cssnano": "^6.0.2",
+    "dotenv": "^16.4.5",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-prettier": "^5.0.0",
     "lz-string": "^1.5.0",
@@ -65,17 +70,12 @@
     "prettier": "^3.0.1",
     "rollup": "^2.70.1",
     "rollup-plugin-copy": "^3.5.0",
-    "rollup-plugin-postprocess": "github:brettz9/rollup-plugin-postprocess#update",
+    "@zsviczian/rollup-plugin-postprocess": "^1.0.3",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-typescript2": "^0.34.1",
     "tslib": "^2.6.1",
     "ttypescript": "^1.5.15",
-    "typescript": "^5.2.2",
-    "@codemirror/commands": "^6.3.3",
-    "@codemirror/language": "^6.10.0",
-    "@codemirror/search": "^6.5.5",
-    "@codemirror/state": "^6.4.0",
-    "@codemirror/view": "^6.23.0"
+    "typescript": "^5.2.2"
   },
   "resolutions": {
     "@typescript-eslint/typescript-estree": "5.3.0"

rollup.config.js

@@ -6,7 +6,7 @@ import copy from "rollup-plugin-copy";
 import typescript2 from "rollup-plugin-typescript2";
 import fs from 'fs';
 import LZString from 'lz-string';
-import postprocess from 'rollup-plugin-postprocess';
+import postprocess from '@zsviczian/rollup-plugin-postprocess';
 import cssnano from 'cssnano';
 
 // Load environment variables
@@ -100,10 +100,13 @@ const BUILD_CONFIG = {
   plugins: getRollupPlugins(
     {tsconfig: isProd ? "tsconfig.json" : "tsconfig.dev.json"},
     ...(isProd ? [
-      terser({ toplevel: false, compress: { passes: 2 } }),
-      //!postprocess - the version available on npmjs does not work, need this update: 
-      //  npm install brettz9/rollup-plugin-postprocess#update --save-dev
-      //  https://github.com/developit/rollup-plugin-postprocess/issues/10
+      terser({
+        toplevel: false,
+        compress: { passes: 2 },
+        format: {
+          comments: false, // Remove all comments
+        },
+      }),
       postprocess([
         [/React=require\("react"\),state=require\("@codemirror\/state"\),view=require\("@codemirror\/view"\)/,
         `state=require("@codemirror/state"),view=require("@codemirror/view")` + packageString],

src/EmbeddedFileLoader.ts

@@ -473,6 +473,8 @@ export class EmbeddedFilesLoader {
       return null;
     }
 
+    const app = this.plugin.app;
+
     const isHyperLink = inFile instanceof EmbeddedFile ? inFile.isHyperLink : false;
     const isLocalLink = inFile instanceof EmbeddedFile ? inFile.isLocalLink : false;
     const hyperlink = inFile instanceof EmbeddedFile ? inFile.hyperlink : "";

src/ExcalidrawAutomate.ts

@@ -63,21 +63,21 @@ import { GenericInputPrompt, NewFileActions } from "src/dialogs/Prompt";
 import { t } from "src/lang/helpers";
 import { ScriptEngine } from "src/Scripts";
 import { ConnectionPoint, DeviceType  } from "src/types/types";
-import CM, { ColorMaster, extendPlugins } from "colormaster";
-import HarmonyPlugin from "colormaster/plugins/harmony";
-import MixPlugin from "colormaster/plugins/mix"
-import A11yPlugin from "colormaster/plugins/accessibility"
-import NamePlugin from "colormaster/plugins/name"
-import LCHPlugin from "colormaster/plugins/lch";
-import LUVPlugin from "colormaster/plugins/luv";
-import LABPlugin from "colormaster/plugins/lab";
-import UVWPlugin from "colormaster/plugins/uvw";
-import XYZPlugin from "colormaster/plugins/xyz";
-import HWBPlugin from "colormaster/plugins/hwb";
-import HSVPlugin from "colormaster/plugins/hsv";
-import RYBPlugin from "colormaster/plugins/ryb";
-import CMYKPlugin from "colormaster/plugins/cmyk";
-import { TInput } from "colormaster/types";
+import CM, { ColorMaster, extendPlugins } from "@zsviczian/colormaster";
+import HarmonyPlugin from "@zsviczian/colormaster/plugins/harmony";
+import MixPlugin from "@zsviczian/colormaster/plugins/mix"
+import A11yPlugin from "@zsviczian/colormaster/plugins/accessibility"
+import NamePlugin from "@zsviczian/colormaster/plugins/name"
+import LCHPlugin from "@zsviczian/colormaster/plugins/lch";
+import LUVPlugin from "@zsviczian/colormaster/plugins/luv";
+import LABPlugin from "@zsviczian/colormaster/plugins/lab";
+import UVWPlugin from "@zsviczian/colormaster/plugins/uvw";
+import XYZPlugin from "@zsviczian/colormaster/plugins/xyz";
+import HWBPlugin from "@zsviczian/colormaster/plugins/hwb";
+import HSVPlugin from "@zsviczian/colormaster/plugins/hsv";
+import RYBPlugin from "@zsviczian/colormaster/plugins/ryb";
+import CMYKPlugin from "@zsviczian/colormaster/plugins/cmyk";
+import { TInput } from "@zsviczian/colormaster/types";
 import {ConversionResult, svgToExcalidraw} from "src/svgToExcalidraw/parser"
 import { ROUNDNESS } from "src/constants/constants";
 import { ClipboardData } from "@zsviczian/excalidraw/types/excalidraw/clipboard";

src/ExcalidrawData.ts

@@ -94,7 +94,10 @@ export const REGEX_TAGS = {
 export const REGEX_LINK = {
   //![[link|alias]] [alias](link){num}
   //      1   2    3           4             5         67         8  9
-  EXPR: /(!)?(\[\[([^|\]]+)\|?([^\]]+)?]]|\[([^\]]*)]\(([^)]*)\))(\{(\d+)\})?/g, //https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/187
+  //EXPR: /(!)?(\[\[([^|\]]+)\|?([^\]]+)?]]|\[([^\]]*)]\(([^)]*)\))(\{(\d+)\})?/g, //https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/187
+  //      1   2    3           4             5         67                             8  9
+  EXPR: /(!)?(\[\[([^|\]]+)\|?([^\]]+)?]]|\[([^\]]*)]\(((?:[^\(\)]|\([^\(\)]*\))*)\))(\{(\d+)\})?/g,  //https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1963
+
   getResList: (text: string): IteratorResult<RegExpMatchArray, any>[] => {
     const res = text.matchAll(REGEX_LINK.EXPR);
     let parts: IteratorResult<RegExpMatchArray, any>;

src/ExcalidrawView.ts

@@ -838,6 +838,7 @@ export default class ExcalidrawView extends TextFileView {
     if(triggerReload) {
       this.reload(true, this.file);
     }
+    this.resetAutosaveTimer(); //next autosave period starts after save
   }
 
   // get the new file content
@@ -1534,8 +1535,17 @@ export default class ExcalidrawView extends TextFileView {
         }
       };
 
+      const onBlurOrLeave = () => {
+        if(!this.excalidrawAPI || !this.excalidrawData.loaded || !this.isDirty()) {
+          return;
+        }
+        this.forceSave(true);
+      };
+
       this.registerDomEvent(this.ownerWindow, "keydown", onKeyDown, false);
       this.registerDomEvent(this.ownerWindow, "keyup", onKeyUp, false);
+      this.registerDomEvent(this.contentEl, "mouseleave", onBlurOrLeave, false);
+      this.registerDomEvent(this.ownerWindow, "blur", onBlurOrLeave, false);
     });
 
     this.setupAutosaveTimer();
@@ -1728,7 +1738,7 @@ export default class ExcalidrawView extends TextFileView {
           this.semaphores.autosaving = true;
           //changed from await to then to avoid lag during saving of large file
           this.save().then(()=>this.semaphores.autosaving = false);
-        } 
+        }
         this.autosaveTimer = window.setTimeout(
           timer,
           this.autosaveInterval,
@@ -1762,7 +1772,6 @@ export default class ExcalidrawView extends TextFileView {
       this.autosaveFunction,
       this.autosaveInterval,
     );
-
   }
 
   unload(): void {
@@ -2611,6 +2620,10 @@ export default class ExcalidrawView extends TextFileView {
 
   public setDirty(location?:number) {
     if(this.semaphores.saving) return; //do not set dirty if saving
+    if(!this.isDirty()) {
+      //the autosave timer should start when the first stroke was made... thus avoiding an immediate impact by saving right then
+      this.resetAutosaveTimer();
+    }
     (process.env.NODE_ENV === 'development') && DEBUGGING && debug(this.setDirty,`ExcalidrawView.setDirty, location:${location}`);
     this.semaphores.dirty = this.file?.path;
     this.actionButtons['save'].querySelector("svg").addClass("excalidraw-dirty");
@@ -3342,6 +3355,7 @@ export default class ExcalidrawView extends TextFileView {
         currentStrokeOptions: st.currentStrokeOptions,
         frameRendering: st.frameRendering,
         objectsSnapModeEnabled: st.objectsSnapModeEnabled,
+        activeTool: st.activeTool,
       },
       prevTextMode: this.prevTextMode,
       files,
@@ -5246,6 +5260,7 @@ export default class ExcalidrawView extends TextFileView {
   }
 
   private renderWelcomeScreen () {
+    if(!this.plugin.settings.showSplashscreen) return null;
     const React = this.packages.react;
     const {WelcomeScreen} = this.packages.excalidrawLib;
     const filecount = this.app.vault.getFiles().filter(f=>this.plugin.isExcalidrawFile(f)).length;

src/MarkdownPostProcessor.ts

@@ -794,7 +794,9 @@ export const markdownPostProcessor = async (
   ctx: MarkdownPostProcessorContext,
 ) => {
   const isPrinting = Boolean(document.body.querySelectorAll("body > .print").length>0);
-  if(isPrinting && el.hasClass("mod-frontmatter")) {
+  //firstElementChild: https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1956
+  const isFrontmatter = el.hasClass("mod-frontmatter") || el.firstElementChild?.hasClass("frontmatter");
+  if(isPrinting && isFrontmatter) {
     return;
   }
   
@@ -816,7 +818,7 @@ export const markdownPostProcessor = async (
   }
 
   if (!isPreview && embeddedItems.length === 0) {
-    if(el.hasClass("mod-frontmatter")) {
+    if(isFrontmatter) {
       docIDs.add(ctx.docId);
     } else {
       if(docIDs.has(ctx.docId) && !el.hasChildNodes()) {

src/customEmbeddable.tsx

@@ -416,8 +416,14 @@ function RenderObsidianView(
       }  
     } else if (leafRef.current?.node) {
       //Handle canvas node
-      containerRef.current?.removeClasses(["is-editing", "is-focused"]);
-      view.canvasNodeFactory.stopEditing(leafRef.current.node);
+      if(view.plugin.settings.markdownNodeOneClickEditing && !containerRef.current?.hasClass("is-editing")) {
+        const newTheme = getTheme(view, themeRef.current);
+        containerRef.current?.addClasses(["is-editing", "is-focused"]);
+        view.canvasNodeFactory.startEditing(leafRef.current.node, newTheme);
+      } else {
+        containerRef.current?.removeClasses(["is-editing", "is-focused"]);
+        view.canvasNodeFactory.stopEditing(leafRef.current.node);
+      }
     }
   }, [
     containerRef,
@@ -428,7 +434,8 @@ function RenderObsidianView(
     element,
     view,
     isEditingRef,
-    view.canvasNodeFactory
+    view.canvasNodeFactory,
+    themeRef.current
   ]);
 
   return null;

src/dialogs/HotkeyEditor.ts

@@ -0,0 +1,162 @@
+import { BaseComponent, Setting, Modifier } from 'obsidian';
+import { DEVICE } from 'src/constants/constants';
+import { t } from 'src/lang/helpers';
+import { ExcalidrawSettings } from 'src/settings';
+import { modifierLabel } from 'src/utils/ModifierkeyHelper';
+import { fragWithHTML } from 'src/utils/Utils';
+
+export class HotkeyEditor extends BaseComponent {
+  private settings: ExcalidrawSettings;
+  private containerEl: HTMLElement;
+  private capturing: boolean = false;
+  private activeModifiers: Modifier[] = [];
+  public isDirty: boolean = false;
+  private applySettingsUpdate: Function;
+
+  // Store bound event handlers
+  private boundKeydownHandler: (event: KeyboardEvent) => void;
+  private boundKeyupHandler: (event: KeyboardEvent) => void;
+
+  constructor(containerEl: HTMLElement, settings: ExcalidrawSettings, applySettingsUpdate: Function) {
+    super();
+    this.containerEl = containerEl.createDiv();
+    this.settings = settings;
+    this.applySettingsUpdate = applySettingsUpdate;
+
+    // Bind the event handlers once in the constructor
+    this.boundKeydownHandler = this.onKeydown.bind(this);
+    this.boundKeyupHandler = this.onKeyup.bind(this);
+  }
+
+  onload(): void {
+    this.render();
+  }
+
+  private render(): void {
+    // Clear previous content
+    this.containerEl.empty();
+
+    // Render current overrides
+    this.settings.modifierKeyOverrides.forEach((override, index) => {
+      const key = override.key.toUpperCase();
+      new Setting(this.containerEl)
+        .setDesc(fragWithHTML(`<b>Code:</b> <kbd>${override.modifiers.join("+")} + ${key}</kbd> | ` +
+          `<b>Apple:</b> <kbd>${modifierLabel(override.modifiers, "Mac")} + ${key}</kbd> | ` +
+          `<b>Windows:</b> <kbd>${modifierLabel(override.modifiers, "Other")} + ${key}</kbd>`))
+        .addButton((button) =>
+          button
+            .setButtonText(t("HOTKEY_BUTTON_REMOVE"))
+            .setCta()
+            .onClick(() => {
+              this.settings.modifierKeyOverrides.splice(index, 1);
+              this.isDirty = true;
+              this.applySettingsUpdate();
+              this.render();
+            })
+        );
+    });
+
+    // Render Add New Override or Capture Instruction
+    if (this.capturing) {
+      new Setting(this.containerEl)
+        .setName(t("HOTKEY_PRESS_COMBO_NANE"))
+        .setDesc(t("HOTKEY_PRESS_COMBO_DESC"))
+        .controlEl.style.cursor = 'pointer';
+    } else {
+      new Setting(this.containerEl)
+        .addButton((button) =>
+          button
+            .setButtonText(t("HOTKEY_BUTTON_ADD_OVERRIDE"))
+            .setCta()
+            .onClick(() => this.startCapture())
+        );
+    }
+  }
+
+  private startCapture(): void {
+    this.capturing = true;
+    this.activeModifiers = [];
+    this.render();
+    // Use the pre-bound handlers
+    window.addEventListener('keydown', this.boundKeydownHandler);
+    window.addEventListener('keyup', this.boundKeyupHandler);
+  }
+
+  private onKeydown(event: KeyboardEvent): void {
+    event.preventDefault();
+    event.stopPropagation();
+
+    const modifiers = this.getModifiersFromEvent(event);
+
+    // If only modifiers are pressed, update activeModifiers and continue listening
+    if (['Control', 'Shift', 'Alt', 'Meta'].includes(event.key)) {
+      this.activeModifiers = modifiers;
+      return;
+    }
+
+    const key = event.key.length === 1 ? event.key.toLowerCase() : event.key;
+
+    // Check for duplicate overrides
+    const exists = this.settings.modifierKeyOverrides.some(
+      (override) =>
+        override.key === key &&
+        override.modifiers.length === modifiers.length &&
+        override.modifiers.every((mod) => modifiers.includes(mod))
+    );
+
+    if (!exists) {
+      this.settings.modifierKeyOverrides.push({ modifiers, key });
+      this.isDirty = true;
+      this.applySettingsUpdate();
+    }
+
+    this.stopCapture();
+  }
+
+  private onKeyup(event: KeyboardEvent): void {
+    // If all modifier keys are released, stop capturing
+    if (!event.ctrlKey && !event.shiftKey && !event.altKey && !event.metaKey) {
+      this.stopCapture();
+    }
+  }
+
+  private stopCapture(): void {
+    this.capturing = false;
+    // Use the pre-bound handlers for removal
+    window.removeEventListener('keydown', this.boundKeydownHandler);
+    window.removeEventListener('keyup', this.boundKeyupHandler);
+    this.render();
+  }
+
+  public unload(): void {
+    // Ensure listeners are removed when the component is unloaded
+    this.stopCapture();
+  }
+
+  private getModifiersFromEvent(event: KeyboardEvent): Modifier[] {
+    const modifiers: Modifier[] = [];
+
+    if (DEVICE.isMacOS && event.metaKey) {
+      modifiers.push('Mod');
+    } else if (!DEVICE.isMacOS && event.ctrlKey) {
+      modifiers.push('Mod');
+    }
+
+    if (DEVICE.isMacOS && event.ctrlKey) {
+      modifiers.push('Ctrl');
+    }
+
+    if (!DEVICE.isMacOS && event.metaKey) {
+      modifiers.push('Meta');
+    }
+
+    if (event.shiftKey) {
+      modifiers.push('Shift');
+    }
+    if (event.altKey) {
+      modifiers.push('Alt');
+    }
+
+    return modifiers;
+  }
+}

src/dialogs/Messages.ts

@@ -17,6 +17,49 @@ I develop this plugin as a hobby, spending my free time doing this. If you find
 
 <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>
 `,
+"2.4.0": `
+<div class="excalidraw-videoWrapper"><div>
+<iframe src="https://www.youtube.com/embed/LtuAaqY_DNc" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+</div></div>
+
+## New
+- Flowcharts with CTRL/CMD+Arrow and ALT/OPT+Arrow keys
+- Improved PDF Support
+  - PDF++ cropped area paste
+  - Import PDF into frames
+- Element links with metadata
+- Obisidan Hotkey overrides
+- Support for Zotero style markdown links
+
+## QoL
+- Much improved freedraw flow, less autosave glitches
+- Link editor CTRL+Meta/(CTRL+CMD) + click or via the command palette "Open the image-link or LaTeX-formula editor.
+- Improved search and search results
+- Disable double tap ereaser activation in pen mode
+- Single click editing of markdown embeddables
+- Set grid size and frequency
+- Improved paste
+- Pan & Zoom while editing Text
+- Save active too-state (e.g. tool-lock) with the drawing
+- Show/hide "sword" splashscreen in new drawings
+
+## Fixed
+- Duplicate line points when Alt+click adding new points in line editor- - Excalidraw Automate measureText, impacting gate placement in ExcaliBrain
+- If a group includes a frame, the image reference will include all the elements in the frame, not just the frame
+- Excalidraw rendering issues in markdown preview
+- Markdown pages embedded in Excalidraw were broken
+- Drawing did not save arrow type
+- Fixed rendering of newly pasted links
+
+## ExcalidrawAutomate
+- new functions
+  - tex2dataURL
+  - addElementsToFrame
+  - resetImageAspectRatio
+- Changed
+  - getViewSelectedElements(includeFrameChildren: boolean = true);
+  - getOriginalImageSize with option to wait for the image to load
+`,
 "2.3.0": `
 I am moving to a new release approach aiming to publish one update per month to the Obsidian script store. If you want to continue to receive more frequent updates with new features and minor bug fixes, then join the beta testing team. [#1912](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1912)
 

src/lang/locale/en.ts

@@ -37,6 +37,7 @@ export default {
   TRANSCLUDE: "Embed a drawing",
   TRANSCLUDE_MOST_RECENT: "Embed the most recently edited drawing",
   TOGGLE_LEFTHANDED_MODE: "Toggle left-handed mode",
+  TOGGLE_SPLASHSCREEN: "Show splash screen in new drawings",
   FLIP_IMAGE: "Open the back-of-the-note of the selected excalidraw image",
   NEW_IN_NEW_PANE: "Create new drawing - IN AN ADJACENT WINDOW",
   NEW_IN_NEW_TAB: "Create new drawing - IN A NEW TAB",
@@ -352,6 +353,10 @@ FILENAME_HEAD: "Filename",
     "<li>When <b>disabled</b> the PDF will show the markdown side of the document.</li></ul>" +
     "See the other related setting for <a href='#"+TAG_MDREADINGMODE+"'>Markdown Reading Mode</a> under 'Appearnace and Behavior' further above.<br>" +
     "⚠️ Note, you must close the active excalidraw/markdown file and reopen for this change to take effect. ⚠️",
+  HOTKEY_OVERRIDE_HEAD: "Hotkey overrides",
+  HOTKEY_OVERRIDE_DESC: `Some of the Excalidraw hotkeys such as <code>${labelCTRL()}+Enter</code> to edit text or <code>${labelCTRL()}+K</code> to create an element link ` +
+    "conflict with Obsidian hotkey settings. The hotkey combinations you add below will override Obsidian's hotkey settings while useing Excalidraw, thus " +
+    `you can add <code>${labelCTRL()}+G</code> if you want to default to Group Object in Excalidraw instead of opening Graph View.`,
   THEME_HEAD: "Theme and styling",
   ZOOM_HEAD: "Zoom",
   DEFAULT_PINCHZOOM_NAME: "Allow pinch zoom in pen mode",
@@ -477,7 +482,11 @@ FILENAME_HEAD: "Filename",
   EMBED_TOEXCALIDRAW_DESC: "In the Embed Files section of Excalidraw Settings, you can configure how various files are embedded into Excalidraw. This includes options for embedding interactive markdown files, PDFs, and markdown files as images.",
   MD_HEAD: "Embed markdown into Excalidraw as image",
   MD_EMBED_CUSTOMDATA_HEAD_NAME: "Interactive Markdown Files",
-  MD_EMBED_CUSTOMDATA_HEAD_DESC: `These settings will only effect future embeds. Current embeds remain unchanged. The theme setting of embedded frames is under the "Excalidraw appearance and behavior" section.`,
+  MD_EMBED_CUSTOMDATA_HEAD_DESC: `The below settings will only effect future embeds. Current embeds remain unchanged. The theme setting of embedded frames is under the "Excalidraw appearance and behavior" section.`,
+  MD_EMBED_SINGLECLICK_EDIT_NAME: "Single click to edit embedded markdown",
+  MD_EMBED_SINGLECLICK_EDIT_DESC:
+    "Single click on an embedded markdown file to edit it. " +
+    "When turned off, the markdown file will first open in preview mode, then switch to edit mode when you click on it again.",
   MD_TRANSCLUDE_WIDTH_NAME: "Default width of a transcluded markdown document",
   MD_TRANSCLUDE_WIDTH_DESC:
     "The width of the markdown page. This affects the word wrapping when transcluding longer paragraphs, and the width of " +
@@ -735,6 +744,12 @@ FILENAME_HEAD: "Filename",
     "the developer of Taskbone (as you can imagine, there is no such thing as 'free', providing this awesome OCR service costs some money to the developer of Taskbone), you can " +
     "purchase a paid API key from <a href='https://www.taskbone.com/' target='_blank'>taskbone.com</a>. In case you have purchased a key, simply overwrite this auto generated free-tier API-key with your paid key.",
 
+  //HotkeyEditor
+  HOTKEY_PRESS_COMBO_NANE: "Press your hotkey combination",
+  HOTKEY_PRESS_COMBO_DESC: "Please press the desired key combination",
+  HOTKEY_BUTTON_ADD_OVERRIDE: "Add New Override",
+  HOTKEY_BUTTON_REMOVE: "Remove",
+
   //openDrawings.ts
   SELECT_FILE: "Select a file then press enter.",
   SELECT_COMMAND: "Select a command then press enter.",

src/lang/locale/zh-cn.ts

@@ -37,6 +37,7 @@ export default {
   TRANSCLUDE: "嵌入绘图（形如 ![[drawing]]）到当前 Markdown 文档中",
   TRANSCLUDE_MOST_RECENT: "嵌入最近编辑过的绘图（形如 ![[drawing]]）到当前 Markdown 文档中",
   TOGGLE_LEFTHANDED_MODE: "切换为左手模式",
+  TOGGLE_SPLASHSCREEN: "在新绘图中显示启动画面",
   FLIP_IMAGE: "打开当前所选 excalidraw 图像的“背景笔记”",
   NEW_IN_NEW_PANE: "新建绘图 - 于新面板",
   NEW_IN_NEW_TAB: "新建绘图 - 于新页签",
@@ -352,6 +353,10 @@ FILENAME_HEAD: "文件名",
     "<li>当 <b>禁用</b> 时，PDF 将显示文档的 Markdown 部分（背景笔记）。</li></ul>" +
     "请参阅上面‘外观和行为’部分的 <<a href='#"+TAG_MDREADINGMODE+"'>>Markdown 阅读模式</a> 相关设置。" +
     "⚠️ 注意，您必须关闭当前的 Excalidraw/Markdown 文件并重新打开，以使此更改生效。⚠️",
+  HOTKEY_OVERRIDE_HEAD: "热键覆盖",
+  HOTKEY_OVERRIDE_DESC: `一些 Excalidraw 的热键，例如 ${labelCTRL()}+Enter 用于编辑文本，或 ${labelCTRL()}+K 用于创建元素链接。` +
+    "与 Obsidian 的热键设置发生冲突。您在下面添加的热键组合将在使用 Excalidraw 时覆盖 Obsidian 的热键设置，" +
+    `因此如果您希望在 Excalidraw 中默认选择“组合对象”，而不是打开“图形视图”，您可以添加 ${labelCTRL()}+G。`,
   THEME_HEAD: "主题和样式",
   ZOOM_HEAD: "缩放",
   DEFAULT_PINCHZOOM_NAME: "允许在触控笔模式下进行双指缩放",
@@ -477,7 +482,11 @@ FILENAME_HEAD: "文件名",
   EMBED_TOEXCALIDRAW_DESC: "包括：以图像形式嵌入到绘图中的 PDF 文档、以交互形式嵌入到绘图中的 Markdown 文档（MD-Embeddable）、以图像形式嵌入的 Markdown 文档（MD-Embed）等。",
   MD_HEAD: "以图像形式嵌入到绘图中的 Markdown 文档（MD-Embed）",
   MD_EMBED_CUSTOMDATA_HEAD_NAME: "以交互形式嵌入到绘图中的 Markdown 文档（MD-Embeddable）",
-  MD_EMBED_CUSTOMDATA_HEAD_DESC: `这些选项不会影响到已存在的 MD-Embeddable。MD-Embeddable 的主题风格在“显示 & 行为”小节设置。`,
+  MD_EMBED_CUSTOMDATA_HEAD_DESC: `以下设置只会影响以后的嵌入。已存在的嵌入保持不变。嵌入框的主题设置位于 “Excalidraw 外观和行为” 部分。`,
+  MD_EMBED_SINGLECLICK_EDIT_NAME: "单击以编辑嵌入的 markdown。",
+  MD_EMBED_SINGLECLICK_EDIT_DESC:
+    "单击嵌入的 markdown 文件以进行编辑。 " +
+    "当此功能关闭时，markdown 文件将首先以预览模式打开，然后在您再次单击时切换到编辑模式。",
   MD_TRANSCLUDE_WIDTH_NAME: "MD-Embed 的默认宽度",
   MD_TRANSCLUDE_WIDTH_DESC:
     "MD-Embed 的宽度。该选项会影响到折行，以及图像元素的宽度。<br>" +
@@ -735,6 +744,12 @@ FILENAME_HEAD: "文件名",
     "Taskbone 的开发者（您懂的，没有人能用爱发电，Taskbone 开发者也需要投入资金来维持这项 OCR 服务）您可以" +
     "到 <a href='https://www.taskbone.com/' target='_blank'>taskbone.com</a> 购买一个商用 API key。购买后请将它填写到旁边这个文本框里，替换掉原本自动生成的免费 API key。",
 
+  //HotkeyEditor
+  HOTKEY_PRESS_COMBO_NANE: "按下您的组合键",
+  HOTKEY_PRESS_COMBO_DESC: "请按下所需的组合键",
+  HOTKEY_BUTTON_ADD_OVERRIDE: "添加新的（热键）覆写",
+  HOTKEY_BUTTON_REMOVE: "移除",
+
   //openDrawings.ts
   SELECT_FILE: "选择一个文件后按回车。",
   SELECT_COMMAND: "选择一个命令后按回车。",

src/main.ts

@@ -2826,37 +2826,53 @@ export default class ExcalidrawPlugin extends Plugin {
       this.popScope = null;
     }
     if (newActiveviewEV) {
-      const scope = this.app.keymap.getRootScope();
-      const handler_ctrlEnter = scope.register(["Mod"], "Enter", () => true);
-      scope.keys.unshift(scope.keys.pop()); // Force our handler to the front of the list
-      const handler_ctrlK = scope.register(["Mod"], "k", () => true);
-      scope.keys.unshift(scope.keys.pop()); // Force our handler to the front of the list
-      const handler_ctrlF = scope.register(["Mod"], "f", () => {
-        const view = this.app.workspace.getActiveViewOfType(ExcalidrawView);
-        if (view) {
-          search(view);
-          return true;
-        }
-        return false;
-      });
-      scope.keys.unshift(scope.keys.pop()); // Force our handler to the front of the list
-      const overridSaveShortcut = (
-        this.forceSaveCommand &&
-        this.forceSaveCommand.hotkeys[0].key === "s" &&
-        this.forceSaveCommand.hotkeys[0].modifiers.includes("Ctrl")
-      )
-      const saveHandler = overridSaveShortcut
-       ? scope.register(["Ctrl"], "s", () => this.forceSaveActiveView(false))
-       : undefined;
-      if(saveHandler) {
-        scope.keys.unshift(scope.keys.pop()); // Force our handler to the front of the list
-      }
-      this.popScope = () => {
-        scope.unregister(handler_ctrlEnter);
-        scope.unregister(handler_ctrlK);
-        scope.unregister(handler_ctrlF);
-        Boolean(saveHandler) && scope.unregister(saveHandler);
+      this.registerHotkeyOverrides();
+    }
+  }
+
+  public registerHotkeyOverrides() {
+    //this is repeated here because the same function is called when settings is closed after hotkeys have changed
+    if (this.popScope) {
+      this.popScope();
+      this.popScope = null;
+    }
+
+    if(!this.activeExcalidrawView) {
+      return;
+    }
+
+    const scope = this.app.keymap.getRootScope();
+    // Register overrides from settings
+    const overrideHandlers = this.settings.modifierKeyOverrides.map(override => {
+      return scope.register(override.modifiers, override.key, () => true);
+    });
+    // Force handlers to the front of the list
+    overrideHandlers.forEach(() => scope.keys.unshift(scope.keys.pop()));
+
+    const handler_ctrlF = scope.register(["Mod"], "f", () => {
+      const view = this.app.workspace.getActiveViewOfType(ExcalidrawView);
+      if (view) {
+        search(view);
+        return true;
       }
+      return false;
+    });
+    scope.keys.unshift(scope.keys.pop()); // Force our handler to the front of the list
+    const overridSaveShortcut = (
+      this.forceSaveCommand &&
+      this.forceSaveCommand.hotkeys[0].key === "s" &&
+      this.forceSaveCommand.hotkeys[0].modifiers.includes("Ctrl")
+    )
+    const saveHandler = overridSaveShortcut
+     ? scope.register(["Ctrl"], "s", () => this.forceSaveActiveView(false))
+     : undefined;
+    if(saveHandler) {
+      scope.keys.unshift(scope.keys.pop()); // Force our handler to the front of the list
+    }
+    this.popScope = () => {
+      overrideHandlers.forEach(handler => scope.unregister(handler));
+      scope.unregister(handler_ctrlF);
+      Boolean(saveHandler) && scope.unregister(saveHandler);
     }
   }
 

src/menu/ActionIcons.tsx

@@ -777,7 +777,11 @@ export const penIcon = (pen: PenStyle) => {
           strokeLinecap="round"
           strokeLinejoin="round"
         >
-          <path fill={pen.strokeColor??"var(--icon-fill-color)"} strokeWidth="2" d="m9 11-6 6v3h9l3-3"></path>
+          <path fill={
+            pen.strokeColor??"var(--icon-fill-color)"}
+            strokeWidth="2" d="m9 11-6 6v3h9l3-3"
+            style={pen.strokeColor ? { filter: "var(--theme-filter)" } : {}}
+          ></path>
           <path fill="none" strokeWidth="2" d="m22 12-4.6 4.6a2 2 0 0 1-2.8 0l-5.2-5.2a2 2 0 0 1 0-2.8L14 4"></path>
         </svg>
       )
@@ -791,6 +795,7 @@ export const penIcon = (pen: PenStyle) => {
           strokeWidth="2"
           strokeLinecap="round"
           strokeLinejoin="round"
+          style={pen.strokeColor ? { filter: "var(--theme-filter)" } : {}}
         >
           <path strokeWidth="2" d="M17 3a2.828 2.828 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5L17 3z"></path>
         </svg>
@@ -822,6 +827,7 @@ export const penIcon = (pen: PenStyle) => {
           strokeWidth="2"
           strokeLinecap="round"
           strokeLinejoin="round"
+          style={pen.strokeColor ? { filter: "var(--theme-filter)" } : {}}
         >
           <path d="M331 315l158.4-215L460.1 70.6 245 229 331 315zm-187 5l0 0V248.3c0-15.3 7.2-29.6 19.5-38.6L436.6 8.4C444 2.9 453 0 462.2 0c11.4 0 22.4 4.5 30.5 12.6l54.8 54.8c8.1 8.1 12.6 19 12.6 30.5c0 9.2-2.9 18.2-8.4 25.6L350.4 396.5c-9 12.3-23.4 19.5-38.6 19.5H240l-25.4 25.4c-12.5 12.5-32.8 12.5-45.3 0l-50.7-50.7c-12.5-12.5-12.5-32.8 0-45.3L144 320zM23 466.3l63-63 70.6 70.6-31 31c-4.5 4.5-10.6 7-17 7H40c-13.3 0-24-10.7-24-24v-4.7c0-6.4 2.5-12.5 7-17z"/>
         </svg>
@@ -834,6 +840,7 @@ export const penIcon = (pen: PenStyle) => {
           strokeWidth="2" 
           fill={pen.strokeColor??"var(--icon-fill-color)"}
           stroke={pen.strokeColor??"var(--icon-fill-color)"}
+          style={pen.strokeColor ? { filter: "var(--theme-filter)" } : {}}
         >
         <path d="m-.58 95.628.22-.89q.22-.89.49-2.44.26-1.54.77-3.35t1.31-3.43q.79-1.61.2-.26-.6 1.34-.03-.14.58-1.49 1.54-2.97.96-1.49 2.54-3.18 1.59-1.68 3.46-2.96 1.86-1.27.81-.54-1.04.73.6-.46 1.64-1.19 2.8-1.81 1.16-.63.16-.08-.99.54 1.21-.5 2.2-1.03 1.11-.58-1.1.45-.03-.07 1.06-.53 2.32-.82 1.26-.3 2.91-.52 1.64-.23 3.05-.18 1.4.05 2.5.12 1.09.07 2.25.24 1.16.17 2.3.49 1.15.32 2.11.78.96.47 2.21 1.01 1.25.55 2.37 1.04t2.34.89q1.22.4 2.5.65 1.29.25 2.44.33 1.16.08 2.35.17 1.18.08 2.26-.1 1.08-.19 2-1.1.92-.91 1.25-1.93.32-1.02.38-2.15t.57.21q.51 1.34-.03-.02-.55-1.37-.96-2.83-.41-1.45.5-.67.92.79-.03-.06-.95-.85-1.52-1.8-.57-.94-1.5-1.52-.93-.57-1.94-1.22-1.01-.65-1.97-1.88-.96-1.22-1.44-2.54-.49-1.32-.65-2.57-.17-1.24-.11-2.35.06-1.11.31-2.91.24-1.79.76-2.77.51-.97 1.29-1.8.77-.84 1.64-1.55.88-.72 1.9-1.33 1.03-.61 2.43-1.15 1.41-.55 2.69-.92 1.29-.37 2.81-.68 1.53-.31 2.83-.58 1.31-.27 2.78-.47 1.47-.2 2.58-.49 1.12-.28 2.19-.58 1.08-.31 2.13-.73 1.05-.42 2.44-1.32 1.39-.9 2.68-1.85 1.3-.95 2.25-1.87.95-.91 2.06-2 1.11-1.09 1.92-1.93.82-.84 1.54-1.82.71-.98 1.4-1.88.69-.9 1.38-1.96.69-1.07 1.25-2.04.55-.97 1.21-1.94.65-.96 1.35-1.79.69-.83 1.46-1.74.77-.9 1.66-1.73.89-.84 2.72-2.31 1.84-1.48 1.84-1.47v.01l-1.1 1.03q-1.1 1.02-1.77 1.92-.68.9-1.39 1.85-.71.96-1.41 1.91-.7.96-1.19 1.92-.48.95-.95 1.92-.46.96-.9 1.95-.43.99-1.02 2.16-.59 1.17-1.17 2.15-.58.97-1.23 2.13t-1.29 2.02q-.64.86-1.3 1.73-.66.88-1.42 1.78-.75.9-1.72 2.03-.97 1.14-1.81 1.89-.85.75-1.98 1.71-1.14.96-2.05 1.61-.91.64-2.42 1.38-1.51.73-2.71 1.21t-2.49.92q-1.3.44-2.35.69-1.06.24-2.1.59-1.03.34-2.06.74-1.03.4-2.29.94-1.26.54-2.27 1.11-1.01.58-1.57 1.57-.56.99-.81 2.06-.25 1.08.56 2.02.8.94-.21-.02-1.02-.96-.01-.48 1 .49 1.87 1.25.87.77 0 0-.88-.77.46-.01 1.34.75 2.6 1.68 1.26.94 2.08 2.03.81 1.09.01.27-.8-.82.3.26 1.11 1.08 1.71 2.1.61 1.02 1.21 2.25.6 1.24.92 2.36.32 1.12-.16.13-.49-.98.02.36.51 1.35.71 2.69.2 1.34.24 2.46.03 1.12-.09 2.42-.13 1.29-.72 3.21-.6 1.92-1.4 3.49-.81 1.58-1.77 2.83-.96 1.24-2.88 2.72-1.92 1.48-2.95 1.85-1.04.36-2.47.76-1.44.41-3.33.72-1.89.32-3.37.41-1.48.09-2.63.15-1.15.05-2.74-.06-1.59-.1-2.8-.29-1.2-.19-3.2-.63-1.99-.45-3.63-.92-1.63-.48-3.28-.79-1.65-.31-2.76-.2-1.11.1-2.21.42-1.11.32.39-.29 1.49-.6-.12.21-1.61.8-.39.19 1.21-.61.29.13-.92.74-1.83 1.34-.92.61.15-.19t.3-.05q-.77.75-1.58 1.57-.81.82.01-.18.82-1 .24.23t-.72 2.72q-.15 1.48-.08 2.4.07.91-.19 2.16-.26 1.26-.81 2.41-.55 1.16-1.36 2.15t-1.84 1.75q-1.03.77-2.21 1.27t-2.44.7q-1.27.2-2.53.1-1.28-.11-2.49-.52-1.22-.41-2.3-1.1-1.08-.68-1.96-1.61-.89-.92-1.52-2.04-.64-1.11-.99-2.34-.36-1.23-.41-2.51l-.04-1.27Z"/>
         </svg>
@@ -846,6 +853,7 @@ export const penIcon = (pen: PenStyle) => {
           strokeWidth="2" 
           fill={pen.strokeColor??"var(--icon-fill-color)"}
           stroke={pen.strokeColor??"var(--icon-fill-color)"}
+          style={pen.strokeColor ? { filter: "var(--theme-filter)" } : {}}
         >
           <path d="m10 103.405.13-1.22q.14-1.22 1.3-3.16 1.15-1.94 2.74-3.46 1.59-1.53 3.35-2.72 1.77-1.2 4-1.95 2.23-.76 4.45-1t4.86-.4q2.64-.15 5.14-.34 2.51-.19 4.85-.94 2.35-.75 4.55-1.71 2.21-.97 4.16-2.26 1.95-1.3 4.03-2.97 2.07-1.67 3.85-3.05 1.78-1.37 3.72-2.48 1.94-1.11 3.3-2.99 1.36-1.89 2.58-3.74 1.22-1.85-.63-3.42-1.85-1.57-3.82-2.86-1.97-1.3-4.11-2.08-2.15-.78-4.21-1.6-2.06-.81-4.02-1.96-1.96-1.14-3.71-2.48-1.74-1.33-3.37-2.77-1.63-1.43-3.23-3.62-1.6-2.18-2.23-4.64-.62-2.46-.36-4.96.27-2.49 1.19-4.46.91-1.97 2.42-3.7 1.5-1.73 3.5-3.15t4.11-2.28q2.1-.86 4.33-1.44 2.24-.58 4.92-.84 2.68-.26 4.83-.19t4.69.35q2.53.28 4.75.66 2.23.38 4.48.2 2.26-.19 4.43-1.3 2.17-1.12 4.2-2.36 2.04-1.24 3.93-2.43 1.9-1.19 3.84-2.14 1.95-.95 4.04-1.78 2.09-.83 4.56-2.28 2.46-1.46 2.46-1.45h.01q.01 0-1.38 1.3-1.38 1.29-3.08 2.59-1.7 1.3-3.5 2.5t-3.42 2.65q-1.62 1.45-3.18 3-1.57 1.56-3.37 3.13-1.8 1.57-3.6 2.91-1.81 1.33-3.92 2.12t-4.24.92q-2.13.14-4.31.26-2.18.12-4.5.39t-4.56.88q-2.25.61-4.24 1.6-1.99 1-3.83 2.29-1.83 1.29.18 2.44 2.01 1.15 4.2 1.92 2.2.78 4.34 1 2.15.22 4.4.69 2.25.46 4.34 1.16 2.08.71 4.33 1.91 2.25 1.21 4.11 2.73 1.87 1.52 3.68 4.03 1.82 2.5 2.74 5 .93 2.5 1.18 5.03.26 2.53-.04 4.81t-1.4 4.85q-1.09 2.58-2.4 4.26-1.3 1.68-3.1 3.44t-4.02 3.62q-2.23 1.85-4.32 3.07-2.08 1.23-4.34 1.99-2.25.76-4.46 1.96t-4.37 2.14q-2.15.93-4.22 1.81t-4.36 1.35q-2.3.46-4.52.82-2.22.35-4.76.38-2.54.04-4.87-.28t-4.67-.67q-2.34-.35-4.72-.54-2.39-.19-4.64.37-2.25.56-4.16 1.66-1.91 1.11-3.52 2.71-1.61 1.6-2.55 2.39l-.94.78Z"/>
         </svg>
@@ -860,6 +868,7 @@ export const penIcon = (pen: PenStyle) => {
           strokeWidth="2"
           strokeLinecap="round"
           strokeLinejoin="round"
+          style={pen.strokeColor ? { filter: "var(--theme-filter)" } : {}}
         >
           <path d="M453.3 19.3l39.4 39.4c25 25 25 65.5 0 90.5l-52.1 52.1 0 0-1-1 0 0-16-16-96-96-17-17 52.1-52.1c25-25 65.5-25 90.5 0zM241 114.9c-9.4-9.4-24.6-9.4-33.9 0L105 217c-9.4 9.4-24.6 9.4-33.9 0s-9.4-24.6 0-33.9L173.1 81c28.1-28.1 73.7-28.1 101.8 0L288 94.1l17 17 96 96 16 16 1 1-17 17L229.5 412.5c-48 48-109.2 80.8-175.8 94.1l-25 5c-7.9 1.6-16-.9-21.7-6.6s-8.1-13.8-6.6-21.7l5-25c13.3-66.6 46.1-127.8 94.1-175.8L254.1 128 241 114.9z"/>
         </svg>

src/settings.ts

@@ -3,6 +3,7 @@ import {
   ButtonComponent,
   DropdownComponent,
   getIcon,
+  Modifier,
   normalizePath,
   PluginSettingTab,
   Setting,
@@ -39,6 +40,7 @@ import { EDITOR_FADEOUT } from "./CodeMirrorExtension/EditorHandler";
 import { setDebugging } from "./utils/DebugHelper";
 import { Rank } from "./menu/ActionIcons";
 import { TAG_AUTOEXPORT, TAG_MDREADINGMODE, TAG_PDFEXPORT } from "src/constants/constSettingsTags";
+import { HotkeyEditor } from "./dialogs/HotkeyEditor";
 
 export interface ExcalidrawSettings {
   folder: string;
@@ -183,6 +185,7 @@ export interface ExcalidrawSettings {
     COLOR: string,
   };
   embeddableMarkdownDefaults: EmbeddableMDCustomProps;
+  markdownNodeOneClickEditing: boolean;
   canvasImmersiveEmbed: boolean,
   startupScriptPath: string,
   openAIAPIToken: string,
@@ -203,6 +206,8 @@ export interface ExcalidrawSettings {
   longPressMobile: number;
   isDebugMode: boolean;
   rank: Rank;
+  modifierKeyOverrides: {modifiers: Modifier[], key: string}[];
+  showSplashscreen: boolean;
 }
 
 declare const PLUGIN_VERSION:string;
@@ -219,8 +224,8 @@ export const DEFAULT_SETTINGS: ExcalidrawSettings = {
   onceOffCompressFlagReset: false,
   onceOffGPTVersionReset: false,
   autosave: true,
-  autosaveIntervalDesktop: 15000,
-  autosaveIntervalMobile: 10000,
+  autosaveIntervalDesktop: 30000,
+  autosaveIntervalMobile: 20000,
   drawingFilenamePrefix: "Drawing ",
   drawingEmbedPrefixWithFilename: true,
   drawingFilnameEmbedPostfix: " ",
@@ -366,6 +371,7 @@ export const DEFAULT_SETTINGS: ExcalidrawSettings = {
     borderOpacity: 0,
     filenameVisible: false,
   },
+  markdownNodeOneClickEditing: false,
   canvasImmersiveEmbed: true,
   startupScriptPath: "",
   openAIAPIToken: "",
@@ -462,6 +468,12 @@ export const DEFAULT_SETTINGS: ExcalidrawSettings = {
   longPressMobile: 500,
   isDebugMode: false,
   rank: "Bronze",
+  modifierKeyOverrides: [
+    {modifiers: ["Mod"], key:"Enter"},
+    {modifiers: ["Mod"], key:"k"},
+    {modifiers: ["Mod"], key:"G"},
+  ],
+  showSplashscreen: true,
 };
 
 export class ExcalidrawSettingTab extends PluginSettingTab {
@@ -470,6 +482,7 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
   private requestReloadDrawings: boolean = false;
   private requestUpdatePinnedPens: boolean = false;
   private requestUpdateDynamicStyling: boolean = false;
+  private hotkeyEditor: HotkeyEditor;
   //private reloadMathJax: boolean = false;
   //private applyDebounceTimer: number = 0;
 
@@ -496,21 +509,25 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
     }
     this.plugin.saveSettings();
     if (this.requestUpdatePinnedPens) {
-      app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW).forEach(v=> {
+      this.app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW).forEach(v=> {
         if (v.view instanceof ExcalidrawView) v.view.updatePinnedCustomPens()
       })
     }
     if (this.requestUpdateDynamicStyling) {
-      app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW).forEach(v=> {
+      this.app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW).forEach(v=> {
         if (v.view instanceof ExcalidrawView) {
           setDynamicStyle(this.plugin.ea,v.view,v.view.previousBackgroundColor,this.plugin.settings.dynamicStyling);
         }
         
       })
     }
+    this.hotkeyEditor.unload();
+    if (this.hotkeyEditor.isDirty) {
+      this.plugin.registerHotkeyOverrides();
+    }
     if (this.requestReloadDrawings) {
       const exs =
-        app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW);
+        this.app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW);
       for (const v of exs) {
         if (v.view instanceof ExcalidrawView) {
           await v.view.save(false);
@@ -745,7 +762,8 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
     .setDesc(fragWithHTML(t("AUTOSAVE_INTERVAL_DESKTOP_DESC")))
     .addDropdown((dropdown) =>
       dropdown
-        .addOption("15000", "Frequent (every 15 seconds)")
+        .addOption("15000", "Very frequent (every 15 seconds)")
+        .addOption("30000", "Frequent (every 30 seconds)")
         .addOption("60000", "Moderate (every 60 seconds)")
         .addOption("300000", "Rare (every 5 minutes)")
         .addOption("900000", "Practically never (every 15 minutes)")
@@ -761,7 +779,8 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
     .setDesc(fragWithHTML(t("AUTOSAVE_INTERVAL_MOBILE_DESC")))
     .addDropdown((dropdown) =>
       dropdown
-        .addOption("10000", "Frequent (every 10 seconds)")
+        .addOption("10000", "Very frequent (every 10 seconds)")
+        .addOption("20000", "Frequent (every 20 seconds)")
         .addOption("30000", "Moderate (every 30 seconds)")
         .addOption("60000", "Rare (every 1 minute)")
         .addOption("300000", "Practically never (every 5 minutes)")
@@ -1093,6 +1112,29 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
       );
     addIframe(detailsEl, "H8Njp7ZXYag",999);
 
+    new Setting(detailsEl)
+      .setName(t("TOGGLE_SPLASHSCREEN"))
+      .addToggle((toggle) =>
+        toggle
+          .setValue(this.plugin.settings.showSplashscreen)
+          .onChange((value)=> {
+            this.plugin.settings.showSplashscreen = value;
+            this.applySettingsUpdate();
+          })
+      )
+
+    detailsEl = displayDetailsEl.createEl("details");
+    detailsEl.createEl("summary", {
+      text: t("HOTKEY_OVERRIDE_HEAD"),
+      cls: "excalidraw-setting-h3",
+    });
+    detailsEl.createEl("span", {}, (el) => {
+      el.innerHTML = t("HOTKEY_OVERRIDE_DESC");
+    });
+
+    this.hotkeyEditor = new HotkeyEditor(detailsEl, this.plugin.settings, this.applySettingsUpdate);
+    this.hotkeyEditor.onload();
+
     detailsEl = displayDetailsEl.createEl("details");
     detailsEl.createEl("summary", { 
       text: t("THEME_HEAD"),
@@ -2125,7 +2167,26 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
       text: t("MD_EMBED_CUSTOMDATA_HEAD_NAME"),
       cls: "excalidraw-setting-h3",
     });
-    detailsEl.createEl("span", {text: t("MD_EMBED_CUSTOMDATA_HEAD_DESC")});
+
+    new Setting(detailsEl)
+    .setName(t("MD_EMBED_SINGLECLICK_EDIT_NAME"))
+    .setDesc(fragWithHTML(t("MD_EMBED_SINGLECLICK_EDIT_DESC")))
+    .addToggle((toggle) =>
+      toggle
+        .setValue(this.plugin.settings.markdownNodeOneClickEditing)
+        .onChange(async (value) => {
+          this.plugin.settings.markdownNodeOneClickEditing = value;
+          this.applySettingsUpdate();
+        })
+    );
+
+    detailsEl.createEl("hr", { cls: "excalidraw-setting-hr" });
+    detailsEl.createEl("span", {}, (el) => {
+      el.innerHTML = t("MD_EMBED_CUSTOMDATA_HEAD_DESC");
+    });
+
+
+
 
     new EmbeddalbeMDFileCustomDataSettingsComponent(
       detailsEl,

src/types/types.d.ts

@@ -28,6 +28,7 @@ export type DeviceType = {
 declare global {
   interface Window {
       ExcalidrawAutomate: ExcalidrawAutomate;
+      pdfjsLib: any;
   }
 }
 

src/utils/DynamicStyling.ts

@@ -1,5 +1,5 @@
 import { ExcalidrawImperativeAPI } from "@zsviczian/excalidraw/types/excalidraw/types";
-import { ColorMaster } from "colormaster";
+import { ColorMaster } from "@zsviczian/colormaster";
 import { ExcalidrawAutomate } from "src/ExcalidrawAutomate";
 import ExcalidrawView from "src/ExcalidrawView";
 import { DynamicStyle } from "src/types/types";

src/utils/FileUtils.ts

@@ -291,9 +291,7 @@ export const blobToBase64 = async (blob: Blob): Promise<string> => {
 }
 
 export const getPDFDoc = async (f: TFile): Promise<any> => {
-  //@ts-ignore
   if(typeof window.pdfjsLib === "undefined") await loadPdfJs();
-  //@ts-ignore
   return await window.pdfjsLib.getDocument(app.vault.getResourcePath(f)).promise;
 }
 

src/utils/ModifierkeyHelper.ts

@@ -1,3 +1,4 @@
+import { Modifier } from "obsidian";
 import { DEVICE } from "src/constants/constants";
 import { ExcalidrawSettings } from "src/settings";
 export type ModifierKeys = {shiftKey:boolean, ctrlKey: boolean, metaKey: boolean, altKey: boolean};
@@ -177,4 +178,26 @@ export const emulateKeysForLinkClick = (action: PaneTarget): ModifierKeys => {
 
 export const anyModifierKeysPressed = (e: ModifierKeys): boolean => {
   return e.shiftKey || e.ctrlKey || e.metaKey || e.altKey;
+}
+
+export function modifierLabel(modifiers: Modifier[], platform?: "Mac" | "Other"): string {
+  const isMacPlatform = platform === "Mac" || 
+                        (platform === undefined && (DEVICE.isIOS || DEVICE.isMacOS));
+
+  return modifiers.map(modifier => {
+    switch (modifier) {
+      case "Mod":
+        return isMacPlatform ? "CMD" : "CTRL";
+      case "Ctrl":
+        return "CTRL";
+      case "Meta":
+        return isMacPlatform ? "CMD" : "WIN";
+      case "Shift":
+        return "SHIFT";
+      case "Alt":
+        return isMacPlatform ? "OPTION" : "ALT";
+      default:
+        return modifier;
+    }
+  }).join("+");
 }

styles.css

@@ -625,4 +625,8 @@ textarea.excalidraw-wysiwyg, .excalidraw input {
 .excalidraw-rank svg {
   height: 8rem;
   width: 8rem;
+}
+
+.excalidraw .color-picker-content input[type="color"] {
+  filter: var(--theme-filter);
 }