customized-fabric 2.0.5 → 2.0.6

package/lib/CurvedTextObject/index.d.ts

@@ -29,9 +29,9 @@ export declare const toCurvedTextObject: (object: CurvedText) => {
         prefix: any;
         infix: any;
         suffix: any;
-        curvedLengthRatio: any;
+        lengthRatio: any;
         pathSide: any;
-        pathStartOffset: any;
+        positionAngle: any;
         isAllCapital: any;
     };
 };

package/lib/CurvedTextObject/index.js

@@ -27,7 +27,8 @@ const CurvedTextClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group,
             objectCaching: false,
             fontFamily: "",
             paintFirst: "stroke",
-            curvedLengthRatio: 0.3,
+            lengthRatio: 0.3,
+            positionAngle: 0,
             ...text,
             text: isAllCapital ? fullText.toUpperCase() : fullText,
         });
@@ -69,12 +70,13 @@ const CurvedTextClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group,
         this.fire("scaling");
     },
     autoChangeFontSize: function (changeSpeed = 0.1) {
-        let { curvedLengthRatio = 0.3, fontSize = 0, maxFontSize, } = this.textObject;
-        const circumference = (0, svg_util_1.getEllipseCircumference)(this.width / 2, this.height / 2);
-        const curvedLength = circumference * curvedLengthRatio;
-        let maxLineWidth = Math.max(...this.textObject.__lineWidths);
+        let { fontSize = 0, lengthRatio = 0.3, maxFontSize } = this.textObject;
         fontSize = Number(fontSize);
-        while (curvedLength <= maxLineWidth) {
+        lengthRatio = Number(lengthRatio);
+        maxFontSize = Number(maxFontSize);
+        const length = (0, svg_util_1.getEllipseCircumference)(this.width / 2, this.height / 2) * lengthRatio;
+        let maxLineWidth = Math.max(...this.textObject.__lineWidths);
+        while (length <= maxLineWidth) {
             fontSize -= changeSpeed;
             this.textObject.set({
                 fontSize,
@@ -82,7 +84,7 @@ const CurvedTextClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group,
             this.canvas?.renderAll?.();
             maxLineWidth = Math.max(...this.textObject.__lineWidths);
         }
-        while (maxFontSize > fontSize.toFixed(1) && curvedLength > maxLineWidth) {
+        while (maxFontSize > fontSize.toFixed(1) && length > maxLineWidth) {
             fontSize += changeSpeed;
             this.textObject.set({
                 fontSize,
@@ -158,7 +160,7 @@ const CurvedTextClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group,
         return this.textObject.get(attribute);
     },
     calculateTextPath: function (width, height) {
-        const { pathSide, pathStartOffset } = this.textObject;
+        const { pathSide, positionAngle } = this.textObject;
         const textHeight = 0;
         const rx = (width - textHeight) / 2;
         const ry = (height - textHeight) / 2;
@@ -173,6 +175,7 @@ const CurvedTextClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group,
         this.pathObject = path;
         const pathInfo = fabric_1.fabric.util?.getPathSegmentsInfo?.(path.path);
         const pathLength = pathInfo?.[(pathInfo?.length ?? 0) - 1]?.length;
+        const pathStartOffset = ((positionAngle % 360) * pathLength) / 360;
         this.textObject.set({
             path,
             pathLength,
@@ -211,9 +214,9 @@ const toCurvedTextObject = (object) => {
             prefix: textObject?.prefix,
             infix: textObject?.infix,
             suffix: textObject?.suffix,
-            curvedLengthRatio: textObject?.curvedLengthRatio,
+            lengthRatio: textObject?.lengthRatio,
             pathSide: textObject?.pathSide,
-            pathStartOffset: textObject?.pathStartOffset,
+            positionAngle: textObject?.positionAngle,
             isAllCapital: textObject?.isAllCapital,
         },
     };

package/lib/CurvedTextObject/interfaces.d.ts

@@ -18,7 +18,7 @@ export interface ICurvedTextOptions extends fabric.IGroupOptions {
         prefix?: string;
         infix?: string;
         suffix?: string;
-        curvedLengthRatio?: number;
+        lengthRatio?: number;
         isAllCapital?: boolean;
     };
     fontUrl?: string;

package/package.json

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