@pixldocs/canvas-renderer 0.5.12 → 0.5.14

package/dist/index.js

@@ -2699,18 +2699,37 @@ const clearFabricCharCache = () => {
 };
 const clearFontCacheAndRerender = (canvas) => {
   clearFabricCharCache();
-  const fixTextbox = (obj) => {
+  const resetTextboxLayoutInternals = (obj) => {
     var _a;
+    (_a = obj._clearCache) == null ? void 0 : _a.call(obj);
+    obj.__charBounds = [];
+    obj.__lineWidths = [];
+    obj.__lineHeights = [];
+    obj.__graphemeLines = [];
+    obj._textLines = [];
+    obj.textLines = [];
+    obj._styleMap = null;
+    obj.styleMap = null;
+    obj.dirty = true;
+  };
+  const fixTextbox = (obj) => {
+    var _a, _b;
     if (obj instanceof fabric.Textbox) {
       const savedWidth = obj.width;
-      obj.dirty = true;
+      const savedScaleX = obj.scaleX;
+      const savedScaleY = obj.scaleY;
+      resetTextboxLayoutInternals(obj);
       obj.initDimensions();
-      if (savedWidth != null && Math.abs((obj.width ?? 0) - savedWidth) > 0.01) {
-        obj.width = savedWidth;
+      if (savedWidth != null) {
+        obj.set({ width: savedWidth, scaleX: savedScaleX, scaleY: savedScaleY });
+        resetTextboxLayoutInternals(obj);
+        obj.initDimensions();
+        obj.set({ width: savedWidth, scaleX: savedScaleX, scaleY: savedScaleY, dirty: true });
       }
+      (_a = obj._clearCache) == null ? void 0 : _a.call(obj);
       obj.setCoords();
     } else if (obj instanceof fabric.Group) {
-      (_a = obj._objects) == null ? void 0 : _a.forEach(fixTextbox);
+      (_b = obj._objects) == null ? void 0 : _b.forEach(fixTextbox);
       obj.dirty = true;
       obj.setCoords();
     }
@@ -11824,6 +11843,7 @@ function PixldocsPreview(props) {
   const [fontsReady, setFontsReady] = useState(false);
   const [fontsReadyVersion, setFontsReadyVersion] = useState(0);
   const [canvasSettled, setCanvasSettled] = useState(false);
+  const [stabilizationPass, setStabilizationPass] = useState(0);
   const isResolveMode = !("config" in props && props.config);
   useEffect(() => {
     if (!isResolveMode) {
@@ -11882,6 +11902,7 @@ function PixldocsPreview(props) {
     if (!config) return;
     let cancelled = false;
     setCanvasSettled(false);
+    setStabilizationPass(0);
     const bump = () => {
       if (cancelled) return;
       clearMeasurementCache();
@@ -11894,22 +11915,32 @@ function PixldocsPreview(props) {
       window.clearTimeout(timeoutId);
     };
   }, [config]);
-  const previewKey = useMemo(() => `${pageIndex}-${fontsReadyVersion}`, [pageIndex, fontsReadyVersion]);
+  const previewKey = useMemo(
+    () => `${pageIndex}-${fontsReadyVersion}-${stabilizationPass}`,
+    [pageIndex, fontsReadyVersion, stabilizationPass]
+  );
   useEffect(() => {
     if (isResolveMode) return;
     if (!config) {
       setFontsReady(false);
       setCanvasSettled(false);
+      setStabilizationPass(0);
       return;
     }
     setFontsReady(false);
     setCanvasSettled(false);
+    setStabilizationPass(0);
     ensureFontsForResolvedConfig(config).then(() => setFontsReady(true)).catch(() => setFontsReady(true));
   }, [isResolveMode, config]);
   const handleCanvasReady = useCallback(() => {
+    if (stabilizationPass === 0) {
+      setCanvasSettled(false);
+      setStabilizationPass(1);
+      return;
+    }
     setCanvasSettled(true);
     onReady == null ? void 0 : onReady();
-  }, [onReady]);
+  }, [onReady, stabilizationPass]);
   if (isLoading) {
     return /* @__PURE__ */ jsx("div", { className, style: { ...style, display: "flex", alignItems: "center", justifyContent: "center", minHeight: 200 }, children: /* @__PURE__ */ jsx("div", { style: { color: "#888", fontSize: 14 }, children: "Loading preview..." }) });
   }
@@ -12323,6 +12354,7 @@ class PixldocsRenderer {
         cleanup();
         reject(new Error("Render timeout (30s)"));
       }, 3e4);
+      let stabilizationPass = 0;
       const cleanup = () => {
         clearTimeout(timeout);
         try {
@@ -12332,6 +12364,19 @@ class PixldocsRenderer {
         container.remove();
       };
       const onReady = () => {
+        if (stabilizationPass === 0) {
+          stabilizationPass = 1;
+          root.render(
+            createElement(PreviewCanvas2, {
+              config,
+              pageIndex,
+              zoom: pixelRatio,
+              absoluteZoom: true,
+              onReady
+            })
+          );
+          return;
+        }
         const expectedImageCount = this.getExpectedImageCount(config, pageIndex);
         this.waitForCanvasImages(container, expectedImageCount).then(async () => {
           try {
@@ -12403,6 +12448,7 @@ class PixldocsRenderer {
         cleanup();
         reject(new Error("SVG render timeout (30s)"));
       }, 3e4);
+      let stabilizationPass = 0;
       const cleanup = () => {
         clearTimeout(timeout);
         try {
@@ -12412,6 +12458,19 @@ class PixldocsRenderer {
         container.remove();
       };
       const onReady = () => {
+        if (stabilizationPass === 0) {
+          stabilizationPass = 1;
+          root.render(
+            createElement(PreviewCanvas2, {
+              config,
+              pageIndex,
+              zoom: 1,
+              absoluteZoom: true,
+              onReady
+            })
+          );
+          return;
+        }
         const expectedImageCount = this.getExpectedImageCount(config, pageIndex);
         this.waitForCanvasImages(container, expectedImageCount).then(async () => {
           var _a, _b;
@@ -12575,14 +12634,30 @@ class PixldocsRenderer {
             scaleX: obj.scaleX,
             scaleY: obj.scaleY
           };
-          (_a3 = obj._clearCache) == null ? void 0 : _a3.call(obj);
-          obj.__charBounds = [];
-          obj.__lineWidths = [];
-          obj.__lineHeights = [];
-          obj._textLines = [];
-          obj.textLines = [];
-          obj.dirty = true;
+          const resetTextboxLayoutInternals = () => {
+            var _a4;
+            (_a4 = obj._clearCache) == null ? void 0 : _a4.call(obj);
+            obj.__charBounds = [];
+            obj.__lineWidths = [];
+            obj.__lineHeights = [];
+            obj.__graphemeLines = [];
+            obj._textLines = [];
+            obj.textLines = [];
+            obj._styleMap = null;
+            obj.styleMap = null;
+            obj.dirty = true;
+          };
+          resetTextboxLayoutInternals();
           obj.initDimensions();
+          if (saved.width != null) {
+            (_a3 = obj.set) == null ? void 0 : _a3.call(obj, {
+              width: saved.width,
+              scaleX: saved.scaleX,
+              scaleY: saved.scaleY
+            });
+            resetTextboxLayoutInternals();
+            obj.initDimensions();
+          }
           (_b2 = obj.set) == null ? void 0 : _b2.call(obj, {
             width: saved.width,
             scaleX: saved.scaleX,