embroidery-qc-image 1.0.35 → 1.0.36

package/dist/index.js

@@ -1584,13 +1584,13 @@ const renderSide = (ctx, side, startY, width, height, scaleFactor, imageRefs, mo
         return currentY - startY;
     }
     // Compute uniform properties
-    const iconColorPositions = side.positions.filter((p) => p.type === "ICON" &&
-        (!p.layer_colors?.length || p.layer_colors.length === 1));
+    // Lấy màu từ tất cả ICON positions (sử dụng getIconColors để ưu tiên layer_colors)
+    const iconColorPositions = side.positions.filter((p) => p.type === "ICON");
     const iconColorValues = iconColorPositions
         .map((p) => {
-        if (p.layer_colors?.length === 1)
-            return p.layer_colors[0];
-        return p.color ?? null;
+        const iconColors = getIconColors(p);
+        // Join các màu bằng dấu phẩy giống TEXT để so sánh uniform
+        return iconColors?.length ? iconColors.join(",") : null;
     })
         .filter((color) => Boolean(color));
     const uniformProps = computeUniformProperties(textPositions, {
@@ -1645,38 +1645,62 @@ const renderSide = (ctx, side, startY, width, height, scaleFactor, imageRefs, mo
     currentY += LAYOUT.LINE_GAP * scaleFactor;
     side.positions.forEach((position) => {
         if (position.type === "ICON") {
-            const layerCount = position.layer_colors?.length ?? 0;
-            const iconUsesSingleColor = layerCount === 0 || layerCount === 1;
-            const iconColorValue = layerCount === 1
-                ? position.layer_colors?.[0] ?? null
-                : position.color ?? null;
+            const iconColors = getIconColors(position);
+            const iconColorValue = iconColors?.length ? iconColors.join(",") : null;
+            // Icon có thể hide color nếu uniform với TEXT, bất kể số lượng màu
+            // (vì TEXT với layer_colors nhiều màu cũng có thể uniform)
             const hideColor = shouldShowUniformLabels &&
                 uniformProps.isUniform.color &&
                 iconColorValue !== null &&
-                uniformProps.values.color === iconColorValue &&
-                iconUsesSingleColor;
+                uniformProps.values.color === iconColorValue;
             currentY += renderIconPosition(ctx, position, padding, currentY, sideWidth, scaleFactor, imageRefs, { hideColor }, mockupBounds);
             currentY += (LAYOUT.LINE_GAP / 3) * scaleFactor;
         }
     });
     return currentY - startY;
 };
+// Helper function để lấy màu từ TEXT position (ưu tiên layer_colors, fallback về character_colors hoặc color)
+const getTextColors = (position) => {
+    if (position.layer_colors?.length) {
+        return position.layer_colors;
+    }
+    if (position.character_colors?.length) {
+        return position.character_colors;
+    }
+    if (position.color) {
+        return [position.color];
+    }
+    return null;
+};
+// Helper function để lấy màu từ ICON position (ưu tiên layer_colors, fallback về color)
+const getIconColors = (position) => {
+    if (position.layer_colors?.length) {
+        return position.layer_colors;
+    }
+    if (position.color) {
+        return [position.color];
+    }
+    return null;
+};
 const groupTextPositions = (textPositions) => {
     const groups = [];
     let currentGroup = null;
     let currentProps = null;
     textPositions.forEach((position) => {
+        const textColors = getTextColors(position);
         const posProps = {
             font: position.font,
             text_shape: position.text_shape,
             color: position.color,
             character_colors: position.character_colors?.join(","),
+            layer_colors: textColors?.join(","),
         };
         if (!currentGroup ||
             currentProps.font !== posProps.font ||
             currentProps.text_shape !== posProps.text_shape ||
             currentProps.color !== posProps.color ||
-            currentProps.character_colors !== posProps.character_colors) {
+            currentProps.character_colors !== posProps.character_colors ||
+            currentProps.layer_colors !== posProps.layer_colors) {
             if (currentGroup) {
                 groups.push(currentGroup);
             }
@@ -1701,9 +1725,12 @@ const computeUniformProperties = (textPositions, options) => {
     const shapes = new Set(textPositions.map((p) => p.text_shape));
     const florals = new Set(textPositions.map((p) => p.floral_pattern ?? "None"));
     const colorSources = [
-        ...textPositions.map((p) => p.character_colors?.length
-            ? p.character_colors.join(",")
-            : p.color ?? "None"),
+        ...textPositions.map((p) => {
+            const textColors = getTextColors(p);
+            return textColors?.length
+                ? textColors.join(",")
+                : p.color ?? "None";
+        }),
         ...(options?.additionalColorValues?.map((color) => color ?? "None") ?? []),
     ];
     if (textPositions.length === 0 &&
@@ -2085,9 +2112,11 @@ displayIndex, showLabels, scaleFactor, imageRefs, mockupBounds = null) => {
             }
         }
         if (showLabels.color) {
-            const colorValue = position.character_colors?.join(", ") || position.color;
-            if (colorValue) {
-                const colors = position.character_colors || [position.color];
+            // Ưu tiên layer_colors, fallback về character_colors hoặc color (giống ICON)
+            const textColors = getTextColors(position);
+            if (textColors && textColors.length > 0) {
+                const colorValue = textColors.join(", ");
+                const colors = textColors;
                 const swatchH = Math.floor(otherFontSize * LAYOUT.SWATCH_HEIGHT_RATIO);
                 const totalSwatchWidth = calculateSwatchesWidth(colors, swatchH, scaleFactor, imageRefs);
                 // Tính effectiveMaxWidth cho dòng này để tránh mockup
@@ -2363,16 +2392,9 @@ const renderIconPosition = (ctx, position, x, y, maxWidth, scaleFactor, imageRef
     cursorY += iconResult.height;
     // Draw color swatches (prefer layer_colors, fallback to single color)
     // Nếu icon đã bị xóa thì không cần hiển thị màu chỉ nữa
-    const iconColors = position.is_delete_icon
-        ? null
-        : position.layer_colors?.length
-            ? position.layer_colors
-            : position.color
-                ? [position.color]
-                : null;
-    const layerCount = position.layer_colors?.length ?? 0;
-    const hasMultiLayerColors = layerCount > 1;
-    const shouldSkipColorSection = options?.hideColor && !hasMultiLayerColors;
+    const iconColors = position.is_delete_icon ? null : getIconColors(position);
+    // Nếu hideColor = true, ẩn màu của ICON (giống TEXT) bất kể số lượng màu
+    const shouldSkipColorSection = options?.hideColor === true;
     if (iconColors?.length && !shouldSkipColorSection) {
         // Dòng "Màu chỉ:" của icon dùng OTHER_FONT_SIZE, không dùng iconFontSize
         const otherFontSize = LAYOUT.OTHER_FONT_SIZE * scaleFactor;