correct library syncing logic in case of conflict

excalidraw · Apr 18, 2022 · 6223ccc · 6223ccc
1 parent fe9aaff
commit 6223ccc
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/extension/src/ExcalidrawEditor.ts b/extension/src/ExcalidrawEditor.ts
@@ -129,9 +129,9 @@ export class ExcalidrawEditorProvider
 
 class ExcalidrawEditor {
   // Allows to pass events between editors
-  private static eventEmitter = new vscode.EventEmitter<{
-    type: string;
-    msg: any;
+  private static onLibraryChange = new vscode.EventEmitter<{
+    uri?: vscode.Uri;
+    content: any;
   }>();
 
   private textDecoder = new TextDecoder();
@@ -160,7 +160,10 @@ class ExcalidrawEditor {
         switch (msg.type) {
           case "library-change":
             await this.saveLibrary(msg.library, libraryUri);
-            ExcalidrawEditor.eventEmitter.fire(msg);
+            ExcalidrawEditor.onLibraryChange.fire({
+              uri: libraryUri,
+              content: msg.library,
+            });
             return;
           case "change":
             await this.document.update(new Uint8Array(msg.content));
@@ -178,8 +181,13 @@ class ExcalidrawEditor {
       this
     );
 
-    const onDidReceiveEvent = ExcalidrawEditor.eventEmitter.event((msg) => {
-      this.webviewPanel.webview.postMessage(msg);
+    const onLibraryChange = ExcalidrawEditor.onLibraryChange.event((msg) => {
+      if (msg.uri?.toString() === libraryUri?.toString()) {
+        this.webviewPanel.webview.postMessage({
+          type: "library-change",
+          library: msg.content,
+        });
+      }
     });
 
     this.webviewPanel.webview.html = await this.buildHtmlForWebview({
@@ -195,7 +203,7 @@ class ExcalidrawEditor {
 
     return new vscode.Disposable(() => {
       onDidReceiveMessage.dispose();
-      onDidReceiveEvent.dispose();
+      onLibraryChange.dispose();
     });
   }