customized-fabric 1.6.3 → 1.6.5

package/lib/CurvedTextObject/index.d.ts

@@ -52,6 +52,7 @@ export default class CurvedText extends fabric.Group {
     setMaxFontSize?: (fontSize: string) => void;
     setFontFamily?: (fontName: string, fontUrl?: string) => void;
     setTextAttributes?: (options: fabric.ITextOptions) => void;
+    setTextWidth?: (width: number) => void;
     getTextAttribute?: (attribute: string) => any;
     getSettings?: (attribute: string) => any;
     setSizes?: (options: {

package/lib/CurvedTextObject/index.js

@@ -24,6 +24,7 @@ const CurvedTextClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group,
             textAlign: "center",
             objectCaching: false,
             ...text,
+            fontFamily: "",
         });
         const group = new fabric_1.fabric.Group([this.rectObject, this.textObject]);
         this.set(group);
@@ -50,8 +51,6 @@ const CurvedTextClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group,
             objectCaching: false,
             pathVisible: !(options?.isOriginal || options?.hideStroke),
         });
-        this.autoChangeFontSize(0.1);
-        this.calculateTextPath(this.width, this.height);
         if (options?.isOriginal) {
             this.rectObject?.set({ strokeWidth: 0 });
         }
@@ -59,12 +58,9 @@ const CurvedTextClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group,
             if (options?.hideStroke) {
                 this.rectObject?.set({ strokeWidth: 0 });
             }
-            if (options?.fontUrl) {
-                (0, utils_1.loadFontFromUrl)(options?.fontUrl, text?.fontFamily ?? "").then(() => {
-                    this.canvas?.renderAll?.();
-                });
-            }
+            this.setFontFamily(text?.fontFamily ?? "", options?.fontUrl);
         }
+        this.fire("scaling");
     },
     autoChangeFontSize: function (changeSpeed) {
         if (this.textObject.curvedWidth <= this.textObject.__lineWidths) {
@@ -142,19 +138,20 @@ const CurvedTextClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group,
         const { width, height } = options;
         if (width) {
             this.set({ width });
-            this.rectObject.set({ width });
         }
         if (height) {
             this.set({ height });
-            this.rectObject.set({ height });
         }
-        this.calculateTextPath(this.width, this.height);
-        this.canvas?.renderAll?.();
+        this.fire("scaling");
     },
     setTextAttributes: function (options) {
         this.textObject.set(options);
         this.canvas?.renderAll?.();
     },
+    setTextWidth: function (width) {
+        this.textObject.set({ curvedWidth: width });
+        this.autoChangeFontSize(0.1);
+    },
     getTextAttribute: function (attribute) {
         return this.textObject.get(attribute);
     },

package/lib/TextInputObject/index.js

@@ -23,6 +23,7 @@ const TextInputClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group, {
             textAlign: "center",
             objectCaching: false,
             ...text,
+            fontFamily: "",
         });
         const group = new fabric_1.fabric.Group([this.rectObject, this.textObject]);
         this.set(group);
@@ -58,9 +59,7 @@ const TextInputClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group, {
             if (options?.hideStroke) {
                 this.rectObject?.set({ strokeWidth: 0 });
             }
-            if (options?.fontUrl) {
-                (0, utils_1.loadFontFromUrl)(options?.fontUrl, text?.fontFamily ?? "");
-            }
+            this.setFontFamily(text?.fontFamily ?? "", options?.fontUrl);
         }
         this.fire("scaling");
     },
@@ -147,14 +146,13 @@ const TextInputClass = fabric_1.fabric.util.createClass(fabric_1.fabric.Group, {
     },
     setSizes: function (options) {
         const { width, height } = options;
-        if (width && width > this.textObject.__lineWidths) {
+        if (width) {
             this.set({ width });
-            this.textObject.set({ width });
         }
-        if (height && height > this.textObject.height) {
+        if (height) {
             this.set({ height });
         }
-        this.canvas?.renderAll?.();
+        this.fire("scaling");
     },
     setTextAttributes: function (options) {
         this.textObject.set(options);

package/package.json

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