0.17.6-6, 2.6.0, glyph worker, host plugin fix

zsviczian · Oct 23, 2024 · 06e854e · 06e854e
1 parent 653a32e
commit 06e854e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 6 deletions.
diff --git a/packages/excalidraw/components/App.tsx b/packages/excalidraw/components/App.tsx
@@ -437,6 +437,7 @@ import {
   getExcalidrawContentEl,
   getMaxZoom,
   hideFreedrawPenmodeCursor,
+  initializeObsidianUtils,
 } from "../obsidianUtils";
 import {
   hitElementBoundText,
@@ -711,6 +712,7 @@ class App extends React.Component<AppProps, AppState> {
     };
 
     this.id = nanoid();
+    initializeObsidianUtils();
     this.library = new Library(this);
     this.actionManager = new ActionManager(
       this.syncActionResult,

diff --git a/packages/excalidraw/index.tsx b/packages/excalidraw/index.tsx
@@ -263,7 +263,6 @@ export {
   getBoundTextMaxWidth, //zsviczian
   mermaidToExcalidraw, //zsviczian
   destroyObsidianUtils, //zsviczian
-  initializeObsidianUtils, //zsviczian
   registerLocalFont, //zsviczian
   getFontFamilies, //zsviczian
   getFontFamilyString, //zsviczian

diff --git a/packages/excalidraw/obsidianUtils.ts b/packages/excalidraw/obsidianUtils.ts
@@ -12,8 +12,9 @@ export function destroyObsidianUtils() {
   hostPlugin = null;
 }
 
-export function initializeObsidianUtils(obsidianPlugin: any) {
-  hostPlugin = obsidianPlugin;
+export function initializeObsidianUtils() {
+  //@ts-ignore
+  hostPlugin = app.plugins.plugins["obsidian-excalidraw-plugin"];
 }
 
 export function getAreaLimit() {

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

diff --git a/packages/excalidraw/subset/subset-main.ts b/packages/excalidraw/subset/subset-main.ts
@@ -4,7 +4,9 @@ import { WorkerInTheMainChunkError, WorkerUrlNotDefinedError } from "../errors";
 
 import type { Commands } from "./subset-shared.chunk";
 
-let shouldUseWorkers = typeof Worker !== "undefined";
+// one day maybe... I don't knwo how to convert this to work locally in Obsidian :(
+// https://chatgpt.com/c/67191889-c740-800a-bebb-a0fca2e800fd
+let shouldUseWorkers = false; //zsviczian typeof Worker !== "undefined";
 
 /**
  * Tries to subset glyphs in a font based on the used codepoints, returning the font as dataurl.

diff --git a/packages/utils/export.ts b/packages/utils/export.ts
@@ -220,7 +220,6 @@ export { getBoundTextMaxWidth } from "../excalidraw/element/textElement"; //zsvi
 export { mermaidToExcalidraw } from "../excalidraw/components/TTDDialog/MermaidToExcalidraw"; //zsviczian
 export {
   destroyObsidianUtils,
-  initializeObsidianUtils,
   registerLocalFont,
   getFontFamilies,
   registerFontsInCSS,