0.17.6-10, 2.6.3-beta-2 (removed font load safari)

zsviczian · Nov 1, 2024 · 8b0c2ad · 8b0c2ad
1 parent a02fff6
commit 8b0c2ad
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/packages/excalidraw/components/App.tsx b/packages/excalidraw/components/App.tsx
@@ -3416,11 +3416,11 @@ class App extends React.Component<AppProps, AppState> {
     });
 
     // paste event may not fire FontFace loadingdone event in Safari, hence loading font faces manually
-    if (isSafari) {
+    /*if (isSafari) {
       Fonts.loadElementsFonts(newElements).then((fontFaces) => {
         this.fonts.onLoaded(fontFaces);
       });
-    }
+    }*/ //zsviczian - this might need testing on Ovsidian iPad, otherwise Obsidian is never on safari
 
     if (opts.files) {
       this.addMissingFiles(opts.files);

diff --git a/packages/excalidraw/fonts/Fonts.ts b/packages/excalidraw/fonts/Fonts.ts
@@ -33,6 +33,8 @@ import type {
 import type Scene from "../scene/Scene";
 import type { ValueOf } from "../utility-types";
 
+const NEVERSAFARI = false; //zsviczian
+
 export class Fonts {
   // it's ok to track fonts across multiple instances only once, so let's use
   // a static member to reduce memory footprint
@@ -148,7 +150,7 @@ export class Fonts {
    */
   public loadSceneFonts = async (): Promise<FontFace[]> => {
     const sceneFamilies = this.getSceneFamilies();
-    const charsPerFamily = isSafari
+    const charsPerFamily = NEVERSAFARI //zsviczian
       ? Fonts.getCharsPerFamily(this.scene.getNonDeletedElements())
       : undefined;
 
@@ -166,7 +168,7 @@ export class Fonts {
     elements: readonly ExcalidrawElement[],
   ): Promise<FontFace[]> => {
     const fontFamilies = Fonts.getUniqueFamilies(elements);
-    const charsPerFamily = isSafari
+    const charsPerFamily = NEVERSAFARI //zsviczian
       ? Fonts.getCharsPerFamily(elements)
       : undefined;
 
@@ -263,7 +265,7 @@ export class Fonts {
       // WARN: without "text" param it does not have to mean that all font faces are loaded, instead it could be just one!
       // for Safari on init, we rather check with the "text" param, even though it's less efficient, as otherwise fonts might remain unloaded
       const text =
-        isSafari && charsPerFamily
+        NEVERSAFARI && charsPerFamily //zsviczian
           ? Fonts.getCharacters(charsPerFamily, fontFamily)
           : "";
 

diff --git a/packages/excalidraw/package.json b/packages/excalidraw/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@zsviczian/excalidraw",
-  "version": "0.17.6-9",
+  "version": "0.17.6-10",
   "main": "main.js",
   "types": "types/excalidraw/index.d.ts",
   "files": [