2.0.19

src/dialogs/InsertPDFModal.ts

@@ -162,6 +162,19 @@ export class InsertPDFModal extends Modal {
       numPagesMessage.innerHTML = `There are <b>${numPages}</b> pages in the selected document.`;
     }
 
+    let pageRangesTextComponent: TextComponent
+    let importPagesMessage: HTMLParagraphElement;
+
+    const rangeOnChange = (value:string) => {
+      const pages = this.createPageListFromString(value);
+      if(pages.length > 15) {
+        importPagesMessage.innerHTML = `You are importing <b>${pages.length}</b> pages. ⚠️ This may take a while. ⚠️`;
+      } else {
+        importPagesMessage.innerHTML = `You are importing <b>${pages.length}</b> pages.`;
+      }
+      importButtonMessages();
+    }
+
     const setFile = async (file: TFile) => {
       if(this.pdfDoc) await this.pdfDoc.destroy();
       this.pdfDoc = null;
@@ -171,6 +184,8 @@ export class InsertPDFModal extends Modal {
         this.pdfFile = file;
         if(this.pdfDoc) {
           numPages = this.pdfDoc.numPages;
+          pageRangesTextComponent.setValue(`1-${numPages}`);
+          rangeOnChange(`1-${numPages}`);
           importButtonMessages();
           numPagesMessages();
           this.getPageDimensions(this.pdfDoc);
@@ -190,23 +205,14 @@ export class InsertPDFModal extends Modal {
     
     numPagesMessage = ce.createEl("p", {text: ""});
     numPagesMessages();
-    let importPagesMessage: HTMLParagraphElement;
-    let pageRangesTextComponent: TextComponent
     new Setting(ce)
       .setName("Pages to import")
+      .setDesc("e.g.: 1,3-5,7,9-10")
       .addText(text => {
         pageRangesTextComponent = text;
         text
-          .setPlaceholder("e.g.: 1,3-5,7,9-10")
-          .onChange((value) => {
-            const pages = this.createPageListFromString(value);
-            if(pages.length > 15) {
-              importPagesMessage.innerHTML = `You are importing <b>${pages.length}</b> pages. ⚠️ This may take a while. ⚠️`;
-            } else {
-              importPagesMessage.innerHTML = `You are importing <b>${pages.length}</b> pages.`;
-            }
-            importButtonMessages();
-          })
+          .setValue("")
+          .onChange((value) => rangeOnChange(value))
         text.inputEl.style.width = "100%";
       })
     importPagesMessage = ce.createEl("p", {text: ""});

src/dialogs/Messages.ts

@@ -17,6 +17,28 @@ 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.0.19":`
+<div class="excalidraw-videoWrapper"><div>
+<iframe src="https://www.youtube.com/embed/4wp6vLiIdGM" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+</div></div>
+
+## Fixed
+- When updating Excalidraw, some open drawings weren't automatically reopening. I hope I got this fixed (note this change will only have an effect when you receive the update after this).
+- In dark mode, the frame header is challenging to see when modified [#1568](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1568).
+
+## New
+- Crop PDF pages:
+  - Available in Excalidraw, Markdown Notes, and on the Canvas.
+  - Crop the active page from the embedded PDF viewer and insert the cropped image into the current view, both in Excalidraw and on Canvas.
+- New Command Palette Action: "Insert active PDF page as image." This action is functional in Excalidraw. If an embedded Obsidian-PDF-viewer is present, executing this command will insert the active page as an image into the Excalidraw scene.
+- Two new settings introduced:
+  - "Basic" section allows setting the folder for crop files.
+  - "Saving/filename" section enables setting the prefix for crop files.
+- PDF import now defaults to importing all pages.
+- Rounded corners now available for images.
+- Second-order links now encompass forward links from embedded Excalidraw Files.
+- Clicking a cropped file in a markdown note or on Canvas will prompt to open the original file, not just the cropper.
+`,
 "2.0.18":`
 ## New
 

src/dialogs/Prompt.ts

@@ -11,14 +11,17 @@ import {
 } from "obsidian";
 import ExcalidrawView from "../ExcalidrawView";
 import ExcalidrawPlugin from "../main";
-import { escapeRegExp, sleep } from "../utils/Utils";
+import { escapeRegExp, getLinkParts, sleep } from "../utils/Utils";
 import { getLeaf } from "../utils/ObsidianUtils";
 import { checkAndCreateFolder, splitFolderAndFilename } from "src/utils/FileUtils";
 import { KeyEvent, isWinCTRLorMacCMD } from "src/utils/ModifierkeyHelper";
 import { t } from "src/lang/helpers";
 import { ExcalidrawElement, getEA } from "src";
 import { ExcalidrawAutomate } from "src/ExcalidrawAutomate";
-import { MAX_IMAGE_SIZE } from "src/constants/constants";
+import { MAX_IMAGE_SIZE, REG_LINKINDEX_INVALIDCHARS } from "src/constants/constants";
+import { REGEX_LINK } from "src/ExcalidrawData";
+import { ScriptEngine } from "src/Scripts";
+import { openExternalLink, openTagSearch } from "src/utils/ExcalidrawViewUtils";
 
 export type ButtonDefinition = { caption: string; tooltip?:string; action: Function };
 
@@ -693,3 +696,46 @@ export class ConfirmationPrompt extends Modal {
     }
   }
 }
+
+export const linkPrompt = async (linkText:string, app: App, view?: ExcalidrawView):Promise<[file:TFile, linkText:string, subpath: string]> => {
+  const partsArray = REGEX_LINK.getResList(linkText);
+  let subpath: string = null;
+  let file: TFile = null;
+  let parts = partsArray[0];
+    if (partsArray.length > 1) {
+      parts = await ScriptEngine.suggester(
+        app,
+        partsArray.filter(p=>Boolean(p.value)).map(p => {
+          const alias = REGEX_LINK.getAliasOrLink(p);
+          return alias === "100%" ? REGEX_LINK.getLink(p) : alias;
+        }),
+        partsArray.filter(p=>Boolean(p.value)),
+        "Select link to open"
+      );
+      if(!parts) return;
+    }
+  if(!parts) return;
+  
+  if (!parts.value) {
+    openTagSearch(linkText, app);
+    return;
+  }
+
+  linkText = REGEX_LINK.getLink(parts);
+  if(openExternalLink(linkText, app)) return;
+
+  if (linkText.search("#") > -1) {
+    const linkParts = getLinkParts(linkText, view ? view.file : undefined);
+    subpath = `#${linkParts.isBlockRef ? "^" : ""}${linkParts.ref}`;
+    linkText = linkParts.path;
+  }
+  if (linkText.match(REG_LINKINDEX_INVALIDCHARS)) {
+    new Notice(t("FILENAME_INVALID_CHARS"), 4000);
+    return;
+  }
+  file = app.metadataCache.getFirstLinkpathDest(
+    linkText,
+    view ? view.file.path : "",
+  );
+  return [file, linkText, subpath];
+}

src/dialogs/SuggesterInfo.ts

@@ -186,8 +186,23 @@ export const EXCALIDRAW_AUTOMATE_INFO: SuggesterInfo[] = [
   },
   {
     field: "create",
-    code: '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,},}): Promise<string>;',
-    desc: "Create a drawing and save it to filename.\nIf filename is null: default filename as defined in Excalidraw settings.\nIf folder is null: default folder as defined in Excalidraw settings\nReturns the path to the created file",
+    code: 'async create(params?: {filename?: string, foldername?: string, templatePath?: string, onNewPane?: boolean, silent?: boolean, frontmatterKeys?: {},}): Promise<string>;',
+    desc: "Create a drawing and save it to filename.\nIf filename is null: default filename as defined in Excalidraw settings.\nIf folder is null: default folder as defined in Excalidraw settings\nReturns the path to the created file.\n" +
+    'frontmatterKeys: {\n' +
+    '  "excalidraw-plugin"?: "raw" | "parsed";\n' +
+    '  "excalidraw-link-prefix"?: string;\n' +
+    '  "excalidraw-link-brackets"?: boolean;\n' +
+    '  "excalidraw-url-prefix"?: string;\n' +
+    '  "excalidraw-export-transparent"?: boolean;\n' +
+    '  "excalidraw-export-dark"?: boolean;\n' +
+    '  "excalidraw-export-padding"?: number;\n' +
+    '  "excalidraw-export-pngscale"?: number;\n' +
+    '  "excalidraw-default-mode"?: "view" | "zen";\n' +
+    '  "excalidraw-onload-script"?: string;\n' +
+    '  "excalidraw-linkbutton-opacity"?: number;\n' +
+    '  "excalidraw-autoexport"?: boolean;\n' +
+    '  "excalidraw-mask"?: boolean;\n' +
+    '  "cssclasses"?: string;\n}',
     after: "",
   },
   {
@@ -264,8 +279,8 @@ export const EXCALIDRAW_AUTOMATE_INFO: SuggesterInfo[] = [
   },
   {
     field: "addImage",
-    code: "async addImage(topX: number, topY: number, imageFile: TFile, scale?: boolean, anchor?: boolean): Promise<string>;",
-    desc: "set scale to false if you want to embed the image at 100% of its original size. Default is true which will insert a scaled image. anchor will only be evaluated if scale is false. anchor true will add |100% to the end of the filename, resulting in an image that will always pop back to 100% when the source file is updated or when the Excalidraw file is reopened. ",
+    code: "async addImage(topX: number, topY: number, imageFile: TFile|string, scale?: boolean, anchor?: boolean): Promise<string>;",
+    desc: "imageFile may be a TFile or a string that contains a hyperlink. imageFile may also be an obsidian filepath including a reference eg.: 'path/my.pdf#page=3'\nSet scale to false if you want to embed the image at 100% of its original size. Default is true which will insert a scaled image.\nanchor will only be evaluated if scale is false. anchor true will add |100% to the end of the filename, resulting in an image that will always pop back to 100% when the source file is updated or when the Excalidraw file is reopened.",
     after: "",
   },
   {