@pixldocs/canvas-renderer 0.5.33 → 0.5.35

package/dist/index.js

@@ -2750,45 +2750,16 @@ const clearFontCacheAndRerender = (canvas) => {
   if (beforeMetrics.length > 0) {
     logUnderlineDebug("before-rerender", beforeMetrics);
   }
-  const fixTextbox = (obj) => {
-    var _a, _b, _c;
+  const markDirty = (obj) => {
+    var _a;
     if (obj instanceof fabric.Textbox) {
-      const savedWidth = obj.width;
-      const savedScaleX = obj.scaleX;
-      const savedScaleY = obj.scaleY;
-      obj._forceClearCache = true;
-      obj.initDimensions();
-      if (savedWidth != null) {
-        obj.set({ width: savedWidth, scaleX: savedScaleX, scaleY: savedScaleY });
-        obj._forceClearCache = true;
-        obj.initDimensions();
-        obj.set({ width: savedWidth, scaleX: savedScaleX, scaleY: savedScaleY, dirty: true });
-      }
-      if (obj.underline) {
-        const lineWidths = obj.__lineWidths;
-        logUnderlineDebug("textbox-rerender", {
-          id: getObjectId(obj) ?? null,
-          text: (obj.text || "").slice(0, 120),
-          fontFamily: obj.fontFamily,
-          fontSize: obj.fontSize,
-          savedWidth,
-          finalWidth: obj.width ?? null,
-          finalHeight: obj.height ?? null,
-          scaleX: obj.scaleX,
-          scaleY: obj.scaleY,
-          lineCount: ((_a = obj.textLines) == null ? void 0 : _a.length) ?? 0,
-          maxLineWidth: lineWidths && lineWidths.length > 0 ? Math.max(...lineWidths) : null
-        });
-      }
-      (_b = obj._clearCache) == null ? void 0 : _b.call(obj);
-      obj.setCoords();
+      obj.dirty = true;
     } else if (obj instanceof fabric.Group) {
-      (_c = obj._objects) == null ? void 0 : _c.forEach(fixTextbox);
+      (_a = obj._objects) == null ? void 0 : _a.forEach(markDirty);
       obj.dirty = true;
-      obj.setCoords();
     }
   };
-  canvas.getObjects().forEach(fixTextbox);
+  canvas.getObjects().forEach(markDirty);
   const afterMetrics = canvas.getObjects().flatMap(collectUnderlineMetrics);
   if (afterMetrics.length > 0) {
     logUnderlineDebug("after-rerender", afterMetrics);
@@ -12755,8 +12726,33 @@ class PixldocsRenderer {
       clearFabricCharCache();
       clearMeasurementCache();
     };
+    const resyncTextboxWidths = (obj) => {
+      if (obj instanceof fabric.Textbox) {
+        const savedWidth = Math.max(1, obj.width ?? 0);
+        const savedScaleX = obj.scaleX ?? 1;
+        const savedScaleY = obj.scaleY ?? 1;
+        obj.initDimensions();
+        if (Math.abs((obj.width ?? 0) - savedWidth) > 0.01) {
+          obj.width = savedWidth;
+        }
+        if (Math.abs((obj.scaleX ?? 1) - savedScaleX) > 0.01) {
+          obj.scaleX = savedScaleX;
+        }
+        if (Math.abs((obj.scaleY ?? 1) - savedScaleY) > 0.01) {
+          obj.scaleY = savedScaleY;
+        }
+        obj.setCoords();
+        obj.dirty = true;
+        return;
+      }
+      if (obj instanceof fabric.Group) {
+        obj.getObjects().forEach(resyncTextboxWidths);
+        obj.dirty = true;
+      }
+    };
     clearTextMetricCaches();
     await waitForPaint();
+    fabricInstance.getObjects().forEach(resyncTextboxWidths);
     (_a = fabricInstance.calcOffset) == null ? void 0 : _a.call(fabricInstance);
     (_b = fabricInstance.renderAll) == null ? void 0 : _b.call(fabricInstance);
     (_c = fabricInstance.requestRenderAll) == null ? void 0 : _c.call(fabricInstance);