customized-fabric 1.3.6 → 1.3.8

package/lib/ImagePlaceholderObject/index.js

@@ -33,9 +33,6 @@ const ImagePlaceholderClass = fabric_1.fabric.util.createClass(fabric_1.fabric.G
             imageType: "Full color",
             objectCaching: false,
         });
-        if (options?.imageFile) {
-            this.loadImage(options?.imageFile);
-        }
         if (options?.isOriginal) {
             this.rectObject?.set({ strokeWidth: 0 });
         }
@@ -43,8 +40,13 @@ const ImagePlaceholderClass = fabric_1.fabric.util.createClass(fabric_1.fabric.G
             if (options?.hideStroke) {
                 this.rectObject?.set({ strokeWidth: 0 });
             }
-            if (options?.maskFile || options?.maskUrl) {
-                this.loadMask(options?.maskFile ?? options?.maskUrl);
+            else {
+                if (options?.maskFile || options?.maskUrl) {
+                    this.loadMask(options?.maskFile ?? options?.maskUrl);
+                }
+            }
+            if (options?.imageFile) {
+                this.loadImage(options?.imageFile);
             }
         }
         if (options?.imageType) {
@@ -178,14 +180,14 @@ const ImagePlaceholderClass = fabric_1.fabric.util.createClass(fabric_1.fabric.G
         this.canvas?.renderAll();
     },
     getMask: async function () {
-        if (this.maskObject) {
-            return this.maskObject;
+        if (this.mask) {
+            return this.mask;
         }
         if (this?.maskUrl) {
-            const maskObject = await (0, utils_1.loadImageFromUrl)(this.maskUrl);
-            maskObject?.set({
-                scaleX: this.width / (maskObject?.width ?? this.width),
-                scaleY: this.height / (maskObject?.height ?? this.height),
+            const mask = await (0, utils_1.loadImageFromUrl)(this.maskUrl);
+            mask?.set({
+                scaleX: this.width / (mask?.width ?? this.width),
+                scaleY: this.height / (mask?.height ?? this.height),
                 absolutePositioned: true,
                 originX: "center",
                 originY: "center",
@@ -193,11 +195,11 @@ const ImagePlaceholderClass = fabric_1.fabric.util.createClass(fabric_1.fabric.G
                 left: this.left,
                 angle: this.angle,
             });
-            this.maskObject = maskObject;
-            return maskObject;
+            this.mask = mask;
+            return mask;
         }
         else {
-            const maskObject = new fabric_1.fabric.Rect({
+            const mask = new fabric_1.fabric.Rect({
                 width: this.width,
                 height: this.height,
                 scaleX: this.scaleX,
@@ -209,8 +211,8 @@ const ImagePlaceholderClass = fabric_1.fabric.util.createClass(fabric_1.fabric.G
                 left: this.left,
                 angle: this.angle,
             });
-            this.maskObject = maskObject;
-            return maskObject;
+            this.mask = mask;
+            return mask;
         }
     },
     loadCustomizedImage: async function (image) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "customized-fabric",
-  "version": "1.3.6",
+  "version": "1.3.8",
   "description": "Customized fabric",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",