2.4.2-rc-1

Update zh-cn.ts to 2.4.1

.github/ISSUE_TEMPLATE/Contribution.yml.old

@@ -0,0 +1,50 @@
+name: Contribution Request
+
+description: Request access to contribute to the Excalidraw plugin documentation on the wiki
+
+title: '[Contribution] Request to Contribute to Wiki'
+
+labels: [collaboration-request]
+
+assignees: []
+
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ## Contribution Request
+
+        Thank you for your interest in contributing to the Excalidraw Plugin wiki! To help me understand how you’d like to contribute, please provide the following details:
+
+        1. **Contribution Area**: Describe what areas of the wiki you’re interested in contributing to (e.g., fixing typos, adding new tutorials, improving existing content).
+        2. **Experience**: Briefly describe your experience with Excalidraw or Obsidian and any relevant background that will help with the contribution.
+        3. **Additional Information**: Any other information or questions you may have.
+
+        **Example:**
+        ```
+        - Contribution Area: Adding a tutorial on advanced Excalidraw features
+        - Experience: Regular user of Excalidraw and experienced in creating tutorials
+        - Additional Information: Looking forward to contributing!
+        ```
+
+        Once I review your request, I will get back to you with instructions on how to proceed. Thank you for helping improve our documentation!
+
+        ---
+        Zsolt
+
+  - type: textarea
+    attributes:
+      label: Contribution Details
+      description: Provide details about your contribution request.
+      placeholder: |
+        - Contribution Area: Adding a tutorial on advanced Excalidraw features
+        - Experience: Regular user of Excalidraw and experienced in creating tutorials
+        - Additional Information: Looking forward to contributing!
+
+  - type: checkboxes
+    id: verify_guidelines
+    attributes:
+      label: Please read the WIKI Contributors Guidelines before submitting your request!
+      options:
+        - label: Yes, I have read and understood the [Contributors Guidelines](https://github.com/zsviczian/obsidian-excalidraw-plugin/wiki/Contributor-Guidelines)
+

.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"
-    }
-```

README.md

@@ -2,6 +2,8 @@
 
 [简体中文](./README.zh-cn.md)
 
+👉👉👉 Check out and contribute to the new [Obsidian-Excalidraw Community Wiki](https://excalidraw-obsidian.online/Hobbies/Excalidraw+Blog/WIKI/Welcome+to+the+WIKI)
+
 The Obsidian-Excalidraw plugin integrates [Excalidraw](https://excalidraw.com/), a feature rich sketching tool, into Obsidian. You can store and edit Excalidraw files in your vault, you can embed drawings into your documents, and you can link to documents and other drawings to/and from Excalidraw. For a showcase of Excalidraw features, please read my blog post [here](https://www.zsolt.blog/2021/03/showcasing-excalidraw.html) and/or watch the videos below.
 
 ## Video Walkthrough

ea-scripts/Golden Ratio.md

@@ -13,6 +13,11 @@ Gravitational point of spiral: $$\left[x,y\right]=\left[ x + \frac{{\text{width}
 Dimensions of inner rectangles in case of Double Spiral: $$[width, height] = \left[\frac{width\cdot(\phi^2+1)}{2\phi^2}\;, \;\frac{height\cdot(\phi^2+1)}{2\phi^2}\right]$$
 
 ```js*/
+if(!ea.verifyMinimumPluginVersion || !ea.verifyMinimumPluginVersion("2.4.0")) {
+  new Notice("This script requires a newer version of Excalidraw. Please install the latest version.");
+  return;
+}
+
 const phi = (1 + Math.sqrt(5)) / 2; // Golden Ratio (φ)
 const inversePhi = (1-1/phi);
 const pointsPerCurve = 20; // Number of points per curve segment
@@ -33,18 +38,16 @@ if(!rect || rect.type !== "rectangle") {
     }
     window.excalidrawGoldenRatio.timer = setTimeout(()=>{delete window.excalidrawGoldenRatio;},2000);
     window.excalidrawGoldenRatio.cycle = (window.excalidrawGoldenRatio.cycle+1)%5;
-    
     ea.copyViewElementsToEAforEditing(textEls);
     ea.getElements().forEach(el=> {
       el.fontSize = window.excalidrawGoldenRatio.cycle === 2
         ? el.fontSize / Math.pow(phi,4)
         : el.fontSize * phi;
-      const font = ExcalidrawLib.getFontString(el);
-      const lineHeight = ExcalidrawLib.getDefaultLineHeight(el.fontFamily);
-      const {width, height, baseline} = ExcalidrawLib.measureText(el.originalText, font, lineHeight);
+      ea.style.fontFamily = el.fontFamily;
+      ea.style.fontSize = el.fontSize;
+      const {width, height } = ea.measureText(el.originalText);
       el.width = width;
       el.height = height;
-      el.baseline = baseline;
     });
     ea.addElementsToView();
     return;
@@ -631,7 +634,7 @@ modal.onOpen = async () => {
     .addDropdown(dropdown=>dropdown
       .addOption("none","None")
       .addOption("top-down","Top down")
-      .addOption("bottom-up","Bottom up")
+      .addOption("bottom-up","Bootom up")
       .addOption("center-out","Center out")
       .addOption("center-in","Center in")
       .setValue(vDirection)

ea-scripts/README.md

@@ -61,6 +61,7 @@ Open the script you are interested in and save it to your Obsidian Vault includi
 |[OCR - Optical Character Recognition](OCR%20-%20Optical%20Character%20Recognition.md)|The script will  1) send the selected image file to [taskbone.com](https://taskbone.com) to extract the text from the image, and 2) will add the text to your drawing as a text element.|![](https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/images/scripts-ocr.jpg)|[@zsviczian](https://github.com/zsviczian)|
 |[Organic Line](Organic%20Line.md)|Converts selected freedraw lines such that pencil pressure will decrease from maximum to minimum from the beginning of the line to its end. The resulting line is placed at the back of the layers, under all other items. Helpful when drawing organic mindmaps.|![](https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/images/scripts-organic-line.jpg)|[@zsviczian](https://github.com/zsviczian)|
 |[Repeat Elements](Repeat%20Elements.md)|This script will detect the difference between 2 selected elements, including position, size, angle, stroke and background color, and create several elements that repeat these differences based on the number of repetitions entered by the user.|![](https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/images/scripts-repeat-elements.png)|[@1-2-3](https://github.com/1-2-3)|
+|[Reset LaTeX Size](Reset%20LaTeX%20Size.md)|Reset the sizes of embedded LaTeX equations to the default sizes or a multiple of the default sizes.|![](https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/images/scripts-reset-latex.jpg)|[@firai](https://github.com/firai)|
 |[Reverse arrows](Reverse%20arrows.md)|Reverse the direction of **arrows** within the scope of selected elements.|![](https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/images/scripts-reverse-arrow.jpg)|[@zsviczian](https://github.com/zsviczian)|
 |[Scribble Helper](Scribble%20Helper.md)|iOS scribble helper for better handwriting experience with text elements. If no elements are selected then the creates a text element at pointer position and you can use the edit box to modify the text with scribble. If a text element is selected then opens the input prompt where you can modify this text with scribble.|![]('https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/images/scripts-scribble-helper.jpg')|[@zsviczian](https://github.com/zsviczian)|
 |[Select Elements of Type](Select%20Elements%20of%20Type.md)|Prompts you with a list of the different element types in the active image. Only elements of the selected type will be selected on the canvas. If nothing is selected when running the script, then the script will process all the elements on the canvas. If some elements are selected when the script is executed, then the script will only process the selected elements.<br>The script is useful when, for example, you want to bring to front all the arrows, or want to change the color of all the text elements, etc.|![]('https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/images/scripts-select-element-of-type.jpg')|[@zsviczian](https://github.com/zsviczian)|

ea-scripts/Reset LaTeX Size.md

@@ -0,0 +1,32 @@
+
+/*
+![](https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/images/scripts-reset-latex.jpg)
+
+Reset the sizes of embedded LaTeX equations to the default sizes or a multiple of the default sizes.
+
+```javascript
+*/
+
+if (!ea.verifyMinimumPluginVersion || !ea.verifyMinimumPluginVersion("2.4.0")) {
+  new Notice("This script requires a newer version of Excalidraw. Please install the latest version.");
+  return;
+}
+
+let elements = ea.getViewSelectedElements().filter((el)=>["image"].includes(el.type));
+if (elements.length === 0) return;
+
+scale = await utils.inputPrompt("Scale?", "Number", "1");
+if (!scale) return;
+scale = parseFloat(scale);
+
+ea.copyViewElementsToEAforEditing(elements);
+
+for (el of elements) {
+  equation = ea.targetView.excalidrawData.getEquation(el.fileId)?.latex;
+  if (!equation) return;
+  eqData = await ea.tex2dataURL(equation);
+  ea.getElement(el.id).width = eqData.size.width * scale;
+  ea.getElement(el.id).height = eqData.size.height * scale;
+};
+
+ea.addElementsToView(false, false);

ea-scripts/Reset LaTeX Size.svg

@@ -0,0 +1 @@
+<svg class="skip" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"><rect stroke-width="2" width="20" height="16" x="2" y="4" rx="2"/><path stroke-width="2" d="M12 9v11"/><path stroke-width="2" d="M2 9h13a2 2 0 0 1 2 2v9"/></svg>

ea-scripts/index-new.md

@@ -89,6 +89,7 @@ I would love to include your contribution in the script library. If you have a s
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Modify%20background%20color%20opacity.svg"/></div>|[[#Modify background color opacity]]|
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Organic%20Line.svg"/></div>|[[#Organic Line]]|
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Organic%20Line%20Legacy.svg"/></div>|[[#Organic Line Legacy]]|
+|<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Reset%20LaTeX%20Size.svg"/></div>|[[#Reset LaTeX Size]]|
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Set%20background%20color%20of%20unclosed%20line%20object%20by%20adding%20a%20shadow%20clone.svg"/></div>|[[#Set background color of unclosed line object by adding a shadow clone]]|
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Set%20Dimensions.svg"/></div>|[[#Set Dimensions]]|
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Set%20Grid.svg"/></div>|[[#Set Grid]]|
@@ -517,6 +518,14 @@ https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea
 ```
 <table><tr  valign='top'><td class="label">Author</td><td class="data"><a href='https://github.com/zsviczian'>@zsviczian</a></td></tr><tr valign='top'><td class="label">Source</td><td class="data"><a href='https://github.com/zsviczian/obsidian-excalidraw-plugin/blob/master/ea-scripts/Select%20Similar%20Elements.md'>File on GitHub</a></td></tr><tr valign='top'><td class="label">Description</td><td class="data">This script allows you to streamline your Obsidian-Excalidraw workflows by enabling the selection of elements based on similar properties. you can precisely define which attributes such as stroke color, fill style, font family, and more, should match for selection. It's perfect for large canvases where manual selection would be cumbersome. You can either run the script to find and select matching elements across the entire scene, or define a specific group of elements to apply the selection criteria within a defined timeframe.<br><img src='https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/images/scripts-select-similar-elements.png'></td></tr></table>
 
+
+## Reset LaTeX Size
+```excalidraw-script-install
+https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Reset%20LaTeX%20Size.md
+```
+<table><tr  valign='top'><td class="label">Author</td><td class="data"><a href='https://github.com/firai'>@firai</a></td></tr><tr valign='top'><td class="label">Source</td><td class="data"><a href='https://github.com/zsviczian/obsidian-excalidraw-plugin/blob/master/ea-scripts/Reset%20LaTeX%20Size.md'>File on GitHub</a></td></tr><tr valign='top'><td class="label">Description</td><td class="data">Reset the sizes of embedded LaTeX equations to the default sizes or a multiple of the default sizes.<br><img src='https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/images/scripts-reset-latex.jpg'></td></tr></table>
+
+
 ## Set background color of unclosed line object by adding a shadow clone
 ```excalidraw-script-install
 https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Set%20background%20color%20of%20unclosed%20line%20object%20by%20adding%20a%20shadow%20clone.md

manifest-beta.json

@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-excalidraw-plugin",
 	"name": "Excalidraw",
-	"version": "2.4.0-rc-1",
+	"version": "2.4.2-rc-1",
 	"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.1",
   "minAppVersion": "1.1.6",
   "description": "An Obsidian plugin to edit and view Excalidraw drawings",
   "author": "Zsolt Viczian",

package.json

@@ -19,10 +19,10 @@
   "license": "MIT",
   "dependencies": {
     "@popperjs/core": "^2.11.8",
-    "@zsviczian/excalidraw": "0.17.1-obsidian-43",
+    "@zsviczian/excalidraw": "0.17.1-obsidian-48",
     "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",
@@ -70,7 +70,7 @@
     "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",

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
@@ -107,9 +107,6 @@ const BUILD_CONFIG = {
           comments: false, // Remove all comments
         },
       }),
-      //!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
       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/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,16 +1535,17 @@ export default class ExcalidrawView extends TextFileView {
         }
       };
 
-      const onMouseLeave = () => {
+      const onBlurOrLeave = () => {
         if(!this.excalidrawAPI || !this.excalidrawData.loaded || !this.isDirty()) {
           return;
         }
-        this.save();
+        this.forceSave(true);
       };
 
       this.registerDomEvent(this.ownerWindow, "keydown", onKeyDown, false);
       this.registerDomEvent(this.ownerWindow, "keyup", onKeyUp, false);
-      this.registerDomEvent(this.contentEl, "mouseleave", onMouseLeave, false);
+      this.registerDomEvent(this.contentEl, "mouseleave", onBlurOrLeave, false);
+      this.registerDomEvent(this.ownerWindow, "blur", onBlurOrLeave, false);
     });
 
     this.setupAutosaveTimer();
@@ -1736,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,
@@ -1770,7 +1772,6 @@ export default class ExcalidrawView extends TextFileView {
       this.autosaveFunction,
       this.autosaveInterval,
     );
-
   }
 
   unload(): void {
@@ -1780,7 +1781,17 @@ export default class ExcalidrawView extends TextFileView {
 
   async onUnloadFile(file: TFile): Promise<void> {
     //deliberately not calling super.onUnloadFile() to avoid autosave (saved in unload)
-    (process.env.NODE_ENV === 'development') && DEBUGGING && debug(this.onUnloadFile,`ExcalidrawView.onUnloadFile, file:${this.file?.name}`);   
+    (process.env.NODE_ENV === 'development') && DEBUGGING && debug(this.onUnloadFile,`ExcalidrawView.onUnloadFile, file:${this.file?.name}`);
+    let counter = 0;
+    while (this.semaphores.saving) {
+      await sleep(50); //https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1988
+      if(counter++ === 15) {
+        new Notice(t("SAVE_IS_TAKING_LONG"));
+      }
+      if(counter === 80) {
+        new Notice(t("SAVE_IS_TAKING_VERY_LONG"));
+      }
+    }
   }
 
   private async forceSaveIfRequired():Promise<boolean> {
@@ -2619,6 +2630,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");
@@ -5254,14 +5269,14 @@ export default class ExcalidrawView extends TextFileView {
     );
   }
 
-  private renderWelcomeScreen () {
-    if(!this.plugin.settings.showSplashscreen) return null;
+  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;
+    const { WelcomeScreen } = this.packages.excalidrawLib;
+    const filecount = this.app.vault.getFiles().filter(f => this.plugin.isExcalidrawFile(f)).length;
     const rank = filecount < 200 ? "Bronze" : filecount < 750 ? "Silver" : filecount < 2000 ? "Gold" : "Platinum";
     const nextRankDelta = filecount < 200 ? 200 - filecount : filecount < 750 ? 750 - filecount : filecount < 2000 ? 2000 - filecount : 0;
-    const {decoration, title} = SwordColors[rank as Rank];
+    const { decoration, title } = SwordColors[rank as Rank];
     return React.createElement(
       WelcomeScreen,
       {},
@@ -5281,20 +5296,22 @@ export default class ExcalidrawView extends TextFileView {
           WelcomeScreen.Center.Heading,
           {
             color: decoration,
-            message: nextRankDelta > 0 ? `${rank}: ${nextRankDelta} more drawings until the next rank!` : `${rank}: You're at the top. Keep on being legendary!`,
+            message: nextRankDelta > 0 
+              ? `${rank}: ${nextRankDelta} ${t("WELCOME_RANK_NEXT")}` 
+              : `${rank}: ${t("WELCOME_RANK_LEGENDARY")}`,
           },
           title,
         ),
         React.createElement(
           WelcomeScreen.Center.Heading,
           {},
-          "Type \"Excalidraw\" in the Command Palette",
+          t("WELCOME_COMMAND_PALETTE"),
           React.createElement("br"),
-          "Explore the Obsidian Menu in the top right",
+          t("WELCOME_OBSIDIAN_MENU"),
           React.createElement("br"),
-          "Visit the Script Library",
+          t("WELCOME_SCRIPT_LIBRARY"),
           React.createElement("br"),
-          "Find help in the hamburger-menu",
+          t("WELCOME_HELP_MENU"),
         ),
         React.createElement(
           WelcomeScreen.Center.Menu,
@@ -5305,9 +5322,9 @@ export default class ExcalidrawView extends TextFileView {
               icon: ICONS.YouTube,
               href: "https://www.youtube.com/@VisualPKM",
               shortcut: null,
-              "aria-label": "Visual PKM YouTube Channel",  
+              "aria-label": t("WELCOME_YOUTUBE_ARIA"),
             },
-            " Check out the Visual PKM YouTube channel."
+            t("WELCOME_YOUTUBE_LINK")
           ),
           React.createElement(
             WelcomeScreen.Center.MenuItemLink,
@@ -5315,9 +5332,9 @@ export default class ExcalidrawView extends TextFileView {
               icon: ICONS.Discord,
               href: "https://discord.gg/DyfAXFwUHc",
               shortcut: null,
-              "aria-label": "Join the Discord Server",
+              "aria-label": t("WELCOME_DISCORD_ARIA"),
             },
-            " Join the Discord Server"
+            t("WELCOME_DISCORD_LINK")
           ),
           React.createElement(
             WelcomeScreen.Center.MenuItemLink,
@@ -5325,9 +5342,9 @@ export default class ExcalidrawView extends TextFileView {
               icon: ICONS.twitter,
               href: "https://twitter.com/zsviczian",
               shortcut: null,
-              "aria-label": "Follow me on Twitter",
+              "aria-label": t("WELCOME_TWITTER_ARIA"),
             },
-            " Follow me on Twitter"
+            t("WELCOME_TWITTER_LINK")
           ),
           React.createElement(
             WelcomeScreen.Center.MenuItemLink,
@@ -5335,9 +5352,9 @@ export default class ExcalidrawView extends TextFileView {
               icon: ICONS.Learn,
               href: "https://visual-thinking-workshop.com",
               shortcut: null,
-              "aria-label": "Learn Visual PKM",
+              "aria-label": t("WELCOME_LEARN_ARIA"),
             },
-            " Sign up for the Visual Thinking Workshop"
+            t("WELCOME_LEARN_LINK")
           ),
           React.createElement(
             WelcomeScreen.Center.MenuItemLink,
@@ -5345,9 +5362,9 @@ export default class ExcalidrawView extends TextFileView {
               icon: ICONS.heart,
               href: "https://ko-fi.com/zsolt",
               shortcut: null,
-              "aria-label": "Donate to support Excalidraw-Obsidian",    
+              "aria-label": t("WELCOME_DONATE_ARIA"),
             },
-            " Say \"Thank You\" & support the plugin."
+            t("WELCOME_DONATE_LINK")
           ),
         )
       )

src/dialogs/Messages.ts

@@ -17,6 +17,60 @@ 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.1": `
+This release includes an important fix that can result in your drawing being overwritten by another drawing. Please update to this version as soon as possible.
+
+## Fixed
+- A problem where switching between two Excalidraw documents in the same tab could result in the content from the first document overwriting the second one, particularly when the first document was large. [#1988](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1988)
+- Styling issue when Obsidian font size is set to the non-default value.
+- Embedding a block reference ${String.fromCharCode(96)}![[file#^block]]${String.fromCharCode(96)} where the file is an excalidraw file incorrectly replaced the embedding with the image instead of the block of text.
+
+## New
+- Improved SVG export to include only the necessary glyphs for .woff2 fonts, minimizing file sizes. Note that this feature is currently supported only for .woff2 files; other font formats like .ttf and .otf will be fully embedded, leading to larger SVG files. I recommend using .woff2 files whenever possible.
+`,
+"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

@@ -153,6 +153,24 @@ export default {
   REMOVE_LINK: "Remove text element link",
   LASER_ON: "Enable laser pointer",
   LASER_OFF: "Disable laser pointer",
+  WELCOME_RANK_NEXT: "more drawings until the next rank!",
+  WELCOME_RANK_LEGENDARY: "You're at the top. Keep on being legendary!",
+  WELCOME_COMMAND_PALETTE: 'Type "Excalidraw" in the Command Palette',
+  WELCOME_OBSIDIAN_MENU: "Explore the Obsidian Menu in the top right",
+  WELCOME_SCRIPT_LIBRARY: "Visit the Script Library",
+  WELCOME_HELP_MENU: "Find help in the hamburger-menu",
+  WELCOME_YOUTUBE_ARIA: "Visual PKM YouTube Channel",
+  WELCOME_YOUTUBE_LINK: "Check out the Visual PKM YouTube channel.",
+  WELCOME_DISCORD_ARIA: "Join the Discord Server",
+  WELCOME_DISCORD_LINK: "Join the Discord Server",
+  WELCOME_TWITTER_ARIA: "Follow me on Twitter",
+  WELCOME_TWITTER_LINK: "Follow me on Twitter",
+  WELCOME_LEARN_ARIA: "Learn Visual PKM",
+  WELCOME_LEARN_LINK: "Sign up for the Visual Thinking Workshop",
+  WELCOME_DONATE_ARIA: "Donate to support Excalidraw-Obsidian",
+  WELCOME_DONATE_LINK: 'Say "Thank You" & support the plugin.',
+  SAVE_IS_TAKING_LONG: "Saving your previous file is taking a long time. Please wait...",
+  SAVE_IS_TAKING_VERY_LONG: "For better performance, consider splitting large drawings into several smaller files.",
 
   //settings.ts
   RELEASE_NOTES_NAME: "Display Release Notes after update",
@@ -721,14 +739,16 @@ FILENAME_HEAD: "Filename",
   CUSTOM_FONT_HEAD: "Local font",
   ENABLE_FOURTH_FONT_NAME: "Enable local font option",
   ENABLE_FOURTH_FONT_DESC:
-    "By turning this on, you will see a local font in the font list on the properties panel for text elements. " +
-    "Files that use this local font will (partly) lose their platform independence. " +
-    "Depending on the custom font set in settings, they will look differently when loaded in another vault, or at a later time. " +
-    "Also the 4th font will display as system default font on excalidraw.com, or other Excalidraw versions.",
+    "Enabling this option will add a local font to the font list in the properties panel for text elements. " +
+    "Be aware that using this local font may compromise platform independence. " +
+    "Files using the custom font might render differently when opened in a different vault or at a later time, depending on the font settings. " +
+    "Additionally, the 4th font will default to the system font on excalidraw.com or other Excalidraw versions.",
   FOURTH_FONT_NAME: "Local font file",
   FOURTH_FONT_DESC:
-    "Select a .ttf, .woff or .woff2 font file from your vault to use as the local font. " +
-    "If no file is selected, Excalidraw will use the Virgil font by default.",
+    "Select a .otf, .ttf, .woff, or .woff2 font file from your vault to use as the local font. " +
+    "If no file is selected, Excalidraw will default to the Virgil font. " +
+    "For optimal performance, it is recommended to use a .woff2 file, as Excalidraw will encode only the necessary glyphs when exporting images to SVG. " +
+    "Other font formats will embed the entire font in the exported file, potentially resulting in significantly larger file sizes.",
   SCRIPT_SETTINGS_HEAD: "Settings for installed Scripts",
   SCRIPT_SETTINGS_DESC: "Some of the Excalidraw Automate Scripts include settings. Settings are organized by script. Settings will only become visible in this list after you have executed the newly downloaded script once.",
   TASKBONE_HEAD: "Taskbone Optical Character Recogntion",

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: "新建绘图 - 于新页签",
@@ -152,6 +153,24 @@ export default {
   REMOVE_LINK: "移除文字元素链接",
   LASER_ON: "启用激光笔",
   LASER_OFF: "关闭激光笔",
+  WELCOME_RANK_NEXT: "张绘图之后，可以到达下一等级！",
+  WELCOME_RANK_LEGENDARY: "您已是绘图大师，请续写传奇~",
+  WELCOME_COMMAND_PALETTE: '在命令面板中输入 "Excalidraw"',
+  WELCOME_OBSIDIAN_MENU: "探索右上角的 Obsidian 菜单",
+  WELCOME_SCRIPT_LIBRARY: "访问脚本库",
+  WELCOME_HELP_MENU: "在汉堡菜单（三横线）中寻找帮助",
+  WELCOME_YOUTUBE_ARIA: "可视化个人知识管理的 YouTube 频道",
+  WELCOME_YOUTUBE_LINK: "查看可视化个人知识管理的 YouTube 频道",
+  WELCOME_DISCORD_ARIA: "加入 Discord 服务器",
+  WELCOME_DISCORD_LINK: "加入 Discord 服务器",
+  WELCOME_TWITTER_ARIA: "在 Twitter 上关注我",
+  WELCOME_TWITTER_LINK: "在 Twitter 上关注我",
+  WELCOME_LEARN_ARIA: "学习“可视化个人知识管理”（Visual PKM）",
+  WELCOME_LEARN_LINK: "报名加入视觉思维工作坊",
+  WELCOME_DONATE_ARIA: "捐赠以支持 Excalidraw-Obsidian",
+  WELCOME_DONATE_LINK: '感谢并支持此插件。',
+  SAVE_IS_TAKING_LONG: "保存您之前的文件花费的时间较长，请稍候...",
+  SAVE_IS_TAKING_VERY_LONG: "为了更好的性能，请考虑将大型绘图拆分成几个较小的文件。",
 
   //settings.ts
   RELEASE_NOTES_NAME: "显示更新说明",
@@ -352,6 +371,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: "允许在触控笔模式下进行双指缩放",
@@ -671,7 +694,7 @@ FILENAME_HEAD: "文件名",
     "我建议尝试多个值来设置这个参数。当您放大一个较大的 PNG 图像时，如果图像突然从视图中消失，那就说明您已经达到了极限。默认值为 1。此设置对 iOS 无效。",
   CUSTOM_PEN_HEAD: "自定义画笔",
   CUSTOM_PEN_NAME: "自定义画笔工具的数量",
-  CUSTOM_PEN_DESC: "在画布上的 Obsidian 菜单按钮旁边切换自定义画笔。长按画笔按钮可以修改其样式。",
+  CUSTOM_PEN_DESC: "在画布上的 Obsidian 菜单按钮旁边切换自定义画笔。长按（双击）画笔按钮可以修改其样式。",
   EXPERIMENTAL_HEAD: "杂项",
   EXPERIMENTAL_DESC: `包括：默认的 LaTeX 公式，字段建议，绘图文件的类型标识符，OCR 等设置。`,
   EA_HEAD: "Excalidraw 自动化",
@@ -716,14 +739,16 @@ FILENAME_HEAD: "文件名",
   CUSTOM_FONT_HEAD: "本地字体",
   ENABLE_FOURTH_FONT_NAME: "为文本元素启用本地字体",
   ENABLE_FOURTH_FONT_DESC:
-    "开启此项后，文本元素的属性面板里会多出一个本地字体按钮。<br>" +
-    "使用了本地字体的绘图文件，将会失去一部分跨平台能力 —— " +
-    "若将绘图文件移动到其他库中打开，显示效果可能会截然不同；" +
-    "若在 excalidraw.com 或者其他版本的 Excalidraw 中打开，使用本地字体的文本会变回系统默认字体。",
+    "启用此选项将在文本元素的属性面板的字体列表中添加一个本地字体。" +
+    "请注意，使用这个本地字体可能会破坏平台的独立性。" +
+    "使用自定义字体的文件在不同的库中打开或在以后打开时，根据字体设置，可能会以不同的方式呈现。" +
+    "此外，在excalidraw.com 或其他 Excalidraw 版本中，默认的本地字体字体将使用系统字体。",
   FOURTH_FONT_NAME: "本地字体文件",
   FOURTH_FONT_DESC:
-    "选择库文件夹中的一个 .ttf，.woff 或 .woff2 字体文件作为本地字体文件。" +
-    "若未选择文件，则使用默认的 Virgil 字体。",
+    "从您的库中选择一个 .otf、.ttf、.woff 或 .woff2 字体文件作为本地字体使用。"+
+    "如果没有选择文件，Excalidraw 将默认使用 Virgil 字体。"+
+    "为了获得最佳性能，建议使用 .woff2 文件，因为当导出到 SVG 格式的图像时，Excalidraw 只会编码必要的字形。"+
+    "其他字体格式将在导出文件中嵌入整个字体，可能会导致文件大小显著增加。<mark>译者注：</mark>您可以在<a href='https://wangchujiang.com/free-font/' target='_blank'>Free Font</a>获取免费商用中文手写字体。",
   SCRIPT_SETTINGS_HEAD: "已安装脚本的设置",
   SCRIPT_SETTINGS_DESC: "有些 Excalidraw 自动化脚本包含设置项，当执行这些脚本时，它们会在该列表下添加设置项。",
   TASKBONE_HEAD: "Taskbone OCR（光学符号识别）",
@@ -739,6 +764,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/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>
@@ -868,6 +877,9 @@ export const penIcon = (pen: PenStyle) => {
 }
 
 export const stringToSVG = (svg: string) => {
+  if(svg.match('class="skip"')) {
+    return <div dangerouslySetInnerHTML={{__html: svg}}></div>
+  }
   svg = svg
     .replace(/stroke\s*=\s*['"][^"']*['"]/g,"")
     .replace(/[^-]width\s*=\s*['"][^"']*['"]/g,"")

src/menu/ToolsPanel.tsx

@@ -453,7 +453,7 @@ export class ToolsPanel extends React.Component<PanelProps, PanelState> {
           style={{
             top: `${this.state.top}px`,
             left: `${this.state.left}px`,
-            width: `${TOOLS_PANEL_WIDTH}px`,
+            width: `13.75rem`,
             display:
               this.state.visible && !this.state.excalidrawViewMode
                 ? "block"

src/settings.ts

@@ -224,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: " ",
@@ -471,6 +471,7 @@ export const DEFAULT_SETTINGS: ExcalidrawSettings = {
   modifierKeyOverrides: [
     {modifiers: ["Mod"], key:"Enter"},
     {modifiers: ["Mod"], key:"k"},
+    {modifiers: ["Mod"], key:"G"},
   ],
   showSplashscreen: true,
 };
@@ -761,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)")
@@ -777,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)")

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/ExcalidrawViewUtils.ts

@@ -378,6 +378,13 @@ export function isTextImageTransclusion (
       return false;
     }
     if(file && file instanceof TFile) {
+      if(
+        view.plugin.isExcalidrawFile(file) &&
+        link?.split("#")[1] &&
+        !isImagePartRef(getEmbeddedFilenameParts(link)))
+      {
+        return false;
+      }
       if (file.extension !== "md" || view.plugin.isExcalidrawFile(file)) {
         callback(link, file);
         return true;

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;
 }