0.17.6-1 ; 2.5.3-beta-1

zsviczian · Oct 19, 2024 · 6ff3694 · 6ff3694
1 parent 587a58a
commit 6ff3694
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 18 deletions.
diff --git a/packages/excalidraw/fonts/ExcalidrawFontFace.ts b/packages/excalidraw/fonts/ExcalidrawFontFace.ts
@@ -105,9 +105,13 @@ export class ExcalidrawFontFace implements IExcalidrawFontFace {
 
   public fetchFont(url: URL | DataURL): Promise<ArrayBuffer> {
     return promiseTry(async () => {
-      const ab = await fetchFontFromVault(url); //zsviczian
-      if (ab) {
-        return ab;
+      const result = await fetchFontFromVault(url); //zsviczian
+      if (result) {
+        if (typeof result === "string") {
+          url = result;
+        } else {
+          return result;
+        }
       }
       const response = await fetch(url, {
         headers: {
@@ -231,20 +235,25 @@ export class ExcalidrawFontFace implements IExcalidrawFontFace {
     const errorMessages = [];
 
     while (i < this.urls.length) {
-      const url = this.urls[i];
+      let url = this.urls[i];
 
       if (typeof url === "string" && url.startsWith("data:")) {
         // it's dataurl, the font is inlined as base64, no need to fetch
         return url as string;
       }
 
       try {
-        const arrayBuffer = await fetchFontFromVault(url); //zsviczian
-        if(arrayBuffer) {
-          return `data:font/woff2;base64,${await stringToBase64(
-            await toByteString(arrayBuffer),
-            true,
-          )}`;
+        const result = await fetchFontFromVault(url); //zsviczian
+        if(result) {
+          if(typeof result === "string") {
+            url = result;
+          } else {
+            return `data:font/woff2;base64,${await stringToBase64(
+              await toByteString(result),
+              true,
+            )}`;
+          }
+
         }
 
         const response = await fetch(url, {

diff --git a/packages/excalidraw/fonts/css/fonts.css b/packages/excalidraw/fonts/css/fonts.css
@@ -4,31 +4,31 @@
 
 @font-face {
   font-family: "Assistant";
-  src: url(https://unpkg.com/@zsviczian/[email protected]/dist/excalidraw-assets/Assistant-Regular.woff2) format("woff2");
+  src: url(../woff2/Assistant/Assistant-Regular.woff2) format("woff2");
   font-weight: 400;
   style: normal;
   display: swap;
 }
 
 @font-face {
   font-family: "Assistant";
-  src: url(https://unpkg.com/@zsviczian/[email protected]/dist/excalidraw-assets/Assistant-Medium.woff2) format("woff2");
+  src: url(../woff2/Assistant/Assistant-Medium.woff2) format("woff2");
   font-weight: 500;
   style: normal;
   display: swap;
 }
 
 @font-face {
   font-family: "Assistant";
-  src: url(https://unpkg.com/@zsviczian/[email protected]/dist/excalidraw-assets/Assistant-SemiBold.woff2) format("woff2");
+  src: url(../woff2/Assistant/Assistant-SemiBold.woff2) format("woff2");
   font-weight: 600;
   style: normal;
   display: swap;
 }
 
 @font-face {
   font-family: "Assistant";
-  src: url(https://unpkg.com/@zsviczian/[email protected]/dist/excalidraw-assets/Assistant-Bold.woff2) format("woff2");
+  src: url(../woff2/Assistant/Assistant-Bold.woff2) format("woff2");
   font-weight: 700;
   style: normal;
   display: swap;

diff --git a/packages/excalidraw/obsidianUtils.ts b/packages/excalidraw/obsidianUtils.ts
@@ -137,13 +137,16 @@ export async function loadSceneFonts(elements: NonDeletedExcalidrawElement[]): P
   await Fonts.loadFontFaces(fontFamilies);
 }
 
-export async function fetchFontFromVault(url: string | URL): Promise<ArrayBuffer|undefined> {
+export async function fetchFontFromVault(url: string | URL): Promise<ArrayBuffer|undefined|string> {
   if(typeof url === "string" && !url.startsWith("data") && url.endsWith(".woff2")) {
-    const arrayBuffer = hostPlugin.loadFontFromFile(decodeURIComponent(url.substring(url.lastIndexOf("/")+1)))
+    const filename = decodeURIComponent(url.substring(url.lastIndexOf("/")+1));
+    const arrayBuffer = hostPlugin.loadFontFromFile(filename)
     if(arrayBuffer) {
       return arrayBuffer;
     }
+    if (["Assistant-Regular.woff2", "Assistant-Medium.woff2", "Assistant-SemiBold.woff2", "Assistant-Bold.woff2"].includes(filename)) {
+      return "https://unpkg.com/@zsviczian/[email protected]/dist/excalidraw-assets/" + filename;
+    }
   }
   return;
-
 }
diff --git a/packages/excalidraw/package.json b/packages/excalidraw/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zsviczian/excalidraw",
-  "version": "0.17.6",
+  "version": "0.17.6-1",
   "main": "main.js",
   "types": "types/excalidraw/index.d.ts",
   "files": [