embroidery-qc-image 1.0.28 → 1.0.29

package/dist/components/EmbroideryQCImage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"EmbroideryQCImage.d.ts","sourceRoot":"","sources":["../../src/components/EmbroideryQCImage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAY,MAAM,UAAU,CAAC;AAChF,OAAO,yBAAyB,CAAC;AAiKjC,MAAM,WAAW,8BAA8B;IAC7C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,WAAW,GAAG,YAAY,GAAG,YAAY,CAAC;IACrD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAofD,QAAA,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAmHvD,CAAC;AAy9CF,eAAO,MAAM,6BAA6B,GACxC,QAAQ,kBAAkB,EAC1B,UAAS,8BAAmC,KAC3C,OAAO,CAAC,IAAI,GAAG,IAAI,CAuBrB,CAAC;AAEF,eAAO,MAAM,6BAA6B,GACxC,QAAQ,kBAAkB,EAC1B,UAAS,8BAAmC,KAC3C,OAAO,CAAC,MAAM,GAAG,IAAI,CAuBvB,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"EmbroideryQCImage.d.ts","sourceRoot":"","sources":["../../src/components/EmbroideryQCImage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAY,MAAM,UAAU,CAAC;AAChF,OAAO,yBAAyB,CAAC;AAiKjC,MAAM,WAAW,8BAA8B;IAC7C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,WAAW,GAAG,YAAY,GAAG,YAAY,CAAC;IACrD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAofD,QAAA,MAAM,iBAAiB,EAAE,KAAK,CAAC,EAAE,CAAC,sBAAsB,CAmHvD,CAAC;AAo9CF,eAAO,MAAM,6BAA6B,GACxC,QAAQ,kBAAkB,EAC1B,UAAS,8BAAmC,KAC3C,OAAO,CAAC,IAAI,GAAG,IAAI,CAuBrB,CAAC;AAEF,eAAO,MAAM,6BAA6B,GACxC,QAAQ,kBAAkB,EAC1B,UAAS,8BAAmC,KAC3C,OAAO,CAAC,MAAM,GAAG,IAAI,CAuBvB,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

package/dist/index.esm.js

@@ -569,21 +569,21 @@ const renderEmbroideryCanvas = (canvas, config, canvasSize, imageRefs) => {
     // Tìm scaleFactor tối ưu bằng binary search trong [0, 1]
     const maxIterations = 12;
     const epsilon = 0.001; // độ chính xác cho khoảng cách low-high
-    const contentHeight = canvas.height - LAYOUT.PADDING;
+    const contentHeight = canvas.height;
     let low = 0;
     let high = 1;
     for (let i = 0; i < maxIterations; i++) {
         const testScale = (low + high) / 2;
         // (Không cần clear measureCanvas vì chỉ dùng để đo chiều cao, nhưng làm sạch cho dễ debug)
         measureCtx.clearRect(0, 0, measureCanvas.width, measureCanvas.height);
-        // Đo warning & message đúng theo renderWarning, không cộng padding ở đây
-        let testMeasureY = 0;
+        // Đo warning & message đúng theo renderWarning, có bao gồm padding
+        let testMeasureY = LAYOUT.PADDING;
         if (config.warning_message) {
-            const testWarningHeight = renderWarning(measureCtx, measureCanvas, config.warning_message, testScale);
+            const testWarningHeight = renderWarning(measureCtx, measureCanvas, config.warning_message, testScale, testMeasureY);
             testMeasureY += testWarningHeight;
         }
         if (config.message) {
-            const testMessageHeight = renderWarning(measureCtx, measureCanvas, config.message, testScale, 0, "", DEFAULT_ERROR_COLOR);
+            const testMessageHeight = renderWarning(measureCtx, measureCanvas, config.message, testScale, testMeasureY, "", DEFAULT_ERROR_COLOR);
             testMeasureY += testMessageHeight;
         }
         // Đo lại chiều cao của các sides với scaleFactor, tiếp nối sau warning/message
@@ -591,7 +591,7 @@ const renderEmbroideryCanvas = (canvas, config, canvasSize, imageRefs) => {
             const sideHeight = renderSide(measureCtx, side, testMeasureY, canvas.width, canvas.height, testScale, imageRefs, mockupBounds);
             testMeasureY += sideHeight + measureSpacing * testScale;
         });
-        // Tổng chiều cao content (không gồm padding)
+        // Tổng chiều cao content
         const totalHeight = testMeasureY;
         if (totalHeight > contentHeight) {
             // Content đang cao hơn vùng cho phép -> giảm scale
@@ -607,23 +607,17 @@ const renderEmbroideryCanvas = (canvas, config, canvasSize, imageRefs) => {
     }
     const scaleFactor = low;
     drawMockup(ctx, canvas, imageRefs);
+    // Calculate currentY: padding top + actual warning & message height (no spacing)
+    let currentY = LAYOUT.PADDING;
     // Render warning & message with scaleFactor and get actual heights
-    let actualWarningHeight = 0;
-    let actualMessageHeight = 0;
     if (config.warning_message) {
-        actualWarningHeight = renderWarning(ctx, canvas, config.warning_message, scaleFactor);
+        const actualWarningHeight = renderWarning(ctx, canvas, config.warning_message, scaleFactor, currentY);
+        currentY += actualWarningHeight;
     }
     if (config.message) {
-        actualMessageHeight = renderWarning(ctx, canvas, config.message, scaleFactor, actualWarningHeight, "", // message: không cần prefix "Note"
+        const actualMessageHeight = renderWarning(ctx, canvas, config.message, scaleFactor, currentY, "", // message: không cần prefix "Note"
         DEFAULT_ERROR_COLOR // message: hiển thị màu đỏ
         );
-    }
-    // Calculate currentY: padding top + actual warning & message height (no spacing)
-    let currentY = LAYOUT.PADDING;
-    if (config.warning_message && actualWarningHeight > 0) {
-        currentY += actualWarningHeight;
-    }
-    if (config.message && actualMessageHeight > 0) {
         currentY += actualMessageHeight;
     }
     config.sides.forEach((side) => {
@@ -696,9 +690,8 @@ const renderWarning = (ctx, canvas, message, scaleFactor = 1, offsetY = 0, prefi
         lines = buildWrappedLines(ctx, sanitizedMessage, maxWidth);
         longestLineWidth = Math.max(...lines.map((line) => ctx.measureText(line).width));
     }
-    const startY = LAYOUT.PADDING * scaleFactor + offsetY;
     lines.forEach((line, index) => {
-        const y = startY + index * lineHeight;
+        const y = offsetY + index * lineHeight;
         ctx.fillText(line, leftX, y);
     });
     ctx.restore();