fixed undo for ink strokes.

2 files changed, 12 insertions, 6 deletions

diff --git a/src/client/views/InkingCanvas.tsx b/src/client/views/InkingCanvas.tsx
index 42ab08001..5d4ea76cd 100644
--- a/src/client/views/InkingCanvas.tsx
+++ b/src/client/views/InkingCanvas.tsx
@@ -60,7 +60,7 @@ export class InkingCanvas extends React.Component<InkCanvasProps> {
     }
 
     set inkData(value: Map<string, StrokeData>) {
-        Doc.SetOnPrototype(this.props.Document, "ink", new InkField(value));
+        Doc.GetProto(this.props.Document).ink = new InkField(value);
     }
 
     @action
@@ -74,7 +74,7 @@ export class InkingCanvas extends React.Component<InkCanvasProps> {
         e.stopPropagation();
         e.preventDefault();
 
-        this.previousState = this.inkData;
+        this.previousState = new Map(this.inkData);
 
         if (InkingControl.Instance.selectedTool !== InkTool.Eraser) {
             // start the new line, saves a uuid to represent the field of the stroke
@@ -106,10 +106,10 @@ export class InkingCanvas extends React.Component<InkCanvasProps> {
         const batch = UndoManager.StartBatch("One ink stroke");
         const oldState = this.previousState || new Map;
         this.previousState = undefined;
-        const newState = this.inkData;
+        const newState = new Map(this.inkData);
         UndoManager.AddEvent({
             undo: () => this.inkData = oldState,
-            redo: () => this.inkData = newState,
+            redo: () => this.inkData = newState
         });
         batch.end();
     }
@@ -134,9 +134,13 @@ export class InkingCanvas extends React.Component<InkCanvasProps> {
         return { x, y };
     }
 
-    @undoBatch
     @action
     removeLine = (id: string): void => {
+        if (!this.previousState) {
+            this.previousState = new Map(this.inkData);
+            document.addEventListener("pointermove", this.onPointerMove, true);
+            document.addEventListener("pointerup", this.onPointerUp, true);
+        }
         let data = this.inkData;
         data.delete(id);
         this.inkData = data;
diff --git a/src/client/views/InkingStroke.tsx b/src/client/views/InkingStroke.tsx
index 37b1f5899..b8d428d31 100644
--- a/src/client/views/InkingStroke.tsx
+++ b/src/client/views/InkingStroke.tsx
@@ -28,6 +28,8 @@ export class InkingStroke extends React.Component<StrokeProps> {
     deleteStroke = (e: React.PointerEvent): void => {
         if (InkingControl.Instance.selectedTool === InkTool.Eraser && e.buttons === 1) {
             this.props.deleteCallback(this.props.id);
+            e.stopPropagation();
+            e.preventDefault();
         }
     }
 
@@ -50,7 +52,7 @@ export class InkingStroke extends React.Component<StrokeProps> {
     render() {
         let pathStyle = this.createStyle();
         let pathData = this.parseData(this.props.line);
-        let pathlength = this.props.count; // bcz: this is needed to force reactions to the line data changes
+        let pathlength = this.props.count; // bcz: this is needed to force reactions to the line's data changes
         let marker = this.props.tool === InkTool.Highlighter ? "-marker" : "";
 
         let pointerEvents: any = InkingControl.Instance.selectedTool === InkTool.Eraser ? "all" : "none";