@leapfrog/interactive-canvas 1.11.0 → 1.11.2

package/dist/interactive-canvas.d.ts

@@ -2,7 +2,6 @@ import { AbstractInteractiveCanvas } from "./abstract-interactive-canvas";
 export declare class InteractiveCanvas extends AbstractInteractiveCanvas {
     protected devicePixelRatio: number;
     private readonly undoStack;
-    private undoSub;
     constructor(elementId: string, devicePixelRatio: number);
     /**
      * @override

package/dist/interactive-canvas.es.js

@@ -3649,11 +3649,8 @@ var UndoStack = /** @class */ (function () {
     }
     UndoStack.prototype.push = function (state) {
         var prev = this.stack[this.stack.length - 1];
-        if (isEqual(prev, state)) {
-            console.error("Ignoring identical undo state"); //todo
+        if (isEqual(prev, state))
             return;
-        }
-        console.error("Undo Registered"); //todo
         this.stack.push(state);
         if (this.stack.length > this.size)
             this.stack.splice(0, 1);
@@ -3669,7 +3666,7 @@ var InteractiveCanvas = /** @class */ (function (_super) {
     function InteractiveCanvas(elementId, devicePixelRatio) {
         var _this = _super.call(this, window['fabric'], new window['fabric'].Canvas(elementId), devicePixelRatio) || this;
         _this.devicePixelRatio = devicePixelRatio;
-        _this.undoStack = new UndoStack(10);
+        _this.undoStack = new UndoStack(100);
         //Initialize watchers
         _this.fabricCanvas.on("selection:updated", function () { return _this.onFabricSelectionChanged(); });
         _this.fabricCanvas.on("selection:created", function () { return _this.onFabricSelectionChanged(); });
@@ -3699,6 +3696,12 @@ var InteractiveCanvas = /** @class */ (function (_super) {
                         state = this.undoStack.pop();
                         if (!state)
                             return [2 /*return*/];
+                        //If the undo state matches the current state, pop again as the undo will have no effect
+                        if (isEqual(state, this.save())) {
+                            state = this.undoStack.pop();
+                            if (!state)
+                                return [2 /*return*/];
+                        }
                         return [4 /*yield*/, this.load(state)];
                     case 1:
                         _a.sent();

package/dist/interactive-canvas.js

@@ -3649,11 +3649,8 @@ var UndoStack = /** @class */ (function () {
     }
     UndoStack.prototype.push = function (state) {
         var prev = this.stack[this.stack.length - 1];
-        if (_.isEqual(prev, state)) {
-            console.error("Ignoring identical undo state"); //todo
+        if (_.isEqual(prev, state))
             return;
-        }
-        console.error("Undo Registered"); //todo
         this.stack.push(state);
         if (this.stack.length > this.size)
             this.stack.splice(0, 1);
@@ -3669,7 +3666,7 @@ var InteractiveCanvas = /** @class */ (function (_super) {
     function InteractiveCanvas(elementId, devicePixelRatio) {
         var _this = _super.call(this, window['fabric'], new window['fabric'].Canvas(elementId), devicePixelRatio) || this;
         _this.devicePixelRatio = devicePixelRatio;
-        _this.undoStack = new UndoStack(10);
+        _this.undoStack = new UndoStack(100);
         //Initialize watchers
         _this.fabricCanvas.on("selection:updated", function () { return _this.onFabricSelectionChanged(); });
         _this.fabricCanvas.on("selection:created", function () { return _this.onFabricSelectionChanged(); });
@@ -3699,6 +3696,12 @@ var InteractiveCanvas = /** @class */ (function (_super) {
                         state = this.undoStack.pop();
                         if (!state)
                             return [2 /*return*/];
+                        //If the undo state matches the current state, pop again as the undo will have no effect
+                        if (_.isEqual(state, this.save())) {
+                            state = this.undoStack.pop();
+                            if (!state)
+                                return [2 /*return*/];
+                        }
                         return [4 /*yield*/, this.load(state)];
                     case 1:
                         _a.sent();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leapfrog/interactive-canvas",
-  "version": "1.11.0",
+  "version": "1.11.2",
   "description": "Leapfrog interactive canvas",
   "files": [
     "dist"