@leapfrog/interactive-canvas 2.0.22-beta-9 → 2.0.23-beta-2

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

@@ -202,11 +202,12 @@ export declare abstract class AbstractInteractiveCanvas implements IInteractiveC
      * @inheritDoc
      */
     sendObjectToBack(target: FabricObject): void;
+    addImageObject(imageUrl: string): Promise<IImage>;
+    private createFabricImage;
     /**
      * @override
      * @inheritDoc
      */
-    addImageObject(imageUrl: string): Promise<IImage>;
     /**
      * @override
      * @inheritDoc

package/dist/interactive-canvas.es.js

@@ -1,6 +1,8 @@
 import _, { round, each, values, reduce, clone, max, isEqual } from 'lodash';
 import { BehaviorSubject, Subject } from 'rxjs';
 import * as fabric from 'fabric';
+import { FabricImage } from 'fabric';
+import { loadImage } from 'canvas';
 
 const PIXELS_PER_MM$2 = 3.937;
 class MillimeterDimensions {
@@ -3033,41 +3035,160 @@ class AbstractInteractiveCanvas {
             this.fabricCanvas.requestRenderAll();
         }
     }
-    /**
-     * @override
-     * @inheritDoc
-     */
+    /*public async addImageObject(imageUrl: string): Promise<IImage> {
+     // Don't let the image be more than half the canvas in size.
+     const maxSizeScale = 2;
+     const maxWidth = this.dimensions$.value.widthPx / maxSizeScale;
+ 
+     const options = { crossOrigin: "anonymous" };
+ 
+     if (this.headless) {
+         // Server-side logic without mock DOM
+         const canvas = createCanvas(1, 1);
+         //const ctx = canvas.getContext("2d");
+ 
+         const image = await loadImage(imageUrl);
+         const id = this.randomId();
+ 
+         let newScale = 1;
+         const curWidth = newScale * image.width;
+         if (curWidth > maxWidth) {
+             newScale = maxWidth / curWidth;
+         }
+ 
+         // Set image properties and add to the canvas
+         const fabricImage = new this.fabric.Image(image, {
+             id: id,
+             scaleX: newScale,
+             scaleY: newScale,
+             originX: "left",
+             originY: "top",
+         });
+ 
+         this.fabricCanvas.add(fabricImage);
+ 
+         const object = new Image(this, fabricImage);
+         this.trackNewObject(object);
+         this.syncObjectList();
+ 
+         return object;
+     } else {
+         // Browser-side logic
+         return await new Promise((resolve) => {
+             this.fabric.Image.fromURL(imageUrl, options).then((fabricImage: FabricImage) => {
+                 const id = this.randomId();
+ 
+                 let newScale = 1;
+ 
+                 const curWidth = newScale * fabricImage.width;
+                 if (curWidth > maxWidth) {
+                     newScale = maxWidth / curWidth;
+                 }
+ 
+                 fabricImage.set({
+                     id: id,
+                     scaleX: newScale,
+                     scaleY: newScale,
+                     originX: "left",
+                     originY: "top",
+                 } as any);
+ 
+                 this.fabricCanvas.add(fabricImage);
+ 
+                 const object = new Image(this, fabricImage);
+                 this.trackNewObject(object);
+                 this.selectFabricObject(fabricImage);
+ 
+                 this.syncObjectList();
+ 
+                 resolve(object);
+             });
+         });
+     }
+ }*/
     addImageObject(imageUrl) {
         return __awaiter(this, void 0, void 0, function* () {
-            //Don't let the image be more than half the canvas in size.
             const maxSizeScale = 2;
             const maxWidth = this.dimensions$.value.widthPx / maxSizeScale;
             const options = { crossOrigin: "anonymous" };
-            return yield new Promise((resolve) => {
-                this.fabric.Image.fromURL(imageUrl, options).then((fabricImage) => {
-                    const id = this.randomId();
-                    let newScale = 1;
-                    const curWidth = newScale * fabricImage.width;
-                    if (curWidth > maxWidth) {
-                        newScale = maxWidth / curWidth;
-                    }
-                    fabricImage.set({
-                        id: id,
-                        scaleX: newScale,
-                        scaleY: newScale,
-                        originX: "left",
-                        originY: "top"
+            if (this.headless) {
+                const image = yield loadImage(imageUrl);
+                console.log("image-->", image);
+                console.log("Loaded image:", imageUrl, "Width:", image.width, "Height:", image.height);
+                return this.createFabricImage(image, maxWidth);
+            }
+            else {
+                return yield new Promise((resolve) => {
+                    this.fabric.Image.fromURL(imageUrl, options).then((fabricImage) => {
+                        resolve(this.createFabricImage(fabricImage, maxWidth));
                     });
-                    this.fabricCanvas.add(fabricImage);
-                    const object = new Image(this, fabricImage);
-                    this.trackNewObject(object);
-                    this.selectFabricObject(fabricImage);
-                    this.syncObjectList();
-                    resolve(object);
                 });
-            });
+            }
         });
     }
+    createFabricImage(image, maxWidth) {
+        const id = this.randomId();
+        console.log("image inside createfabricimage-->", image);
+        let newScale = 1;
+        const curWidth = newScale * image.width;
+        if (curWidth > maxWidth) {
+            newScale = maxWidth / curWidth;
+        }
+        const fabricImage = new FabricImage(image, {
+            id: id,
+            scaleX: newScale,
+            scaleY: newScale,
+            originX: "left",
+            originY: "top",
+        });
+        this.fabricCanvas.add(fabricImage);
+        const object = new Image(this, fabricImage);
+        this.trackNewObject(object);
+        this.syncObjectList();
+        return object;
+    }
+    /**
+     * @override
+     * @inheritDoc
+     */
+    /*  public async addImageObject(imageUrl: string): Promise<IImage> {
+          //Don't let the image be more than half the canvas in size.
+          const maxSizeScale = 2;
+          const maxWidth = this.dimensions$.value.widthPx / maxSizeScale;
+  
+          const options = {crossOrigin: "anonymous"};
+          return await new Promise((resolve) => {
+              this.fabric.Image.fromURL(imageUrl, options).then((fabricImage: FabricImage) => {
+                  const id = this.randomId();
+  
+                  let newScale = 1;
+  
+                  const curWidth = newScale * fabricImage.width;
+                  if (curWidth > maxWidth) {
+                      newScale = maxWidth / curWidth;
+                  }
+  
+                  fabricImage.set({
+                      id: id,
+                      scaleX: newScale,
+                      scaleY: newScale,
+                      originX: "left",
+                      originY: "top"
+                  } as any);
+  
+                  this.fabricCanvas.add(fabricImage);
+  
+                  const object = new Image(this, fabricImage);
+                  this.trackNewObject(object);
+                  this.selectFabricObject(fabricImage);
+  
+                  this.syncObjectList();
+  
+                  resolve(object);
+              });
+          });
+      }
+  */
     /**
      * @override
      * @inheritDoc

package/dist/interactive-canvas.js

@@ -3,6 +3,7 @@
 var _ = require('lodash');
 var rxjs = require('rxjs');
 var fabric = require('fabric');
+var canvas = require('canvas');
 
 function _interopNamespaceDefault(e) {
     var n = Object.create(null);
@@ -3054,41 +3055,160 @@ class AbstractInteractiveCanvas {
             this.fabricCanvas.requestRenderAll();
         }
     }
-    /**
-     * @override
-     * @inheritDoc
-     */
+    /*public async addImageObject(imageUrl: string): Promise<IImage> {
+     // Don't let the image be more than half the canvas in size.
+     const maxSizeScale = 2;
+     const maxWidth = this.dimensions$.value.widthPx / maxSizeScale;
+ 
+     const options = { crossOrigin: "anonymous" };
+ 
+     if (this.headless) {
+         // Server-side logic without mock DOM
+         const canvas = createCanvas(1, 1);
+         //const ctx = canvas.getContext("2d");
+ 
+         const image = await loadImage(imageUrl);
+         const id = this.randomId();
+ 
+         let newScale = 1;
+         const curWidth = newScale * image.width;
+         if (curWidth > maxWidth) {
+             newScale = maxWidth / curWidth;
+         }
+ 
+         // Set image properties and add to the canvas
+         const fabricImage = new this.fabric.Image(image, {
+             id: id,
+             scaleX: newScale,
+             scaleY: newScale,
+             originX: "left",
+             originY: "top",
+         });
+ 
+         this.fabricCanvas.add(fabricImage);
+ 
+         const object = new Image(this, fabricImage);
+         this.trackNewObject(object);
+         this.syncObjectList();
+ 
+         return object;
+     } else {
+         // Browser-side logic
+         return await new Promise((resolve) => {
+             this.fabric.Image.fromURL(imageUrl, options).then((fabricImage: FabricImage) => {
+                 const id = this.randomId();
+ 
+                 let newScale = 1;
+ 
+                 const curWidth = newScale * fabricImage.width;
+                 if (curWidth > maxWidth) {
+                     newScale = maxWidth / curWidth;
+                 }
+ 
+                 fabricImage.set({
+                     id: id,
+                     scaleX: newScale,
+                     scaleY: newScale,
+                     originX: "left",
+                     originY: "top",
+                 } as any);
+ 
+                 this.fabricCanvas.add(fabricImage);
+ 
+                 const object = new Image(this, fabricImage);
+                 this.trackNewObject(object);
+                 this.selectFabricObject(fabricImage);
+ 
+                 this.syncObjectList();
+ 
+                 resolve(object);
+             });
+         });
+     }
+ }*/
     addImageObject(imageUrl) {
         return __awaiter(this, void 0, void 0, function* () {
-            //Don't let the image be more than half the canvas in size.
             const maxSizeScale = 2;
             const maxWidth = this.dimensions$.value.widthPx / maxSizeScale;
             const options = { crossOrigin: "anonymous" };
-            return yield new Promise((resolve) => {
-                this.fabric.Image.fromURL(imageUrl, options).then((fabricImage) => {
-                    const id = this.randomId();
-                    let newScale = 1;
-                    const curWidth = newScale * fabricImage.width;
-                    if (curWidth > maxWidth) {
-                        newScale = maxWidth / curWidth;
-                    }
-                    fabricImage.set({
-                        id: id,
-                        scaleX: newScale,
-                        scaleY: newScale,
-                        originX: "left",
-                        originY: "top"
+            if (this.headless) {
+                const image = yield canvas.loadImage(imageUrl);
+                console.log("image-->", image);
+                console.log("Loaded image:", imageUrl, "Width:", image.width, "Height:", image.height);
+                return this.createFabricImage(image, maxWidth);
+            }
+            else {
+                return yield new Promise((resolve) => {
+                    this.fabric.Image.fromURL(imageUrl, options).then((fabricImage) => {
+                        resolve(this.createFabricImage(fabricImage, maxWidth));
                     });
-                    this.fabricCanvas.add(fabricImage);
-                    const object = new Image(this, fabricImage);
-                    this.trackNewObject(object);
-                    this.selectFabricObject(fabricImage);
-                    this.syncObjectList();
-                    resolve(object);
                 });
-            });
+            }
         });
     }
+    createFabricImage(image, maxWidth) {
+        const id = this.randomId();
+        console.log("image inside createfabricimage-->", image);
+        let newScale = 1;
+        const curWidth = newScale * image.width;
+        if (curWidth > maxWidth) {
+            newScale = maxWidth / curWidth;
+        }
+        const fabricImage = new fabric.FabricImage(image, {
+            id: id,
+            scaleX: newScale,
+            scaleY: newScale,
+            originX: "left",
+            originY: "top",
+        });
+        this.fabricCanvas.add(fabricImage);
+        const object = new Image(this, fabricImage);
+        this.trackNewObject(object);
+        this.syncObjectList();
+        return object;
+    }
+    /**
+     * @override
+     * @inheritDoc
+     */
+    /*  public async addImageObject(imageUrl: string): Promise<IImage> {
+          //Don't let the image be more than half the canvas in size.
+          const maxSizeScale = 2;
+          const maxWidth = this.dimensions$.value.widthPx / maxSizeScale;
+  
+          const options = {crossOrigin: "anonymous"};
+          return await new Promise((resolve) => {
+              this.fabric.Image.fromURL(imageUrl, options).then((fabricImage: FabricImage) => {
+                  const id = this.randomId();
+  
+                  let newScale = 1;
+  
+                  const curWidth = newScale * fabricImage.width;
+                  if (curWidth > maxWidth) {
+                      newScale = maxWidth / curWidth;
+                  }
+  
+                  fabricImage.set({
+                      id: id,
+                      scaleX: newScale,
+                      scaleY: newScale,
+                      originX: "left",
+                      originY: "top"
+                  } as any);
+  
+                  this.fabricCanvas.add(fabricImage);
+  
+                  const object = new Image(this, fabricImage);
+                  this.trackNewObject(object);
+                  this.selectFabricObject(fabricImage);
+  
+                  this.syncObjectList();
+  
+                  resolve(object);
+              });
+          });
+      }
+  */
     /**
      * @override
      * @inheritDoc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leapfrog/interactive-canvas",
-  "version": "2.0.22-beta-9",
+  "version": "2.0.23-beta-2",
   "description": "Leapfrog interactive canvas",
   "files": [
     "dist"
@@ -18,6 +18,7 @@
     "typescript": "^6.0.3"
   },
   "dependencies": {
+    "canvas": "^3.2.3",
     "fabric": "^7.2.0",
     "lodash": "^4.18.1",
     "rollup": "^4.60.3",