customized-fabric 2.0.7 → 2.0.8

package/lib/CurvedTextObject/index.js

@@ -6,9 +6,10 @@ const constants_1 = require("./constants");
 const utils_1 = require("../utils");
 const objectId_1 = require("../utils/objectId");
 const svg_util_1 = require("../utils/svg.util");
+const common_util_1 = require("../utils/common.util");
 const CurvedTextClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group, {
     initialize: function (options) {
-        const { text, ...rest } = options ?? {};
+        let { text, ...rest } = options ?? {};
         this.rectObject = new fabric_1.fabric.Rect({
             width: options?.width,
             height: options?.height,
@@ -18,6 +19,7 @@ const CurvedTextClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group,
             objectCaching: false,
             ...constants_1.CURVED_TEXT_OBJECT_ATTRIBUTES.stroke,
         });
+        text = (0, common_util_1.removeValueKeys)(text);
         const { prefix = "", infix = "", suffix = "", isAllCapital } = text ?? {};
         const fullText = prefix + infix + suffix;
         this.textObject = new fabric_1.fabric.IText("", {
@@ -27,8 +29,9 @@ const CurvedTextClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group,
             objectCaching: false,
             fontFamily: "",
             paintFirst: "stroke",
-            lengthRatio: 0.3,
+            lengthRatio: 0.4,
             positionAngle: 0,
+            maxFontSize: 200,
             ...text,
             text: isAllCapital ? fullText.toUpperCase() : fullText,
         });
@@ -54,8 +57,8 @@ const CurvedTextClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group,
             };
             this.set(attributes);
             this.rectObject.set(attributes);
-            this.autoChangeFontSize(0.1);
             this.calculateTextPath(width, height);
+            this.autoChangeFontSize(0.1);
             this.canvas?.renderAll?.();
         });
         if (options?.isOriginal) {
@@ -70,10 +73,10 @@ const CurvedTextClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group,
         this.fire("scaling");
     },
     autoChangeFontSize: function (changeSpeed = 0.1) {
-        let { fontSize = 0, lengthRatio = 0.3, maxFontSize } = this.textObject;
-        fontSize = Number(fontSize);
-        lengthRatio = Number(lengthRatio);
-        maxFontSize = Number(maxFontSize);
+        let { fontSize, lengthRatio, maxFontSize } = this.textObject;
+        fontSize = Number(fontSize || 0);
+        lengthRatio = Number(lengthRatio || 0.4);
+        maxFontSize = Number(maxFontSize || 200);
         const length = (0, svg_util_1.getEllipseCircumference)(this.width / 2, this.height / 2) * lengthRatio;
         let maxLineWidth = Math.max(...this.textObject.__lineWidths);
         while (length <= maxLineWidth) {
@@ -160,7 +163,8 @@ const CurvedTextClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group,
         return this.textObject.get(attribute);
     },
     calculateTextPath: function (width, height) {
-        const { pathSide, positionAngle } = this.textObject;
+        let { pathSide, positionAngle } = this.textObject;
+        positionAngle = Number(positionAngle || 0);
         const textHeight = 0;
         const rx = (width - textHeight) / 2;
         const ry = (height - textHeight) / 2;

package/lib/utils/common.util.d.ts

@@ -0,0 +1 @@
+export declare const removeValueKeys: (object: any, value?: any) => any;

package/lib/utils/common.util.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeValueKeys = void 0;
+const removeValueKeys = (object, value = null) => {
+    const newObject = {};
+    for (const key in object) {
+        if (!(object[key] === null)) {
+            newObject[key] = object[key];
+        }
+    }
+    return newObject;
+};
+exports.removeValueKeys = removeValueKeys;

package/package.json

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