customized-fabric 1.8.6 → 1.8.8

package/lib/TextInputObject/index.d.ts

@@ -30,6 +30,8 @@ export declare const toTextInputObject: (object: TextInput) => {
         infix: any;
         suffix: any;
         isAllCapital: any;
+        lineHeight: number | undefined;
+        charSpacing: number | undefined;
     };
 };
 export default class TextInput extends fabric.Group {

package/lib/TextInputObject/index.js

@@ -17,7 +17,7 @@ const TextInputClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group, {
             objectCaching: false,
             ...constants_1.TEXT_INPUT_OBJECT_ATTRIBUTES.stroke,
         });
-        const { prefix = "", infix = "A", suffix = "", isAllCapital } = text ?? {};
+        const { prefix = "", infix = "A", suffix = "", isAllCapital, lineHeight = 1, charSpacing = 0, } = text ?? {};
         const fullText = prefix + infix + suffix;
         this.textObject = new fabric_1.fabric.IText("", {
             originX: "center",
@@ -28,6 +28,8 @@ const TextInputClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group, {
             text: isAllCapital ? fullText.toUpperCase() : fullText,
             fontFamily: "",
             paintFirst: "stroke",
+            lineHeight,
+            charSpacing,
         });
         const group = new fabric_1.fabric.Group([this.rectObject, this.textObject]);
         this.set(group);
@@ -69,22 +71,24 @@ const TextInputClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group, {
         this.fire("scaling");
     },
     autoChangeFontSize: function (changeSpeed) {
-        if (this.width <= this.textObject.__lineWidths ||
-            this.height <= this.textObject.height) {
-            while (this.width <= this.textObject.__lineWidths ||
+        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);
             }
         }
         else {
             while (this.textObject.maxFontSize > this.textObject.fontSize &&
-                this.width > this.textObject.__lineWidths &&
+                this.width > maxLineWidth &&
                 this.height > this.textObject.height) {
                 this.textObject.set({
                     fontSize: this.textObject.fontSize + changeSpeed,
                 });
+                maxLineWidth = Math.max(...this.textObject.__lineWidths);
             }
         }
     },
@@ -126,8 +130,8 @@ const TextInputClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group, {
         this.textObject.set({
             fontSize,
         });
-        if (this.textObject.__lineWidths < this.width &&
-            this.textObject.height < this.height) {
+        const maxLineWidth = Math.max(...this.textObject.__lineWidths);
+        if (maxLineWidth < this.width && this.textObject.height < this.height) {
         }
         else {
             this.autoChangeFontSize(1);
@@ -209,6 +213,8 @@ const toTextInputObject = (object) => {
             infix: textObject?.infix,
             suffix: textObject?.suffix,
             isAllCapital: textObject?.isAllCapital,
+            lineHeight: textObject?.lineHeight,
+            charSpacing: textObject?.charSpacing,
         },
     };
 };

package/lib/TextInputObject/interfaces.d.ts

@@ -19,6 +19,8 @@ export interface ITextInputOptions extends fabric.IGroupOptions {
         infix?: string;
         suffix?: string;
         isAllCapital?: boolean;
+        lineHeight?: number;
+        charSpacing?: number;
     };
     fontUrl?: string;
     isOriginal?: boolean;

package/package.json

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