Fixed undo not working properly

Author: Developer-Mike

src/@types/Canvas.d.ts

@@ -232,7 +232,7 @@ export interface CanvasNode extends CanvasElement {
 
   color: string
 
-  setData(data: CanvasNodeData): void
+  setData(data: CanvasNodeData, addHistory?: boolean): void
   getData(): CanvasNodeData
 }
 
@@ -297,7 +297,7 @@ export interface CanvasEdge extends CanvasElement {
   render(): void
   updatePath(): void
 
-  setData(data: CanvasEdgeData): void
+  setData(data: CanvasEdgeData, addHistory?: boolean): void
   getData(): CanvasEdgeData
 }
 

src/canvas-extensions/edge-styles-canvas-extension.ts

@@ -133,13 +133,13 @@ export default class EdgeStylesCanvasExtension {
 
   private setStyleForSelection(_canvas: Canvas, selectedEdges: CanvasEdge[], styleId: string|undefined) {
     for (const edge of selectedEdges) {
-      edge.setData({ ...edge.getData(), edgeStyle: styleId as any })
+      edge.setData({ ...edge.getData(), edgeStyle: styleId as any }, true)
     }
   }
 
   private setPathRouteForSelection(_canvas: Canvas, selectedEdges: CanvasEdge[], pathRouteTypeId: string|undefined) {
     for (const edge of selectedEdges) {
-      edge.setData({ ...edge.getData(), edgePathRoute: pathRouteTypeId as any })
+      edge.setData({ ...edge.getData(), edgePathRoute: pathRouteTypeId as any }, true)
     }
   }
 

src/canvas-extensions/node-styles-canvas-extension.ts

@@ -141,7 +141,7 @@ export default class NodeStylesCanvasExtension {
       const node = canvas.nodes.get(nodeData.id)
       if (!node) continue
 
-      node.setData({ ...nodeData, shape: shapeId })
+      node.setData({ ...nodeData, shape: shapeId }, true)
     }
   }
 
@@ -152,7 +152,7 @@ export default class NodeStylesCanvasExtension {
       const node = canvas.nodes.get(nodeData.id)
       if (!node) continue
 
-      node.setData({ ...nodeData, borderStyle: borderId })
+      node.setData({ ...nodeData, borderStyle: borderId }, true)
     }
   }
 }

src/canvas-extensions/presentation-canvas-extension.ts

@@ -164,7 +164,7 @@ export default class PresentationCanvasExtension {
     const startNode = this.getStartNode(canvas)
     if (startNode) startNode.setData({ ...startNode.getData(), isStartNode: false })
 
-    if (node !== startNode) node.setData({ ...node.getData(), isStartNode: true })
+    if (node !== startNode) node.setData({ ...node.getData(), isStartNode: true }, true)
   }
 
   private getDefaultSlideSize(): Size {

src/canvas-extensions/properties-canvas-extension.ts

@@ -39,7 +39,7 @@ export default class PropertiesCanvasExtension {
       canvas.wrapperEl.classList.remove(cssclass)
     })
 
-    this.previousCssclasses = canvas.metadata.properties?.cssclasses || []
+    this.previousCssclasses = canvas.metadata?.properties?.cssclasses || []
     this.previousCssclasses.forEach((cssclass) => {
       canvas.wrapperEl.classList.add(cssclass)
     })

src/core/canvas-patcher.ts

@@ -1,5 +1,5 @@
 import AdvancedCanvasPlugin from "src/main"
-import { BBox, Canvas, CanvasData, CanvasEdge, CanvasElement, CanvasNode, CanvasView } from "src/@types/Canvas"
+import { BBox, Canvas, CanvasData, CanvasEdge, CanvasEdgeData, CanvasElement, CanvasNode, CanvasNodeData, CanvasView } from "src/@types/Canvas"
 import { patchObjectInstance, patchObjectPrototype } from "src/utils/patch-helper"
 import { CanvasEvent } from "./events"
 import { WorkspaceLeaf } from "obsidian"
@@ -191,8 +191,8 @@ export default class CanvasPatcher {
     const that = this
 
     patchObjectInstance(this.plugin, node, {
-      setData: (next: any) => function (...args: any) {
-        const result = next.call(this, ...args)
+      setData: (next: any) => function (data: CanvasNodeData, addHistory?: boolean) {
+        const result = next.call(this, data)
 
         if (node.initialized && !node.isDirty) {
           node.isDirty = true
@@ -204,6 +204,9 @@ export default class CanvasPatcher {
         this.canvas.data = this.canvas.getData()
         this.canvas.view.requestSave()
 
+        // Add to the undo stack
+        if (addHistory) this.canvas.pushHistory(this.canvas.getData())
+
         return result
       },
       getBBox: (next: any) => function (...args: any) {
@@ -223,8 +226,8 @@ export default class CanvasPatcher {
     const that = this
 
     patchObjectInstance(this.plugin, edge, {
-      setData: (next: any) => function (...args: any) {
-        const result = next.call(this, ...args)
+      setData: (next: any) => function (data: CanvasEdgeData, addHistory?: boolean) {
+        const result = next.call(this, data)
 
         if (edge.initialized && !edge.isDirty) {
           edge.isDirty = true
@@ -236,6 +239,9 @@ export default class CanvasPatcher {
         this.canvas.data = this.canvas.getData()
         this.canvas.view.requestSave()
 
+        // Add to the undo stack
+        if (addHistory) this.canvas.pushHistory(this.canvas.getData())
+
         return result
       },
       render: (next: any) => function (...args: any) {

src/utils/modal-helper.ts

@@ -90,10 +90,8 @@ export class FileSelectModal extends SuggestModal<string> {
       this.onChooseSuggestion = (path: string, _evt: MouseEvent | KeyboardEvent) => {
         const file = this.app.vault.getAbstractFileByPath(path)
 
-        if (file instanceof TFile) {
-          resolve(file)
-          return
-        }
+        if (file instanceof TFile)
+          return resolve(file)
 
         if (!this.suggestNewFile) return