Updated events trigger

Author: Developer-Mike

src/events/canvas-event-emitter.ts

@@ -1,5 +1,5 @@
 import AdvancedCanvasPlugin from "src/main"
-import { BBox, CanvasNode, SelectionData } from "src/@types/Canvas"
+import { BBox, Canvas, CanvasNode, SelectionData } from "src/@types/Canvas"
 import { patchWorkspaceFunction } from "src/utils/patch-helper"
 import { CanvasEvent } from "./events"
 
@@ -10,6 +10,15 @@ export default class CanvasEventEmitter {
     this.plugin = plugin
     const that = this
 
+    // Patch canvas view
+    patchWorkspaceFunction(this.plugin, () => this.plugin.getCurrentCanvasView(), {
+      setViewData: (next: any) => function (...args: any) {
+        const result = next.call(this, ...args)
+        that.triggerCanvasChangedEvent(this.canvas)
+        return result
+      }
+    })
+
     // Patch canvas
     patchWorkspaceFunction(this.plugin, () => this.plugin.getCurrentCanvas(), {
       // Add custom function
@@ -76,29 +85,32 @@ export default class CanvasEventEmitter {
     patchWorkspaceFunction(this.plugin, () => this.plugin.getCurrentCanvas()?.nodeInteractionLayer, {
       setTarget: (next: any) => function (node: CanvasNode) {
         const result = next.call(this, node)
-
         that.triggerWorkspaceEvent(CanvasEvent.NodeInteraction, this.canvas, node)
-
         return result
       }
     })
 
     // Listen to canvas changes
-    const onCanvasChangeListener = this.plugin.app.workspace.on('active-leaf-change', () => {
+    const onCanvasChangeListener = this.plugin.app.workspace.on('layout-change', () => {
       const canvas = this.plugin.getCurrentCanvas()
       if (!canvas) return
 
-      this.triggerWorkspaceEvent(CanvasEvent.CanvasChanged, canvas)
-      this.triggerWorkspaceEvent(CanvasEvent.ViewportChanged.After, canvas)
-      this.triggerWorkspaceEvent(CanvasEvent.ReadonlyChanged, canvas, canvas.readonly)
-      this.triggerWorkspaceEvent(CanvasEvent.NodesChanged, canvas, [...canvas.nodes.values()])
+      this.triggerCanvasChangedEvent(canvas)
+      this.plugin.app.workspace.offref(onCanvasChangeListener)
     })
     this.plugin.registerEvent(onCanvasChangeListener)
 
     // Trigger instantly (Plugin reload)
     onCanvasChangeListener.fn.call(this.plugin.app.workspace)
   }
 
+  private triggerCanvasChangedEvent(canvas: Canvas) {
+    this.triggerWorkspaceEvent(CanvasEvent.CanvasChanged, canvas)
+    this.triggerWorkspaceEvent(CanvasEvent.ViewportChanged.After, canvas)
+    this.triggerWorkspaceEvent(CanvasEvent.ReadonlyChanged, canvas, canvas.readonly)
+    this.triggerWorkspaceEvent(CanvasEvent.NodesChanged, canvas, [...canvas.nodes.values()])
+  }
+
   private triggerWorkspaceEvent(event: string, ...args: any) {
     this.plugin.app.workspace.trigger(event, ...args)
   }

src/main.ts

@@ -38,10 +38,13 @@ export default class AdvancedCanvasPlugin extends Plugin {
 
   onunload() {}
 
-  getCurrentCanvas(): Canvas|null {
+  getCurrentCanvasView(): any {
     const canvasView = this.app.workspace.getActiveViewOfType(ItemView)
+    if (canvasView?.getViewType() !== 'canvas') return null
+    return canvasView
+  }
 
-		if (canvasView?.getViewType() !== 'canvas') return null
-    return (canvasView as any).canvas
+  getCurrentCanvas(): Canvas|null {
+    return this.getCurrentCanvasView()?.canvas
   }
 }