2.5.1

Update color palette details in README

.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/How-to.yml

@@ -0,0 +1,68 @@
+name: How to? Support request
+description: Ask for help with using the plugin or understanding its features.
+title: "SUPPORT: "
+body:
+  - type: markdown
+    attributes:
+      value: |
+        ℹ️ **Important: Please Read Before Submitting a Support Request** ℹ️
+
+        I am a one-person team working on this plugin as a part-time hobby. Please help me manage the workload by following these guidelines. **Support requests that don't include enough details may be closed without review**.
+
+        Before submitting a support request, please:
+        1. **Review the [documentation](https://github.com/zsviczian/obsidian-excalidraw-plugin/wiki)** – your question may already be answered.
+        2. **[Search issues](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues) (including closed ones)** to see if your question has already been addressed.
+
+  - type: markdown
+    attributes:
+      value: |
+        Please help by providing the following details. Requests without this information may be closed without review.
+
+  - type: markdown
+    attributes:
+      value: |
+        ---
+
+  - type: checkboxes
+    id: search_existing_resources
+    attributes:
+      label: Have you checked the documentation and searched existing issues?
+      description: Please confirm that you've reviewed available resources before submitting your request.
+      options:
+        - label: Yes, I have reviewed the documentation and searched for related issues.
+
+  - type: textarea
+    id: support_question
+    attributes:
+      label: "Your question"
+      description: "Provide a clear and concise description of the question or issue you need help with."
+      placeholder: "Describe your question or the problem you are trying to solve..."
+
+  - type: textarea
+    id: steps_tried
+    attributes:
+      label: "Steps you've already tried"
+      description: "List any steps you've taken to try to resolve or understand the issue."
+      placeholder: |
+        1. Tried reading the documentation.
+        2. Searched the issues for similar questions.
+
+  - type: textarea
+    id: expected_outcome
+    attributes:
+      label: "Expected outcome"
+      description: "Describe what you expected to happen or what you are trying to achieve."
+      placeholder: "Describe the result you are aiming for..."
+
+  - type: textarea
+    id: additional_context
+    attributes:
+      label: "Additional context"
+      description: "Add any other context or details that may help."
+      placeholder: "Include any other information that may be relevant..."
+
+  - type: markdown
+    attributes:
+      value: |
+        **Attachments: Screenshots and files are critical!**  
+        A picture speaks a thousand words, and a screen recording even more. **Please attach screenshots, screen recordings, or sample files** to help illustrate your question or issue. Drag and drop them into the comment area or directly into any of the text fields above.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,85 @@
+name: Bug report
+description: If something is clearly broken, it’s a bug. Everything else is a feature or support request. Most reported “bugs” are actually how-to questions or feature requests.
+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. 
+

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,69 @@
+name: Feature request
+description: Request a new feature for the Excalidraw plugin.
+title: "FR: "
+body:
+  - type: markdown
+    attributes:
+      value: |
+        🛠️ **Important: Please Read Before Submitting a Feature Request** 🛠️
+
+        I develop Excalidraw primarily as a hobby, and I prioritize features that I personally use regularly. Features I don't use often break without me noticing, which is why the plugin is as stable as it is—because I rely on it every day. 
+
+        **Your task isn't just to describe the feature you want, but to sell me on the idea**. If I'm not convinced that the feature would significantly benefit my own workflow, it's unlikely I'll spend my free hobby time on it. 
+
+        When creating your feature request:
+        - **Provide real-life usage scenarios**: How will this feature help you? How do you imagine using it in practice? 
+        - **Sell the idea**: Convince me that I need this feature too.
+        - **Include supporting materials**: Reference other solutions? Include relevant screenshots, screen recordings, and links. The more work I need to do to understand your request, the less likely it is to be implemented.
+
+        **Additional Guidelines:**
+        - **Excalidraw Core Features**: If your request relates to core Excalidraw features, and not the Obsidian integration specifically, please raise it with the Excalidraw product team here: [Excalidraw Issues](https://github.com/excalidraw/excalidraw/issues).
+        - **Cross-Platform Compatibility**: Obsidian and Excalidraw are cross-platform solutions. I cannot develop platform-specific features like Apple Pencil or Samsung S-Pen support due to technical limitations. Please only request features that make sense across all platforms (Windows, Linux, ChromeOS, macOS, Android, iOS).
+
+        Remember: You're not asking from a genie. You're pitching to someone who will need to spend hours (even for small changes) on testing, releasing, documenting, and supporting the feature. If you don't sell it well, it won't get done.
+
+        **Explore Scripting First:**  
+        Many feature requests can already be achieved with scripts using Excalidraw Automate. While the documentation is somewhat dated, there are nearly a hundred published scripts available. With a little determination, you can explore the possibilities. Feeding relevant scripts into GPT can often generate a working solution. Start here: [Excalidraw Automate Documentation](https://zsviczian.github.io/obsidian-excalidraw-plugin/ExcalidrawScriptsEngine.html).
+
+  - type: textarea
+    id: problem_description
+    attributes:
+      label: "Is your feature request related to a problem? Please describe."
+      description: "Provide a clear and concise description of the problem. Ex. I'm always frustrated when..."
+      placeholder: "Describe the problem you are facing..."
+
+  - type: textarea
+    id: solution_description
+    attributes:
+      label: "Describe the solution you'd like"
+      description: "Provide a clear and concise description of what you want to happen."
+      placeholder: "Describe the feature you are requesting..."
+
+  - type: textarea
+    id: usage_scenario
+    attributes:
+      label: "Real-life usage scenarios"
+      description: "Provide specific examples of how you would use this feature. Convince me that this is a feature I need in my own workflow."
+      placeholder: |
+        1. In this scenario, I would use the feature to...
+        2. Another use case is when I...
+
+  - type: textarea
+    id: alternatives_considered
+    attributes:
+      label: "Describe alternatives you've considered"
+      description: "Provide a clear and concise description of any alternative solutions or features you've considered."
+      placeholder: "Describe any alternative approaches you have considered..."
+
+  - type: textarea
+    id: additional_context
+    attributes:
+      label: "Additional context"
+      description: "Include any other context, screenshots, or references about the feature request."
+      placeholder: "Include screenshots, recordings, or other supporting material..."
+
+  - type: markdown
+    attributes:
+      value: |
+        **Attachments: Make your case visually!**  
+        Supporting images, screenshots, or screen recordings are critical for helping me understand your request. Drag and drop them into the comment area or directly into any of the text fields above. Every bit of detail increases the chance of your request being understood and prioritized.

.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

@@ -1,6 +1,8 @@
 # Excalidraw
 
-[简体中文](./README.zh-cn.md)
+[简体中文](./docs/zh-cn/README.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.
 
@@ -98,15 +100,17 @@ Plugin settings are grouped into the following sections:
 
 #### Templates
 
-- Template for new drawings. The template will restore stroke properties. This means you can set up defaults in your template for stroke color, stroke width, opacity, font family, font size, fill style, stroke style, etc. This also applies to ExcalidrawAutomate.
+- Template for new drawings. The template will restore stroke properties. This means you can set up defaults in your template for stroke color, stroke width, opacity, font family, font size, fill style, stroke style, etc. This also applies to ExcalidrawAutomate. With versions 1.6.13 or higher make sure to enable "Decompress Excalidraw JSON in Markdown View" in the settings before editing the JSON in the template. This can be disabled after the canges are performed.
   - Via the template, you can customize the color palette used by Excalidraw.
     - Switch to Markdown view.
     - Scroll down to the bottom of the file and find `"AppState": {`.
-    - Find `"customColorPalette": {` at the end of the AppState section.
-    - You may specify the 3 palettes used in Excalidraw by adding any or all of the following 3 variables:
-        - `"canvasBackground":[], "elementBackground":[], "elementStroke": []`.
-    - Add a comma-separated list of valid HTML colors (e.g. `#FF0000` for red).
-        in the array for each of the variables.
+    - Find `"colorPalette": {` at the end of the AppState section.
+        - You may specify the 3 palettes used in Excalidraw by adding any or all of the following 3 variables:
+            - `"canvasBackground":[], "elementBackground":[], "elementStroke": []`.
+            - Add a comma-separated list of valid HTML colors (e.g. `#FF0000` for red) in the array for each of the variables.
+        - To change the previewed colors, a `"topPicks": {` may be specified containing the same three keys:
+            - `"canvasBackground":[], "elementBackground":[], "elementStroke": []`.
+            - Note that the corresponding arrays must contain 5 elements.
     - See my videos above for further help.
 
 #### Export
@@ -225,6 +229,7 @@ For more details, see this [video](https://youtu.be/yZQoJg2RCKI)
     - `excalidraw-export-dark`: true == Dark mode / false == light mode.
     - `excalidraw-export-padding`: Specify the export padding for the image.
     - `excalidraw-export-pngscale`: This only affects export to PNG. Specify the export scale for the image. The typical range is between 0.5 and 5, but you can experiment with other values as well.
+- Since 1.6.13, enable "Decompress Excalidraw JSON in Markdown View" in the settings if you want to change any JSON content.
 
 ### Embed complete markdown files into your drawings
 

dev.postprocess.config.js

@@ -1,36 +0,0 @@
-import fs from'fs';
-import LZString from 'lz-string';
-
-const excalidraw_pkg = isProd
-  ? fs.readFileSync("./node_modules/@zsviczian/excalidraw/dist/excalidraw.production.min.js", "utf8")
-  : fs.readFileSync("./node_modules/@zsviczian/excalidraw/dist/excalidraw.development.js", "utf8");
-const react_pkg = isProd
-  ? fs.readFileSync("./node_modules/react/umd/react.production.min.js", "utf8")
-  : fs.readFileSync("./node_modules/react/umd/react.development.js", "utf8");
-const reactdom_pkg = isProd
-  ? fs.readFileSync("./node_modules/react-dom/umd/react-dom.production.min.js", "utf8")
-  : fs.readFileSync("./node_modules/react-dom/umd/react-dom.development.js", "utf8");
-const lzstring_pkg = fs.readFileSync("./node_modules/lz-string/libs/lz-string.min.js", "utf8")
-
-const packageString = lzstring_pkg+'const EXCALIDRAW_PACKAGES = "' + LZString.compressToBase64(react_pkg + reactdom_pkg + excalidraw_pkg) +'";var ExcalidrawPackageLoader=(d=document)=>{const excalidraw_id = "excalidraw-script";if(!d.getElementById(excalidraw_id)){const script=d.createElement("script");script.type="text/javascript";script.id=excalidraw_id;script.text=LZString.decompressFromBase64(EXCALIDRAW_PACKAGES);d.body.appendChild(script);}};ExcalidrawPackageLoader();';
-
-const mainjs = fs.readFileSync("main.js", "utf8")
-
-
-fs.writeFileSync(
-  "main2.js",
-  mainjs
-    .replace('(require("react"));','')
-    .replace('"use strict";','"use strict";' + packageString),
-  {
-    encoding: "utf8",
-    flag: "w",
-    mode: 0o666
-  }
-);
-
-
-let config = {
-};
-
-export default config;

docs/zh-cn/AutomateHowTo.md

@@ -0,0 +1,484 @@
+# Excalidraw 自动化使用指南
+
+> 此说明当前更新至 `5569cff`。
+
+[English](../../AutomateHowTo.md)
+
+Excalidraw 自动化允许您使用 [Templater](https://github.com/SilentVoid13/Templater) 插件创建 Excalidraw 绘图。
+
+通过一些工作，使用 Excalidraw 自动化，您可以根据保管库中的文档生成简单的思维导图、填写 SVG 表单、创建自定义图表等。
+
+您可以通过 ExcalidrawAutomate 对象访问 Excalidraw 自动化。我建议您以以下代码开始您的自动化脚本。
+
+*使用 <kbd>CTRL+Shift+V</kbd> 将代码粘贴到 Obsidian 中！*
+
+```javascript
+const ea = ExcalidrawAutomate;
+ea.reset();
+```
+
+第一行创建了一个实用的常量，这样您就可以避免写 100 次 `ExcalidrawAutomate`。
+
+第二行将 `ExcalidrawAutomate` 重置为默认值。这一点很重要，因为您将不知道之前执行了哪个模板，因此您也不知道 `Excalidraw` 的状态。
+
+## 使用 Excalidraw 自动化的基本逻辑
+
+1. 设置您想要绘制的元素的样式
+2. 添加元素。每添加一个新元素，它都会在上一个元素的上方添加一层，因此在重叠对象的情况下，后添加的元素会在前一个元素之上。
+3. 调用 `await ea.create();` 来实例化绘图
+
+您可以在添加不同元素之间更改样式。我将元素样式与创建分开是基于这样的假设：您可能会设置描边颜色、描边样式、描边粗糙度等，并使用这些设置绘制大多数元素。每次添加元素时设置所有这些参数是没有意义的。
+
+### 在深入探讨之前，这里有两个简单的示例脚本
+#### 使用模板在自定义文件夹中创建具有自定义名称的新绘图
+这个简单的脚本为您提供了比 Excalidraw 插件设置更大的灵活性，可以为您的绘图命名、将其放入文件夹中，并应用模板。
+
+*使用 <kbd>CTRL+Shift+V</kbd> 将代码粘贴到 Obsidian 中！*
+```javascript
+<%*
+  const ea = ExcalidrawAutomate;
+  ea.reset();
+  await ea.create({
+    filename    : tp.date.now("HH.mm"), 
+    foldername  : tp.date.now("YYYY-MM-DD"),
+    templatePath: "Excalidraw/Template1.excalidraw",
+    onNewPane   : false
+  });
+%>
+```
+
+#### 创建一个简单的绘图
+*使用 <kbd>CTRL+Shift+V</kbd> 将代码粘贴到 Obsidian 中！*
+```javascript
+<%*
+  const ea = ExcalidrawAutomate;
+  ea.reset();
+  ea.addRect(-150,-50,450,300);
+  ea.addText(-100,70,"Left to right");
+  ea.addArrow([[-100,100],[100,100]]);
+
+  ea.style.strokeColor = "red";
+  ea.addText(100,-30,"top to bottom",{width:200,textAligh:"center"});
+  ea.addArrow([[200,0],[200,200]]);
+  await ea.create();
+%>
+```
+该脚本将生成以下绘图：
+
+![FristDemo](https://user-images.githubusercontent.com/14358394/116825643-6e5a8b00-ab90-11eb-9e3a-37c524620d0d.png)
+
+## 属性和功能一览
+这是 ExcalidrawAutomate 实现的接口：
+*使用 <kbd>CTRL+Shift+V</kbd> 将代码粘贴到 Obsidian 中！*
+```javascript
+ExcalidrawAutomate: {
+  style: {
+    strokeColor: string;
+    backgroundColor: string;
+    angle: number;
+    fillStyle: FillStyle;
+    strokeWidth: number;
+    storkeStyle: StrokeStyle;
+    roughness: number;
+    opacity: number;
+    strokeSharpness: StrokeSharpness;
+    fontFamily: FontFamily;
+    fontSize: number;
+    textAlign: string;
+    verticalAlign: string;
+    startArrowHead: string;
+    endArrowHead: string;
+  }
+  canvas: {theme: string, viewBackgroundColor: string};
+  setFillStyle: Function;
+  setStrokeStyle: Function;
+  setStrokeSharpness: Function;
+  setFontFamily: Function;
+  setTheme: Function;
+  addRect: Function;
+  addDiamond: Function;
+  addEllipse: Function;
+  addText: Function;
+  addLine: Function;
+  addArrow: Function;
+  connectObjects: Function;
+  addToGroup: Function;
+  toClipboard: Function;
+  create: Function;
+  createPNG: Function;
+  createSVG: Function;
+  clear: Function;
+  reset: Function;
+};
+```
+
+## 元素样式
+正如您所注意到的，某些样式具有设置函数。这是为了帮助您浏览属性的可用值。不过，您并不需要使用设置函数，您也可以直接设置值。
+
+### strokeColor
+字符串。线条的颜色。[CSS 合法颜色值](https://www.w3schools.com/cssref/css_colors_legal.asp)
+
+允许的值包括 [HTML 颜色名称](https://www.w3schools.com/colors/colors_names.asp)、十六进制 RGB 字符串，例如 `#FF0000` 表示红色。
+
+### backgroundColor
+字符串。对象的填充颜色。[CSS 合法颜色值](https://www.w3schools.com/cssref/css_colors_legal.asp)
+
+允许的值包括 [HTML 颜色名称](https://www.w3schools.com/colors/colors_names.asp)、十六进制 RGB 字符串，例如 `#FF0000` 表示红色，或 `transparent`（透明）。
+
+### angle
+数字。以弧度表示的旋转。90° == `Math.PI/2`。
+
+### fillStyle, setFillStyle()
+```typescript
+type FillStyle = "hachure" | "cross-hatch" | "solid";
+setFillStyle (val:number);
+```
+fillStyle 是一个字符串.
+
+`setFillStyle()` 接受一个数字：
+- 0: "hachure"（斜线填充）
+- 1: "cross-hatch"（交叉斜线填充）
+- 其他任何数字: "solid"（实心填充）
+
+### strokeWidth
+数字，设置描边的宽度。
+
+### strokeStyle, setStrokeStyle()
+```typescript
+type StrokeStyle = "solid" | "dashed" | "dotted";
+setStrokeStyle (val:number);
+```
+strokeStyle 是一个字符串。
+
+`setStrokeStyle()` 接受一个数字：
+- 0: "solid"（实线）
+- 1: "dashed"（虚线）
+- 其他任何数字: "dotted"（点线）
+
+### roughness
+数字。在 Excalidraw 中称为“粗糙度”。接受三个值：
+- 0: 建筑师
+- 1: 艺术家
+- 2: 卡通画家
+
+### opacity
+介于 0 和 100 之间的数字。对象的透明度，包括描边和填充。
+
+### strokeSharpness, setStrokeSharpness()
+```typescript
+type StrokeSharpness = "round" | "sharp";
+setStrokeSharpness(val:nmuber);
+```
+strokeSharpness 是一个字符串。
+
+“round” 线条是曲线，“sharp” 线条在转折点处断开（硬弯折）。
+
+`setStrokeSharpness()` 接受一个数字：
+- 0: "round"（圆滑）
+- 其他任何数字: "sharp"（尖锐）
+
+### fontFamily, setFontFamily()
+数字。有效值为 1、2 和 3。
+
+`setFontFamily()` 也会接受一个数字并返回字体名称。
+- 1: "Virgil, Segoe UI Emoji"
+- 2: "Helvetica, Segoe UI Emoji"
+- 3: "Cascadia, Segoe UI Emoji"
+
+### fontSize
+数字。默认值为 20 像素。
+
+### textAlign
+字符串。文本的水平对齐方式。有效值为 "left"（左对齐）、"center"（居中对齐）、"right"（右对齐）。
+
+在使用 `addText()` 函数设置固定宽度时，这一点很重要。
+
+### verticalAlign
+字符串。文本的垂直对齐方式。有效值为 "top"（顶部）和 "middle"（中间）。
+
+在使用 `addText()` 函数设置固定高度时，这一点很重要。
+
+### startArrowHead, endArrowHead
+字符串。有效值为 "arrow"（箭头）、"bar"（线条）、"dot"（点）和 "none"（无）。指定箭头的起始和结束。
+
+在使用 `addArrow()` 和 `connectObjects()` 函数时，这一点很重要。
+
+## canvas
+设置画布的属性。
+
+### theme, setTheme()
+字符串。有效值为 "light"（明亮）和 "dark"（黑暗）。
+
+`setTheme()` 接受一个数字：
+- 0: "light"（明亮）
+- 其他任何数字: "dark"（黑暗）
+
+### viewBackgroundColor
+字符串。对象的填充颜色。[CSS 合法颜色值](https://www.w3schools.com/cssref/css_colors_legal.asp)
+
+允许的值包括 [HTML 颜色名称](https://www.w3schools.com/colors/colors_names.asp)、十六进制 RGB 字符串，例如 `#FF0000` 表示红色，或 `transparent`（透明）。
+
+## 添加对象
+这些函数将向您的绘图中添加对象。画布是无限的，接受负值和正值的 X 和 Y 坐标。X 值从左到右增加，Y 值从上到下增加。
+
+![坐标](https://user-images.githubusercontent.com/14358394/116825632-6569b980-ab90-11eb-827b-ada598e91e46.png)
+
+### addRect(), addDiamond(), addEllipse()
+```typescript
+addRect(topX:number, topY:number, width:number, height:number):string
+addDiamond(topX:number, topY:number, width:number, height:number):string
+addEllipse(topX:number, topY:number, width:number, height:number):string
+```
+返回对象的 `id`。在用线连接对象时，需要使用 `id`。请参见后文。
+### addText
+```typescript
+addText(topX:number, topY:number, text:string, formatting?:{width:number, height:number,textAlign: string, verticalAlign:string, box: boolean, boxPadding: number}):string
+```
+
+向绘图中添加文本。
+
+格式参数是可选的：
+- 如果未指定 `width`（宽度）和 `height`（高度），函数将根据 `fontFamily`、`fontSize` 和提供的文本计算宽度和高度。
+- 如果您希望文本相对于绘图中的其他元素居中，可以提供固定的高度和宽度，同时可以指定 `textAlign` 和 `verticalAlign`，如上所述。例如：`{width:500, textAlign:"center"}`。
+- 如果您想在文本周围添加一个框，请设置 `{box:true}`。
+
+返回对象的 `id`。在用线连接对象时，需要使用 `id`。请参见后文。如果 `{box:true}`，则返回包围框的 `id`。
+
+### addLine()
+```typescript
+addLine(points: [[x:number,y:number]]):void
+```
+添加一条连接提供的点的线。必须至少包含两个点 `points.length >= 2`。如果提供的点超过两个，间隔点将作为断点添加。如果 `strokeSharpness` 设置为 "sharp"，线条将在转折处断开；如果设置为 "round"，线条将是曲线。
+
+### addArrow()
+```typescript
+addArrow(points: [[x:number,y:number]],formatting?:{startArrowHead:string,endArrowHead:string,startObjectId:string,endObjectId:string}):void
+```
+
+添加一条连接提供的点的箭头。必须至少包含两个点 `points.length >= 2`。如果提供的点超过两个，间隔点将作为断点添加。如果元素 `style.strokeSharpness` 设置为 "sharp"，线条将在转折处断开；如果设置为 "round"，线条将是曲线。
+
+`startArrowHead` 和 `endArrowHead` 指定要使用的箭头类型，如上所述。有效值为 "none"（无）、"arrow"（箭头）、"dot"（点）和 "bar"（线条）。例如：`{startArrowHead: "dot", endArrowHead: "arrow"}`。
+
+`startObjectId` 和 `endObjectId` 是连接对象的对象 ID。我建议使用 `connectObjects` 而不是调用 `addArrow()` 来连接对象。
+
+### connectObjects()
+```typescript
+declare type ConnectionPoint = "top"|"bottom"|"left"|"right";
+connectObjects(objectA: string, connectionA: ConnectionPoint, objectB: string, connectionB: ConnectionPoint, formatting?:{numberOfPoints: number,startArrowHead:string,endArrowHead:string, padding: number}):void
+```
+连接两个对象的箭头。
+
+`objectA` 和 `objectB` 是字符串。这些是要连接的对象的 ID。这些 ID 是通过 `addRect()`、`addDiamond()`、`addEllipse()` 和 `addText()` 创建这些对象时返回的。
+
+`connectionA` 和 `connectionB` 指定在对象上的连接位置。有效值为："top"（上）、"bottom"（下）、"left"（左）和 "right"（右）。
+
+`numberOfPoints` 设置线条的间隔断点数量。默认值为零，意味着箭头的起点和终点之间不会有断点。当在绘图中移动对象时，这些断点将影响 Excalidraw 如何重新调整线条。
+
+`startArrowHead` 和 `endArrowHead` 的功能与 `addArrow()` 中描述的一致。
+
+### addToGroup()
+```typescript
+addToGroup(objectIds:[]):void
+```
+将 `objectIds` 中列出的对象进行分组。
+
+## Utility functions
+### clear()
+`clear()` 将从缓存中清除对象，但会保留元素样式设置。
+
+### reset()
+`reset()` 将首先调用 `clear()`，然后将元素样式重置为默认值。
+
+### toClipboard()
+```typescript
+async toClipboard(templatePath?:string)
+```
+将生成的图形放入剪贴板。当您不想创建新图形，而是想将其他项目粘贴到现有图形上时，这非常有用。
+
+### create()
+```typescript
+async create(params?:{filename: string, foldername:string, templatePath:string, onNewPane: boolean})
+```
+创建图形并打开它。
+
+`filename` 是要创建的图形的文件名（不带扩展名）。如果为 `null`，则 Excalidraw 会生成一个文件名。
+
+`foldername` 是文件应创建的文件夹。如果为 `null`，则将根据 Excalidraw 设置使用新图形的默认文件夹。
+
+`templatePath` 是包含完整路径和扩展名的模板文件名。该模板文件将作为基础层添加，所有通过 ExcalidrawAutomate 添加的额外对象将出现在模板元素之上。如果为 `null`，则不使用模板，即空白图形将作为添加对象的基础。
+
+`onNewPane` 定义新图形应创建的位置。`false` 将在当前活动的标签页中打开图形；`true` 将通过垂直分割当前标签页来打开图形。
+
+示例：
+
+```javascript
+create({filename:"my drawing", foldername:"myfolder/subfolder/", templatePath: "Excalidraw/template.excalidraw", onNewPane: true});
+```
+### createSVG()
+```typescript
+async createSVG(templatePath?:string)
+```
+返回一个包含生成图形的 HTML `SVGSVGElement`。
+
+### createPNG()
+```typescript
+async createPNG(templatePath?:string)
+```
+返回一个包含生成图形的 PNG 图像的 blob。
+
+## 示例
+### 将新图形插入到当前编辑的文档中
+此模板将提示您输入图形的标题。它将在您提供的标题下创建一个新图形，并在您正在编辑的文档的文件夹中。然后，它将在光标位置插入新图形，并通过分割当前标签页在新的工作区标签页中打开新图形。
+
+*使用 <kbd>CTRL+Shift+V</kbd> 将代码粘贴到 Obsidian 中！*
+```javascript
+<%*
+  const defaultTitle = tp.date.now("HHmm")+' '+tp.file.title;
+  const title = await tp.system.prompt("Title of the drawing?", defaultTitle);
+  const folder = tp.file.folder(true);
+  const transcludePath = (folder== '/' ? '' : folder + '/') + title + '.excalidraw';
+  tR = String.fromCharCode(96,96,96)+'excalidraw\n[['+transcludePath+']]\n'+String.fromCharCode(96,96,96);
+  const ea = ExcalidrawAutomate;
+  ea.reset();
+  ea.setTheme(1); //set Theme to dark
+  await ea.create({
+    filename : title,
+    foldername : folder,
+    //templatePath: 'Excalidraw/Template.excalidraw', //uncomment if you want to use a template
+    onNewPane : true
+  });
+%>
+```
+
+### 连接对象
+*使用 <kbd>CTRL+Shift+V</kbd> 将代码粘贴到 Obsidian 中！*
+```javascript
+<%*
+  const ea = ExcalidrawAutomate;
+  ea.reset();
+  ea.addText(-130,-100,"Connecting two objects");
+  const a = ea.addRect(-100,-100,100,100);
+  const b = ea.addEllipse(200,200,100,100);
+  ea.connectObjects(a,"bottom",b,"left",{numberOfPoints: 2}); //see how the line breaks differently when moving objects around
+  ea.style.strokeColor = "red";
+  ea.connectObjects(a,"right",b,"top",1);
+  await ea.create();
+%>
+```
+### 使用模板
+这个示例与第一个类似，但旋转了 90°，并使用了模板，同时指定了文件名和保存图形的文件夹，并在新的标签页中打开新图形。
+
+*使用 <kbd>CTRL+Shift+V</kbd> 将代码粘贴到 Obsidian 中！*
+```javascript
+<%*
+  const ea = ExcalidrawAutomate;
+  ea.reset();
+  ea.style.angle = Math.PI/2; 
+  ea.style.strokeWidth = 3.5;
+  ea.addRect(-150,-50,450,300);
+  ea.addText(-100,70,"Left to right");
+  ea.addArrow([[-100,100],[100,100]]);
+
+  ea.style.strokeColor = "red";
+  await ea.addText(100,-30,"top to bottom",{width:200,textAlign:"center"});
+  ea.addArrow([[200,0],[200,200]]);
+  await ea.create({filename:"My Drawing",foldername:"myfolder/fordemo/",templatePath:"Excalidraw/Template2.excalidraw",onNewPane:true});
+%>
+```
+
+### 从文本大纲生成简单思维导图
+这是一个稍微复杂一些的示例。这个示例将从一个表格化的大纲生成思维导图。
+
+![Drawing 2021-05-05 20 52 34](https://user-images.githubusercontent.com/14358394/117194124-00a69d00-ade4-11eb-8b75-5e18a9cbc3cd.png)
+
+输入示例:
+
+```
+- Test 1
+	- Test 1.1
+- Test 2
+	- Test 2.1
+	- Test 2.2
+		- Test 2.2.1
+		- Test 2.2.2
+		- Test 2.2.3
+			- Test 2.2.3.1
+- Test 3
+	- Test 3.1
+```
+
+The script:
+
+*使用 <kbd>CTRL+Shift+V</kbd> 将代码粘贴到 Obsidian 中！*
+```javascript
+<%*
+const IDX = Object.freeze({"depth":0, "text":1, "parent":2, "size":3, "children": 4, "objectId":5});
+
+//check if an editor is the active view
+const editor = this.app.workspace.activeLeaf?.view?.editor;
+if(!editor) return;
+
+//initialize the tree with the title of the document as the first element
+let tree = [[0,this.app.workspace.activeLeaf?.view?.getDisplayText(),-1,0,[],0]];
+const linecount = editor.lineCount();
+
+//helper function, use regex to calculate indentation depth, and to get line text
+function getLineProps (i) {
+  props = editor.getLine(i).match(/^(\t*)-\s+(.*)/);
+  return [props[1].length+1, props[2]];
+}
+
+//a vector that will hold last valid parent for each depth
+let parents = [0];
+
+//load outline into tree
+for(i=0;i<linecount;i++) {
+  [depth,text] = getLineProps(i);
+  if(depth>parents.length) parents.push(i+1);
+  else parents[depth] = i+1;
+  tree.push([depth,text,parents[depth-1],1,[]]);
+  tree[parents[depth-1]][IDX.children].push(i+1);
+}
+
+//recursive function to crawl the tree and identify height aka. size of each node
+function crawlTree(i) {
+  if(i>linecount) return 0;
+  size = 0;
+  if((i+1<=linecount && tree[i+1][IDX.depth] <= tree[i][IDX.depth])|| i == linecount) { //I am a leaf
+    tree[i][IDX.size] = 1; 
+    return 1; 
+  }
+  tree[i][IDX.children].forEach((node)=>{ 
+    size += crawlTree(node);
+  });
+  tree[i][IDX.size] = size; 
+  return size;   
+}
+
+crawlTree(0);
+
+//Build the mindmap in Excalidraw
+const width = 300;
+const height = 100;
+const ea = ExcalidrawAutomate;
+ea.reset();
+
+//stores position offset of branch/leaf in height units
+offsets = [0];
+
+for(i=0;i<=linecount;i++) {
+  depth = tree[i][IDX.depth];
+  if (depth == 1) ea.style.strokeColor = '#'+(Math.random()*0xFFFFFF<<0).toString(16);
+  tree[i][IDX.objectId] = ea.addText(depth*width,((tree[i][IDX.size]/2)+offsets[depth])*height,tree[i][IDX.text],{box:true});  
+  //set child offset equal to parent offset
+  if((depth+1)>offsets.length) offsets.push(offsets[depth]);
+  else offsets[depth+1] = offsets[depth];
+  offsets[depth] += tree[i][IDX.size];
+  if(tree[i][IDX.parent]!=-1) {
+    ea.connectObjects(tree[tree[i][IDX.parent]][IDX.objectId],"right",tree[i][IDX.objectId],"left",{startArrowHead: 'dot'});
+  }
+}
+
+await ea.create({onNewPane: true});
+%>
+```

docs/zh-cn/README.md

@@ -1,6 +1,10 @@
 # Excalidraw
 
-> 此说明当前更新至 2.4.0-beta-9。
+> 此说明当前更新至 `5569cff`。
+
+[English](../../README.md)
+
+👉👉👉 快来查看并为新的 [Obsidian-Excalidraw 社区维基](https://excalidraw-obsidian.online/Hobbies/Excalidraw+Blog/WIKI/Welcome+to+the+WIKI)贡献你的力量吧
 
 Obsidian-Excalidraw 插件将 [Excalidraw](https://excalidraw.com/) 这一功能丰富的草图工具集成到 Obsidian 中。您可以在您的库中存储和编辑 Excalidraw 文件，可以将图形嵌入到文档中，还可以在 Excalidraw 中链接到文档和其他图形。有关 Excalidraw 功能的展示，请查看我的博客文章 [这里](https://www.zsolt.blog/2021/03/showcasing-excalidraw.html) 或观看以下视频。
 

ea-scripts/Auto Draw for Pen.md

@@ -1,67 +0,0 @@
-/*
-Automatically switches between the select and draw tools, based on whether a pen is being used.
-
-1. Choose the select tool
-2. Hover/use the pen to draw, move it away to return to select mode
-*This is based on pen hover status, so will only work if your pen supports hover!*
-If you click draw with the mouse or press select with the pen, switching will be disabled until the opposite input method is used.
-
-**Note:** This script will stay active until the *Obsidian* window is closed.
-
-Compatible with my *Hardware Eraser Support* script
-
-```javascript
-*/
-(function() {
-    'use strict';
-    
-    let promise
-    let timeout
-    let disable
-
-    function handlePointer(e) {
-        ea.setView("active");
-        var activeTool = ea.getExcalidrawAPI().getAppState().activeTool;
-        function setActiveTool(t) {
-            ea.getExcalidrawAPI().setActiveTool(t)
-        }
-
-        if (e.pointerType === 'pen') {
-            if (disable) return
-            if (!promise && activeTool.type==='selection') {
-                setActiveTool({type:"freedraw"})
-            }
-
-            if (timeout) clearTimeout(timeout)
-
-            function setTimeoutX(a,b) {
-                timeout = setTimeout(a,b)
-                return timeout
-            }
-    
-            function revert() {
-                activeTool = ea.getExcalidrawAPI().getAppState().activeTool;
-                disable = false
-                if (activeTool.type==='freedraw') {
-                    setActiveTool({type:"selection"})
-                } else if (activeTool.type==='selection') {
-                    disable = true
-                }
-                promise = false
-            }
-
-            promise = new Promise(resolve => setTimeoutX(resolve, 500))
-            promise.then(() => revert())
-        }
-    }
-    function handleClick(e) {
-        ea.setView("active");
-        if (e.pointerType !== 'pen') {
-            disable = false
-        }
-    }
-
-    window.addEventListener('pointermove', handlePointer, { capture: true })
-    window.addEventListener('pointerdown', handleClick, { capture: true })
-
-})();

ea-scripts/Auto Draw for Pen.svg

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 448 512" style="enable-background:new 0 0 448 512;" xml:space="preserve">
-<style type="text/css">
-	.st0{stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
-</style>
-<g>
-	<g>
-		<path class="st0" d="M355.8,234.1"/>
-	</g>
-	<g>
-		<path d="M32.3,139.7l28.8,24.2l63.5-71.7L95.7,67c-7.2-6.3-18.2-5.6-24.5,1.6l-40.6,46.6C24.3,122.4,25,133.3,32.3,139.7z"/>
-		<path d="M61.2,165.3l-29.6-24.9c-3.7-3.3-5.9-7.8-6.3-12.7c-0.3-4.9,1.3-9.6,4.5-13.2L70.5,68c6.7-7.6,18.3-8.4,25.9-1.7L126,92.1
-			L61.2,165.3z M32.9,138.9l28,23.6l62.2-70.2l-28-24.6c-6.8-5.9-17.1-5.2-23.1,1.5l-40.6,46.6c-2.9,3.3-4.3,7.5-4,11.8
-			C27.6,132,29.6,136,32.9,138.9z"/>
-	</g>
-	<g>
-		<polygon points="218.7,240.1 212.3,168.6 197.2,155.4 133.7,228.1 148.9,241.3 		"/>
-		<path d="M148.5,242.3l-16.2-14.1l64.8-74.2l16.2,14.1l6.5,73L148.5,242.3z M135.1,228l14.1,12.3l68.4-1.2l-6.2-70.1l-14.1-12.3
-			L135.1,228z"/>
-	</g>
-	<g>
-		<polygon points="192.6,151.6 129.1,224.3 66.2,168.4 129.6,96.7 		"/>
-		<path d="M129.2,225.7l-64.5-57.2l64.8-73.2l64.5,56.2L129.2,225.7z M67.6,168.3l61.5,54.6l62.2-71.2l-61.5-53.6L67.6,168.3z"/>
-	</g>
-	<g>
-		<path d="M109.7,381.6c-23.7-22.2-40-49.3-48.9-78.2c8.2-0.9,22.4-3.6,30.1-12.3c-12.6-12.5-25.3-25-37.9-37.5c0-0.1,0-0.3,0-0.4
-			l-23.6-22c-6,60.7,15.5,123.7,63.7,168.8s112.5,62.4,172.7,52.4l-24.1-22.6C194.8,432.3,146.9,416.4,109.7,381.6z"/>
-		<path d="M232.6,456.1c-19.6,0-39.2-2.8-57.9-8.3c-30.9-9.1-58.6-24.9-82.3-47.1C68.7,378.6,51.1,352,40,321.8
-			c-10.6-28.8-14.6-60.2-11.6-90.7l0.2-2L54,252.8v0.4c6.2,6.1,12.4,12.3,18.6,18.4c6.3,6.3,12.7,12.5,19,18.8l0.7,0.7l-0.6,0.7
-			c-7.2,8.1-19.8,11.3-29.5,12.5c9.2,29.2,25.9,55.6,48.3,76.6l0,0c35.8,33.5,82.4,50.5,131.3,47.9l0.4,0l25.9,24.3l-2,0.3
-			C255,455.2,243.8,456.1,232.6,456.1z M30.2,233.3c-5.6,62.5,17.5,122.9,63.6,166c46,43.1,107.8,62.1,169.8,52.5l-22.3-20.9
-			c-49.2,2.5-96.2-14.7-132.3-48.5l0,0c-22.9-21.5-39.9-48.7-49.2-78.6l-0.4-1.2l1.2-0.1c9.3-1,21.6-3.8,28.8-11.3
-			c-6.1-6-12.2-12.1-18.3-18.1c-6.3-6.2-12.6-12.5-18.9-18.7L52,254v-0.4L30.2,233.3z"/>
-	</g>
-	<g>
-		<path d="M368.8,105.4c-56-52.4-133.5-67.2-201.3-45.5l21,19.6c56.1-13.2,117.7,1.1,163.1,43.7c33,30.9,51.7,71.2,55.9,112.7
-			c-0.2-0.4-0.3-0.6-0.3-0.6s-25.1-0.1-36.5,12.7c11.8,11.6,23.5,23.3,35.3,34.9v0.1l2.4,2.3c0.4,0.4,0.9,0.9,1.3,1.3l0,0l17.7,16.6
-			C444.7,234.1,424.8,157.7,368.8,105.4z"/>
-		<path d="M428,305.1L409,287.3l-1.3-1.3l-2.7-2.6v-0.1c-5.8-5.7-11.5-11.4-17.3-17.1c-5.9-5.8-11.8-11.7-17.7-17.5l-0.7-0.7
-			l0.6-0.7c10.5-11.8,31.7-12.9,36.4-13c-4.7-42.1-24.3-81.3-55.4-110.4c-43.5-40.9-104.2-57.1-162.2-43.5l-0.5,0.1l-22.6-21.1
-			l1.6-0.5c70.5-22.6,148-5,202.3,45.7c54.3,50.7,76.9,126.9,58.9,198.8L428,305.1z M407,282.6l3.4,3.3l16.4,15.4
-			c17.1-70.7-5.3-145.3-58.7-195.2l0,0c-53.3-49.9-129.3-67.4-198.7-45.8l19.4,18.1c58.5-13.6,119.6,2.9,163.5,44.1
-			c31.9,29.8,51.8,70.1,56.2,113.3l0.5,5.4l-2.5-4.9c-3.8,0.1-24.3,1.1-34.5,11.7c5.7,5.6,11.3,11.2,17,16.8
-			c5.9,5.8,11.7,11.6,17.6,17.4L407,282.6L407,282.6z"/>
-	</g>
-	<polygon points="425.2,382.2 302.7,283.9 299.4,437.6 340.9,383.8 382.3,456.5 398,447.5 359.4,379.8 	"/>
-</g>
-</svg>

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/Hardware Eraser Support.md

@@ -1,75 +0,0 @@
-/*
-Adds support for pen inversion, a.k.a. the hardware eraser on the back of your pen.
-
-Simply use the eraser on a supported pen, and it will erase. Your previous tool will be restored when the eraser leaves the screen.
-(Tested with a surface pen, but should work with all windows ink devices, and probably others)
-
-**Note:** This script will stay active until the *Obsidian* window is closed.
-
-Compatible with my *Auto Draw for Pen* script
-
-```javascript
-*/
-
-(function() {
-    'use strict';
-
-    let activated
-    let revert
-    
-    function handlePointer(e) {
-        const activeTool = ea.getExcalidrawAPI().getAppState().activeTool;
-        const isEraser = e.pointerType === 'pen' && e.buttons & 32
-        function setActiveTool(t) {
-            ea.getExcalidrawAPI().setActiveTool(t)
-        }
-        if (!activated && isEraser) {
-            //Store previous tool
-            const btns = document.querySelectorAll('.App-toolbar input.ToolIcon_type_radio')
-            for (const i in btns) {
-                if (btns[i]?.checked) {
-                    revert = btns[i]
-                }
-            }
-            revert = activeTool
-
-            // Activate eraser tool
-            setActiveTool({type: "eraser"})
-            activated = true
-
-            // Force Excalidraw to recognize this the same as pen tip
-            // https://github.com/excalidraw/excalidraw/blob/4a9fac2d1e5c4fac334201ef53c6f5d2b5f6f9f5/src/components/App.tsx#L2945-L2951
-            Object.defineProperty(e, 'button', {
-                value: 0,
-                writable: false
-            });
-        }
-        // Keep on eraser!
-        if (isEraser && activated) {
-            setActiveTool({type: "eraser"})
-        }
-        if (activated && !isEraser) {
-            // Revert tool on release
-            // revert.click()
-            setActiveTool(revert)
-            activated = false
-            
-            // Force delete "limbo" elements
-            // This doesn't happen on the web app
-            // It's a bug caused by switching to eraser during a stroke
-            ea.setView("active");
-            var del = []
-            for (const i in ea.getViewElements()) {
-                const element = ea.getViewElements()[i];
-                if (element.opacity === 20) {
-                    del.push(element)
-                }
-            }
-            ea.deleteViewElements(del)
-            setActiveTool(revert)
-        }
-    }
-    
-    window.addEventListener('pointerdown', handlePointer, { capture: true })
-    window.addEventListener('pointermove', handlePointer, { capture: true })
-})();

ea-scripts/Hardware Eraser Support.svg

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 27.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 448 512" style="enable-background:new 0 0 448 512;" xml:space="preserve">
-<style type="text/css">
-	.st0{stroke:#000000;stroke-width:2;stroke-miterlimit:10;}
-</style>
-<path class="st0" d="M355.8,234.1"/>
-<g>
-	<path class="st0" d="M404.8,293.5L306.9,208l-120,137.4l97.9,85.5c13.6,11.9,34.4,10.5,46.3-3.1l76.8-88
-		C419.9,326.2,418.5,305.5,404.8,293.5z M389.4,322.2l-78.2,89.6c-3.8,4.3-10.4,4.8-14.8,1l-77.8-68l92-105.3l77.8,68
-		C392.8,311.2,393.2,317.8,389.4,322.2z"/>
-	<polygon class="st0" points="52.4,103.7 64.4,238.9 93,263.8 213,126.4 184.4,101.4 	"/>
-	
-		<rect x="108.3" y="185.1" transform="matrix(0.6578 -0.7532 0.7532 0.6578 -108.9276 230.7956)" class="st0" width="182.4" height="100.3"/>
-	<path class="st0" d="M109.7,381.6c-23.7-22.2-40-49.3-48.9-78.2c8.2-0.9,22.4-3.6,30.1-12.3c-12.6-12.5-25.3-25-37.9-37.5
-		c0-0.1,0-0.3,0-0.4l-23.6-22c-6,60.7,15.5,123.7,63.7,168.8s112.5,62.4,172.7,52.4l-24.1-22.6C194.8,432.3,146.9,416.4,109.7,381.6
-		z"/>
-	<path class="st0" d="M368.8,105.4c-56-52.4-133.5-67.2-201.3-45.5l21,19.6c56.1-13.2,117.7,1.1,163.1,43.7
-		c33,30.9,51.7,71.2,55.9,112.7c-0.2-0.4-0.3-0.6-0.3-0.6s-25.1-0.1-36.5,12.7c11.8,11.6,23.5,23.3,35.3,34.9c0,0,0,0.1,0,0.1
-		l2.4,2.3c0.4,0.4,0.9,0.9,1.3,1.3c0,0,0,0,0,0l17.7,16.6C444.7,234.1,424.8,157.7,368.8,105.4z"/>
-</g>
-</svg>

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]]|
@@ -114,14 +115,12 @@ 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/Auto%20Draw%20for%20Pen.svg"/></div>|[[#Auto Draw for Pen]]|
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Boolean%20Operations.svg"/></div>|[[#Boolean Operations]]|
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Custom%20Zoom.svg"/></div>|[[#Custom Zoom]]|
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Copy%20Selected%20Element%20Styles%20to%20Global.svg"/></div>|[[#Copy Selected Element Styles to Global]]|
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/ExcaliAI.svg"/></div>|[[#ExcaliAI]]|
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Excalidraw%20Writing%20Machine.svg"/></div>|[[#Excalidraw Writing Machine]]|
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/GPT-Draw-a-UI.svg"/></div>|[[#GPT Draw-a-UI]]|
-|<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Hardware%20Eraser%20Support.svg"/></div>|[[#Hardware Eraser Support]]|
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Palette%20loader.svg"/></div>|[[#Palette Loader]]|
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/PDF%20Page%20Text%20to%20Clipboard.svg"/></div>|[[#PDF Page Text to Clipboard]]|
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Rename%20Image.svg"/></div>|[[#Rename Image]]|
@@ -183,12 +182,6 @@ 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/Add%20Next%20Step%20in%20Process.md'>File on GitHub</a></td></tr><tr valign='top'><td class="label">Description</td><td class="data">This script will prompt you for the title of the process step, then will create a stick note with the text. If an element is selected then the script will connect this new step with an arrow to the previous step (the selected element). If no element is selected, then the script assumes this is the first step in the process and will only output the sticky note with the text that was entered.<br><img src='https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/images/scripts-add-process-step.jpg'></td></tr></table>
 
-## Auto Draw for Pen
-```excalidraw-script-install
-https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Auto%20Draw%20for%20Pen.md
-```
-<table><tr  valign='top'><td class="label">Author</td><td class="data"><a href='https://github.com/threethan'>@threethan</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/Auto%20Draw%20for%20Pen.md'>File on GitHub</a></td></tr><tr valign='top'><td class="label">Description</td><td class="data">Automatically switches from select mode to drawing mode when hovering a pen, and then back.</td></tr></table>
-
 ## Auto Layout
 ```excalidraw-script-install
 https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Auto%20Layout.md
@@ -402,13 +395,6 @@ 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/GPT-Draw-a-UI.md'>File on GitHub</a></td></tr><tr valign='top'><td class="label">Description</td><td class="data">This script was discontinued in favor of ExcaliAI. Draw a UI and let GPT create the code for you.<br><iframe width="400" height="225" src="https://www.youtube.com/embed/y3kHl_6Ll4w" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe><img src='https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/images/scripts-draw-a-ui.jpg'></td></tr></table>
 
-
-## Hardware Eraser Support
-```excalidraw-script-install
-https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Hardware%20Eraser%20Support.md
-```
-<table><tr  valign='top'><td class="label">Author</td><td class="data"><a href='https://github.com/threethan'>@threethan</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/Hardware%20Eraser%20Support.md'>File on GitHub</a></td></tr><tr valign='top'><td class="label">Description</td><td class="data">Allows you to use inversion, aka hardware eraser, on supported pens.</td></tr></table>
-
 ## Invert colors
 ```excalidraw-script-install
 https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Invert%20colors.md
@@ -517,6 +503,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.5.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.5.1",
   "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-56",
     "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"

prod.postprocess.config.js

@@ -1,32 +0,0 @@
-import fs from'fs';
-import LZString from 'lz-string';
-
-const excalidraw_pkg =  fs.readFileSync("./node_modules/@zsviczian/excalidraw/dist/excalidraw.production.min.js", "utf8");
-const react_pkg = fs.readFileSync("./node_modules/react/umd/react.production.min.js", "utf8");
-const reactdom_pkg = fs.readFileSync("./node_modules/react-dom/umd/react-dom.production.min.js", "utf8");
-const lzstring_pkg = fs.readFileSync("./node_modules/lz-string/libs/lz-string.min.js", "utf8");
-const mainjs = fs.readFileSync("main.js", "utf8")
-
-const packageString = lzstring_pkg+'const EXCALIDRAW_PACKAGES="' + LZString.compressToBase64(react_pkg + reactdom_pkg + excalidraw_pkg) +'";var ExcalidrawPackageLoader=(d=document)=>{if(!d.getElementById("excalidraw-script")){const script=d.createElement("script");script.type="text/javascript";script.id="excalidraw-script";script.text=LZString.decompressFromBase64(EXCALIDRAW_PACKAGES);d.body.appendChild(script);}};ExcalidrawPackageLoader();';
-
-fs.writeFileSync(
-  "main2.js",
-  mainjs
-    .replace('(require("react"))','')
-    .replace('"use strict";','"use strict";' + packageString),
-  {
-    encoding: "utf8",
-    flag: "w",
-    mode: 0o666
-  }
-);
-
-
-export default ({
-  input: 'foo',
-  plugins: [],
-  output: [{
-    file: 'foo.js',
-    format: 'es'
-  }]
-});

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 : "";
@@ -591,6 +593,7 @@ export class EmbeddedFilesLoader {
     addFiles: (files: FileData[], isDark: boolean, final?: boolean) => void,
     depth:number,
     isThemeChange:boolean = false,
+    fileIDWhiteList?: Set<FileId>,
   ) {
     
     if(depth > 7) {
@@ -605,6 +608,7 @@ export class EmbeddedFilesLoader {
     let entry: IteratorResult<[FileId, EmbeddedFile]>;
     const files: FileData[] = [];
     while (!this.terminate && !(entry = entries.next()).done) {
+      if(fileIDWhiteList && !fileIDWhiteList.has(entry.value[0])) continue;
       const embeddedFile: EmbeddedFile = entry.value[1];
       if (!embeddedFile.isLoaded(this.isDark)) {
         //debug({where:"EmbeddedFileLoader.loadSceneFiles",uid:this.uid,status:"embedded Files are not loaded"});
@@ -651,6 +655,7 @@ export class EmbeddedFilesLoader {
     let equation;
     const equations = excalidrawData.getEquationEntries();
     while (!this.terminate && !(equation = equations.next()).done) {
+      if(fileIDWhiteList && !fileIDWhiteList.has(equation.value[0])) continue;
       if (!excalidrawData.getEquation(equation.value[0]).isLoaded) {
         const latex = equation.value[1].latex;
         const data = await tex2dataURL(latex);

src/ExcalidrawAutomate.ts

@@ -21,7 +21,6 @@ import { ExcalidrawData, getMarkdownDrawingSection, REGEX_LINK } from "src/Excal
 import {
   FRONTMATTER,
   nanoid,
-  VIEW_TYPE_EXCALIDRAW,
   MAX_IMAGE_SIZE,
   COLOR_NAMES,
   fileid,
@@ -55,29 +54,29 @@ import {
   wrapTextAtCharLength,
   arrayToMap,
 } from "src/utils/Utils";
-import { getAttachmentsFolderAndFilePath, getLeaf, getNewOrAdjacentLeaf, isObsidianThemeDark, mergeMarkdownFiles, openLeaf } from "src/utils/ObsidianUtils";
-import { AppState, BinaryFileData,  DataURL,  ExcalidrawImperativeAPI, Point } from "@zsviczian/excalidraw/types/excalidraw/types";
+import { getAttachmentsFolderAndFilePath, getExcalidrawViews, getLeaf, getNewOrAdjacentLeaf, isObsidianThemeDark, mergeMarkdownFiles, openLeaf } from "src/utils/ObsidianUtils";
+import { AppState, BinaryFileData,  DataURL,  ExcalidrawImperativeAPI } from "@zsviczian/excalidraw/types/excalidraw/types";
 import { EmbeddedFile, EmbeddedFilesLoader, FileData } from "src/EmbeddedFileLoader";
 import { tex2dataURL } from "src/LaTeX";
 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 { ConnectionPoint, DeviceType, Point  } from "src/types/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";
@@ -282,8 +281,17 @@ export class ExcalidrawAutomate {
     return LZString.compressToBase64(str);
   }
 
-  public decompressFromBase64(str:string): string {
-    return LZString.decompressFromBase64(str);
+  public decompressFromBase64(data:string): string {
+    if (!data) throw new Error("No input string provided for decompression.");
+    let cleanedData = '';
+    const length = data.length;
+    for (let i = 0; i < length; i++) {
+      const char = data[i];
+      if (char !== '\\n' && char !== '\\r') {
+        cleanedData += char;
+      }
+    }
+    return LZString.decompressFromBase64(cleanedData);
   }
 
   /**
@@ -427,7 +435,9 @@ export class ExcalidrawAutomate {
    * @returns 
    */
   public getAPI(view?:ExcalidrawView):ExcalidrawAutomate {
-    return new ExcalidrawAutomate(this.plugin, view);
+    const ea = new ExcalidrawAutomate(this.plugin, view);
+    this.plugin.eaInstances.push(ea);
+    return ea;
   }
 
   /**
@@ -741,18 +751,18 @@ export class ExcalidrawAutomate {
   
       outString += Object.keys(this.imagesDict).length > 0
         ? `\n## Embedded Files\n`
-        : "";
+        : "\n";
         
       Object.keys(this.imagesDict).forEach((key: FileId)=> {
         const item = this.imagesDict[key];
         if(item.latex) {
-          outString += `${key}: $$${item.latex}$$\n`;  
+          outString += `${key}: $$${item.latex}$$\n\n`;  
         } else {
           if(item.file) {
             if(item.file instanceof TFile) {
-              outString += `${key}: [[${item.file.path}]]\n`;
+              outString += `${key}: [[${item.file.path}]]\n\n`;
             } else {
-              outString += `${key}: [[${item.file}]]\n`;
+              outString += `${key}: [[${item.file}]]\n\n`;
             }
           } else {
             const hyperlinkSplit = item.hyperlink.split("#");
@@ -760,15 +770,15 @@ export class ExcalidrawAutomate {
             if(file && file instanceof TFile) {
               const hasFileRef = hyperlinkSplit.length === 2
               outString += hasFileRef
-                ? `${key}: [[${file.path}#${hyperlinkSplit[1]}]]\n`
-                : `${key}: [[${file.path}]]\n`;
+                ? `${key}: [[${file.path}#${hyperlinkSplit[1]}]]\n\n`
+                : `${key}: [[${file.path}]]\n\n`;
             } else {
-              outString += `${key}: ${item.hyperlink}\n`;
+              outString += `${key}: ${item.hyperlink}\n\n`;
             }
           }
         }
       })
-      return outString + "\n%%\n";
+      return outString + "%%\n";
     }
 
     const filename = params?.filename
@@ -1824,33 +1834,23 @@ export class ExcalidrawAutomate {
    */
   setView(view?: ExcalidrawView | "first" | "active"): ExcalidrawView {
     if(!view) {
-      const v = app.workspace.getActiveViewOfType(ExcalidrawView);
+      const v = this.plugin.app.workspace.getActiveViewOfType(ExcalidrawView);
       if (v instanceof ExcalidrawView) {
         this.targetView = v;
       }
       else {
-        const leaves =
-          app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW);
-        if (!leaves || leaves.length == 0) {
-          return;
-        }
-        this.targetView = leaves[0].view as ExcalidrawView;
+        this.targetView = getExcalidrawViews(this.plugin.app)[0];
       }
     }
     if (view == "active") {
-      const v = app.workspace.getActiveViewOfType(ExcalidrawView);
+      const v = this.plugin.app.workspace.getActiveViewOfType(ExcalidrawView);
       if (!(v instanceof ExcalidrawView)) {
         return;
       }
       this.targetView = v;
     }
     if (view == "first") {
-      const leaves =
-        app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW);
-      if (!leaves || leaves.length == 0) {
-        return;
-      }
-      this.targetView = leaves[0].view as ExcalidrawView;
+      this.targetView = getExcalidrawViews(this.plugin.app)[0];
     }
     if (view instanceof ExcalidrawView) {
       this.targetView = view;
@@ -2961,27 +2961,6 @@ async function getTemplate(
     }
 
     let scene = excalidrawData.scene;
-    if (loadFiles) {
-      //debug({where:"getTemplate",template:file.name,loader:loader.uid});
-      await loader.loadSceneFiles(excalidrawData, (fileArray: FileData[]) => {
-        //, isDark: boolean) => {
-        if (!fileArray || fileArray.length === 0) {
-          return;
-        }
-        for (const f of fileArray) {
-          if (f.hasSVGwithBitmap) {
-            hasSVGwithBitmap = true;
-          }
-          excalidrawData.scene.files[f.id] = {
-            mimeType: f.mimeType,
-            id: f.id,
-            dataURL: f.dataURL,
-            created: f.created,
-          };
-        }
-        scene = scaleLoadedImage(excalidrawData.scene, fileArray).scene;
-      }, depth);
-    }
 
     let groupElements:ExcalidrawElement[] = scene.elements;
     if(filenameParts.hasGroupref) {
@@ -3008,8 +2987,49 @@ async function getTemplate(
         ));
     }
 
+    let fileIDWhiteList:Set<FileId>;
+
+    if(groupElements.length < scene.elements.length) {
+      fileIDWhiteList = new Set<FileId>();
+      groupElements.filter(el=>el.type==="image").forEach((el:ExcalidrawImageElement)=>fileIDWhiteList.add(el.fileId));
+    }
+
+    if (loadFiles) {
+      //debug({where:"getTemplate",template:file.name,loader:loader.uid});
+      await loader.loadSceneFiles(excalidrawData, (fileArray: FileData[]) => {
+        //, isDark: boolean) => {
+        if (!fileArray || fileArray.length === 0) {
+          return;
+        }
+        for (const f of fileArray) {
+          if (f.hasSVGwithBitmap) {
+            hasSVGwithBitmap = true;
+          }
+          excalidrawData.scene.files[f.id] = {
+            mimeType: f.mimeType,
+            id: f.id,
+            dataURL: f.dataURL,
+            created: f.created,
+          };
+        }
+        scene = scaleLoadedImage(excalidrawData.scene, fileArray).scene;
+      }, depth, false, fileIDWhiteList);
+    }
+
     excalidrawData.destroy();
     const filehead = data.substring(0, trimLocation);
+    let files:any = {};
+    const sceneFilesSize = Object.values(scene.files).length;
+    if (sceneFilesSize > 0) {
+      if(fileIDWhiteList && (sceneFilesSize > fileIDWhiteList.size)) {
+          Object.values(scene.files).filter((f: any) => fileIDWhiteList.has(f.id)).forEach((f: any) => {
+            files[f.id] = f;
+          });
+      } else {
+        files = scene.files;
+      }
+    }
+
     return {
       elements: convertMarkdownLinksToObsidianURLs
         ? updateElementLinksToObsidianLinks({
@@ -3018,7 +3038,7 @@ async function getTemplate(
         }) : groupElements,
       appState: scene.appState,
       frontmatter: filehead.match(/^---\n.*\n---\n/ms)?.[0] ?? filehead,
-      files: scene.files,
+      files,
       hasSVGwithBitmap,
     };
   }
@@ -3414,7 +3434,7 @@ export const getFrameElementsMatchingQuery = (
     el.type === "frame" && 
     query.some((q) => {
       if (exactMatch) {
-        const text = el.name.toLowerCase().split("\n")[0].trim();
+        const text = el.name?.toLowerCase().split("\n")[0].trim() ?? "";
         const m = text.match(/^#*(# .*)/);
         if (!m || m.length !== 2) {
           return false;
@@ -3495,4 +3515,10 @@ export const cloneElement = (el: ExcalidrawElement):any => {
 
 export const verifyMinimumPluginVersion = (requiredVersion: string): boolean => {
   return PLUGIN_VERSION === requiredVersion || isVersionNewerThanOther(PLUGIN_VERSION,requiredVersion);
-}
+}
+
+export const getBoundTextElementId = (container: ExcalidrawElement | null) => {
+  return container?.boundElements?.length
+    ? container?.boundElements?.find((ele) => ele.type === "text")?.id || null
+    : null;
+};

src/ExcalidrawData.ts

@@ -51,6 +51,7 @@ import { getMermaidImageElements, getMermaidText, shouldRenderMermaid } from "./
 import { DEBUGGING, debug } from "./utils/DebugHelper";
 import { Mutable } from "@zsviczian/excalidraw/types/excalidraw/utility-types";
 import { updateElementIdsInScene } from "./utils/ExcalidrawSceneUtils";
+import { getNewUniqueFilepath } from "./utils/FileUtils";
 
 type SceneDataWithFiles = SceneData & { files: BinaryFiles };
 
@@ -1434,12 +1435,11 @@ export class ExcalidrawData {
     if (this.elementLinks.size > 0  || textElementLinks.size > 0) {
       outString += `## Element Links\n`;
       for (const key of this.elementLinks.keys()) {
-        outString += `${key}: ${this.elementLinks.get(key)}\n`;
+        outString += `${key}: ${this.elementLinks.get(key)}\n\n`;
       }
       for (const key of textElementLinks.keys()) {
-        outString += `${key}: ${textElementLinks.get(key)}\n`;
+        outString += `${key}: ${textElementLinks.get(key)}\n\n`;
       }
-      outString += "\n";
     }
 
     // deliberately not adding mermaids to here. It is enough to have the mermaidText in the image element's customData
@@ -1449,7 +1449,7 @@ export class ExcalidrawData {
         : "";
     if (this.equations.size > 0) {
       for (const key of this.equations.keys()) {
-        outString += `${key}: $$${this.equations.get(key).latex}$$\n`;
+        outString += `${key}: $$${this.equations.get(key).latex}$$\n\n`;
       }
     }
     if (this.files.size > 0) {
@@ -1457,18 +1457,18 @@ export class ExcalidrawData {
         const PATHREG = /(^[^#\|]*)/;
         const ef = this.files.get(key);
         if(ef.isHyperLink || ef.isLocalLink) {
-          outString += `${key}: ${ef.hyperlink}\n`;
+          outString += `${key}: ${ef.hyperlink}\n\n`;
         } else {
           //https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/829
           const path = ef.file
             ? ef.linkParts.original.replace(PATHREG,this.app.metadataCache.fileToLinktext(ef.file,this.file.path))
             : ef.linkParts.original;
           const colorMap = ef.colorMap ? " " + JSON.stringify(ef.colorMap) : "";
-          outString += `${key}: [[${path}]]${colorMap}\n`;
+          outString += `${key}: [[${path}]]${colorMap}\n\n`;
         }
       }
     }
-    outString += this.equations.size > 0 || this.files.size > 0 ? "\n" : "";
+    //outString += this.equations.size > 0 || this.files.size > 0 ? "\n" : "";
 
     const sceneJSONstring = JSON.stringify({
       type: this.scene.type,
@@ -1507,31 +1507,40 @@ export class ExcalidrawData {
     return result;
   }
 
-  public async saveDataURLtoVault(dataURL: DataURL, mimeType: MimeType, key: FileId) {
+  public async saveDataURLtoVault(dataURL: DataURL, mimeType: MimeType, key: FileId, name?:string) {
     const scene = this.scene as SceneDataWithFiles;
-    let fname = `Pasted Image ${window
-      .moment()
-      .format("YYYYMMDDHHmmss_SSS")}`;
-  
-    switch (mimeType) {
-      case "image/png":
-        fname += ".png";
-        break;
-      case "image/jpeg":
-        fname += ".jpg";
-        break;
-      case "image/svg+xml":
-        fname += ".svg";
-        break;
-      case "image/gif":
-        fname += ".gif";
-        break;
-      default:
-        fname += ".png";
+    let fname = name;
+
+    if(!fname) {
+      fname = `Pasted Image ${window
+        .moment()
+        .format("YYYYMMDDHHmmss_SSS")}`;
+    
+      switch (mimeType) {
+        case "image/png":
+          fname += ".png";
+          break;
+        case "image/jpeg":
+          fname += ".jpg";
+          break;
+        case "image/svg+xml":
+          fname += ".svg";
+          break;
+        case "image/gif":
+          fname += ".gif";
+          break;
+        default:
+          fname += ".png";
+      }
     }
+
+    const x = await getAttachmentsFolderAndFilePath(this.app, this.file.path, fname);
+    const filepath = getNewUniqueFilepath(this.app.vault,fname,x.folder);
+
+    /*
     const filepath = (
       await getAttachmentsFolderAndFilePath(this.app, this.file.path, fname)
-    ).filepath;
+    ).filepath;*/
 
     const arrayBuffer = await getBinaryFileFromDataURL(dataURL);
     if(!arrayBuffer) return null;
@@ -1658,7 +1667,9 @@ export class ExcalidrawData {
         await this.saveDataURLtoVault(
           scene.files[key].dataURL,
           scene.files[key].mimeType,
-          key as FileId
+          key as FileId,
+          //@ts-ignore
+          scene.files[key].name,
         );
       }
     }

src/ExcalidrawView.ts

@@ -9,6 +9,8 @@ import {
   MarkdownView,
   request,
   requireApiVersion,
+  HoverParent,
+  HoverPopover,
 } from "obsidian";
 //import * as React from "react";
 //import * as ReactDOM from "react-dom";
@@ -63,7 +65,8 @@ import {
   cloneElement,
   getFrameElementsMatchingQuery,
   getElementsWithLinkMatchingQuery,
-  getImagesMatchingQuery
+  getImagesMatchingQuery,
+  getBoundTextElementId
 } from "./ExcalidrawAutomate";
 import { t } from "./lang/helpers";
 import {
@@ -251,7 +254,8 @@ type ActionButtons = "save" | "isParsed" | "isRaw" | "link" | "scriptInstall";
 
 let windowMigratedDisableZoomOnce = false;
 
-export default class ExcalidrawView extends TextFileView {
+export default class ExcalidrawView extends TextFileView implements HoverParent{
+  public hoverPopover: HoverPopover;
   private freedrawLastActiveTimestamp: number = 0;
   public exportDialog: ExportDialog;
   public excalidrawData: ExcalidrawData;
@@ -277,6 +281,7 @@ export default class ExcalidrawView extends TextFileView {
   private embeddableLeafRefs = new Map<ExcalidrawElement["id"], any>();
 
   public semaphores: {
+    warnAboutLinearElementLinkClick: boolean;
     //flag to prevent overwriting the changes the user makes in an embeddable view editing the back side of the drawing
     embeddableIsEditingSelf: boolean;
     popoutUnload: boolean; //the unloaded Excalidraw view was the last leaf in the popout window
@@ -313,6 +318,7 @@ export default class ExcalidrawView extends TextFileView {
     hoverSleep: boolean; //flag with timer to prevent hover preview from being triggered dozens of times
     wheelTimeout:number; //used to avoid hover preview while zooming
   } | null = {
+    warnAboutLinearElementLinkClick: true,
     embeddableIsEditingSelf: false,
     popoutUnload: false,
     viewunload: false,
@@ -520,8 +526,8 @@ export default class ExcalidrawView extends TextFileView {
       if (!svg) {
         return;
       }
-      const serializer = new XMLSerializer();
-      const svgString = serializer.serializeToString(svg);
+      //https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2026
+      const svgString = svg.outerHTML;
       if (file && file instanceof TFile) {
         await this.app.vault.modify(file, svgString);
       } else {
@@ -763,6 +769,8 @@ export default class ExcalidrawView extends TextFileView {
         this.clearPreventReloadTimer();
 
         this.semaphores.preventReload = preventReload;
+        await this.prepareGetViewData();
+
         //added this to avoid Electron crash when terminating a popout window and saving the drawing, need to check back
         //can likely be removed once this is resolved: https://github.com/electron/electron/issues/40607
         if(this.semaphores?.viewunload) {
@@ -774,10 +782,10 @@ export default class ExcalidrawView extends TextFileView {
             await plugin.app.vault.modify(file,d);
             await imageCache.addBAKToCache(file.path,d);                        
           },200)
+          this.semaphores.saving = false;
           return;
         }
 
-        await this.prepareGetViewData();
         await super.save();
         if (process.env.NODE_ENV === 'development') {
           if (DEBUGGING) {
@@ -838,6 +846,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
@@ -930,6 +939,10 @@ export default class ExcalidrawView extends TextFileView {
   }
 
   async openLaTeXEditor(eqId: string) {
+    if(await this.excalidrawData.syncElements(this.getScene())) {
+      //https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1994
+      await this.forceSave(true);
+    }
     const el = this.getViewElements().find((el:ExcalidrawElement)=>el.id === eqId && el.type==="image") as ExcalidrawImageElement;
     if(!el) {
       return;
@@ -1134,61 +1147,111 @@ export default class ExcalidrawView extends TextFileView {
 
   private getLinkTextForElement(
     selectedText:SelectedElementWithLink,
-    selectedElementWithLink?:SelectedElementWithLink
+    selectedElementWithLink?:SelectedElementWithLink,
+    allowLinearElementClick: boolean = false,
   ): {
     linkText: string,
     selectedElement: ExcalidrawElement,
+    isLinearElement: boolean,
   } {
     (process.env.NODE_ENV === 'development') && DEBUGGING && debug(this.getLinkTextForElement, "ExcalidrawView.getLinkTextForElement", selectedText, selectedElementWithLink);
     if (selectedText?.id || selectedElementWithLink?.id) {
-      const selectedTextElement: ExcalidrawTextElement = selectedText.id
+      let selectedTextElement: ExcalidrawTextElement = selectedText.id
       ? this.excalidrawAPI.getSceneElements().find((el:ExcalidrawElement)=>el.id === selectedText.id)
       : null;
 
-      const selectedElement = selectedElementWithLink.id
-      ? this.excalidrawAPI.getSceneElements().find((el:ExcalidrawElement)=>el.id === selectedElementWithLink.id)
+      let selectedElement = selectedElementWithLink.id
+      ? this.excalidrawAPI.getSceneElements().find((el:ExcalidrawElement)=>
+          el.id === selectedElementWithLink.id)
       : null;
 
+      //if the user clicked on the label of an arrow then the label will be captured in selectedElement, because
+      //Excalidraw returns the container as the selected element. But in this case we want this to be treated as the
+      //text element, as the assumption is, if the user wants to invoke the linear element editor for an arrow that has
+      //a label with a link, then he/she should rather CTRL+click on the arrow line, not the label. CTRL+Click on
+      //the label is an indication of wanting to navigate.
+      if (!Boolean(selectedTextElement) && selectedElement?.type === "text") {
+        const container = getContainerElement(selectedElement, arrayToMap(this.excalidrawAPI.getSceneElements()));
+        if(container?.type === "arrow") {
+          const x = getTextElementAtPointer(this.currentPosition,this);
+          if(x?.id === selectedElement.id) {
+            selectedTextElement = selectedElement;
+            selectedElement = null;
+          }
+        }
+      }
+      
+      //CTRL click on a linear element with a link will navigate instead of line editor
+      if(!allowLinearElementClick && ["arrow", "line"].includes(selectedElement?.type)) {
+        return {linkText: selectedElement.link, selectedElement: selectedElement, isLinearElement: true};
+      }
+
+      if (!selectedTextElement && selectedElement?.type === "text") {
+        if(!allowLinearElementClick) {
+          //CTRL click on a linear element with a link will navigate instead of line editor
+          const container = getContainerElement(selectedElement, arrayToMap(this.excalidrawAPI.getSceneElements()));
+          if(container?.type !== "arrow") {
+            selectedTextElement = selectedElement as ExcalidrawTextElement;
+            selectedElement = null;
+          } else {
+            const x = this.processLinkText(selectedElement.rawText, selectedElement as ExcalidrawTextElement, container, false);
+            return {linkText: x.linkText, selectedElement: container, isLinearElement: true};
+          }
+        } else {
+          selectedTextElement = selectedElement as ExcalidrawTextElement;
+          selectedElement = null;
+        }
+      }
+
       let linkText =
         selectedElementWithLink?.text ??
         (this.textMode === TextMode.parsed
           ? this.excalidrawData.getRawText(selectedText.id)
           : selectedText.text);
 
-      if(linkText.startsWith("#")) {
-        return {linkText, selectedElement: selectedTextElement ?? selectedElement};
-      }
+      return {...this.processLinkText(linkText, selectedTextElement, selectedElement), isLinearElement: false};
+    }
+    return {linkText: null, selectedElement: null, isLinearElement: false};
+  }
 
-      const maybeObsidianLink = parseObsidianLink(linkText, this.app);
-      if(typeof maybeObsidianLink === "string") {
-        linkText = maybeObsidianLink;
-      }
+  
+  processLinkText(linkText: string, selectedTextElement: ExcalidrawTextElement, selectedElement: ExcalidrawElement, shouldOpenLink: boolean = true) {
+    if(!linkText) {
+      return {linkText: null, selectedElement: null};
+    }
 
-      const partsArray = REGEX_LINK.getResList(linkText);
-      if (!linkText || partsArray.length === 0) {
-        //the container link takes precedence over the text link
-        if(selectedTextElement?.containerId) {
-          const container = _getContainerElement(selectedTextElement, {elements: this.excalidrawAPI.getSceneElements()});
-          if(container) {
-            linkText = container.link;
-            
-            if(linkText?.startsWith("#")) {
-              return {linkText, selectedElement: selectedTextElement ?? selectedElement};
-            }
-
-            const maybeObsidianLink = parseObsidianLink(linkText, this.app);
-            if(typeof maybeObsidianLink === "string") {
-              linkText = maybeObsidianLink;
-            }
-          }
-        }
-        if(!linkText || partsArray.length === 0) {
-          linkText = selectedTextElement?.link;
-        }
-      }
+    if(linkText.startsWith("#")) {
       return {linkText, selectedElement: selectedTextElement ?? selectedElement};
     }
-    return {linkText: null, selectedElement: null};
+
+    const maybeObsidianLink = parseObsidianLink(linkText, this.app, shouldOpenLink);
+    if(typeof maybeObsidianLink === "string") {
+      linkText = maybeObsidianLink;
+    }
+
+    const partsArray = REGEX_LINK.getResList(linkText);
+    if (!linkText || partsArray.length === 0) {
+      //the container link takes precedence over the text link
+      if(selectedTextElement?.containerId) {
+        const container = _getContainerElement(selectedTextElement, {elements: this.excalidrawAPI.getSceneElements()});
+        if(container) {
+          linkText = container.link;
+          
+          if(linkText?.startsWith("#")) {
+            return {linkText, selectedElement: selectedTextElement ?? selectedElement};
+          }
+
+          const maybeObsidianLink = parseObsidianLink(linkText, this.app, shouldOpenLink);
+          if(typeof maybeObsidianLink === "string") {
+            linkText = maybeObsidianLink;
+          }
+        }
+      }
+      if(!linkText || partsArray.length === 0) {
+        linkText = selectedTextElement?.link;
+      }
+    }
+    return {linkText, selectedElement: selectedTextElement ?? selectedElement};
   }
 
   async linkClick(
@@ -1196,7 +1259,8 @@ export default class ExcalidrawView extends TextFileView {
     selectedText: SelectedElementWithLink,
     selectedImage: SelectedImage,
     selectedElementWithLink: SelectedElementWithLink,
-    keys?: ModifierKeys
+    keys?: ModifierKeys,
+    allowLinearElementClick: boolean = false,
   ) {
     (process.env.NODE_ENV === 'development') && DEBUGGING && debug(this.linkClick, "ExcalidrawView.linkClick", ev, selectedText, selectedImage, selectedElementWithLink, keys);
     if(!selectedText) selectedText = {id:null, text: null};
@@ -1209,10 +1273,17 @@ export default class ExcalidrawView extends TextFileView {
 
     let file = null;
     let subpath: string = null;
-    let {linkText, selectedElement} = this.getLinkTextForElement(selectedText, selectedElementWithLink);
+    let {linkText, selectedElement, isLinearElement} = this.getLinkTextForElement(selectedText, selectedElementWithLink, allowLinearElementClick);
 
     //if (selectedText?.id || selectedElementWithLink?.id) {
     if (selectedElement) {
+      if (!allowLinearElementClick && linkText && isLinearElement) {
+        if(this.semaphores.warnAboutLinearElementLinkClick) {
+          new Notice(t("LINEAR_ELEMENT_LINK_CLICK_ERROR"), 20000);
+          this.semaphores.warnAboutLinearElementLinkClick = false;
+        }
+        return;
+      }
       if (!linkText) {
           return;
       }
@@ -1291,6 +1362,9 @@ export default class ExcalidrawView extends TextFileView {
     }
 
     if (!linkText) {
+      if(allowLinearElementClick) {
+        return;
+      }
       new Notice(t("LINK_BUTTON_CLICK_NO_TEXT"), 20000);
       return;
     }
@@ -1341,7 +1415,7 @@ export default class ExcalidrawView extends TextFileView {
       
       //if link will open in the same pane I want to save the drawing before opening the link
       await this.forceSaveIfRequired();
-      const {leaf, promise} = openLeaf({
+      const { promise } = openLeaf({
         plugin: this.plugin,
         fnGetLeaf: () => getLeaf(this.plugin,this.leaf,keys),
         file,
@@ -1357,7 +1431,7 @@ export default class ExcalidrawView extends TextFileView {
     }
   }
   
-  async handleLinkClick(ev: MouseEvent | ModifierKeys) {
+  async handleLinkClick(ev: MouseEvent | ModifierKeys, allowLinearElementClick: boolean = false) {
     (process.env.NODE_ENV === 'development') && DEBUGGING && debug(this.handleLinkClick, "ExcalidrawView.handleLinkClick", ev);
     this.removeLinkTooltip();
 
@@ -1375,6 +1449,7 @@ export default class ExcalidrawView extends TextFileView {
       selectedImage,
       selectedElementWithLink,
       ev instanceof MouseEvent ? null : ev,
+      allowLinearElementClick,
     );
   }
 
@@ -1534,8 +1609,19 @@ export default class ExcalidrawView extends TextFileView {
         }
       };
 
+      const onBlurOrLeave = () => {
+        if(!this.excalidrawAPI || !this.excalidrawData.loaded || !this.isDirty()) {
+          return;
+        }
+        if((this.excalidrawAPI as ExcalidrawImperativeAPI).getAppState().activeTool.type !== "image") {
+          this.forceSave(true);
+        }
+      };
+
       this.registerDomEvent(this.ownerWindow, "keydown", onKeyDown, false);
       this.registerDomEvent(this.ownerWindow, "keyup", onKeyUp, false);
+      //this.registerDomEvent(this.contentEl, "mouseleave", onBlurOrLeave, false); //https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2004
+      this.registerDomEvent(this.ownerWindow, "blur", onBlurOrLeave, false);
     });
 
     this.setupAutosaveTimer();
@@ -1728,7 +1814,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 +1848,6 @@ export default class ExcalidrawView extends TextFileView {
       this.autosaveFunction,
       this.autosaveInterval,
     );
-
   }
 
   unload(): void {
@@ -1772,7 +1857,22 @@ 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 && (counter++ < 200)) {
+      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"));
+      }
+    }
+    if(counter >= 200) {
+      new Notice("Unknown error, save is taking too long");
+      return;
+    }
+    await this.forceSaveIfRequired();
   }
 
   private async forceSaveIfRequired():Promise<boolean> {
@@ -1781,9 +1881,9 @@ export default class ExcalidrawView extends TextFileView {
     let dirty = false;
     //if saving was already in progress
     //the function awaits the save to finish.
-    while (this.semaphores.saving && watchdog++ < 10) {
+    while (this.semaphores.saving && watchdog++ < 200) {
       dirty = true;
-      await sleep(20);
+      await sleep(40);
     }
     if(this.excalidrawAPI) {
       this.checkSceneVersion(this.excalidrawAPI.getSceneElements());
@@ -2119,6 +2219,7 @@ export default class ExcalidrawView extends TextFileView {
   // clear the view content
   clear() {
     (process.env.NODE_ENV === 'development') && DEBUGGING && debug(this.clear, "ExcalidrawView.clear");
+    this.semaphores.warnAboutLinearElementLinkClick = true;
     this.viewSaveData = "";
     this.canvasNodeFactory.purgeNodes();
     this.embeddableRefs.clear();
@@ -2296,14 +2397,35 @@ export default class ExcalidrawView extends TextFileView {
     });
   }
 
-  private getGridColor(bgColor: string, st: AppState):{Bold: string, Regular: string} {
+  private getGridColor(bgColor: string, st: AppState): { Bold: string, Regular: string } {
     (process.env.NODE_ENV === 'development') && DEBUGGING && debug(this.getGridColor, "ExcalidrawView.getGridColor", bgColor, st);
+  
     const cm = this.plugin.ea.getCM(bgColor);
     const isDark = cm.isDark();
-    const Regular = (isDark ? cm.lighterBy(7) : cm.darkerBy(7)).stringHEX({alpha: false});
-    const Bold = (isDark ? cm.lighterBy(14) : cm.darkerBy(14)).stringHEX({alpha: false});
-    return {Bold, Regular};
+  
+    let Regular: string;
+    let Bold: string;
+    const opacity = this.plugin.settings.gridSettings.OPACITY/100;
+
+    if (this.plugin.settings.gridSettings.DYNAMIC_COLOR) {
+      // Dynamic color: concatenate opacity to the HEX string  
+      Regular = (isDark ? cm.lighterBy(10) : cm.darkerBy(10)).alphaTo(opacity).stringRGB({ alpha: true });
+      Bold = (isDark ? cm.lighterBy(5) : cm.darkerBy(5)).alphaTo(opacity).stringRGB({ alpha: true });
+    } else {
+      // Custom color handling
+      const customCM = this.plugin.ea.getCM(this.plugin.settings.gridSettings.COLOR);
+      const customIsDark = customCM.isDark();
+      
+      // Regular uses the custom color directly
+      Regular = customCM.alphaTo(opacity).stringRGB({ alpha: true });
+      
+      // Bold is 7 shades lighter or darker based on the custom color's darkness
+      Bold = (customIsDark ? customCM.lighterBy(10) : customCM.darkerBy(10)).alphaTo(opacity).stringRGB({ alpha: true });
+    }
+  
+    return { Bold, Regular };
   }
+  
 
   public activeLoader: EmbeddedFilesLoader = null;
   private nextLoader: EmbeddedFilesLoader = null;
@@ -2611,6 +2733,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");
@@ -3080,6 +3206,16 @@ export default class ExcalidrawView extends TextFileView {
       };
     }
 
+    const textId = getBoundTextElementId(selectedElement[0]);
+    if (textId) {
+      const textElement = api
+        .getSceneElements()
+        .filter((el: any) => el.id === textId && el.link);
+      if (textElement.length > 0) {
+        return { id: textElement[0].id, text: textElement[0].text };
+      }
+    }
+
     if (selectedElement[0].groupIds.length === 0) {
       return { id: null, text: null };
     } //is the selected element part of a group?
@@ -3308,6 +3444,13 @@ export default class ExcalidrawView extends TextFileView {
       toDelete.forEach((k) => delete files[k]);
     }
 
+    const activeTool = st.activeTool;
+    if(!["freedraw","hand"].includes(activeTool.type)) {
+      activeTool.type = "selection";
+    }
+    activeTool.customType = null;
+    activeTool.lastActiveTool = null;
+
     return {
       type: "excalidraw",
       version: 2,
@@ -3342,6 +3485,7 @@ export default class ExcalidrawView extends TextFileView {
         currentStrokeOptions: st.currentStrokeOptions,
         frameRendering: st.frameRendering,
         objectsSnapModeEnabled: st.objectsSnapModeEnabled,
+        activeTool,
       },
       prevTextMode: this.prevTextMode,
       files,
@@ -3369,7 +3513,15 @@ export default class ExcalidrawView extends TextFileView {
   }
 
   private clearHoverPreview() {
-    if (this.hoverPreviewTarget) {
+    if (this.hoverPopover) {
+      this.hoverPreviewTarget = null;
+      //@ts-ignore
+      if(this.hoverPopover.embed?.editor) {
+        return;
+      }
+      //@ts-ignore
+      this.hoverPopover?.hide();
+    } else if (this.hoverPreviewTarget) {
       (process.env.NODE_ENV === 'development') && DEBUGGING && debug(this.clearHoverPreview, "ExcalidrawView.clearHoverPreview", this);
       const event = new MouseEvent("click", {
         view: this.ownerWindow,
@@ -3555,7 +3707,7 @@ export default class ExcalidrawView extends TextFileView {
     this.app.workspace.trigger("hover-link", {
       event: this.lastMouseEvent,
       source: VIEW_TYPE_EXCALIDRAW,
-      hoverParent: this.hoverPreviewTarget,
+      hoverParent: this,
       targetEl: this.hoverPreviewTarget, //null //0.15.0 hover editor!!
       linktext: this.plugin.hover.linkText,
       sourcePath: this.plugin.hover.sourcePath,
@@ -3584,6 +3736,7 @@ export default class ExcalidrawView extends TextFileView {
 
   private excalidrawDIVonKeyDown(event: KeyboardEvent) {
     //(process.env.NODE_ENV === 'development') && DEBUGGING && debug(this.excalidrawDIVonKeyDown, "ExcalidrawView.excalidrawDIVonKeyDown", event);
+    if (this.semaphores?.viewunload) return;
     if (event.target === this.excalidrawWrapperRef.current) {
       return;
     } //event should originate from the canvas
@@ -3602,6 +3755,9 @@ export default class ExcalidrawView extends TextFileView {
     if (!this.plugin.settings.allowCtrlClick && !isWinMETAorMacCTRL(e)) {
       return;
     }
+    if (Boolean((this.excalidrawAPI as ExcalidrawImperativeAPI)?.getAppState().contextMenu)) {
+      return;
+    }
     //added setTimeout when I changed onClick(e: MouseEvent) to onPointerDown() in 1.7.9. 
     //Timeout is required for Excalidraw to first complete the selection action before execution
     //of the link click continues
@@ -3710,10 +3866,18 @@ export default class ExcalidrawView extends TextFileView {
     }
   }
 
+  public updateGridColor(canvasColor?: string, st?: any) {
+    if(!canvasColor) {
+      st = (this.excalidrawAPI as ExcalidrawImperativeAPI).getAppState();
+      canvasColor = canvasColor ?? st.viewBackgroundColor === "transparent" ? "white" : st.viewBackgroundColor;
+    }
+    window.setTimeout(()=>this.updateScene({appState:{gridColor: this.getGridColor(canvasColor, st)}, storeAction: "update"}));
+  }
+
   private canvasColorChangeHook(st: AppState) {
     (process.env.NODE_ENV === 'development') && DEBUGGING && debug(this.canvasColorChangeHook, "ExcalidrawView.canvasColorChangeHook", st);
     const canvasColor = st.viewBackgroundColor === "transparent" ? "white" : st.viewBackgroundColor;
-    window.setTimeout(()=>this.updateScene({appState:{gridColor: this.getGridColor(canvasColor, st)}, storeAction: "update"}));
+    this.updateGridColor(canvasColor,st);
     setDynamicStyle(this.plugin.ea,this,canvasColor,this.plugin.settings.dynamicStyling);
     if(this.plugin.ea.onCanvasColorChangeHook) {
       try {
@@ -4666,6 +4830,7 @@ export default class ExcalidrawView extends TextFileView {
       null,
       {id: element.id, text: link},
       event,
+      true,
     );
     return;
   }
@@ -4875,7 +5040,7 @@ export default class ExcalidrawView extends TextFileView {
           t("OPEN_LINK_CLICK"),
           () => {
             const event = emulateKeysForLinkClick("new-tab");
-            this.handleLinkClick(event);
+            this.handleLinkClick(event, true);
           },
           onClose
         ),
@@ -5009,7 +5174,8 @@ export default class ExcalidrawView extends TextFileView {
             React,
             t("COPY_DRAWING_LINK"),
             () => {
-              navigator.clipboard.writeText(`![[${this.file.path}]]`);
+              const path = this.file.path.match(/(.*)(\.md)$/)?.[1];
+              navigator.clipboard.writeText(`![[${path ?? this.file.path}]]`);
             },
             onClose
           ),
@@ -5245,13 +5411,14 @@ export default class ExcalidrawView extends TextFileView {
     );
   }
 
-  private renderWelcomeScreen () {
+  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,
       {},
@@ -5271,20 +5438,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,
@@ -5295,9 +5464,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,
@@ -5305,9 +5474,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,
@@ -5315,9 +5484,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,
@@ -5325,9 +5494,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,
@@ -5335,9 +5504,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/MarkdownPostProcessor.ts

@@ -374,7 +374,9 @@ const getIMG = async (
 
 const addSVGToImgSrc = (img: HTMLImageElement, svg: SVGSVGElement, cacheReady: boolean, cacheKey: ImageKey):HTMLImageElement => {
   (process.env.NODE_ENV === 'development') && DEBUGGING && debug(addSVGToImgSrc, `MarkdownPostProcessor.ts > addSVGToImgSrc`);
-  const svgString = new XMLSerializer().serializeToString(svg);
+  //https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2026
+  //const svgString = new XMLSerializer().serializeToString(svg);
+  const svgString = svg.outerHTML;
   const blob = new Blob([svgString], { type: 'image/svg+xml' });
   const blobUrl = URL.createObjectURL(blob);
   img.setAttribute("src", blobUrl);
@@ -587,6 +589,102 @@ const processInternalEmbed = async (internalEmbedEl: Element, file: TFile ):Prom
   return await createImageDiv(attr);
 }
 
+function getDimensionsFromAliasString(data: string) {
+  const dimensionRegex = /^(?<width>\d+%|\d+)(x(?<height>\d+%|\d+))?$/;
+  const heightOnlyRegex = /^x(?<height>\d+%|\d+)$/;
+
+  const match = data.match(dimensionRegex) || data.match(heightOnlyRegex);
+  if (match) {
+      const { width, height } = match.groups;
+
+      // Ensure width and height do not start with '0'
+      if ((width && width.startsWith('0') && width !== '0') || 
+          (height && height.startsWith('0') && height !== '0')) {
+          return null;
+      }
+
+      return {
+          width: width || undefined,
+          height: height || undefined,
+      };
+  }
+  
+  // If the input starts with a 0 or is a decimal, return null
+  if (/^0\d|^\d+\.\d+/.test(data)) {
+      return null;
+  }
+  return null;
+}
+
+type AliasParts = { alias?: string, width?: string, height?: string, style?: string };
+function parseAlias(input: string):AliasParts {
+  const result:AliasParts = {};
+  const parts = input.split('|').map(part => part.trim());
+
+  switch (parts.length) {
+      case 1:
+          const singleMatch = getDimensionsFromAliasString(parts[0]);
+          if (singleMatch) {
+              return singleMatch; // Return dimensions if valid
+          }
+          result.style = parts[0]; // Otherwise, return as style
+          break;
+
+      case 2:
+          const firstDim = getDimensionsFromAliasString(parts[0]);
+          const secondDim = getDimensionsFromAliasString(parts[1]);
+
+          if (secondDim) {
+              result.alias = parts[0];
+              result.width = secondDim.width;
+              result.height = secondDim.height;
+          } else if (firstDim) {
+              result.width = firstDim.width;
+              result.height = firstDim.height;
+              result.style = parts[1]; // Second part is style
+          } else {
+              result.alias = parts[0];
+              result.style = parts[1]; // Assuming second part is style
+          }
+          break;
+
+      case 3:
+          const middleMatch = getDimensionsFromAliasString(parts[1]);
+          if (middleMatch) {
+              result.alias = parts[0];
+              result.width = middleMatch.width;
+              result.height = middleMatch.height;
+              result.style = parts[2];
+          } else {
+              result.alias = parts[0];
+              result.style = parts[2]; // Last part is style
+          }
+          break;
+
+      default:
+          const secondValue = getDimensionsFromAliasString(parts[1]);
+          if (secondValue) {
+              result.alias = parts[0];
+              result.width = secondValue.width;
+              result.height = secondValue.height;
+              result.style = parts[parts.length - 1]; // Last part is style
+          } else {
+              result.alias = parts[0];
+              result.style = parts[parts.length - 1]; // Last part is style
+          }
+          break;
+  }
+
+  // Clean up the result to remove undefined properties
+  Object.keys(result).forEach((key: keyof AliasParts) => {
+    if (result[key] === undefined) {
+        delete result[key];
+    }
+  });
+
+  return result;
+}
+
 const processAltText = (
   fname: string,
   alt:string,
@@ -594,19 +692,11 @@ const processAltText = (
 ) => {
   (process.env.NODE_ENV === 'development') && DEBUGGING && debug(processAltText, `MarkdownPostProcessor.ts > processAltText`);
   if (alt && !alt.startsWith(fname)) {
-    //2:width, 3:height, 4:style  12        3           4
-    const parts = alt.match(/[^\|\d]*\|?((\d*%?)x?(\d*%?))?\|?(.*)/);
-    attr.fwidth = parts[2] ?? attr.fwidth;
-    attr.fheight = parts[3] ?? attr.fheight;
-    if (parts[4] && !parts[4].startsWith(fname)) {
-      attr.style = [`excalidraw-svg${`-${parts[4]}`}`];
-    }
-    if (
-      (!parts[4] || parts[4]==="") &&
-      (!parts[2] || parts[2]==="") &&
-      parts[0] && parts[0] !== ""
-    ) {
-      attr.style = [`excalidraw-svg${`-${parts[0]}`}`];
+    const aliasParts = parseAlias(alt);
+    attr.fwidth = aliasParts.width ?? attr.fwidth;
+    attr.fheight = aliasParts.height ?? attr.fheight;
+    if (aliasParts.style && !aliasParts.style.startsWith(fname)) {
+      attr.style = [`excalidraw-svg${`-${aliasParts.style}`}`];
     }
   }
 }
@@ -795,7 +885,9 @@ export const markdownPostProcessor = async (
 ) => {
   const isPrinting = Boolean(document.body.querySelectorAll("body > .print").length>0);
   //firstElementChild: https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1956
-  const isFrontmatter = el.hasClass("mod-frontmatter") || el.firstElementChild?.hasClass("frontmatter");
+  const isFrontmatter = el.hasClass("mod-frontmatter") ||
+    el.firstElementChild?.hasClass("frontmatter") ||
+    el.firstElementChild?.hasClass("block-language-yaml");
   if(isPrinting && isFrontmatter) {
     return;
   }

src/Scripts.ts

@@ -5,7 +5,7 @@ import {
   TFile,
   WorkspaceLeaf,
 } from "obsidian";
-import { PLUGIN_ID, VIEW_TYPE_EXCALIDRAW } from "./constants/constants";
+import { PLUGIN_ID } from "./constants/constants";
 import ExcalidrawView from "./ExcalidrawView";
 import ExcalidrawPlugin from "./main";
 import { ButtonDefinition, GenericInputPrompt, GenericSuggester } from "./dialogs/Prompt";
@@ -14,6 +14,7 @@ import { splitFolderAndFilename } from "./utils/FileUtils";
 import { getEA } from "src";
 import { ExcalidrawAutomate } from "./ExcalidrawAutomate";
 import { WeakArray } from "./utils/WeakArray";
+import { getExcalidrawViews } from "./utils/ObsidianUtils";
 
 export type ScriptIconMap = {
   [key: string]: { name: string; group: string; svgString: string };
@@ -303,10 +304,8 @@ export class ScriptEngine {
 }
 
   private updateToolPannels() {
-    const leaves =
-      this.plugin.app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW);
-    leaves.forEach((leaf: WorkspaceLeaf) => {
-      const excalidrawView = leaf.view as ExcalidrawView;
+    const excalidrawViews = getExcalidrawViews(this.plugin.app);
+    excalidrawViews.forEach(excalidrawView => {
       excalidrawView.toolsPanelRef?.current?.updateScriptIconMap(
         this.scriptIconMap,
       );

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,127 @@ 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.5.1": `
+## New
+- Excalidraw will now save images using the filename from the file system when adding an image via the image tool (in the top toolbar).
+- Increased the maximum image size from a width/height of 1440 to 2880 when adding an image via the image tool in the top toolbar.
+- Flip arrowheads: If you have an arrow bound to elements, select only the arrow (not the bound elements) and press SHIFT+H or SHIFT+V to swap the arrowheads. [#8525](https://github.com/excalidraw/excalidraw/pull/8525)
+
+## Fixed
+- Zoom
+  - "Zoom to Fit" did not work correctly when multiple Obsidian tabs were open, and Excalidraw was in a lower tab. Additionally, there was an offset when the left side panel was open, especially if the panel was relatively large compared to the canvas area. [#2039](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2039)
+  - SHIFT+1 and SHIFT+2 will now honor the max zoom setting in Plugin Settings.
+- Adding images using the image tool in the toolbar was unreliable. Sometimes it worked, sometimes it didn't, depending on whether the drawing had unsaved changes. Autosave was causing the issue with the image tool. [#1992](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1992)
+- Frame related issues
+  - Fixed an issue where links to the back of the note were broken if an unnamed frame was present in the scene. [#2027](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2027)
+  - Frame transclusion was not working when there was a LaTeX equation anywhere in the scene. [#2028](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2028)
+  - Frame settings and rounded image corners were not honored when exporting (and auto-exporting) SVGs. [#2026](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2026)
+- Resolved issues with the width, height, and style parsing of Excalidraw drawings embedded in Markdown notes. ${String.fromCharCode(96)}![[my file|10 - my alias]]${String.fromCharCode(96)} was incorrectly parsed as a width of 10 and a style of "- my alias."
+- Links
+  - When navigating element links, selecting a #tag from the link-list did not open the Obsidian tag in the search.
+  - False-positive tag results in second-order links list.
+  - Arrow label links did not work as expected. Since CTRL/CMD+Click is used in Excalidraw to start the line editor, the solution is not straightforward from a UX perspective. [#2023](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2023)
+    - You can open arrow links by ctrl+clicking on the label itself. If the arrow or line element contains the link, ctrl+click on the link indicator in the top right.
+    - You can also right-click the linear element and select "Open Link" from the context menu.
+- Various elbow-arrow fixes and QoL improvements from excalidraw.com [#8324](https://github.com/excalidraw/excalidraw/pull/8324), [#8448](https://github.com/excalidraw/excalidraw/pull/8448), [#8440](https://github.com/excalidraw/excalidraw/pull/8440)
+
+`,
+"2.5.0": `
+The new [Community Wiki](https://excalidraw-obsidian.online/Hobbies/Excalidraw+Blog/WIKI/Welcome+to+the+WIKI) is waiting for your contribution!
+
+## Fixed
+- Regression from 2.4.3: Text flickers when editing text in a container [#2015](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2015).
+- Significantly improved the performance of group and frame [image fragments](https://youtu.be/sjZfdqpxqsg) when the source drawing includes many images, but the fragment does not.
+- Minor styling tweaks. Note that with Obsidian 1.7.1, the font size and zoom settings in Obsidian > Appearance will affect the size of buttons and menu items in Excalidraw as well.
+
+## New
+- New Canvas Search from Excalidraw.com (CTRL/CMD+F). The "old" search is still available in the Obsidian Command Palette _"Search for text in drawing"_. The old search will also search in image-file names and frame titles, but the result set is not as sophisticated as the one built by Excalidraw.com. If you want to use the old search, you can set up a hotkey in Obsidian settings, e.g., CTRL+ALT/CMD+OPT+F. [#8438](https://github.com/excalidraw/excalidraw/pull/8438)
+- Grid Color settings under **Excalidraw Appearance and Behavior**. Note that the grid color and opacity also affect the color and transparency of the binding box when using the arrow tool. [#2007](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2007)
+- Refactoring the code to be compatible with the upcoming Obsidian 1.7.2.
+- ${String.fromCharCode(96)}ExcalidrawAutomate.decompressFromBase64()${String.fromCharCode(96)} will now remove line breaks from the input string so you can directly supply the compressed JSON string for decompression by script.
+`,
+"2.4.3": `
+Check out the [Excalidraw Plugin's Community WIKI](https://excalidraw-obsidian.online/Hobbies/Excalidraw+Blog/WIKI/Welcome+to+the+WIKI) and help with your content contribution.
+
+## Fixed
+- In some situations Excalidraw hangs indefinitely when opening a different file in the same tab
+- Can't exit arrow tool on phone [#2006](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2006)
+- Save is triggered every few seconds, leading to glitches in handwriting [#2004](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2004)
+- Canvas shifts when editing text reaches right hand side of the canvas, especially at higher zoom values
+- Minor styling tweaks to adapt to Obsidian 1.7.1 new stylesheet, in particular to scale Excalidraw properly in line with Obsidian Appearance Setting Font-Size value.
+- Tweaked Compatibilty Setting description to mention Obsidian 1.7.1 Footnotes support
+`,
+"2.4.2": `
+This release addresses critical issues for all Obsidian Mobile users.
+
+#### 😞 I made two mistakes...
+- I expedited the 2.4.1 release to resolve a major bug, but in doing so, I skippes some of my usual rigorous testing
+- I included a new feature in 2.4.1 fresh from Excalidraw.com because I believe it brings significant end user benefits and did not want to wait until October. However, a small part of this feature was designed for server-side execution on Excalidraw.com, not for local use on Obsidian Mobile.
+
+Despite the recent two (2.4.1 and 2.4.2) emergency bug-fix releases, this doesn't deviate from the [monthly release schedule](https://youtu.be/2poSS-Z91lY). The next feature update is still planned for early October.
+
+## Fixes:
+- **Excalidraw rendering issues on Obsidian Mobile:** [#1995](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1995), [#1997](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1997)
+  - Nested Excalidraw drawings with text failed to render.
+  - Drawings in Markdown view didn't render if they contained text and were set to SVG Image or SVG Native (they worked with PNG).
+  - SVG export failed for drawings containing text.
+- **LaTeX equation duplication:** After using ALT+Drag to duplicate a LaTeX equation, editing the duplicate modified the original instead. [#1984](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1994)
+- **Unreadable Obsidian search results:** When drawings contained numerous Element Links and Embedded Files Links, search results became unreadable. This fix will apply to files saved after installing the update. [#1999](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1999)
+`,
+"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/dialogs/PenSettingsModal.ts

@@ -1,12 +1,13 @@
 import { ExcalidrawImperativeAPI } from "@zsviczian/excalidraw/types/excalidraw/types";
-import { ColorComponent, Modal, Setting, SliderComponent, TextComponent, ToggleComponent } from "obsidian";
-import { COLOR_NAMES, VIEW_TYPE_EXCALIDRAW } from "src/constants/constants";
+import { ColorComponent, Modal, Setting, TextComponent, ToggleComponent } from "obsidian";
+import { COLOR_NAMES } from "src/constants/constants";
 import ExcalidrawView from "src/ExcalidrawView";
 import ExcalidrawPlugin from "src/main";
 import { setPen } from "src/menu/ObsidianMenu";
-import { ExtendedFillStyle, PenStyle, PenType } from "src/PenTypes";
+import { ExtendedFillStyle, PenType } from "src/PenTypes";
+import { getExcalidrawViews } from "src/utils/ObsidianUtils";
 import { PENS } from "src/utils/Pens";
-import { fragWithHTML, getExportPadding, getExportTheme, getPNGScale, getWithBackground } from "src/utils/Utils";
+import { fragWithHTML } from "src/utils/Utils";
 import { __values } from "tslib";
 
 const EASINGFUNCTIONS: Record<string,string> = {
@@ -65,9 +66,7 @@ export class PenSettingsModal extends Modal {
 
   async onClose() {
     if(this.dirty) {
-      app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW).forEach(v=> {
-        if (v.view instanceof ExcalidrawView) v.view.updatePinnedCustomPens()
-      })
+      getExcalidrawViews(this.app).forEach(excalidrawView=>excalidrawView.updatePinnedCustomPens());
       this.plugin.saveSettings();
       const pen = this.plugin.settings.customPens[this.pen]
       const api = this.view.excalidrawAPI;

src/dialogs/Prompt.ts

@@ -720,7 +720,7 @@ export async function linkPrompt (
   message: string = "Select link to open",
 ):Promise<[file:TFile, linkText:string, subpath: string]> {
   const linksArray = REGEX_LINK.getResList(linkText);
-  const tagsArray = REGEX_TAGS.getResList(linkText);
+  const tagsArray = REGEX_TAGS.getResList(linkText.replaceAll(/([^\s])#/g,"$1 "));
   let subpath: string = null;
   let file: TFile = null;
   let parts = linksArray[0] ?? tagsArray[0];

src/dialogs/ScriptInstallPrompt.ts

@@ -22,7 +22,7 @@ export class ScriptInstallPrompt extends Modal {
     searchBar.type = "text";
     searchBar.id = "search-bar";
     searchBar.placeholder = "Search...";
-    searchBar.style.width = "calc(100% - 120px)"; // space for the buttons and hit count
+    //searchBar.style.width = "calc(100% - 120px)"; // space for the buttons and hit count
 
     const nextButton = document.createElement("button");
     nextButton.textContent = "→";

src/dialogs/SuggesterInfo.ts

@@ -654,6 +654,12 @@ export const EXCALIDRAW_AUTOMATE_INFO: SuggesterInfo[] = [
       "the function will use ea.targetView.file",
     after: "",
   },
+  {
+    field: "getAPI",
+    code: "public getAPI(view?:ExcalidrawView):ExcalidrawAutomate",
+    desc: "Returns a new instance of ExcalidrawAutomate.",
+    after: "",
+  },
   {
     field: "getAttachmentFilepath",
     code: "async getAttachmentFilepath(filename: string): Promise<string>",
@@ -907,7 +913,7 @@ export const FRONTMATTER_KEYS_INFO: SuggesterInfo[] = [
     after: ": 1",
   },
   {
-    field: "excalidraw-export-embed-scene",
+    field: "export-embed-scene",
     code: null,
     desc: "If this key is present it will override the default excalidraw embed and export setting.",
     after: ": false",

src/index.ts

@@ -3,7 +3,7 @@ import "obsidian";
 //export ExcalidrawAutomate from "./ExcalidrawAutomate";
 //export {ExcalidrawAutomate} from  "./ExcaildrawAutomate";
 export type { ExcalidrawBindableElement, ExcalidrawElement, FileId, FillStyle, StrokeRoundness, StrokeStyle } from "@zsviczian/excalidraw/types/excalidraw/element/types";
-export type { Point } from "@zsviczian/excalidraw/types/excalidraw/types";
+export type { Point } from "src/types/types";
 export const getEA = (view?:any): any => {
   try {
     return window.ExcalidrawAutomate.getAPI(view);

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",
@@ -127,7 +128,10 @@ export default {
   OPEN_LINK: "Open selected text as link\n(SHIFT+CLICK to open in a new pane)",
   EXPORT_EXCALIDRAW: "Export to an .Excalidraw file",
   LINK_BUTTON_CLICK_NO_TEXT:
-    "Select an ImageElement, or select a TextElement that contains an internal or external link.\n",
+    "Select an element that contains an internal or external link.\n",
+  LINEAR_ELEMENT_LINK_CLICK_ERROR:
+    "Arrow- and Line-Element links cannot be navigated by " + labelCTRL() + " + CLICKing on the element because that also activates the line editor.\n" +
+    "Use the right-click context menu to open the link, or click the link indicator in the top right corner of the element.\n",
   FILENAME_INVALID_CHARS:
     'File name cannot contain any of the following characters: * " \\ < > : | ? #',
   FORCE_SAVE:
@@ -152,6 +156,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",
@@ -352,6 +374,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",
@@ -372,6 +398,14 @@ FILENAME_HEAD: "Filename",
   ZOOM_TO_FIT_MAX_LEVEL_NAME: "Zoom to fit max ZOOM level",
   ZOOM_TO_FIT_MAX_LEVEL_DESC:
     "Set the maximum level to which zoom to fit will enlarge the drawing. Minimum is 0.5 (50%) and maximum is 10 (1000%).",
+  GRID_HEAD: "Grid",
+  GRID_DYNAMIC_COLOR_NAME: "Dynamic grid color",
+  GRID_DYNAMIC_COLOR_DESC:
+    "<b><u>Toggle ON:</u></b>Change grid color to match the canvas color<br><b><u>Toggle OFF:</u></b>Use the color below as the grid color",
+  GRID_COLOR_NAME: "Grid color",
+  GRID_OPACITY_NAME: "Grid opacity",
+  GRID_OPACITY_DESC: "Grid opacity will also control the opacity of the binding box when binding an arrow to an element.<br>" +
+    "Set the opacity of the grid. 0 is transparent, 100 is opaque.",
   LASER_HEAD: "Laser pointer",
   LASER_COLOR: "Laser pointer color",
   LASER_DECAY_TIME_NAME: "Laser pointer decay time",
@@ -630,7 +664,7 @@ FILENAME_HEAD: "Filename",
     "Use this setting if for good reasons you have decided to ignore my recommendation and configured linting of Excalidraw files.<br> " +
     "The <code>## Text Elements</code> section is sensitive to empty lines. A common linting approach is to add an empty line after section headings. In case of Excalidraw this will break/change the first text element in your drawing. " +
     "To overcome this, you can enable this setting. When enabled, Excalidraw will add a dummy element to the beginning of <code>## Text Elements</code> that the linter can safely modify." ,
-  PRESERVE_TEXT_AFTER_DRAWING_NAME: "Zotero compatibility",
+  PRESERVE_TEXT_AFTER_DRAWING_NAME: "Zotero and Footnotes compatibility",
   PRESERVE_TEXT_AFTER_DRAWING_DESC: "Preserve text after the ## Drawing section of the markdown file. This may have a very slight performance impact when saving very large drawings.",
   DEBUGMODE_NAME: "Enable debug messages",
   DEBUGMODE_DESC: "I recommend restarting Obsidian after enabling/disabling this setting. This enable debug messages in the console. This is useful for troubleshooting issues. " +
@@ -716,14 +750,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",
@@ -739,6 +775,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: "新建绘图 - 于新页签",
@@ -127,7 +128,10 @@ export default {
   OPEN_LINK: "打开所选元素里的链接 \n（按住 Shift 在新面板打开）",
   EXPORT_EXCALIDRAW: "导出为 .excalidraw 文件（旧版绘图文件格式）",
   LINK_BUTTON_CLICK_NO_TEXT:
-    "请选择一个含有链接的图形或文本元素。",
+    "请选择一个包含内部或外部链接的元素。\n",
+  LINEAR_ELEMENT_LINK_CLICK_ERROR:
+    "箭头和线元素的链接无法通过 " + labelCTRL() + " + 点击元素来导航，因为这也会激活线编辑器。\n" +
+    "请使用右键上下文菜单打开链接，或点击元素右上角的链接指示器。\n",
   FILENAME_INVALID_CHARS:
     '文件名不能含有以下符号： * " \\  < > : | ? #',
   FORCE_SAVE:
@@ -152,6 +156,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 +374,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: "允许在触控笔模式下进行双指缩放",
@@ -372,7 +398,15 @@ FILENAME_HEAD: "文件名",
   ZOOM_TO_FIT_MAX_LEVEL_NAME: "自动缩放的最高级别",
   ZOOM_TO_FIT_MAX_LEVEL_DESC:
     "自动缩放画布时，允许放大的最高级别。该值不能低于 0.5（50%）且不能超过 10（1000%）。",
-  LASER_HEAD: "激光笔工具（More Tools > Laser pointer）",
+  GRID_HEAD: "网格",
+  GRID_DYNAMIC_COLOR_NAME: "动态网格颜色",
+  GRID_DYNAMIC_COLOR_DESC:
+    "<b><u>开启：</u></b>更改网格颜色以匹配画布颜色<br><b><u>关闭：</u></b>将以下颜色用作网格颜色",
+  GRID_COLOR_NAME: "网格颜色",
+  GRID_OPACITY_NAME: "网格透明度",
+  GRID_OPACITY_DESC: "网格透明度还将控制将箭头绑定到元素时绑定框的透明度。<br>"+
+    "设置网格的不透明度。 0 表示完全透明，100 表示完全不透明。",
+  LASER_HEAD: "激光笔工具（更多工具 > 激光笔）",
   LASER_COLOR: "激光笔颜色",
   LASER_DECAY_TIME_NAME: "激光笔消失时间",
   LASER_DECAY_TIME_DESC: "单位是毫秒，默认是 1000（即 1 秒）。",
@@ -477,7 +511,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>" +
@@ -626,7 +664,7 @@ FILENAME_HEAD: "文件名",
     "如果出于某些合理的原因，您决定忽略我的建议并配置了 Excalidraw 文件的自动代码格式化，那么可以使用这个设置<br> " +
     "<code>## Text Elements</code> 部分对空行很敏感。一种常见的代码格式化是在章节标题后添加一个空行。但对于 Excalidraw 来说，这将破坏/改变您绘图中的第一个文本元素。" +
     "为了解决这个问题，您可以启用这个设置。启用后 Excalidraw 将在 <code>## Text Elements</code> 的开头添加一个虚拟元素，供自动代码格式化工具修改。" ,
-  PRESERVE_TEXT_AFTER_DRAWING_NAME: "Zotero 兼容性",
+  PRESERVE_TEXT_AFTER_DRAWING_NAME: "Zotero 和脚注（footnotes）的兼容性",
   PRESERVE_TEXT_AFTER_DRAWING_DESC: "保留 Markdown 文件中 <code>## Drawing</code> 部分之后的文本内容。保存非常大的绘图时，这可能会造成微小的性能影响。",
   DEBUGMODE_NAME: "开启 debug 信息",
   DEBUGMODE_DESC: "我建议在启用/禁用此设置后重新启动 Obsidian。这将在控制台中启用调试消息。这对于排查问题很有帮助。" +
@@ -667,7 +705,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 自动化",
@@ -712,14 +750,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（光学符号识别）",
@@ -735,6 +775,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

@@ -101,7 +101,7 @@ import {
   versionUpdateCheckTimer,
   getFontMetrics,
 } from "./utils/Utils";
-import { editorInsertText, extractSVGPNGFileName, foldExcalidrawSection, getActivePDFPageNumberFromPDFView, getAttachmentsFolderAndFilePath, getNewOrAdjacentLeaf, getParentOfClass, isObsidianThemeDark, mergeMarkdownFiles, openLeaf, setExcalidrawView } from "./utils/ObsidianUtils";
+import { editorInsertText, extractSVGPNGFileName, foldExcalidrawSection, getActivePDFPageNumberFromPDFView, getAttachmentsFolderAndFilePath, getExcalidrawViews, getNewOrAdjacentLeaf, getParentOfClass, isObsidianThemeDark, mergeMarkdownFiles, openLeaf, setExcalidrawView } from "./utils/ObsidianUtils";
 import { ExcalidrawElement, ExcalidrawEmbeddableElement, ExcalidrawImageElement, ExcalidrawTextElement, FileId } from "@zsviczian/excalidraw/types/excalidraw/element/types";
 import { ScriptEngine } from "./Scripts";
 import {
@@ -139,6 +139,7 @@ import { ExcalidrawLib } from "./ExcalidrawLib";
 import { Rank, SwordColors } from "./menu/ActionIcons";
 import { RankMessage } from "./dialogs/RankMessage";
 import { initCompressionWorker, terminateCompressionWorker } from "./workers/compression-worker";
+import { WeakArray } from "./utils/WeakArray";
 
 declare let EXCALIDRAW_PACKAGES:string;
 declare let react:any;
@@ -147,6 +148,7 @@ declare let excalidrawLib: typeof ExcalidrawLib;
 declare let PLUGIN_VERSION:string;
 
 export default class ExcalidrawPlugin extends Plugin {
+  public eaInstances = new WeakArray<ExcalidrawAutomate>();
   public fourthFontLoaded: boolean = false;
   public excalidrawConfig: ExcalidrawConfig;
   public taskbone: Taskbone;
@@ -756,9 +758,8 @@ export default class ExcalidrawPlugin extends Plugin {
 
       setTimeout(()=>{ //run async to avoid blocking the UI
         const theme = isObsidianThemeDark() ? "dark" : "light";
-        const leaves = this.app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW);
-        leaves.forEach((leaf: WorkspaceLeaf) => {
-          const excalidrawView = leaf.view as ExcalidrawView;
+        const excalidrawViews = getExcalidrawViews(this.app);
+        excalidrawViews.forEach(excalidrawView => {
           if (excalidrawView.file && excalidrawView.excalidrawAPI) {
             excalidrawView.setTheme(theme);
           }
@@ -1493,7 +1494,6 @@ export default class ExcalidrawPlugin extends Plugin {
 
     this.addCommand({
       id: "toggle-lock",
-      hotkeys: [{ modifiers: ["Ctrl" || "Meta", "Shift"], key: "e" }],
       name: t("TOGGLE_LOCK"),
       checkCallback: (checking: boolean) => {
         if (checking) {
@@ -1583,7 +1583,7 @@ export default class ExcalidrawPlugin extends Plugin {
 
     this.addCommand({
       id: "insert-link",
-      hotkeys: [{ modifiers: ["Ctrl" || "Meta", "Shift"], key: "k" }],
+      hotkeys: [{ modifiers: ["Mod", "Shift"], key: "k" }],
       name: t("INSERT_LINK"),
       checkCallback: (checking: boolean) => {
         if (checking) {
@@ -1616,7 +1616,6 @@ export default class ExcalidrawPlugin extends Plugin {
 
     this.addCommand({
       id: "insert-link-to-element",
-      hotkeys: [{ modifiers: ["Ctrl" || "Meta", "Shift"], key: "k" }],
       name: t("INSERT_LINK_TO_ELEMENT_NORMAL"),
       checkCallback: (checking: boolean) => {
         if (checking) {
@@ -2826,37 +2825,46 @@ 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);
+      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", () => true);
+    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
-      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.popScope = () => {
+      overrideHandlers.forEach(handler => scope.unregister(handler));
+      scope.unregister(handler_ctrlF);
+      Boolean(saveHandler) && scope.unregister(saveHandler);
     }
   }
 
@@ -2940,9 +2948,8 @@ export default class ExcalidrawPlugin extends Plugin {
 
       const modifyEventHandler = async (file: TFile) => {
         (process.env.NODE_ENV === 'development') && DEBUGGING && debug(modifyEventHandler,`ExcalidrawPlugin.modifyEventHandler`, file);
-        const leaves = this.app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW);
-        leaves.forEach(async (leaf: WorkspaceLeaf) => {
-          const excalidrawView = leaf.view as ExcalidrawView;
+        const excalidrawViews = getExcalidrawViews(this.app);
+        excalidrawViews.forEach(async (excalidrawView) => {
           if(excalidrawView.semaphores?.viewunload) {
             return;
           }
@@ -3002,10 +3009,10 @@ export default class ExcalidrawPlugin extends Plugin {
         }
 
         //close excalidraw view where this file is open
-        const leaves = this.app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW);
-        for (let i = 0; i < leaves.length; i++) {
-          if ((leaves[i].view as ExcalidrawView).file.path == file.path) {
-            await leaves[i].setViewState({
+        const excalidrawViews = getExcalidrawViews(this.app);
+        for (const excalidrawView of excalidrawViews) {
+          if (excalidrawView.file.path === file.path) {
+            await excalidrawView.leaf.setViewState({
               type: VIEW_TYPE_EXCALIDRAW,
               state: { file: null },
             });
@@ -3201,8 +3208,8 @@ export default class ExcalidrawPlugin extends Plugin {
   }
 
   onunload() {
-    const excalidrawLeaves = this.app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW);
-    excalidrawLeaves.forEach((leaf) => {
+    const excalidrawViews = getExcalidrawViews(this.app);
+    excalidrawViews.forEach(({leaf}) => {
       this.setMarkdownView(leaf);
     });
     
@@ -3233,6 +3240,10 @@ export default class ExcalidrawPlugin extends Plugin {
     );
     this.removeEventLisnters = [];
 
+    this.eaInstances.forEach((ea) => ea?.destroy());
+    this.eaInstances.clear();
+    this.eaInstances = null;
+
     this.ea.destroy();
     this.ea = null;
     

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/ObsidianMenu.tsx

@@ -2,7 +2,7 @@ import { AppState, ExcalidrawImperativeAPI } from "@zsviczian/excalidraw/types/e
 import clsx from "clsx";
 import { TFile } from "obsidian";
 import * as React from "react";
-import { DEVICE, VIEW_TYPE_EXCALIDRAW } from "src/constants/constants";
+import { DEVICE } from "src/constants/constants";
 import { PenSettingsModal } from "src/dialogs/PenSettingsModal";
 import ExcalidrawView from "src/ExcalidrawView";
 import { PenStyle } from "src/PenTypes";
@@ -11,8 +11,7 @@ import ExcalidrawPlugin from "../main";
 import { ICONS, penIcon, stringToSVG } from "./ActionIcons";
 import { UniversalInsertFileModal } from "src/dialogs/UniversalInsertFileModal";
 import { t } from "src/lang/helpers";
-
-declare const PLUGIN_VERSION:string;
+import { getExcalidrawViews } from "src/utils/ObsidianUtils";
 
 export function setPen (pen: PenStyle, api: any) {
   const st = api.getAppState();
@@ -134,10 +133,8 @@ export class ObsidianMenu {
               this.view.excalidrawAPI?.setToast({message:`Pin removed: ${name}`, duration: 3000, closable: true});
             } 
             await this.plugin.saveSettings();
-            this.plugin.app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW).forEach(v=> {
-              if (v.view instanceof ExcalidrawView) v.view.updatePinnedScripts()
-            })
-            })()
+            getExcalidrawViews(this.plugin.app).forEach(excalidrawView=>excalidrawView.updatePinnedScripts());
+          })()
         },
         1500
       )

src/menu/ToolsPanel.tsx

@@ -3,7 +3,7 @@ import { Notice, TFile } from "obsidian";
 import * as React from "react";
 import { ActionButton } from "./ActionButton";
 import { ICONS, saveIcon, stringToSVG } from "./ActionIcons";
-import { DEVICE, SCRIPT_INSTALL_FOLDER, VIEW_TYPE_EXCALIDRAW } from "../constants/constants";
+import { DEVICE, SCRIPT_INSTALL_FOLDER } from "../constants/constants";
 import { insertLaTeXToView, search } from "../ExcalidrawAutomate";
 import ExcalidrawView, { TextMode } from "../ExcalidrawView";
 import { t } from "../lang/helpers";
@@ -17,10 +17,10 @@ import { ExportDialog } from "src/dialogs/ExportDialog";
 import { openExternalLink } from "src/utils/ExcalidrawViewUtils";
 import { UniversalInsertFileModal } from "src/dialogs/UniversalInsertFileModal";
 import { DEBUGGING, debug } from "src/utils/DebugHelper";
+import { REM_VALUE } from "src/utils/StylesManager";
+import { getExcalidrawViews } from "src/utils/ObsidianUtils";
 
 declare const PLUGIN_VERSION:string;
-const dark = '<svg style="stroke:#ced4da;#212529;color:#ced4da;fill:#ced4da" ';
-const light = '<svg style="stroke:#212529;color:#212529;fill:#212529" ';
 
 type PanelProps = {
   visible: boolean;
@@ -42,7 +42,7 @@ export type PanelState = {
   scriptIconMap: ScriptIconMap | null;
 };
 
-const TOOLS_PANEL_WIDTH = 228;
+const TOOLS_PANEL_WIDTH = () => REM_VALUE * 14.4;
 
 export class ToolsPanel extends React.Component<PanelProps, PanelState> {
   pos1: number = 0;
@@ -155,11 +155,11 @@ export class ToolsPanel extends React.Component<PanelProps, PanelState> {
       return {
         left:
           (this.containerRef.current.clientWidth -
-            TOOLS_PANEL_WIDTH -
-            (isMobileOrZen ? 0 : TOOLS_PANEL_WIDTH + 4)) /
+            TOOLS_PANEL_WIDTH() -
+            (isMobileOrZen ? 0 : TOOLS_PANEL_WIDTH() + 4)) /
             2 +
           this.containerRef.current.parentElement.offsetLeft +
-          (isMobileOrZen ? 0 : TOOLS_PANEL_WIDTH + 4),
+          (isMobileOrZen ? 0 : TOOLS_PANEL_WIDTH() + 4),
         top: 64 + this.containerRef.current.parentElement.offsetTop,
       };
     });
@@ -262,7 +262,7 @@ export class ToolsPanel extends React.Component<PanelProps, PanelState> {
       shiftKey: e.shiftKey,
       altKey: e.altKey,
     });
-    this.view.handleLinkClick(event);
+    this.view.handleLinkClick(event, true);
   }
 
   actionOpenLinkProperties() {
@@ -366,11 +366,11 @@ export class ToolsPanel extends React.Component<PanelProps, PanelState> {
   async actionRunScript(key: string) {
     const view = this.view;
     const plugin = view.plugin;
-    const f = app.vault.getAbstractFileByPath(key);
+    const f = plugin.app.vault.getAbstractFileByPath(key);
     if (f && f instanceof TFile) {
       plugin.scriptEngine.executeScript(
         view,
-        await app.vault.read(f),
+        await plugin.app.vault.read(f),
         plugin.scriptEngine.getScriptName(f),
         f
       );
@@ -391,9 +391,7 @@ export class ToolsPanel extends React.Component<PanelProps, PanelState> {
       api?.setToast({message:`Pinned: ${scriptName}`, duration: 3000, closable: true})
     }
     await plugin.saveSettings();
-    plugin.app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW).forEach(v=> {
-      if (v.view instanceof ExcalidrawView) v.view.updatePinnedScripts()
-    })
+    getExcalidrawViews(plugin.app).forEach(excalidrawView=>excalidrawView.updatePinnedScripts());
   }
 
   private islandOnClick(event: React.MouseEvent<HTMLDivElement, MouseEvent>) {
@@ -453,7 +451,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: `14.4rem`,
             display:
               this.state.visible && !this.state.excalidrawViewMode
                 ? "block"
@@ -492,7 +490,7 @@ export class ToolsPanel extends React.Component<PanelProps, PanelState> {
               maxHeight: "350px",
               width: "initial",
               //@ts-ignore
-              "--padding": 2,
+              "--padding": "0.125rem",
               display: this.state.minimized ? "none" : "block",
             }}
           >

src/settings.ts

@@ -3,18 +3,18 @@ import {
   ButtonComponent,
   DropdownComponent,
   getIcon,
+  Modifier,
   normalizePath,
   PluginSettingTab,
   Setting,
   TextComponent,
   TFile,
 } from "obsidian";
-import { GITHUB_RELEASES, VIEW_TYPE_EXCALIDRAW } from "./constants/constants";
-import ExcalidrawView from "./ExcalidrawView";
+import { GITHUB_RELEASES } from "./constants/constants";
 import { t } from "./lang/helpers";
 import type ExcalidrawPlugin from "./main";
 import { PenStyle } from "./PenTypes";
-import { DynamicStyle } from "./types/types";
+import { DynamicStyle, GridSettings } from "./types/types";
 import { PreviewImageType } from "./utils/UtilTypes";
 import { setDynamicStyle } from "./utils/DynamicStyling";
 import {
@@ -39,6 +39,8 @@ 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";
+import { getExcalidrawViews } from "./utils/ObsidianUtils";
 
 export interface ExcalidrawSettings {
   folder: string;
@@ -177,6 +179,7 @@ export interface ExcalidrawSettings {
   pdfNumRows: number;
   pdfDirection: "down" | "right";
   pdfImportScale: number;
+  gridSettings: GridSettings;
   laserSettings: {
     DECAY_TIME: number,
     DECAY_LENGTH: number,
@@ -204,6 +207,8 @@ export interface ExcalidrawSettings {
   longPressMobile: number;
   isDebugMode: boolean;
   rank: Rank;
+  modifierKeyOverrides: {modifiers: Modifier[], key: string}[];
+  showSplashscreen: boolean;
 }
 
 declare const PLUGIN_VERSION:string;
@@ -220,8 +225,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: " ",
@@ -351,6 +356,11 @@ export const DEFAULT_SETTINGS: ExcalidrawSettings = {
   pdfNumRows: 1,
   pdfDirection: "right",
   pdfImportScale: 0.3,
+  gridSettings: {
+    DYNAMIC_COLOR: true,
+    COLOR: "#000000",
+    OPACITY: 50,
+  },
   laserSettings: {
     DECAY_LENGTH: 50,
     DECAY_TIME: 1000,
@@ -464,6 +474,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 {
@@ -472,6 +488,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;
 
@@ -498,27 +515,25 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
     }
     this.plugin.saveSettings();
     if (this.requestUpdatePinnedPens) {
-      app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW).forEach(v=> {
-        if (v.view instanceof ExcalidrawView) v.view.updatePinnedCustomPens()
-      })
+      getExcalidrawViews(this.app).forEach(excalidrawView =>
+        excalidrawView.updatePinnedCustomPens()
+      )
     }
     if (this.requestUpdateDynamicStyling) {
-      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);
-        }
-        
-      })
+      getExcalidrawViews(this.app).forEach(excalidrawView =>
+          setDynamicStyle(this.plugin.ea,excalidrawView,excalidrawView.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);
-      for (const v of exs) {
-        if (v.view instanceof ExcalidrawView) {
-          await v.view.save(false);
-          //debug({where:"ExcalidrawSettings.hide",file:v.view.file.name,before:"reload(true)"})
-          await v.view.reload(true);
-        }
+      const excalidrawViews = getExcalidrawViews(this.app);
+      for (const excalidrawView of excalidrawViews) {
+        await excalidrawView.save(false);
+        //debug({where:"ExcalidrawSettings.hide",file:v.view.file.name,before:"reload(true)"})
+        await excalidrawView.reload(true);
       }
       this.requestEmbedUpdate = true;
     }
@@ -747,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)")
@@ -763,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)")
@@ -1095,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"),
@@ -1201,9 +1241,7 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
           .setValue(this.plugin.settings.allowPinchZoom)
           .onChange(async (value) => {
             this.plugin.settings.allowPinchZoom = value;
-            app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW).forEach(v=> {
-              if (v.view instanceof ExcalidrawView) v.view.updatePinchZoom()
-            })
+            getExcalidrawViews(this.app).forEach(excalidrawView=>excalidrawView.updatePinchZoom())
             this.applySettingsUpdate();
           }),
       );
@@ -1217,9 +1255,7 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
           .setValue(this.plugin.settings.allowWheelZoom)
           .onChange(async (value) => {
             this.plugin.settings.allowWheelZoom = value;
-            app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW).forEach(v=> {
-              if (v.view instanceof ExcalidrawView) v.view.updateWheelZoom()
-            })
+            getExcalidrawViews(this.app).forEach(excalidrawView=>excalidrawView.updateWheelZoom());
             this.applySettingsUpdate();
           }),
       );
@@ -1270,7 +1306,79 @@ export class ExcalidrawSettingTab extends PluginSettingTab {
         el.innerText = ` ${this.plugin.settings.zoomToFitMaxLevel.toString()}`;
       });
 
-    
+      // ------------------------------------------------
+      // Grid
+      // ------------------------------------------------
+      detailsEl = displayDetailsEl.createEl("details");
+      detailsEl.createEl("summary", {
+        text: t("GRID_HEAD"),
+        cls: "excalidraw-setting-h3",
+      });
+
+      const updateGridColor = () => {
+        getExcalidrawViews(this.app).forEach(excalidrawView=>excalidrawView.updateGridColor());
+      };
+
+      // Dynamic color toggle
+      let gridColorSection: HTMLDivElement;
+      new Setting(detailsEl)
+        .setName(t("GRID_DYNAMIC_COLOR_NAME"))
+        .setDesc(fragWithHTML(t("GRID_DYNAMIC_COLOR_DESC")))
+        .addToggle((toggle) =>
+          toggle
+            .setValue(this.plugin.settings.gridSettings.DYNAMIC_COLOR)
+            .onChange(async (value) => {
+              this.plugin.settings.gridSettings.DYNAMIC_COLOR = value;
+              gridColorSection.style.display = value ? "none" : "block";
+              this.applySettingsUpdate();
+              updateGridColor();
+            }),
+        );
+
+      // Create a div to contain color and opacity settings
+      gridColorSection = detailsEl.createDiv();
+      gridColorSection.style.display = this.plugin.settings.gridSettings.DYNAMIC_COLOR ? "none" : "block";
+
+      // Grid color picker
+      new Setting(gridColorSection)
+        .setName(t("GRID_COLOR_NAME"))
+        .addColorPicker((colorPicker) =>
+          colorPicker
+            .setValue(this.plugin.settings.gridSettings.COLOR)
+            .onChange(async (value) => {
+              this.plugin.settings.gridSettings.COLOR = value;
+              this.applySettingsUpdate();
+              updateGridColor();
+            }),
+        );
+
+      // Grid opacity slider (hex value between 00 and FF)
+      let opacityValue: HTMLDivElement;
+      new Setting(detailsEl)
+        .setName(t("GRID_OPACITY_NAME"))
+        .setDesc(fragWithHTML(t("GRID_OPACITY_DESC")))
+        .addSlider((slider) =>
+          slider
+            .setLimits(0, 100, 1) // 0 to 100 in decimal
+            .setValue(this.plugin.settings.gridSettings.OPACITY)
+            .onChange(async (value) => {
+              opacityValue.innerText = ` ${value.toString()}`;
+              this.plugin.settings.gridSettings.OPACITY = value;
+              this.applySettingsUpdate();
+              updateGridColor();
+            }),
+        )
+        .settingEl.createDiv("", (el) => {
+          opacityValue = el;
+          el.style.minWidth = "3em";
+          el.style.textAlign = "right";
+          el.innerText = ` ${this.plugin.settings.gridSettings.OPACITY}`;
+        });
+
+
+    // ------------------------------------------------
+    // Laser Pointer
+    // ------------------------------------------------
     detailsEl = displayDetailsEl.createEl("details");
     detailsEl.createEl("summary", { 
       text: t("LASER_HEAD"),

src/types/types.d.ts

@@ -13,6 +13,12 @@ export type ValueOf<T> = T[keyof T];
 
 export type DynamicStyle = "none" | "gray" | "colorful";
 
+export type GridSettings = {
+  DYNAMIC_COLOR: boolean;  // Whether the grid color is dynamic
+  COLOR: string;           // The grid color (in hex format)
+  OPACITY: number;         // The grid opacity (hex value between "00" and "FF")
+};
+
 export type DeviceType = {
   isDesktop: boolean,
   isPhone: boolean,
@@ -25,9 +31,12 @@ export type DeviceType = {
   isAndroid: boolean,
 };
 
+export type Point = [number, number];
+
 declare global {
   interface Window {
       ExcalidrawAutomate: ExcalidrawAutomate;
+      pdfjsLib: any;
   }
 }
 

src/utils/CarveOut.ts

@@ -4,6 +4,7 @@ import { getEA } from "src";
 import { ExcalidrawAutomate } from "src/ExcalidrawAutomate";
 import { getCropFileNameAndFolder, getListOfTemplateFiles, splitFolderAndFilename } from "./FileUtils";
 import { Notice, TFile } from "obsidian";
+import { Radians } from "@zsviczian/excalidraw/types/math";
 
 export const CROPPED_PREFIX = "cropped_";
 export const ANNOTATED_PREFIX = "annotated_";
@@ -30,7 +31,7 @@ export const carveOutImage = async (sourceEA: ExcalidrawAutomate, viewImageEl: E
   const scale = newImage.scale;
   const angle = newImage.angle;
   newImage.scale = [1,1];
-  newImage.angle = 0;
+  newImage.angle = 0 as Radians;
 
   const ef = sourceEA.targetView.excalidrawData.getFile(viewImageEl.fileId);
   let imageLink = "";

src/utils/CropImage.ts

@@ -139,7 +139,9 @@ export class CropImage {
     const PLUGIN = app.plugins.plugins["obsidian-excalidraw-plugin"];
     const svg = await this.buildSVG();
     return new Promise((resolve, reject) => {
-      const svgData = new XMLSerializer().serializeToString(svg);
+      //https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2026
+      const svgData = svg.outerHTML;
+      //const svgData = new XMLSerializer().serializeToString(svg);
       const canvas = document.createElement('canvas');
       const context = canvas.getContext('2d');
   

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";
@@ -82,8 +82,10 @@ export const setDynamicStyle = (
     [`--color-surface-high`]: str(gray1().lighterBy(step)),
     [`--color-on-primary-container`]: str(!isDark?accent().darkerBy(15):accent().lighterBy(15)),
     [`--color-surface-primary-container`]: str(isDark?accent().darkerBy(step):accent().lighterBy(step)),
-    //[`--color-primary-darker`]: str(accent().darkerBy(step)),
-    //[`--color-primary-darkest`]: str(accent().darkerBy(step)),
+    [`--bold-color`]: str(!isDark?accent().darkerBy(15):accent().lighterBy(15)),
+    [`--color-primary-darker`]: str(accent().darkerBy(step)),
+    [`--color-primary-darkest`]: str(accent().darkerBy(2*step)),
+    ['--button-bg-color']: str(gray1()),
     [`--button-gray-1`]: str(gray1()),
     [`--button-gray-2`]: str(gray2()),
     [`--input-border-color`]: str(gray1()),
@@ -96,11 +98,11 @@ export const setDynamicStyle = (
     [`--overlay-bg-color`]: gray2().alphaTo(0.6).stringHEX(),
     [`--popup-bg-color`]: str(gray1()),
     [`--color-on-surface`]: str(text),
+    [`--default-border-color`]: str(gray1()),
     //[`--color-gray-100`]: str(text),
     [`--color-gray-40`]: str(text), //frame
-    [`--color-gray-50`]: str(text), //frame
     [`--color-surface-highlight`]: str(gray1()),
-    //[`--color-gray-30`]: str(gray1),
+    [`--color-gray-20`]: str(gray1()),
     [`--sidebar-border-color`]: str(gray1()),
     [`--color-primary-light`]: str(accent().lighterBy(step)),
     [`--button-hover-bg`]: str(gray1()),
@@ -116,7 +118,11 @@ export const setDynamicStyle = (
     [`color`]: str(text),
     ['--excalidraw-caret-color']: str(isLightTheme ? text : cmBG()),
     [`--select-highlight-color`]: str(gray1()),
-    [`--color-gray-80`]: str(isDark?text.darkerBy(40):text.lighterBy(40)), //frame
+    [`--color-gray-90`]: str(isDark?text.darkerBy(5):text.lighterBy(5)), //search background
+    [`--color-gray-80`]: str(isDark?text.darkerBy(10):text.lighterBy(10)), //frame
+    [`--color-gray-70`]: str(isDark?text.darkerBy(10):text.lighterBy(10)), //frame
+    [`--default-bg-color`]: str(isDark?text.darkerBy(20):text.lighterBy(20)), //search background,
+    [`--color-gray-50`]: str(text), //frame
   };
   
     const styleString = Object.keys(styleObject)

src/utils/ExcalidrawViewUtils.ts

@@ -81,20 +81,18 @@ export function openTagSearch(link: string, app: App, view?: ExcalidrawView) {
     return;
   }
 
-  const search = app.workspace.getLeavesOfType("search");
-  if (search.length === 0) {
-    return;
+  const query = `tag:${tags[0].value[1]}`;
+  const searchPlugin = app.internalPlugins.getPluginById("global-search");
+  if (searchPlugin) {
+    const searchInstance = searchPlugin.instance;
+    if (searchInstance) {
+      searchInstance.openGlobalSearch(query);
+    }
   }
 
-  //@ts-ignore
-  search[0].view.setQuery(`tag:${tags[0].value[1]}`);
-  app.workspace.revealLeaf(search[0]);
-
   if (view && view.isFullscreen()) {
     view.exitFullscreen();
   }
-
-  return;
 }
 
 function getLinkFromMarkdownLink(link: string): string {
@@ -123,14 +121,21 @@ export function openExternalLink (link:string, app: App, element?: ExcalidrawEle
  * @param link 
  * @param app 
  * @param returnWikiLink 
+ * @param openLink: if set to false, the link will not be opened just true will be returned for an obsidian link.
  * @returns 
  *   false if the link is not an obsidian link,
  *   true if the link is an obsidian link and it was opened (i.e. it is a link to another Vault or not a file link e.g. plugin link), or
  *   the link to the file path. By default as a wiki link, or as a file path if returnWikiLink is false.
  */
-export function parseObsidianLink(link: string, app: App, returnWikiLink: boolean = true): boolean | string {
+export function parseObsidianLink(
+  link: string,
+  app: App,
+  returnWikiLink: boolean = true,
+  openLink: boolean = true,
+): boolean | string {
+  if(!link) return false;
   link = getLinkFromMarkdownLink(link);
-  if (!link.startsWith("obsidian://")) {
+  if (!link?.startsWith("obsidian://")) {
       return false;
   }
   const url = new URL(link);
@@ -153,7 +158,9 @@ export function parseObsidianLink(link: string, app: App, returnWikiLink: boolea
       }
   }
 
-  window.open(link, "_blank");
+  if(openLink) {
+    window.open(link, "_blank");
+  }
   return true;
 }
 
@@ -378,6 +385,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;
@@ -387,4 +401,4 @@ export function isTextImageTransclusion (
     }
   }
   return false;
-}
+}

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

@@ -2,6 +2,7 @@ import { ExcalidrawElement, ExcalidrawImageElement, ExcalidrawTextElement } from
 import { REGEX_LINK, REG_LINKINDEX_HYPERLINK } from "src/ExcalidrawData";
 import ExcalidrawView, { TextMode } from "src/ExcalidrawView";
 import { rotatedDimensions } from "./Utils";
+import { getBoundTextElementId } from "src/ExcalidrawAutomate";
 
 export const getElementsAtPointer = (
   pointer: any,
@@ -93,13 +94,24 @@ const api = view.excalidrawAPI;
   if (!api) {
     return;
   }
-  const elements = (
+  let elements = (
     getElementsAtPointer(
       pointer,
       api.getSceneElements(),
-    ) as ExcalidrawImageElement[]
+    ) as ExcalidrawElement[]
   ).filter((el) => el.link);
 
+  //as a fallback let's check if any of the elements at pointer are containers with a text element that has a link.
+  if (elements.length === 0) {
+    const textElIDs = (
+      getElementsAtPointer(
+        pointer,
+        api.getSceneElements(),
+      ) as ExcalidrawImageElement[]
+    ).map((el) => getBoundTextElementId(el));
+    elements = view.getViewElements().filter((el) => el.type==="text" && el.link && textElIDs.includes(el.id));
+  }
+
   if (elements.length === 0) {
     return { id: null, text: null };
   }

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("+");
 }

src/utils/ObsidianUtils.ts

@@ -9,8 +9,9 @@ import ExcalidrawPlugin from "../main";
 import { checkAndCreateFolder, splitFolderAndFilename } from "./FileUtils";
 import { linkClickModifierType, ModifierKeys } from "./ModifierkeyHelper";
 import { REG_BLOCK_REF_CLEAN, REG_SECTION_REF_CLEAN, VIEW_TYPE_EXCALIDRAW } from "src/constants/constants";
-import yaml, { Mark } from "js-yaml";
+import yaml from "js-yaml";
 import { debug, DEBUGGING } from "./DebugHelper";
+import ExcalidrawView from "src/ExcalidrawView";
 
 export const getParentOfClass = (element: Element, cssClass: string):HTMLElement | null => {
   let parent = element.parentElement;
@@ -24,6 +25,11 @@ export const getParentOfClass = (element: Element, cssClass: string):HTMLElement
   return parent?.classList?.contains(cssClass) ? parent : null;
 };
 
+export function getExcalidrawViews(app: App): ExcalidrawView[] {
+  const leaves = app.workspace.getLeavesOfType(VIEW_TYPE_EXCALIDRAW).filter(l=>l.view instanceof ExcalidrawView);
+  return leaves.map(l=>l.view as ExcalidrawView);
+}
+
 export const getLeaf = (
   plugin: ExcalidrawPlugin,
   origo: WorkspaceLeaf,

src/utils/StylesManager.ts

@@ -3,6 +3,8 @@ import ExcalidrawPlugin from "src/main";
 import { getAllWindowDocuments } from "./ObsidianUtils";
 import { DEBUGGING, debug } from "./DebugHelper";
 
+export let REM_VALUE = 16;
+
 const STYLE_VARIABLES = [
   "--background-modifier-cover",
   "--background-primary-alt",
@@ -77,6 +79,11 @@ export class StylesManager {
   }
 
   private async harvestStyles() {
+    REM_VALUE = parseInt(window.getComputedStyle(document.body).getPropertyValue('--font-text-size').trim());
+    if (isNaN(REM_VALUE)) {
+      REM_VALUE = 16;
+    }
+
     const body = document.body;
     const iframe:HTMLIFrameElement = document.createElement("iframe");
     iframe.style.display = "none";

styles.css

@@ -226,7 +226,7 @@ li[data-testid] {
 }
 
 .excalidraw .ToolIcon__icon img{
-  height: 1em;
+  height: 1rem;
 }
 
 .excalidraw-scriptengine-install tbody>tr>td>div>img {
@@ -394,23 +394,28 @@ div.excalidraw-draginfo {
 
 .modal-content.excalidraw-scriptengine-install .search-bar-wrapper {
   position: sticky;
-  top: 1em;
-  margin-right: 1em;
+  top: 1rem;
+  margin-right: 1rem;
   display: flex;
   align-items: center;
   gap: 5px;
   flex-wrap: nowrap;
   z-index: 10;
   background: var(--background-secondary);
-  padding: 0.5em;
+  padding: 0.5rem;
   border-bottom: 1px solid var(--background-modifier-border);
   float: right;
-  max-width: 28em;
+  max-width: 28rem;
+}
+
+div.search-bar-wrapper input {
+  margin-right: -0.5rem;
 }
 
 .modal-content.excalidraw-scriptengine-install .hit-count {
   margin-left: 0.5em;
   white-space: nowrap;
+  font-size: smaller;
 }
 
 .modal-content.excalidraw-scriptengine-install .active-highlight {
@@ -629,4 +634,20 @@ textarea.excalidraw-wysiwyg, .excalidraw input {
 
 .excalidraw .color-picker-content input[type="color"] {
   filter: var(--theme-filter);
-}
+}
+
+.ExcTextField__input input::placeholder {
+  color: var(--select-highlight-color);
+}
+
+.excalidraw textarea::placeholder {
+  color: var(--color-gray-50);
+}
+
+.excalidraw textarea.ttd-dialog-input {
+  caret-color: var(--excalidraw-caret-color);
+}
+
+.excalidraw .ToolIcon_type_button {
+  color: var(--text-primary-color);
+}