customized-fabric 1.9.0 → 1.9.2

package/lib/GroupLayoutObject/constants.d.ts

@@ -1,4 +1,4 @@
-export declare const GROUP_LAYOUT_OBJECT_ATTRIBUTES: {
-    name: string;
-    type: string;
-};
+export declare const GROUP_LAYOUT_OBJECT_ATTRIBUTES: {
+    name: string;
+    type: string;
+};

package/lib/GroupLayoutObject/constants.js

@@ -1,7 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GROUP_LAYOUT_OBJECT_ATTRIBUTES = void 0;
-exports.GROUP_LAYOUT_OBJECT_ATTRIBUTES = {
-    name: "Group layout",
-    type: "GROUP_LAYOUT",
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GROUP_LAYOUT_OBJECT_ATTRIBUTES = void 0;
+exports.GROUP_LAYOUT_OBJECT_ATTRIBUTES = {
+    name: "Group layout",
+    type: "GROUP_LAYOUT",
+};

package/lib/GroupLayoutObject/index.d.ts

@@ -1,19 +1,19 @@
-import { fabric } from "fabric";
-import { ObjectId } from "../utils/objectId";
-import { IGroupLayoutOptions } from "./interfaces";
-export declare const toGroupLayoutObject: (groupLayoutObject: GroupLayout) => {
-    _id: ObjectId | undefined;
-    id: ObjectId | undefined;
-    personalizeId: number | undefined;
-    layerId: number | undefined;
-    name: string | undefined;
-    locked: boolean | undefined;
-    isAdditional: boolean | undefined;
-};
-export default class GroupLayout extends fabric.ActiveSelection {
-    _id?: ObjectId;
-    layerId?: number;
-    locked?: boolean;
-    isAdditional?: boolean;
-    constructor(options?: IGroupLayoutOptions);
-}
+import { fabric } from "fabric";
+import { ObjectId } from "../utils/objectId";
+import { IGroupLayoutOptions } from "./interfaces";
+export declare const toGroupLayoutObject: (groupLayoutObject: GroupLayout) => {
+    _id: ObjectId | undefined;
+    id: ObjectId | undefined;
+    personalizeId: number | undefined;
+    layerId: number | undefined;
+    name: string | undefined;
+    locked: boolean | undefined;
+    isAdditional: boolean | undefined;
+};
+export default class GroupLayout extends fabric.ActiveSelection {
+    _id?: ObjectId;
+    layerId?: number;
+    locked?: boolean;
+    isAdditional?: boolean;
+    constructor(options?: IGroupLayoutOptions);
+}

package/lib/GroupLayoutObject/index.js

@@ -1,26 +1,26 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.toGroupLayoutObject = void 0;
-const fabric_1 = require("fabric");
-const GroupLayoutClass = fabric_1.fabric.util.createClass(fabric_1.fabric.ActiveSelection, {
-    initialize: async function (options) { },
-});
-const toGroupLayoutObject = (groupLayoutObject) => {
-    return {
-        _id: groupLayoutObject._id,
-        id: groupLayoutObject._id,
-        personalizeId: groupLayoutObject.layerId,
-        layerId: groupLayoutObject.layerId,
-        name: groupLayoutObject.name,
-        locked: groupLayoutObject.locked,
-        isAdditional: groupLayoutObject?.isAdditional,
-    };
-};
-exports.toGroupLayoutObject = toGroupLayoutObject;
-class GroupLayout extends fabric_1.fabric.ActiveSelection {
-    constructor(options) {
-        super();
-        return new GroupLayoutClass(options);
-    }
-}
-exports.default = GroupLayout;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toGroupLayoutObject = void 0;
+const fabric_1 = require("fabric");
+const GroupLayoutClass = fabric_1.fabric.util.createClass(fabric_1.fabric.ActiveSelection, {
+    initialize: async function (options) { },
+});
+const toGroupLayoutObject = (groupLayoutObject) => {
+    return {
+        _id: groupLayoutObject._id,
+        id: groupLayoutObject._id,
+        personalizeId: groupLayoutObject.layerId,
+        layerId: groupLayoutObject.layerId,
+        name: groupLayoutObject.name,
+        locked: groupLayoutObject.locked,
+        isAdditional: groupLayoutObject?.isAdditional,
+    };
+};
+exports.toGroupLayoutObject = toGroupLayoutObject;
+class GroupLayout extends fabric_1.fabric.ActiveSelection {
+    constructor(options) {
+        super();
+        return new GroupLayoutClass(options);
+    }
+}
+exports.default = GroupLayout;

package/lib/GroupLayoutObject/interfaces.d.ts

@@ -1,3 +1,3 @@
-export interface IGroupLayoutOptions extends fabric.IObjectOptions {
-    objects?: fabric.Object[];
-}
+export interface IGroupLayoutOptions extends fabric.IObjectOptions {
+    objects?: fabric.Object[];
+}

package/lib/GroupLayoutObject/interfaces.js

@@ -1,2 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/ImagePlaceholderObject/index.js

@@ -245,8 +245,9 @@ const ImagePlaceholderClass = fabric_1.fabric.util.createClass(fabric_1.fabric.G
     loadCustomizedImage: async function (image) {
         if (image) {
             const { url, filteredUrl, data, clipPath } = image;
-            if (url && data && clipPath) {
-                const loadedImage = await (0, utils_1.loadImageFromUrl)(filteredUrl ?? url);
+            const imageUrl = filteredUrl ?? url;
+            if (imageUrl && data && clipPath) {
+                const loadedImage = await (0, utils_1.loadImageFromUrl)(imageUrl);
                 if (loadedImage) {
                     const mask = await this.getMask();
                     const { top, left, scaleX, width, angle, flipX, flipY, settings = {}, } = data;

package/lib/TextInputObject/index.js

@@ -45,9 +45,6 @@ const TextInputClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group, {
             this.set(attributes);
             this.rectObject.set(attributes);
             this.autoChangeFontSize(0.1);
-            this.textObject.set({
-                width: width,
-            });
             this.canvas?.renderAll?.();
         });
         this.set({
@@ -72,35 +69,30 @@ const TextInputClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group, {
     },
     autoChangeFontSize: function (changeSpeed) {
         let maxLineWidth = Math.max(...this.textObject.__lineWidths);
-        if (this.width <= maxLineWidth || this.height <= this.textObject.height) {
-            while (this.width <= maxLineWidth ||
-                this.height <= this.textObject.height) {
-                this.textObject.set({
-                    fontSize: this.textObject.fontSize - changeSpeed,
-                });
-                maxLineWidth = Math.max(...this.textObject.__lineWidths);
-            }
+        let fontSize = this.textObject.fontSize;
+        while (this.width - fontSize / 4 < maxLineWidth ||
+            this.height < this.textObject.height) {
+            fontSize -= changeSpeed;
+            this.textObject.set({
+                fontSize,
+            });
+            maxLineWidth = Math.max(...this.textObject.__lineWidths);
         }
-        else {
-            while (this.textObject.maxFontSize > this.textObject.fontSize &&
-                this.width > maxLineWidth &&
-                this.height > this.textObject.height) {
-                this.textObject.set({
-                    fontSize: this.textObject.fontSize + changeSpeed,
-                });
-                maxLineWidth = Math.max(...this.textObject.__lineWidths);
-            }
+        while (this.textObject.maxFontSize > fontSize.toFixed(1) &&
+            this.width - fontSize / 4 > maxLineWidth &&
+            this.height > this.textObject.height) {
+            fontSize += changeSpeed;
+            this.textObject.set({
+                fontSize,
+            });
+            maxLineWidth = Math.max(...this.textObject.__lineWidths);
         }
     },
     setText: function (text) {
         this.textObject.set({
             text,
         });
-        this.autoChangeFontSize(0.1);
-        this.textObject.set({
-            width: this.width,
-        });
-        this.canvas?.renderAll?.();
+        this.fire("scaling");
     },
     setPrefix: function (text) {
         this.textObject.set({
@@ -126,34 +118,17 @@ const TextInputClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group, {
         const text = prefix + infix + suffix;
         this.setText(infix?.length > 0 ? (isAllCapital ? text.toUpperCase() : text) : "");
     },
-    setMaxFontSize: function (fontSize) {
-        this.textObject.set({
-            fontSize,
-        });
-        const maxLineWidth = Math.max(...this.textObject.__lineWidths);
-        if (maxLineWidth < this.width && this.textObject.height < this.height) {
-        }
-        else {
-            this.autoChangeFontSize(1);
-        }
-        this.textObject.set({
-            width: this.width,
-        });
-        this.textObject.set({
-            maxFontSize: fontSize,
-        });
-        this.canvas?.renderAll?.();
+    setMaxFontSize: function (size) {
+        const fontSize = Number(size);
+        this.textObject.set({ fontSize, maxFontSize: fontSize });
+        this.fire("scaling");
     },
     setFontFamily: async function (fontName, fontUrl) {
         if (!(0, utils_1.isFontLoaded)(fontName)) {
             await (0, utils_1.loadFontFromUrl)(fontUrl ?? "", fontName);
         }
         this.textObject.set({ fontFamily: fontName });
-        this.autoChangeFontSize(0.1);
-        this.textObject.set({
-            width: this.width,
-        });
-        this.canvas?.renderAll?.();
+        this.fire("scaling");
     },
     setSizes: function (options) {
         const { width, height } = options;
@@ -167,9 +142,6 @@ const TextInputClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group, {
     },
     setTextAttributes: function (options) {
         this.textObject.set(options);
-        this.textObject.set({
-            width: this.width,
-        });
         this.canvas?.renderAll?.();
     },
     getTextAttribute: function (attribute) {

package/lib/constants/index.d.ts

@@ -1,6 +1,6 @@
-export declare const OBJECT_TYPES: {
-    textInput: string;
-    clipart: string;
-    imagePlaceHolder: string;
-    activeSelection: string;
-};
+export declare const OBJECT_TYPES: {
+    textInput: string;
+    clipart: string;
+    imagePlaceHolder: string;
+    activeSelection: string;
+};

package/lib/constants/index.js

@@ -1,12 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OBJECT_TYPES = void 0;
-const constants_1 = require("../ClipartObject/constants");
-const constants_2 = require("../ImagePlaceholderObject/constants");
-const constants_3 = require("../TextInputObject/constants");
-exports.OBJECT_TYPES = {
-    textInput: constants_3.TEXT_INPUT_OBJECT_ATTRIBUTES.type,
-    clipart: constants_1.CLIPART_OBJECT_ATTRIBUTES.type,
-    imagePlaceHolder: constants_2.IMAGE_PLACEHOLDER_OBJECT_ATTRIBUTES.type,
-    activeSelection: "activeSelection",
-};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OBJECT_TYPES = void 0;
+const constants_1 = require("../ClipartObject/constants");
+const constants_2 = require("../ImagePlaceholderObject/constants");
+const constants_3 = require("../TextInputObject/constants");
+exports.OBJECT_TYPES = {
+    textInput: constants_3.TEXT_INPUT_OBJECT_ATTRIBUTES.type,
+    clipart: constants_1.CLIPART_OBJECT_ATTRIBUTES.type,
+    imagePlaceHolder: constants_2.IMAGE_PLACEHOLDER_OBJECT_ATTRIBUTES.type,
+    activeSelection: "activeSelection",
+};

package/package.json

@@ -1,25 +1,25 @@
-{
-  "name": "customized-fabric",
-  "version": "1.9.0",
-  "description": "Customized fabric",
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
-  "files": [
-    "lib"
-  ],
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "tsc",
-    "prepare": "npm run build"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@types/node": "^20.6.0",
-    "fabric": "^5.3.0"
-  },
-  "devDependencies": {
-    "@types/fabric": "^5.3.3",
-    "typescript": "^5.2.2"
-  }
-}
+{
+  "name": "customized-fabric",
+  "version": "1.9.2",
+  "description": "Customized fabric",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
+  "files": [
+    "lib"
+  ],
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "tsc",
+    "prepare": "npm run build"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@types/node": "^20.6.0",
+    "fabric": "^5.3.0"
+  },
+  "devDependencies": {
+    "@types/fabric": "^5.3.3",
+    "typescript": "^5.2.2"
+  }
+}