@leapfrog/interactive-canvas 1.12.1 → 1.13.0

package/dist/abstract-interactive-canvas.d.ts

@@ -28,6 +28,7 @@ export declare abstract class AbstractInteractiveCanvas implements IInteractiveC
     protected readonly fabricCanvas: fabric.Canvas;
     protected devicePixelRatio: number;
     protected readonly IMAGE_CAPTURE_COEFFICIENT: number;
+    abstract readonly headless: boolean;
     protected readonly fontLibrary: IFontLibrary;
     protected readonly profile$: BehaviorSubject<ICanvasProfile>;
     protected readonly layoutManager$: BehaviorSubject<ILayoutManager>;

package/dist/headless-interactive-canvas.d.ts

@@ -1,6 +1,7 @@
 import { fabric } from "fabric";
 import { AbstractInteractiveCanvas } from "./abstract-interactive-canvas";
 export declare class HeadlessInteractiveCanvas extends AbstractInteractiveCanvas {
+    readonly headless: boolean;
     constructor();
     /**
      * @override

package/dist/interactive-canvas.d.ts

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

package/dist/interactive-canvas.es.js

@@ -284,6 +284,63 @@ var RedrawAllLayoutFunction = /** @class */ (function () {
     return RedrawAllLayoutFunction;
 }());
 
+var RepositionCutoffsLayoutFunction = /** @class */ (function () {
+    function RepositionCutoffsLayoutFunction() {
+    }
+    RepositionCutoffsLayoutFunction.prototype.execute = function (canvas) {
+        canvas.getObjectsByTypeInternal(ObjectType.CUTOFF)
+            .forEach(function (cutoff) { return cutoff.updatePosition(); });
+    };
+    return RepositionCutoffsLayoutFunction;
+}());
+
+var RepositionBordersLayoutFunction = /** @class */ (function () {
+    function RepositionBordersLayoutFunction() {
+    }
+    RepositionBordersLayoutFunction.prototype.execute = function (canvas) {
+        canvas.getObjectsByTypeInternal(ObjectType.BORDER)
+            .forEach(function (border) { return border.updatePosition(); });
+    };
+    return RepositionBordersLayoutFunction;
+}());
+
+var PinToBottomLayoutFunction = /** @class */ (function () {
+    function PinToBottomLayoutFunction() {
+    }
+    PinToBottomLayoutFunction.prototype.execute = function (canvas) {
+        canvas.getObjectsInternal()
+            .forEach(function (object) { return object.moveToPinnedPosition(); });
+    };
+    return PinToBottomLayoutFunction;
+}());
+
+var ResizeCanvasLayoutFunction = /** @class */ (function () {
+    function ResizeCanvasLayoutFunction() {
+    }
+    ResizeCanvasLayoutFunction.prototype.execute = function (canvas) {
+        if (canvas.getLayoutManager().isEnforcedPositioning)
+            return;
+        if (oc(canvas.getDimensionsRestrictions()).fixed(false))
+            return;
+        var currentDimensions = canvas.getDimensions();
+        var baseDimensions = canvas.getBaseDimensions();
+        var textHeightIncreasePx = _(canvas.getObjectsByTypeInternal(ObjectType.TEXT))
+            .filter(function (text) { return text.isResizeCanvas(); })
+            .reduce(function (x, text) { return x + text.getSizeIncreaseSinceCreation(); }, 0);
+        var increase = baseDimensions.withSize(currentDimensions.width, 0);
+        while (increase.heightPx < textHeightIncreasePx) {
+            increase = increase.withSize(increase.width, increase.height + 1);
+        }
+        var targetHeight = increase.withSize(increase.width, baseDimensions.height + increase.height);
+        if (currentDimensions.height !== targetHeight.height) {
+            canvas.setDimensions(targetHeight);
+        }
+        canvas.getObjectsInternal().forEach(function (object) { return object.setCoords(); });
+        canvas.redraw();
+    };
+    return ResizeCanvasLayoutFunction;
+}());
+
 var LayoutManager;
 (function (LayoutManager) {
     LayoutManager["LEGACY"] = "LEGACY";
@@ -291,6 +348,45 @@ var LayoutManager;
     LayoutManager["ADVANCED"] = "ADVANCED";
 })(LayoutManager || (LayoutManager = {}));
 
+var RepositionBackgroundsLayoutFunction = /** @class */ (function () {
+    function RepositionBackgroundsLayoutFunction() {
+    }
+    RepositionBackgroundsLayoutFunction.prototype.execute = function (canvas) {
+        canvas.getObjectsByTypeInternal(ObjectType.BACKGROUND_IMAGE)
+            .forEach(function (border) { return border.updatePosition(); });
+    };
+    return RepositionBackgroundsLayoutFunction;
+}());
+
+var AdvancedLayoutManager = /** @class */ (function (_super) {
+    __extends(AdvancedLayoutManager, _super);
+    function AdvancedLayoutManager(canvas) {
+        var _this = _super.call(this, canvas) || this;
+        _this.key = LayoutManager.ADVANCED;
+        _this.pinToBottom = new PinToBottomLayoutFunction();
+        _this.redrawAll = new RedrawAllLayoutFunction();
+        _this.repositionBorders = new RepositionBordersLayoutFunction();
+        _this.repositionCutoffs = new RepositionCutoffsLayoutFunction();
+        _this.repositionBackgrounds = new RepositionBackgroundsLayoutFunction();
+        _this.resizeCanvas = new ResizeCanvasLayoutFunction();
+        return _this;
+    }
+    AdvancedLayoutManager.prototype.onCanvasDimensionsChange = function () {
+        this.pinToBottom.execute(this.canvas);
+        this.repositionCutoffs.execute(this.canvas);
+        this.repositionBorders.execute(this.canvas);
+        this.repositionBackgrounds.execute(this.canvas);
+        this.redrawAll.execute(this.canvas);
+    };
+    AdvancedLayoutManager.prototype.onTextChange = function () {
+        this.resizeCanvas.execute(this.canvas);
+    };
+    AdvancedLayoutManager.prototype.onObjectListChange = function () {
+        this.redrawAll.execute(this.canvas);
+    };
+    return AdvancedLayoutManager;
+}(AbstractLayoutManager));
+
 var UpdateObjectDimensionsLayoutFunction = /** @class */ (function () {
     function UpdateObjectDimensionsLayoutFunction() {
     }
@@ -454,26 +550,6 @@ var StackObjectsLayoutFunction = /** @class */ (function () {
     return StackObjectsLayoutFunction;
 }());
 
-var RepositionBordersLayoutFunction = /** @class */ (function () {
-    function RepositionBordersLayoutFunction() {
-    }
-    RepositionBordersLayoutFunction.prototype.execute = function (canvas) {
-        canvas.getObjectsByTypeInternal(ObjectType.BORDER)
-            .forEach(function (border) { return border.updatePosition(); });
-    };
-    return RepositionBordersLayoutFunction;
-}());
-
-var RepositionBackgroundsLayoutFunction = /** @class */ (function () {
-    function RepositionBackgroundsLayoutFunction() {
-    }
-    RepositionBackgroundsLayoutFunction.prototype.execute = function (canvas) {
-        canvas.getObjectsByTypeInternal(ObjectType.BACKGROUND_IMAGE)
-            .forEach(function (border) { return border.updatePosition(); });
-    };
-    return RepositionBackgroundsLayoutFunction;
-}());
-
 var StandardLayoutManager = /** @class */ (function (_super) {
     __extends(StandardLayoutManager, _super);
     function StandardLayoutManager(canvas) {
@@ -2389,6 +2465,8 @@ var Text = /** @class */ (function (_super) {
         return this.canvas.getSelection().isText && this.textSelection$.value.length > 0;
     };
     Text.prototype.updateTextSelection = function () {
+        if (this.canvas.headless)
+            return;
         this.textSelection$.next(new TextSelection(this.fabricObject, this.fontLibrary));
         this.notifyCanvasOfTextChanges();
     };
@@ -2710,7 +2788,7 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
      */
     AbstractInteractiveCanvas.prototype.setDimensions = function (dimensions) {
         if (this.dimensionsExceedRestrictions(dimensions)) {
-            console.debug("Requested canvas dimensions exceed current restrictions", dimensions, this.dimensionRestrictions$.value);
+            console.info("Requested canvas dimensions exceed current restrictions", dimensions, this.dimensionRestrictions$.value);
             this.dimensionChangeRejections$.next(dimensions);
             return;
         }
@@ -3263,7 +3341,6 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        console.debug("Loading canvas state", canvasState);
                         this.setBaseDimensions(canvasState.dimensions);
                         if (!(canvasState.canvasJson != undefined)) return [3 /*break*/, 2];
                         json_1 = JSON.parse(canvasState.canvasJson);
@@ -3327,7 +3404,6 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
             multiplier: multiplier || this.IMAGE_CAPTURE_COEFFICIENT,
             enableRetinaScaling: true
         };
-        console.debug("Capturing canvas image", options);
         var base64 = this.executeWithNormalizedCanvas(function () { return _this.fabricCanvas.toDataURL(options); });
         return replace(base64, /^data:.*;base64,/, "");
     };
@@ -3415,7 +3491,6 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
     };
     AbstractInteractiveCanvas.prototype.bindFields = function (persistedFields) {
         var _this = this;
-        console.debug("Binding fields", persistedFields);
         var bound = _(persistedFields)
             .flatMap(function (field) {
             try {
@@ -3427,11 +3502,9 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
             }
         })
             .value();
-        console.debug("Bound fields", bound);
         this.objects$.next(bound);
     };
     AbstractInteractiveCanvas.prototype.bindField = function (persistedField) {
-        console.debug("Binding field", persistedField);
         var fabricObject = this.findFabricObject(persistedField.id);
         switch (persistedField.type) {
             case ObjectType.TEXT:
@@ -3491,7 +3564,6 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
     AbstractInteractiveCanvas.prototype.updateCanvasDimensions = function (dims, zoom) {
         var width = dims.widthPx * zoom;
         var height = dims.heightPx * zoom;
-        console.debug("Updating canvas dimensions: zoom: " + zoom + ", width: " + width + ", height: " + height);
         this.fabricCanvas.setZoom(zoom);
         this.fabricCanvas.setDimensions({
             width: width,
@@ -3501,7 +3573,6 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
     AbstractInteractiveCanvas.prototype.onProfileChanged = function (profile) {
         this.setMultiSelect(profile.allowMultiSelect);
         this.layoutManager$.value.onProfileChange(profile);
-        console.debug("Canvas profile set", profile);
     };
     AbstractInteractiveCanvas.prototype.getFieldByCanvasObject = function (object) {
         if (!object) {
@@ -3562,7 +3633,9 @@ var SelectionData = /** @class */ (function () {
 var HeadlessInteractiveCanvas = /** @class */ (function (_super) {
     __extends(HeadlessInteractiveCanvas, _super);
     function HeadlessInteractiveCanvas() {
-        return _super.call(this, fabric, new fabric.StaticCanvas(null, { width: 640, height: 480 }), null) || this;
+        var _this = _super.call(this, fabric, new fabric.StaticCanvas(null, { width: 640, height: 480 }), null) || this;
+        _this.headless = true;
+        return _this;
     }
     /**
      * @override
@@ -3579,9 +3652,13 @@ var UndoStack = /** @class */ (function () {
         this.canvas = canvas;
         this.undoStates = [];
         this.redoStates = [];
-        this.lastUndo = null;
+        this.lastState = null;
         this.size = size;
     }
+    /**
+     * @override
+     * @inheritDoc
+     */
     UndoStack.prototype.save = function (state) {
         var currentState = this.canvas.save();
         var undoState = this.undoStates[this.undoStates.length - 1];
@@ -3590,9 +3667,12 @@ var UndoStack = /** @class */ (function () {
         this.undoStates.push(state);
         if (this.undoStates.length > this.size)
             this.undoStates.splice(0, 1);
-        if (!isEqual(this.lastUndo, currentState))
-            this.redoStates = [];
+        this.clearRedoStackIfCanvasChanged(currentState);
     };
+    /**
+     * @override
+     * @inheritDoc
+     */
     UndoStack.prototype.undo = function () {
         return __awaiter(this, void 0, void 0, function () {
             var undoState, currentState;
@@ -3608,7 +3688,7 @@ var UndoStack = /** @class */ (function () {
                             if (!undoState)
                                 return [2 /*return*/];
                         }
-                        this.lastUndo = undoState;
+                        this.lastState = undoState;
                         this.redoStates.push(currentState);
                         return [4 /*yield*/, this.canvas.load(undoState)];
                     case 1:
@@ -3618,18 +3698,23 @@ var UndoStack = /** @class */ (function () {
             });
         });
     };
+    /**
+     * @override
+     * @inheritDoc
+     */
     UndoStack.prototype.redo = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var state, currentState;
+            var redoState, currentState;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        state = this.redoStates.pop();
-                        if (!state)
+                        redoState = this.redoStates.pop();
+                        if (!redoState)
                             return [2 /*return*/];
                         currentState = this.canvas.save();
+                        this.lastState = redoState;
                         this.undoStates.push(currentState);
-                        return [4 /*yield*/, this.canvas.load(state)];
+                        return [4 /*yield*/, this.canvas.load(redoState)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -3637,6 +3722,11 @@ var UndoStack = /** @class */ (function () {
             });
         });
     };
+    UndoStack.prototype.clearRedoStackIfCanvasChanged = function (currentState) {
+        if (isEqual(this.lastState, currentState))
+            return;
+        this.redoStates = [];
+    };
     return UndoStack;
 }());
 
@@ -3645,6 +3735,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.headless = false;
         _this.undoStack = new UndoStack(_this);
         //Initialize watchers
         _this.fabricCanvas.on("selection:updated", function () { return _this.onFabricSelectionChanged(); });
@@ -3696,7 +3787,6 @@ var InteractiveCanvas = /** @class */ (function (_super) {
     };
     InteractiveCanvas.prototype.onFabricSelectionChanged = function () {
         var selected = this.getFieldsByCanvasObject(this.fabricCanvas.getActiveObjects());
-        console.debug("Selection changed", selected);
         this.selection$.next(new SelectionData(selected));
         this.enterTextSelectionModeIfRequired();
     };
@@ -3715,80 +3805,4 @@ var InteractiveCanvas = /** @class */ (function (_super) {
     return InteractiveCanvas;
 }(AbstractInteractiveCanvas));
 
-var RepositionCutoffsLayoutFunction = /** @class */ (function () {
-    function RepositionCutoffsLayoutFunction() {
-    }
-    RepositionCutoffsLayoutFunction.prototype.execute = function (canvas) {
-        canvas.getObjectsByTypeInternal(ObjectType.CUTOFF)
-            .forEach(function (cutoff) { return cutoff.updatePosition(); });
-    };
-    return RepositionCutoffsLayoutFunction;
-}());
-
-var PinToBottomLayoutFunction = /** @class */ (function () {
-    function PinToBottomLayoutFunction() {
-    }
-    PinToBottomLayoutFunction.prototype.execute = function (canvas) {
-        canvas.getObjectsInternal()
-            .forEach(function (object) { return object.moveToPinnedPosition(); });
-    };
-    return PinToBottomLayoutFunction;
-}());
-
-var ResizeCanvasLayoutFunction = /** @class */ (function () {
-    function ResizeCanvasLayoutFunction() {
-    }
-    ResizeCanvasLayoutFunction.prototype.execute = function (canvas) {
-        if (canvas.getLayoutManager().isEnforcedPositioning)
-            return;
-        if (oc(canvas.getDimensionsRestrictions()).fixed(false))
-            return;
-        var currentDimensions = canvas.getDimensions();
-        var baseDimensions = canvas.getBaseDimensions();
-        var textHeightIncreasePx = _(canvas.getObjectsByTypeInternal(ObjectType.TEXT))
-            .filter(function (text) { return text.isResizeCanvas(); })
-            .reduce(function (x, text) { return x + text.getSizeIncreaseSinceCreation(); }, 0);
-        var increase = baseDimensions.withSize(currentDimensions.width, 0);
-        while (increase.heightPx < textHeightIncreasePx) {
-            increase = increase.withSize(increase.width, increase.height + 1);
-        }
-        var targetHeight = increase.withSize(increase.width, baseDimensions.height + increase.height);
-        if (currentDimensions.height !== targetHeight.height) {
-            canvas.setDimensions(targetHeight);
-        }
-        canvas.getObjectsInternal().forEach(function (object) { return object.setCoords(); });
-        canvas.redraw();
-    };
-    return ResizeCanvasLayoutFunction;
-}());
-
-var AdvancedLayoutManager = /** @class */ (function (_super) {
-    __extends(AdvancedLayoutManager, _super);
-    function AdvancedLayoutManager(canvas) {
-        var _this = _super.call(this, canvas) || this;
-        _this.key = LayoutManager.ADVANCED;
-        _this.pinToBottom = new PinToBottomLayoutFunction();
-        _this.redrawAll = new RedrawAllLayoutFunction();
-        _this.repositionBorders = new RepositionBordersLayoutFunction();
-        _this.repositionCutoffs = new RepositionCutoffsLayoutFunction();
-        _this.repositionBackgrounds = new RepositionBackgroundsLayoutFunction();
-        _this.resizeCanvas = new ResizeCanvasLayoutFunction();
-        return _this;
-    }
-    AdvancedLayoutManager.prototype.onCanvasDimensionsChange = function () {
-        this.pinToBottom.execute(this.canvas);
-        this.repositionCutoffs.execute(this.canvas);
-        this.repositionBorders.execute(this.canvas);
-        this.repositionBackgrounds.execute(this.canvas);
-        this.redrawAll.execute(this.canvas);
-    };
-    AdvancedLayoutManager.prototype.onTextChange = function () {
-        this.resizeCanvas.execute(this.canvas);
-    };
-    AdvancedLayoutManager.prototype.onObjectListChange = function () {
-        this.redrawAll.execute(this.canvas);
-    };
-    return AdvancedLayoutManager;
-}(AbstractLayoutManager));
-
 export { AbstractCanvasObject, AbstractInteractiveCanvas, AbstractLayoutManager, AdvancedLayoutManager, BackgroundImage, Border, CanvasObjectData, Cutoff, DefaultCanvasProfile, Font, FontLibrary, HeadlessInteractiveCanvas, HorizontalRule, Image, ImageType, InteractiveCanvas, LayoutManager, MillimeterDimensions, ObjectType, PixelCanvasDimensions, Print6ColCanvasDimensions, Print8ColCanvasDimensions, Rectangle, RichText, SelectionData, StandardLayoutManager, Text, UNKNOWN_FONT, UnknownFont, VerticalRule, isMutableBackgroundColor, isMutableColor, isMutableImage, isMutablePosition, isMutableStroke, isMutableText, isMutableTextStyle };

package/dist/interactive-canvas.interface.d.ts

@@ -25,6 +25,10 @@ import { IBackgroundImage } from "./object/impl/background-image";
  * New leapfrog canvas implementation c. 2019.
  */
 export interface IInteractiveCanvas {
+    /**
+     * True if the canvas is operating in a headless mode.
+     */
+    readonly headless: boolean;
     /**
      * Get the canvas font library.
      */

package/dist/interactive-canvas.js

@@ -287,12 +287,108 @@ var RedrawAllLayoutFunction = /** @class */ (function () {
     return RedrawAllLayoutFunction;
 }());
 
+var RepositionCutoffsLayoutFunction = /** @class */ (function () {
+    function RepositionCutoffsLayoutFunction() {
+    }
+    RepositionCutoffsLayoutFunction.prototype.execute = function (canvas) {
+        canvas.getObjectsByTypeInternal(exports.ObjectType.CUTOFF)
+            .forEach(function (cutoff) { return cutoff.updatePosition(); });
+    };
+    return RepositionCutoffsLayoutFunction;
+}());
+
+var RepositionBordersLayoutFunction = /** @class */ (function () {
+    function RepositionBordersLayoutFunction() {
+    }
+    RepositionBordersLayoutFunction.prototype.execute = function (canvas) {
+        canvas.getObjectsByTypeInternal(exports.ObjectType.BORDER)
+            .forEach(function (border) { return border.updatePosition(); });
+    };
+    return RepositionBordersLayoutFunction;
+}());
+
+var PinToBottomLayoutFunction = /** @class */ (function () {
+    function PinToBottomLayoutFunction() {
+    }
+    PinToBottomLayoutFunction.prototype.execute = function (canvas) {
+        canvas.getObjectsInternal()
+            .forEach(function (object) { return object.moveToPinnedPosition(); });
+    };
+    return PinToBottomLayoutFunction;
+}());
+
+var ResizeCanvasLayoutFunction = /** @class */ (function () {
+    function ResizeCanvasLayoutFunction() {
+    }
+    ResizeCanvasLayoutFunction.prototype.execute = function (canvas) {
+        if (canvas.getLayoutManager().isEnforcedPositioning)
+            return;
+        if (tsOptchain.oc(canvas.getDimensionsRestrictions()).fixed(false))
+            return;
+        var currentDimensions = canvas.getDimensions();
+        var baseDimensions = canvas.getBaseDimensions();
+        var textHeightIncreasePx = _(canvas.getObjectsByTypeInternal(exports.ObjectType.TEXT))
+            .filter(function (text) { return text.isResizeCanvas(); })
+            .reduce(function (x, text) { return x + text.getSizeIncreaseSinceCreation(); }, 0);
+        var increase = baseDimensions.withSize(currentDimensions.width, 0);
+        while (increase.heightPx < textHeightIncreasePx) {
+            increase = increase.withSize(increase.width, increase.height + 1);
+        }
+        var targetHeight = increase.withSize(increase.width, baseDimensions.height + increase.height);
+        if (currentDimensions.height !== targetHeight.height) {
+            canvas.setDimensions(targetHeight);
+        }
+        canvas.getObjectsInternal().forEach(function (object) { return object.setCoords(); });
+        canvas.redraw();
+    };
+    return ResizeCanvasLayoutFunction;
+}());
+
 (function (LayoutManager) {
     LayoutManager["LEGACY"] = "LEGACY";
     LayoutManager["STANDARD"] = "STANDARD";
     LayoutManager["ADVANCED"] = "ADVANCED";
 })(exports.LayoutManager || (exports.LayoutManager = {}));
 
+var RepositionBackgroundsLayoutFunction = /** @class */ (function () {
+    function RepositionBackgroundsLayoutFunction() {
+    }
+    RepositionBackgroundsLayoutFunction.prototype.execute = function (canvas) {
+        canvas.getObjectsByTypeInternal(exports.ObjectType.BACKGROUND_IMAGE)
+            .forEach(function (border) { return border.updatePosition(); });
+    };
+    return RepositionBackgroundsLayoutFunction;
+}());
+
+var AdvancedLayoutManager = /** @class */ (function (_super) {
+    __extends(AdvancedLayoutManager, _super);
+    function AdvancedLayoutManager(canvas) {
+        var _this = _super.call(this, canvas) || this;
+        _this.key = exports.LayoutManager.ADVANCED;
+        _this.pinToBottom = new PinToBottomLayoutFunction();
+        _this.redrawAll = new RedrawAllLayoutFunction();
+        _this.repositionBorders = new RepositionBordersLayoutFunction();
+        _this.repositionCutoffs = new RepositionCutoffsLayoutFunction();
+        _this.repositionBackgrounds = new RepositionBackgroundsLayoutFunction();
+        _this.resizeCanvas = new ResizeCanvasLayoutFunction();
+        return _this;
+    }
+    AdvancedLayoutManager.prototype.onCanvasDimensionsChange = function () {
+        this.pinToBottom.execute(this.canvas);
+        this.repositionCutoffs.execute(this.canvas);
+        this.repositionBorders.execute(this.canvas);
+        this.repositionBackgrounds.execute(this.canvas);
+        this.redrawAll.execute(this.canvas);
+    };
+    AdvancedLayoutManager.prototype.onTextChange = function () {
+        this.resizeCanvas.execute(this.canvas);
+    };
+    AdvancedLayoutManager.prototype.onObjectListChange = function () {
+        this.redrawAll.execute(this.canvas);
+    };
+    return AdvancedLayoutManager;
+}(AbstractLayoutManager));
+
 var UpdateObjectDimensionsLayoutFunction = /** @class */ (function () {
     function UpdateObjectDimensionsLayoutFunction() {
     }
@@ -456,26 +552,6 @@ var StackObjectsLayoutFunction = /** @class */ (function () {
     return StackObjectsLayoutFunction;
 }());
 
-var RepositionBordersLayoutFunction = /** @class */ (function () {
-    function RepositionBordersLayoutFunction() {
-    }
-    RepositionBordersLayoutFunction.prototype.execute = function (canvas) {
-        canvas.getObjectsByTypeInternal(exports.ObjectType.BORDER)
-            .forEach(function (border) { return border.updatePosition(); });
-    };
-    return RepositionBordersLayoutFunction;
-}());
-
-var RepositionBackgroundsLayoutFunction = /** @class */ (function () {
-    function RepositionBackgroundsLayoutFunction() {
-    }
-    RepositionBackgroundsLayoutFunction.prototype.execute = function (canvas) {
-        canvas.getObjectsByTypeInternal(exports.ObjectType.BACKGROUND_IMAGE)
-            .forEach(function (border) { return border.updatePosition(); });
-    };
-    return RepositionBackgroundsLayoutFunction;
-}());
-
 var StandardLayoutManager = /** @class */ (function (_super) {
     __extends(StandardLayoutManager, _super);
     function StandardLayoutManager(canvas) {
@@ -2391,6 +2467,8 @@ var Text = /** @class */ (function (_super) {
         return this.canvas.getSelection().isText && this.textSelection$.value.length > 0;
     };
     Text.prototype.updateTextSelection = function () {
+        if (this.canvas.headless)
+            return;
         this.textSelection$.next(new TextSelection(this.fabricObject, this.fontLibrary));
         this.notifyCanvasOfTextChanges();
     };
@@ -2710,7 +2788,7 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
      */
     AbstractInteractiveCanvas.prototype.setDimensions = function (dimensions) {
         if (this.dimensionsExceedRestrictions(dimensions)) {
-            console.debug("Requested canvas dimensions exceed current restrictions", dimensions, this.dimensionRestrictions$.value);
+            console.info("Requested canvas dimensions exceed current restrictions", dimensions, this.dimensionRestrictions$.value);
             this.dimensionChangeRejections$.next(dimensions);
             return;
         }
@@ -3263,7 +3341,6 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        console.debug("Loading canvas state", canvasState);
                         this.setBaseDimensions(canvasState.dimensions);
                         if (!(canvasState.canvasJson != undefined)) return [3 /*break*/, 2];
                         json_1 = JSON.parse(canvasState.canvasJson);
@@ -3327,7 +3404,6 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
             multiplier: multiplier || this.IMAGE_CAPTURE_COEFFICIENT,
             enableRetinaScaling: true
         };
-        console.debug("Capturing canvas image", options);
         var base64 = this.executeWithNormalizedCanvas(function () { return _this.fabricCanvas.toDataURL(options); });
         return _.replace(base64, /^data:.*;base64,/, "");
     };
@@ -3415,7 +3491,6 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
     };
     AbstractInteractiveCanvas.prototype.bindFields = function (persistedFields) {
         var _this = this;
-        console.debug("Binding fields", persistedFields);
         var bound = _(persistedFields)
             .flatMap(function (field) {
             try {
@@ -3427,11 +3502,9 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
             }
         })
             .value();
-        console.debug("Bound fields", bound);
         this.objects$.next(bound);
     };
     AbstractInteractiveCanvas.prototype.bindField = function (persistedField) {
-        console.debug("Binding field", persistedField);
         var fabricObject = this.findFabricObject(persistedField.id);
         switch (persistedField.type) {
             case exports.ObjectType.TEXT:
@@ -3491,7 +3564,6 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
     AbstractInteractiveCanvas.prototype.updateCanvasDimensions = function (dims, zoom) {
         var width = dims.widthPx * zoom;
         var height = dims.heightPx * zoom;
-        console.debug("Updating canvas dimensions: zoom: " + zoom + ", width: " + width + ", height: " + height);
         this.fabricCanvas.setZoom(zoom);
         this.fabricCanvas.setDimensions({
             width: width,
@@ -3501,7 +3573,6 @@ var AbstractInteractiveCanvas = /** @class */ (function () {
     AbstractInteractiveCanvas.prototype.onProfileChanged = function (profile) {
         this.setMultiSelect(profile.allowMultiSelect);
         this.layoutManager$.value.onProfileChange(profile);
-        console.debug("Canvas profile set", profile);
     };
     AbstractInteractiveCanvas.prototype.getFieldByCanvasObject = function (object) {
         if (!object) {
@@ -3562,7 +3633,9 @@ var SelectionData = /** @class */ (function () {
 var HeadlessInteractiveCanvas = /** @class */ (function (_super) {
     __extends(HeadlessInteractiveCanvas, _super);
     function HeadlessInteractiveCanvas() {
-        return _super.call(this, fabric.fabric, new fabric.fabric.StaticCanvas(null, { width: 640, height: 480 }), null) || this;
+        var _this = _super.call(this, fabric.fabric, new fabric.fabric.StaticCanvas(null, { width: 640, height: 480 }), null) || this;
+        _this.headless = true;
+        return _this;
     }
     /**
      * @override
@@ -3579,9 +3652,13 @@ var UndoStack = /** @class */ (function () {
         this.canvas = canvas;
         this.undoStates = [];
         this.redoStates = [];
-        this.lastUndo = null;
+        this.lastState = null;
         this.size = size;
     }
+    /**
+     * @override
+     * @inheritDoc
+     */
     UndoStack.prototype.save = function (state) {
         var currentState = this.canvas.save();
         var undoState = this.undoStates[this.undoStates.length - 1];
@@ -3590,9 +3667,12 @@ var UndoStack = /** @class */ (function () {
         this.undoStates.push(state);
         if (this.undoStates.length > this.size)
             this.undoStates.splice(0, 1);
-        if (!_.isEqual(this.lastUndo, currentState))
-            this.redoStates = [];
+        this.clearRedoStackIfCanvasChanged(currentState);
     };
+    /**
+     * @override
+     * @inheritDoc
+     */
     UndoStack.prototype.undo = function () {
         return __awaiter(this, void 0, void 0, function () {
             var undoState, currentState;
@@ -3608,7 +3688,7 @@ var UndoStack = /** @class */ (function () {
                             if (!undoState)
                                 return [2 /*return*/];
                         }
-                        this.lastUndo = undoState;
+                        this.lastState = undoState;
                         this.redoStates.push(currentState);
                         return [4 /*yield*/, this.canvas.load(undoState)];
                     case 1:
@@ -3618,18 +3698,23 @@ var UndoStack = /** @class */ (function () {
             });
         });
     };
+    /**
+     * @override
+     * @inheritDoc
+     */
     UndoStack.prototype.redo = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var state, currentState;
+            var redoState, currentState;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        state = this.redoStates.pop();
-                        if (!state)
+                        redoState = this.redoStates.pop();
+                        if (!redoState)
                             return [2 /*return*/];
                         currentState = this.canvas.save();
+                        this.lastState = redoState;
                         this.undoStates.push(currentState);
-                        return [4 /*yield*/, this.canvas.load(state)];
+                        return [4 /*yield*/, this.canvas.load(redoState)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -3637,6 +3722,11 @@ var UndoStack = /** @class */ (function () {
             });
         });
     };
+    UndoStack.prototype.clearRedoStackIfCanvasChanged = function (currentState) {
+        if (_.isEqual(this.lastState, currentState))
+            return;
+        this.redoStates = [];
+    };
     return UndoStack;
 }());
 
@@ -3645,6 +3735,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.headless = false;
         _this.undoStack = new UndoStack(_this);
         //Initialize watchers
         _this.fabricCanvas.on("selection:updated", function () { return _this.onFabricSelectionChanged(); });
@@ -3696,7 +3787,6 @@ var InteractiveCanvas = /** @class */ (function (_super) {
     };
     InteractiveCanvas.prototype.onFabricSelectionChanged = function () {
         var selected = this.getFieldsByCanvasObject(this.fabricCanvas.getActiveObjects());
-        console.debug("Selection changed", selected);
         this.selection$.next(new SelectionData(selected));
         this.enterTextSelectionModeIfRequired();
     };
@@ -3715,82 +3805,6 @@ var InteractiveCanvas = /** @class */ (function (_super) {
     return InteractiveCanvas;
 }(AbstractInteractiveCanvas));
 
-var RepositionCutoffsLayoutFunction = /** @class */ (function () {
-    function RepositionCutoffsLayoutFunction() {
-    }
-    RepositionCutoffsLayoutFunction.prototype.execute = function (canvas) {
-        canvas.getObjectsByTypeInternal(exports.ObjectType.CUTOFF)
-            .forEach(function (cutoff) { return cutoff.updatePosition(); });
-    };
-    return RepositionCutoffsLayoutFunction;
-}());
-
-var PinToBottomLayoutFunction = /** @class */ (function () {
-    function PinToBottomLayoutFunction() {
-    }
-    PinToBottomLayoutFunction.prototype.execute = function (canvas) {
-        canvas.getObjectsInternal()
-            .forEach(function (object) { return object.moveToPinnedPosition(); });
-    };
-    return PinToBottomLayoutFunction;
-}());
-
-var ResizeCanvasLayoutFunction = /** @class */ (function () {
-    function ResizeCanvasLayoutFunction() {
-    }
-    ResizeCanvasLayoutFunction.prototype.execute = function (canvas) {
-        if (canvas.getLayoutManager().isEnforcedPositioning)
-            return;
-        if (tsOptchain.oc(canvas.getDimensionsRestrictions()).fixed(false))
-            return;
-        var currentDimensions = canvas.getDimensions();
-        var baseDimensions = canvas.getBaseDimensions();
-        var textHeightIncreasePx = _(canvas.getObjectsByTypeInternal(exports.ObjectType.TEXT))
-            .filter(function (text) { return text.isResizeCanvas(); })
-            .reduce(function (x, text) { return x + text.getSizeIncreaseSinceCreation(); }, 0);
-        var increase = baseDimensions.withSize(currentDimensions.width, 0);
-        while (increase.heightPx < textHeightIncreasePx) {
-            increase = increase.withSize(increase.width, increase.height + 1);
-        }
-        var targetHeight = increase.withSize(increase.width, baseDimensions.height + increase.height);
-        if (currentDimensions.height !== targetHeight.height) {
-            canvas.setDimensions(targetHeight);
-        }
-        canvas.getObjectsInternal().forEach(function (object) { return object.setCoords(); });
-        canvas.redraw();
-    };
-    return ResizeCanvasLayoutFunction;
-}());
-
-var AdvancedLayoutManager = /** @class */ (function (_super) {
-    __extends(AdvancedLayoutManager, _super);
-    function AdvancedLayoutManager(canvas) {
-        var _this = _super.call(this, canvas) || this;
-        _this.key = exports.LayoutManager.ADVANCED;
-        _this.pinToBottom = new PinToBottomLayoutFunction();
-        _this.redrawAll = new RedrawAllLayoutFunction();
-        _this.repositionBorders = new RepositionBordersLayoutFunction();
-        _this.repositionCutoffs = new RepositionCutoffsLayoutFunction();
-        _this.repositionBackgrounds = new RepositionBackgroundsLayoutFunction();
-        _this.resizeCanvas = new ResizeCanvasLayoutFunction();
-        return _this;
-    }
-    AdvancedLayoutManager.prototype.onCanvasDimensionsChange = function () {
-        this.pinToBottom.execute(this.canvas);
-        this.repositionCutoffs.execute(this.canvas);
-        this.repositionBorders.execute(this.canvas);
-        this.repositionBackgrounds.execute(this.canvas);
-        this.redrawAll.execute(this.canvas);
-    };
-    AdvancedLayoutManager.prototype.onTextChange = function () {
-        this.resizeCanvas.execute(this.canvas);
-    };
-    AdvancedLayoutManager.prototype.onObjectListChange = function () {
-        this.redrawAll.execute(this.canvas);
-    };
-    return AdvancedLayoutManager;
-}(AbstractLayoutManager));
-
 exports.AbstractCanvasObject = AbstractCanvasObject;
 exports.AbstractInteractiveCanvas = AbstractInteractiveCanvas;
 exports.AbstractLayoutManager = AbstractLayoutManager;

package/dist/undo-stack.d.ts

@@ -1,13 +1,27 @@
 import { ICanvasState } from "./types/canvas-state.interface";
 import { IInteractiveCanvas } from "./interactive-canvas.interface";
-export declare class UndoStack {
+import { IUndoStack } from "./undo-stack.interface";
+export declare class UndoStack implements IUndoStack {
     protected canvas: IInteractiveCanvas;
     private readonly size;
     private undoStates;
     private redoStates;
-    private lastUndo;
+    private lastState;
     constructor(canvas: IInteractiveCanvas, size?: number);
+    /**
+     * @override
+     * @inheritDoc
+     */
     save(state: ICanvasState): void;
+    /**
+     * @override
+     * @inheritDoc
+     */
     undo(): Promise<void>;
+    /**
+     * @override
+     * @inheritDoc
+     */
     redo(): Promise<void>;
+    private clearRedoStackIfCanvasChanged;
 }

package/dist/undo-stack.interface.d.ts

@@ -0,0 +1,6 @@
+import { ICanvasState } from "./types/canvas-state.interface";
+export interface IUndoStack {
+    save(state: ICanvasState): void;
+    undo(): Promise<void>;
+    redo(): Promise<void>;
+}

package/package.json

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