customized-fabric 1.9.1 → 1.9.3

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 ?? 0;
+        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/package.json

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