1.9.19

2025-08-06 05:46:28 +00:00 · 2023-09-03 11:27:04 +02:00
parent 9d9201b4d1
commit cd58d1af06
10 changed files with 228 additions and 51 deletions
--- a/ea-scripts/Deconstruct
+++ b/ea-scripts/Deconstruct
@@ -3,13 +3,60 @@

 Select some elements in the scene. The script will take these elements and move them into a new Excalidraw file, and open that file. The selected elements will also be replaced in your original drawing with the embedded Excalidraw file (the one that was just created). You will be prompted for the file name of the new deconstructed image. The script is useful if you want to break a larger drawing into smaller reusable parts that you want to reference in multiple drawings.

+<iframe width="560" height="315" src="https://www.youtube.com/embed/HRtaaD34Zzg" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+
+<iframe width="560" height="315" src="https://www.youtube.com/embed/mvMQcz401yo" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+
 ```javascript
 */
-if(!ea.verifyMinimumPluginVersion || !ea.verifyMinimumPluginVersion("1.7.29")) {
+if(!ea.verifyMinimumPluginVersion || !ea.verifyMinimumPluginVersion("1.9.19")) {
  new Notice("This script requires a newer version of Excalidraw. Please install the latest version.");
  return;
 }

+// -------------------------------
+// Utility variables and functions
+// -------------------------------
+const excalidrawTemplate = app.metadataCache.getFirstLinkpathDest(ea.plugin.settings.templateFilePath,"");
+if(typeof window.ExcalidrawDeconstructElements === "undefined") {
+	window.ExcalidrawDeconstructElements = {
+	  openDeconstructedImage: true,
+	  templatePath: excalidrawTemplate?.path??""
+	};
+}
+
+const splitFolderAndFilename = (filepath) => {
+  const lastIndex = filepath.lastIndexOf("/");
+  return {
+    foldername: ea.obsidian.normalizePath(filepath.substring(0, lastIndex)),
+    filename: (lastIndex == -1 ? filepath : filepath.substring(lastIndex + 1)) + ".md"
+  };
+}
+
+let settings = ea.getScriptSettings();
+//set default values on first run
+if(!settings["Templates"]) {
+	settings = {
+	  "Templates" : {
+			value: "",
+      description: "Comma-separated list of template filepaths"
+		}
+	};
+	await ea.setScriptSettings(settings);
+}
+
+const templates = settings["Templates"]
+  .value
+  .split(",")
+  .map(p=>app.metadataCache.getFirstLinkpathDest(p.trim(),""))
+  .concat(excalidrawTemplate)
+  .filter(f=>Boolean(f))
+  .sort((a,b) => a.basename.localeCompare(b.basename));
+
+
+// ------------------------------------
+// Prepare elements to be deconstructed
+// ------------------------------------
 const els = ea.getViewSelectedElements();
 if (els.length === 0) {
  new Notice("You must select elements first")
@@ -20,53 +67,114 @@ const bb = ea.getBoundingBox(els);
 ea.copyViewElementsToEAforEditing(els);

 ea.getElements().filter(el=>el.type==="image").forEach(el=>{
-    const img = ea.targetView.excalidrawData.getFile(el.fileId);
-    const path = (img?.linkParts?.original)??(img?.file?.path);
-    if(img && path) {
-	    ea.imagesDict[el.fileId] = {
-	      mimeType: img.mimeType,
-	      id: el.fileId,
-	      dataURL: img.img,
-	      created: img.mtime,
-	      file: path,
-	      hasSVGwithBitmap: img.isSVGwithBitmap,
-	      latex: null,
-	    };
-	    return;
+  const img = ea.targetView.excalidrawData.getFile(el.fileId);
+  const path = (img?.linkParts?.original)??(img?.file?.path);
+  if(img && path) {
+	  ea.imagesDict[el.fileId] = {
+	    mimeType: img.mimeType,
+	    id: el.fileId,
+	    dataURL: img.img,
+	    created: img.mtime,
+	    file: path,
+	    hasSVGwithBitmap: img.isSVGwithBitmap,
+     latex: null,
+   };
+   return;
 	}
 	const equation = ea.targetView.excalidrawData.getEquation(el.fileId);
 	eqImg = ea.targetView.getScene()?.files[el.fileId]
 	if(equation && eqImg) {
-          ea.imagesDict[el.fileId] = {
-	      mimeType: eqImg.mimeType,
-	      id: el.fileId,
-	      dataURL: eqImg.dataURL,
-	      created: eqImg.created,
-	      file: null,
-	      hasSVGwithBitmap: null,
-	      latex: equation.latex,
-	    };
-	    return;
+    ea.imagesDict[el.fileId] = {
+	    mimeType: eqImg.mimeType,
+	    id: el.fileId,
+	    dataURL: eqImg.dataURL,
+	    created: eqImg.created,
+	    file: null,
+	    hasSVGwithBitmap: null,
+	    latex: equation.latex,
+	  };
+	  return;
 	}
 });

-let folder = ea.targetView.file.path;
-folder = folder.lastIndexOf("/")===-1?"":folder.substring(0,folder.lastIndexOf("/"))+"/";
-const fname = await utils.inputPrompt("Filename for new file","Filename","");
-const template = app.metadataCache.getFirstLinkpathDest(ea.plugin.settings.templateFilePath,"");
+
+// ------------
+// Input prompt
+// ------------
+let shouldAnchor = false;
+const actionButtons = [
+  {
+    caption: "Insert @100%",
+    tooltip: "Anchor to 100% size",
+    action: () => {
+      shouldAnchor = true;
+    }
+  },
+  {
+    caption: "Insert",
+    tooltip: "Insert without anchoring",
+    action: () => {
+      shouldAnchor = false;
+    }
+  }];
+
+const customControls =  (container) => {
+  new ea.obsidian.Setting(container)
+    .setName(`Select template`)
+    .addDropdown(dropdown => {
+      templates.forEach(file => dropdown.addOption(file.path, file.basename));
+      if(templates.length === 0) dropdown.addOption(null, "none");
+      dropdown
+        .setValue(window.ExcalidrawDeconstructElements.templatePath)
+        .onChange(value => {
+           window.ExcalidrawDeconstructElements.templatePath = value;
+        })
+    })
+
+  new ea.obsidian.Setting(container)
+    .setName(`Open deconstructed image`)
+    .addToggle((toggle) => toggle
+      .setValue(window.ExcalidrawDeconstructElements.openDeconstructedImage)
+      .onChange(value => {
+        window.ExcalidrawDeconstructElements.openDeconstructedImage = value;
+      })
+    )
+}
+
+const path = await utils.inputPrompt(
+  "Filename for new file",
+  "Filename",
+  await ea.getAttachmentFilepath("deconstructed"),
+  actionButtons,
+  2,
+  false,
+  customControls
+);
+
+if(!path) return;
+
+// ----------------------
+// Execute deconstruction
+// ----------------------
+const {foldername, filename} = splitFolderAndFilename(path);

 const newPath = await ea.create ({
-  filename: fname + ".md",
-  foldername: folder,
-  templatePath: template?.path,
-  onNewPane: true
+  filename,
+  foldername,
+  templatePath: window.ExcalidrawDeconstructElements.templatePath,
+  onNewPane: true,
+  silent: !window.ExcalidrawDeconstructElements.openDeconstructedImage
 });

 setTimeout(async ()=>{
-  const file = app.metadataCache.getFirstLinkpathDest(newPath,"")
+  const file = app.metadataCache.getFirstLinkpathDest(newPath,"");
  ea.deleteViewElements(els);
  ea.clear();
-  await ea.addImage(bb.topX,bb.topY,file,false);
+  await ea.addImage(bb.topX,bb.topY,file,false, shouldAnchor);
  await ea.addElementsToView(false, true, true);
  ea.getExcalidrawAPI().history.clear(); //to avoid undo/redo messing up the decomposition
 },1000);
+
+if(!window.ExcalidrawDeconstructElements.openDeconstructedImage) {
+  new Notice("Deconstruction ready");
+}
--- a/ea-scripts/Set
+++ b/ea-scripts/Set
@@ -8,18 +8,44 @@ https://zsviczian.github.io/obsidian-excalidraw-plugin/ExcalidrawScriptsEngine.h

 ```javascript
 */
-if(!ea.verifyMinimumPluginVersion || !ea.verifyMinimumPluginVersion("1.8.11")) {
+if(!ea.verifyMinimumPluginVersion || !ea.verifyMinimumPluginVersion("1.9.19")) {
  new Notice("This script requires a newer version of Excalidraw. Please install the latest version.");
  return;
 }

 const api = ea.getExcalidrawAPI();
 let appState = api.getAppState();
-const grid = parseInt(await utils.inputPrompt("Grid size?",null,appState.previousGridSize?.toString()??"20"));
+const gridColor = appState.gridColor;
+let gridFrequency = gridColor?.MajorGridFrequency ?? 5;
+
+const customControls =  (container) => {
+  new ea.obsidian.Setting(container)
+    .setName(`Major grid frequency`)
+    .addDropdown(dropdown => {
+      [2,3,4,5,6,7,8,9,10].forEach(grid=>dropdown.addOption(grid,grid));
+      dropdown
+        .setValue(gridFrequency)
+        .onChange(value => {
+           gridFrequency = value;
+        })
+    })
+}
+
+const grid = parseInt(await utils.inputPrompt(
+  "Grid size?",
+  null,
+  appState.previousGridSize?.toString()??"20",
+  null,
+  1,
+  false,
+  customControls
+));
 if(isNaN(grid)) return; //this is to avoid passing an illegal value to Excalidraw
+
 appState.gridSize = grid;
 appState.previousGridSize = grid;
+if(gridColor) gridColor.MajorGridFrequency = parseInt(gridFrequency);
 api.updateScene({
-  appState,
+  appState : {gridSize: grid, previousGridSize: grid, gridColor},
  commitToHistory:false
 });
--- a/ea-scripts/directory-info.json
+++ b/ea-scripts/directory-info.json
--- a/ea-scripts/index-new.md
+++ b/ea-scripts/index-new.md
@@ -71,6 +71,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/Set%20Text%20Alignment.svg"/></div>|[[#Set Text Alignment]]|
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Split%20text%20by%20lines.svg"/></div>|[[#Split text by lines]]|
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Text%20Arch.svg"/></div>|[[#Text Arch]]|
+|<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Text%20Aura.svg"/></div>|[[#Text Aura]]|
 |<div><img src="https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Text%20to%20Sticky%20Notes.svg"/></div>|[[#Text to Sticky Notes]]|

 ## Styling and Appearance
@@ -502,6 +503,12 @@ 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/Text%20Arch.md'>File on GitHub</a></td></tr><tr valign='top'><td class="label">Description</td><td class="data">Fit a text to the arch of a circle. The script will prompt you for the radius of the circle and then split your text to individual letters and place each letter to the arch defined by the radius. Setting a lower radius value will increase the arching of the text. Note that the arched-text will no longer be editable as a text element and it will no longer function as a markdown link. Emojis are currently not supported.<br><img src='https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/images/text-arch.jpg'></td></tr></table>

+## Text Aura
+```excalidraw-script-install
+https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Text%20Aura.md
+```
+<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/Text%20Aura.md'>File on GitHub</a></td></tr><tr valign='top'><td class="label">Description</td><td class="data">Select a single text element, or a text element in a container. The container must have a transparent background.<br>The script will add an aura to the text by adding 4 copies of the text each with the inverted stroke color of the original text element and with a very small X and Y offset. The resulting 4 + 1 (original) text elements or containers will be grouped.<br>If you copy a color string on the clipboard before running the script, the script will use that color instead of the inverted color.<br><img src='https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/images/scripts-text-aura.jpg'></td></tr></table>
+
 ## Toggle Grid
 ```excalidraw-script-install
 https://raw.githubusercontent.com/zsviczian/obsidian-excalidraw-plugin/master/ea-scripts/Toggle%20Grid.md
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
  "id": "obsidian-excalidraw-plugin",
  "name": "Excalidraw",
-  "version": "1.9.18",
+  "version": "1.9.19",
  "minAppVersion": "1.1.6",
  "description": "An Obsidian plugin to edit and view Excalidraw drawings",
  "author": "Zsolt Viczian",
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
  "author": "",
  "license": "MIT",
  "dependencies": {
-    "@zsviczian/excalidraw": "0.15.2-obsidian-13",
+    "@zsviczian/excalidraw": "0.15.3-obsidian-1",
    "chroma-js": "^2.4.2",
    "clsx": "^2.0.0",
    "colormaster": "^1.2.1",
--- a/src/EmbeddedFileLoader.ts
+++ b/src/EmbeddedFileLoader.ts
@@ -102,9 +102,9 @@ const replaceSVGColors = (svg: SVGSVGElement | string, colorMap: ColorMap | null
  if(typeof svg === 'string') {
    // Replace colors in the SVG string
    for (const [oldColor, newColor] of Object.entries(colorMap)) {
-      const fillRegex = new RegExp(`fill="${oldColor}"`, 'g');
+      const fillRegex = new RegExp(`fill="${oldColor}"`, 'gi');
      svg = svg.replaceAll(fillRegex, `fill="${newColor}"`);
-      const strokeRegex = new RegExp(`stroke="${oldColor}"`, 'g');
+      const strokeRegex = new RegExp(`stroke="${oldColor}"`, 'gi');
      svg = svg.replaceAll(strokeRegex, `stroke="${newColor}"`);
    }
    return svg;
@@ -113,8 +113,8 @@ const replaceSVGColors = (svg: SVGSVGElement | string, colorMap: ColorMap | null
  // Modify the fill and stroke attributes of child nodes
  const childNodes = (node: ChildNode) => {
    if (node instanceof SVGElement) {
-      const oldFill = node.getAttribute('fill');
-      const oldStroke = node.getAttribute('stroke');
+      const oldFill = node.getAttribute('fill').toLocaleLowerCase();
+      const oldStroke = node.getAttribute('stroke').toLocaleLowerCase();

      if (oldFill && colorMap[oldFill]) {
        node.setAttribute('fill', colorMap[oldFill]);
@@ -158,7 +158,7 @@ export class EmbeddedFile {
    this.resetImage(hostPath, imgPath);
    if(this.file && (this.plugin.ea.isExcalidrawFile(this.file) || this.file.extension.toLowerCase() === "svg")) {
      try {
-        this.colorMap = colorMapJSON ? JSON.parse(colorMapJSON) : null;
+        this.colorMap = colorMapJSON ? JSON.parse(colorMapJSON.toLocaleLowerCase()) : null;
      } catch (error) {
        this.colorMap = null;
      }
--- a/src/ExcalidrawView.ts
+++ b/src/ExcalidrawView.ts
@@ -1784,12 +1784,12 @@ export default class ExcalidrawView extends TextFileView {
    });
  }

-  private getGridColor(bgColor: string):{Bold: string, Regular: string} {
+  private getGridColor(bgColor: string, st: AppState):{Bold: string, Regular: string, MajorGridFrequency: number} {
    const cm = this.plugin.ea.getCM(bgColor);
    const isDark = cm.isDark();
-    const Regular = (isDark ? cm.lighterBy(5) : cm.darkerBy(5)).stringHEX();
-    const Bold = (isDark ? cm.lighterBy(10) : cm.darkerBy(10)).stringHEX();
-    return {Bold, Regular};
+    const Regular = (isDark ? cm.lighterBy(7) : cm.darkerBy(7)).stringHEX();
+    const Bold = (isDark ? cm.lighterBy(14) : cm.darkerBy(14)).stringHEX();
+    return {Bold, Regular, MajorGridFrequency:st.gridColor.MajorGridFrequency};
  }

  public activeLoader: EmbeddedFilesLoader = null;
@@ -2790,6 +2790,7 @@ export default class ExcalidrawView extends TextFileView {
            zoom: st.zoom,
            currentItemRoundness: st.currentItemRoundness,
            gridSize: st.gridSize,
+            gridColor: st.gridColor,
            colorPalette: st.colorPalette,
            currentStrokeOptions: st.currentStrokeOptions,
            previousGridSize: st.previousGridSize,
@@ -3185,7 +3186,7 @@ export default class ExcalidrawView extends TextFileView {
            onChange: (et: ExcalidrawElement[], st: AppState) => {
              const canvasColorChangeHook = () => {
                const canvasColor = st.viewBackgroundColor === "transparent" ? "white" : st.viewBackgroundColor;
-                setTimeout(()=>this.updateScene({appState:{gridColor: this.getGridColor(canvasColor)}}));
+                setTimeout(()=>this.updateScene({appState:{gridColor: this.getGridColor(canvasColor, st)}}));
                setDynamicStyle(this.plugin.ea,this,canvasColor,this.plugin.settings.dynamicStyling);
                if(this.plugin.ea.onCanvasColorChangeHook) {
                  try {
--- a/src/dialogs/Messages.ts
+++ b/src/dialogs/Messages.ts
@@ -17,6 +17,41 @@ 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>
 `,
+"1.9.19":`
+## New
+- I added new features to the [Deconstruct Selected Elements](https://github.com/zsviczian/obsidian-excalidraw-plugin/blob/master/ea-scripts/Deconstruct%20selected%20elements%20into%20new%20drawing.md) script
+- I added a new script: [Text Aura](https://github.com/zsviczian/obsidian-excalidraw-plugin/blob/master/ea-scripts/Text%20Aura.md)
+- I updated the [Set Grid](https://github.com/zsviczian/obsidian-excalidraw-plugin/blob/master/ea-scripts/Set%20Grid.md) script. You can now set the Major/Minor tick frequency. [#1305](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1305)
+- The re-colorMap is now case-insensitive. The color map is a hidden feature. In Markdown View mode you can add a JSON map after the embedded SVG or Excalidraw image filename with a mapping of current colors to new colors.
+<img width="100%" src="https://github.com/zsviczian/obsidian-excalidraw-plugin/assets/14358394/1d985a59-a2d2-48a2-9cef-686bfbe9ef02"/>
+
+## New in ExcalidrawAutomate
+- I added the ${String.fromCharCode(96)}silent${String.fromCharCode(96)} switch. If this is true, the created file will not be opened.
+${String.fromCharCode(96,96,96)}typescript
+  async create(params?: {
+    filename?: string;
+    foldername?: string;
+    templatePath?: string;
+    onNewPane?: boolean;
+    silent?: boolean;
+    frontmatterKeys?: {
+      "excalidraw-plugin"?: "raw" | "parsed";
+      "excalidraw-link-prefix"?: string;
+      "excalidraw-link-brackets"?: boolean;
+      "excalidraw-url-prefix"?: string;
+      "excalidraw-export-transparent"?: boolean;
+      "excalidraw-export-dark"?: boolean;
+      "excalidraw-export-padding"?: number;
+      "excalidraw-export-pngscale"?: number;
+      "excalidraw-default-mode"?: "view" | "zen";
+      "excalidraw-onload-script"?: string;
+      "excalidraw-linkbutton-opacity"?: number;
+      "excalidraw-autoexport"?: boolean;
+    };
+    plaintext?: string; //text to insert above the ${String.fromCharCode(96)}# Text Elements${String.fromCharCode(96)} section
+  }): Promise<string>
+${String.fromCharCode(96,96,96)}
+`,
 "1.9.18":`
 ## New
 - Excalidraw now syncs with Obsidian's language settings, provided translations are available. [#1297](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1297)
--- a/src/main.ts
+++ b/src/main.ts
@@ -2263,7 +2263,7 @@ export default class ExcalidrawPlugin extends Plugin {
    this.settings = Object.assign({}, DEFAULT_SETTINGS, await this.loadData());
    if(!this.settings.previewImageType) { //migration 1.9.13
      if(typeof this.settings.displaySVGInPreview === "undefined") {
-        this.settings.previewImageType = PreviewImageType.SVG;
+        this.settings.previewImageType = PreviewImageType.SVGIMG;
      } else {
        this.settings.previewImageType = this.settings.displaySVGInPreview
          ? PreviewImageType.SVGIMG