2.8.2-beta-1

fix grammar

README.md

@@ -89,8 +89,8 @@ Plugin settings are grouped into the following sections:
 - **Basic settings**: such as default folders to use.
 - **Saving**: compression and autosave timer.
 - **Filename**: configure the automatically created Excalidraw filename.
-- **Display**: settings that effect the handling of Excalidraw (e.g.: left-handed mode, theme settings, mouse wheel and pinch zoom settings, zoom to fit settings).
-- **Links and transclusions**: Settings that effect how links and embedded items behave on the Excalidraw canvas.
+- **Display**: settings that affect the handling of Excalidraw (e.g.: left-handed mode, theme settings, mouse wheel and pinch zoom settings, zoom to fit settings).
+- **Links and transclusions**: Settings that affect how links and embedded items behave on the Excalidraw canvas.
 - **Markdown-embed settings**: These settings control how markdown documents from your Vault embedded into Excalidraw drawings will behave.
 - **Embed & Export**: Settings that control how Excalidraw images are displayed when embedding them into markdown documents.
 - **Auto-export Settings**: You can configure Excalidraw to create a PNG or SVG copy of your drawing each time it gets saved.

ea-scripts/Slideshow.md

@@ -205,7 +205,7 @@ const gotoFullscreen = async () => {
 	}
 	await waitForExcalidrawResize();
 	const layerUIWrapper = contentEl.querySelector(".layer-ui__wrapper");
-	if(!layerUIWrapper.hasClass("excalidraw-hidden")) layerUIWrapper.addClass("excalidraw-hidden");
+	if(!layerUIWrapper?.hasClass("excalidraw-hidden")) layerUIWrapper.addClass("excalidraw-hidden");
 	if(toggleFullscreenButton) toggleFullscreenButton.innerHTML = SVG_MINIMIZE;
 	resetControlPanelElPosition();
 	isFullscreen = true;
@@ -769,7 +769,7 @@ function setSingleNotice(message) {
     return;
   }
   notice = new Notice(message, 0);
-  noticeEl = notice.containerEl ?? n.noticeEl;
+  noticeEl = notice.containerEl ?? notice.noticeEl;
 }
 
 function hideSingleNotice() {

manifest-beta.json

@@ -1,7 +1,7 @@
 {
 	"id": "obsidian-excalidraw-plugin",
 	"name": "Excalidraw",
-	"version": "2.8.0-rc-2",
+	"version": "2.8.2-beta-1",
 	"minAppVersion": "1.1.6",
 	"description": "An Obsidian plugin to edit and view Excalidraw drawings",
 	"author": "Zsolt Viczian",

manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "obsidian-excalidraw-plugin",
   "name": "Excalidraw",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "minAppVersion": "1.1.6",
   "description": "An Obsidian plugin to edit and view Excalidraw drawings",
   "author": "Zsolt Viczian",

package.json

@@ -24,7 +24,7 @@
   "license": "MIT",
   "dependencies": {
     "@popperjs/core": "^2.11.8",
-    "@zsviczian/excalidraw": "0.17.6-29",
+    "@zsviczian/excalidraw": "0.17.6-30",
     "chroma-js": "^2.4.2",
     "clsx": "^2.0.0",
     "@zsviczian/colormaster": "^1.2.2",

src/shared/Dialogs/Messages.ts

@@ -17,6 +17,10 @@ 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://storage.ko-fi.com/cdn/kofi6.png?v=6" border="0" alt="Buy Me a Coffee at ko-fi.com"  height=45></a></div>
 `,
+"2.8.1":`
+## Fixed
+- Unable to open Excalidraw files after the 2.8.0 update. [#2235](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/2235)
+`,
 "2.8.0":`
 <div class="excalidraw-videoWrapper"><div>
 <iframe src="https://www.youtube.com/embed/tWi5xTUTz7E" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>

src/shared/Workers/compression-worker.ts

@@ -11,7 +11,7 @@ function createWorkerBlob(jsCode:string) {
 const workerCode = `
 var LZString=function(){var r=String.fromCharCode,o="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-$",e={};function t(r,o){if(!e[r]){e[r]={};for(var n=0;n<r.length;n++)e[r][r.charAt(n)]=n}return e[r][o]}var i={compressToBase64:function(r){if(null==r)return"";var n=i._compress(r,6,function(r){return o.charAt(r)});switch(n.length%4){default:case 0:return n;case 1:return n+"===";case 2:return n+"==";case 3:return n+"="}},decompressFromBase64:function(r){return null==r?"":""==r?null:i._decompress(r.length,32,function(n){return t(o,r.charAt(n))})},compressToUTF16:function(o){return null==o?"":i._compress(o,15,function(o){return r(o+32)})+" "},decompressFromUTF16:function(r){return null==r?"":""==r?null:i._decompress(r.length,16384,function(o){return r.charCodeAt(o)-32})},compressToUint8Array:function(r){for(var o=i.compress(r),n=new Uint8Array(2*o.length),e=0,t=o.length;e<t;e++){var s=o.charCodeAt(e);n[2*e]=s>>>8,n[2*e+1]=s%256}return n},decompressFromUint8Array:function(o){if(null==o)return i.decompress(o);for(var n=new Array(o.length/2),e=0,t=n.length;e<t;e++)n[e]=256*o[2*e]+o[2*e+1];var s=[];return n.forEach(function(o){s.push(r(o))}),i.decompress(s.join(""))},compressToEncodedURIComponent:function(r){return null==r?"":i._compress(r,6,function(r){return n.charAt(r)})},decompressFromEncodedURIComponent:function(r){return null==r?"":""==r?null:(r=r.replace(/ /g,"+"),i._decompress(r.length,32,function(o){return t(n,r.charAt(o))}))},compress:function(o){return i._compress(o,16,function(o){return r(o)})},_compress:function(r,o,n){if(null==r)return"";var e,t,i,s={},u={},a="",p="",c="",l=2,f=3,h=2,d=[],m=0,v=0;for(i=0;i<r.length;i+=1)if(a=r.charAt(i),Object.prototype.hasOwnProperty.call(s,a)||(s[a]=f++,u[a]=!0),p=c+a,Object.prototype.hasOwnProperty.call(s,p))c=p;else{if(Object.prototype.hasOwnProperty.call(u,c)){if(c.charCodeAt(0)<256){for(e=0;e<h;e++)m<<=1,v==o-1?(v=0,d.push(n(m)),m=0):v++;for(t=c.charCodeAt(0),e=0;e<8;e++)m=m<<1|1&t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t>>=1}else{for(t=1,e=0;e<h;e++)m=m<<1|t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t=0;for(t=c.charCodeAt(0),e=0;e<16;e++)m=m<<1|1&t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t>>=1}0==--l&&(l=Math.pow(2,h),h++),delete u[c]}else for(t=s[c],e=0;e<h;e++)m=m<<1|1&t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t>>=1;0==--l&&(l=Math.pow(2,h),h++),s[p]=f++,c=String(a)}if(""!==c){if(Object.prototype.hasOwnProperty.call(u,c)){if(c.charCodeAt(0)<256){for(e=0;e<h;e++)m<<=1,v==o-1?(v=0,d.push(n(m)),m=0):v++;for(t=c.charCodeAt(0),e=0;e<8;e++)m=m<<1|1&t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t>>=1}else{for(t=1,e=0;e<h;e++)m=m<<1|t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t=0;for(t=c.charCodeAt(0),e=0;e<16;e++)m=m<<1|1&t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t>>=1}0==--l&&(l=Math.pow(2,h),h++),delete u[c]}else for(t=s[c],e=0;e<h;e++)m=m<<1|1&t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t>>=1;0==--l&&(l=Math.pow(2,h),h++)}for(t=2,e=0;e<h;e++)m=m<<1|1&t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t>>=1;for(;;){if(m<<=1,v==o-1){d.push(n(m));break}v++}return d.join("")},decompress:function(r){return null==r?"":""==r?null:i._decompress(r.length,32768,function(o){return r.charCodeAt(o)})},_decompress:function(o,n,e){var t,i,s,u,a,p,c,l=[],f=4,h=4,d=3,m="",v=[],g={val:e(0),position:n,index:1};for(t=0;t<3;t+=1)l[t]=t;for(s=0,a=Math.pow(2,2),p=1;p!=a;)u=g.val&g.position,g.position>>=1,0==g.position&&(g.position=n,g.val=e(g.index++)),s|=(u>0?1:0)*p,p<<=1;switch(s){case 0:for(s=0,a=Math.pow(2,8),p=1;p!=a;)u=g.val&g.position,g.position>>=1,0==g.position&&(g.position=n,g.val=e(g.index++)),s|=(u>0?1:0)*p,p<<=1;c=r(s);break;case 1:for(s=0,a=Math.pow(2,16),p=1;p!=a;)u=g.val&g.position,g.position>>=1,0==g.position&&(g.position=n,g.val=e(g.index++)),s|=(u>0?1:0)*p,p<<=1;c=r(s);break;case 2:return""}for(l[3]=c,i=c,v.push(c);;){if(g.index>o)return"";for(s=0,a=Math.pow(2,d),p=1;p!=a;)u=g.val&g.position,g.position>>=1,0==g.position&&(g.position=n,g.val=e(g.index++)),s|=(u>0?1:0)*p,p<<=1;switch(c=s){case 0:for(s=0,a=Math.pow(2,8),p=1;p!=a;)u=g.val&g.position,g.position>>=1,0==g.position&&(g.position=n,g.val=e(g.index++)),s|=(u>0?1:0)*p,p<<=1;l[h++]=r(s),c=h-1,f--;break;case 1:for(s=0,a=Math.pow(2,16),p=1;p!=a;)u=g.val&g.position,g.position>>=1,0==g.position&&(g.position=n,g.val=e(g.index++)),s|=(u>0?1:0)*p,p<<=1;l[h++]=r(s),c=h-1,f--;break;case 2:return v.join("")}if(0==f&&(f=Math.pow(2,d),d++),l[c])m=l[c];else{if(c!==h)return null;m=i+i.charAt(0)}v.push(m),l[h++]=i+m.charAt(0),i=m,0==--f&&(f=Math.pow(2,d),d++)}}};return i}();"function"==typeof define&&define.amd?define(function(){return LZString}):"undefined"!=typeof module&&null!=module?module.exports=LZString:"undefined"!=typeof angular&&null!=angular&&angular.module("LZString",[]).factory("LZString",function(){return LZString});
 self.onmessage = function(e) {
-  const { data, action } = e.data;
+  const { data, action, messageId } = e.data;
   try {
     switch (action) {
       case 'compress':
@@ -22,7 +22,7 @@ self.onmessage = function(e) {
         for (let i = 0; i < compressed.length; i += chunkSize) {
           result += compressed.slice(i, i + chunkSize) + '\\n\\n';
         }
-        self.postMessage({ compressed: result.trim() });
+        self.postMessage({ messageId, compressed: result.trim() });
         break;
       case 'decompress':
         if (!data) throw new Error("No input string provided for decompression.");
@@ -35,14 +35,13 @@ self.onmessage = function(e) {
           }
         }
         const decompressed = LZString.decompressFromBase64(cleanedData);
-        self.postMessage({ decompressed });
+        self.postMessage({ messageId, decompressed });
         break;
       default:
         throw new Error("Unknown action.");
     }
   } catch (error) {
-    // Post the error message back to the main thread
-    self.postMessage({ error: error.message });
+    self.postMessage({ messageId, error: error.message });
   }
 };
 `;
@@ -55,27 +54,48 @@ export function initCompressionWorker() {
   }
 }
 
-export async function runCompressionWorker(data:string, action: 'compress' | 'decompress'): Promise<string> {
+let messageCounter = 0;
+const pendingOperations = new Map<number, {
+  resolve: (value: string) => void,
+  reject: (reason: Error) => void
+}>();
+
+export async function runCompressionWorker(data: string, action: 'compress' | 'decompress'): Promise<string> {
+  const messageId = messageCounter++;
+  
   return new Promise((resolve, reject) => {
-    worker.onmessage = function(e) {
-      const { compressed, decompressed, error } = e.data;
-      
-      if (error) {
-        reject(new Error(error));
-      } else if (compressed || decompressed) {
-        resolve(compressed || decompressed);
-      } else {
-        reject(new Error('Unexpected response from worker'));
-      }
-    };
+    // Store the promise handlers
+    pendingOperations.set(messageId, { resolve, reject });
 
-    // Set up the worker's error handler
-    worker.onerror = function(error) {
-      reject(new Error(error.message));
-    };
+    // Set up worker message handler if not already set
+    if (!worker.onmessage) {
+      worker.onmessage = function(e) {
+        const { messageId, compressed, decompressed, error } = e.data;
+        const handlers = pendingOperations.get(messageId);
+        
+        if (handlers) {
+          if (error) {
+            handlers.reject(new Error(error));
+          } else if (compressed || decompressed) {
+            handlers.resolve(compressed || decompressed);
+          } else {
+            handlers.reject(new Error('Unexpected response from worker'));
+          }
+          pendingOperations.delete(messageId);
+        }
+      };
 
-    // Post the message to the worker
-    worker.postMessage({ data, action });
+      worker.onerror = function(error) {
+        // Handle any pending operations in case of worker error
+        for (const [id, handlers] of pendingOperations) {
+          handlers.reject(new Error(error.message));
+          pendingOperations.delete(id);
+        }
+      };
+    }
+
+    // Post message with ID
+    worker.postMessage({ messageId, data, action });
   });
 }
 

src/utils/customEmbeddableUtils.ts

@@ -1,7 +1,7 @@
 import { NonDeletedExcalidrawElement } from "@zsviczian/excalidraw/types/excalidraw/element/types";
 import { DEVICE, REG_LINKINDEX_INVALIDCHARS } from "src/constants/constants";
 import { getParentOfClass } from "./obsidianUtils";
-import { App, TFile, WorkspaceLeaf } from "obsidian";
+import { App, Notice, TFile, WorkspaceLeaf } from "obsidian";
 import { getLinkParts } from "./utils";
 import ExcalidrawView from "src/view/ExcalidrawView";
 
@@ -62,8 +62,12 @@ export function setFileToLocalGraph(app: App, file: TFile) {
   app.workspace.iterateAllLeaves((l) => {
     if (l.view?.getViewType() === "localgraph") lgv = l.view;
   });
-  if (lgv) {
-    //@ts-ignore
-    lgv.loadFile(file);
+  try {
+    if (lgv) {
+      //@ts-ignore
+      lgv.loadFile(file);
+    }
+  } catch (e) {
+    console.error(e);
   }
 }

styles.css

@@ -342,7 +342,9 @@ label.color-input-container > input {
   overflow-y: auto;
 }
 
-.excalidraw .panelColumn {
+.excalidraw .selected-shape-actions .panelColumn,
+.excalidraw .App-mobile-menu .panelColumn
+ {
   max-height: 70vh;
   overflow-y: auto;
 }