@leapfrog/interactive-canvas 2.0.23-beta-8 → 2.0.24-beta-1

package/dist/interactive-canvas.es.js

@@ -1,7 +1,7 @@
 import _, { round, each, values, reduce, clone, max, isEqual } from 'lodash';
 import { BehaviorSubject, Subject } from 'rxjs';
-import { loadImage } from 'canvas';
 import * as fabric from 'fabric';
+import { loadImage } from 'canvas';
 
 const PIXELS_PER_MM$2 = 3.937;
 class MillimeterDimensions {
@@ -3045,23 +3045,20 @@ class AbstractInteractiveCanvas {
                 //const canvas = createCanvas(1, 1);
                 //const ctx = canvas.getContext("2d");
                 const image = yield loadImage(imageUrl);
-                const fabricImage = new this.fabric.Image(image, { src: imageUrl, crossOrigin: "anonymous" });
+                const fabricImage = new this.fabric.Image(image, {
+                    src: imageUrl,
+                    crossOrigin: "anonymous",
+                    toObject: function () {
+                        return Object.assign(Object.assign({}, fabric.Object.prototype.toObject.call(this)), { src: this.src, crossOrigin: this.crossOrigin });
+                    },
+                });
+                //const fabricImage = new this.fabric.Image(image as any, { src: imageUrl, crossOrigin: "anonymous" });
                 const id = this.randomId();
                 let newScale = 1;
                 const curWidth = newScale * fabricImage.width;
                 if (curWidth > maxWidth) {
                     newScale = maxWidth / curWidth;
                 }
-                /*const fabricImage = new this.fabric.Image(image as any, {
-                    src: imageUrl,
-                    crossOrigin: "anonymous",
-                    toObject: function () {
-                        return {
-                            ...this.callSuper("toObject"),
-                            src: this.src,
-                        };
-                    },
-                });*/
                 // Set image properties and add to the canvas
                 // const fabricImage = new FabricImage(imageUrl, {
                 //const fabricImage = new this.fabric.Image(image, {

package/dist/interactive-canvas.js

@@ -2,8 +2,8 @@
 
 var _ = require('lodash');
 var rxjs = require('rxjs');
-var canvas = require('canvas');
 var fabric = require('fabric');
+var canvas = require('canvas');
 
 function _interopNamespaceDefault(e) {
     var n = Object.create(null);
@@ -3066,23 +3066,20 @@ class AbstractInteractiveCanvas {
                 //const canvas = createCanvas(1, 1);
                 //const ctx = canvas.getContext("2d");
                 const image = yield canvas.loadImage(imageUrl);
-                const fabricImage = new this.fabric.Image(image, { src: imageUrl, crossOrigin: "anonymous" });
+                const fabricImage = new this.fabric.Image(image, {
+                    src: imageUrl,
+                    crossOrigin: "anonymous",
+                    toObject: function () {
+                        return Object.assign(Object.assign({}, fabric__namespace.Object.prototype.toObject.call(this)), { src: this.src, crossOrigin: this.crossOrigin });
+                    },
+                });
+                //const fabricImage = new this.fabric.Image(image as any, { src: imageUrl, crossOrigin: "anonymous" });
                 const id = this.randomId();
                 let newScale = 1;
                 const curWidth = newScale * fabricImage.width;
                 if (curWidth > maxWidth) {
                     newScale = maxWidth / curWidth;
                 }
-                /*const fabricImage = new this.fabric.Image(image as any, {
-                    src: imageUrl,
-                    crossOrigin: "anonymous",
-                    toObject: function () {
-                        return {
-                            ...this.callSuper("toObject"),
-                            src: this.src,
-                        };
-                    },
-                });*/
                 // Set image properties and add to the canvas
                 // const fabricImage = new FabricImage(imageUrl, {
                 //const fabricImage = new this.fabric.Image(image, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leapfrog/interactive-canvas",
-  "version": "2.0.23-beta-8",
+  "version": "2.0.24-beta-1",
   "description": "Leapfrog interactive canvas",
   "files": [
     "dist"