circuit-to-canvas 0.0.44 → 0.0.46

package/dist/index.js

@@ -464,8 +464,9 @@ function getSoldermaskColor(layers, colorMap) {
 }
 function drawPcbPlatedHole(params) {
   const { ctx, hole, realToCanvasMat, colorMap } = params;
-  const hasSoldermask = hole.is_covered_with_solder_mask === true && hole.soldermask_margin !== void 0 && hole.soldermask_margin !== 0;
-  const margin = hasSoldermask ? hole.soldermask_margin : 0;
+  const isCoveredWithSoldermask = hole.is_covered_with_solder_mask === true;
+  const margin = isCoveredWithSoldermask ? 0 : hole.soldermask_margin ?? 0;
+  const hasSoldermask = !isCoveredWithSoldermask && hole.soldermask_margin !== void 0 && hole.soldermask_margin !== 0;
   const soldermaskRingColor = getSoldermaskColor(hole.layers, colorMap);
   const positiveMarginColor = colorMap.substrate;
   const copperColor = colorMap.copper.top;
@@ -497,13 +498,24 @@ function drawPcbPlatedHole(params) {
         copperColor
       );
     }
-    drawCircle({
-      ctx,
-      center: { x: hole.x, y: hole.y },
-      radius: hole.hole_diameter / 2,
-      fill: colorMap.drill,
-      realToCanvasMat
-    });
+    if (isCoveredWithSoldermask) {
+      drawCircle({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        radius: hole.outer_diameter / 2,
+        fill: soldermaskRingColor,
+        realToCanvasMat
+      });
+    }
+    if (!isCoveredWithSoldermask) {
+      drawCircle({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        radius: hole.hole_diameter / 2,
+        fill: colorMap.drill,
+        realToCanvasMat
+      });
+    }
     return;
   }
   if (hole.shape === "oval") {
@@ -540,15 +552,28 @@ function drawPcbPlatedHole(params) {
         copperColor
       );
     }
-    drawOval({
-      ctx,
-      center: { x: hole.x, y: hole.y },
-      radius_x: hole.hole_width / 2,
-      radius_y: hole.hole_height / 2,
-      fill: colorMap.drill,
-      realToCanvasMat,
-      rotation: hole.ccw_rotation
-    });
+    if (isCoveredWithSoldermask) {
+      drawOval({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        radius_x: hole.outer_width / 2,
+        radius_y: hole.outer_height / 2,
+        fill: soldermaskRingColor,
+        realToCanvasMat,
+        rotation: hole.ccw_rotation
+      });
+    }
+    if (!isCoveredWithSoldermask) {
+      drawOval({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        radius_x: hole.hole_width / 2,
+        radius_y: hole.hole_height / 2,
+        fill: colorMap.drill,
+        realToCanvasMat,
+        rotation: hole.ccw_rotation
+      });
+    }
     return;
   }
   if (hole.shape === "pill") {
@@ -585,15 +610,28 @@ function drawPcbPlatedHole(params) {
         copperColor
       );
     }
-    drawPill({
-      ctx,
-      center: { x: hole.x, y: hole.y },
-      width: hole.hole_width,
-      height: hole.hole_height,
-      fill: colorMap.drill,
-      realToCanvasMat,
-      rotation: hole.ccw_rotation
-    });
+    if (isCoveredWithSoldermask) {
+      drawPill({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.outer_width,
+        height: hole.outer_height,
+        fill: soldermaskRingColor,
+        realToCanvasMat,
+        rotation: hole.ccw_rotation
+      });
+    }
+    if (!isCoveredWithSoldermask) {
+      drawPill({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.hole_width,
+        height: hole.hole_height,
+        fill: colorMap.drill,
+        realToCanvasMat,
+        rotation: hole.ccw_rotation
+      });
+    }
     return;
   }
   if (hole.shape === "circular_hole_with_rect_pad") {
@@ -631,15 +669,28 @@ function drawPcbPlatedHole(params) {
         copperColor
       );
     }
-    const holeX = hole.x + (hole.hole_offset_x ?? 0);
-    const holeY = hole.y + (hole.hole_offset_y ?? 0);
-    drawCircle({
-      ctx,
-      center: { x: holeX, y: holeY },
-      radius: hole.hole_diameter / 2,
-      fill: colorMap.drill,
-      realToCanvasMat
-    });
+    if (isCoveredWithSoldermask) {
+      drawRect({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.rect_pad_width,
+        height: hole.rect_pad_height,
+        fill: soldermaskRingColor,
+        realToCanvasMat,
+        borderRadius: hole.rect_border_radius ?? 0
+      });
+    }
+    if (!isCoveredWithSoldermask) {
+      const holeX = hole.x + (hole.hole_offset_x ?? 0);
+      const holeY = hole.y + (hole.hole_offset_y ?? 0);
+      drawCircle({
+        ctx,
+        center: { x: holeX, y: holeY },
+        radius: hole.hole_diameter / 2,
+        fill: colorMap.drill,
+        realToCanvasMat
+      });
+    }
     return;
   }
   if (hole.shape === "pill_hole_with_rect_pad") {
@@ -677,16 +728,29 @@ function drawPcbPlatedHole(params) {
         copperColor
       );
     }
-    const holeX = hole.x + (hole.hole_offset_x ?? 0);
-    const holeY = hole.y + (hole.hole_offset_y ?? 0);
-    drawPill({
-      ctx,
-      center: { x: holeX, y: holeY },
-      width: hole.hole_width,
-      height: hole.hole_height,
-      fill: colorMap.drill,
-      realToCanvasMat
-    });
+    if (isCoveredWithSoldermask) {
+      drawRect({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.rect_pad_width,
+        height: hole.rect_pad_height,
+        fill: soldermaskRingColor,
+        realToCanvasMat,
+        borderRadius: hole.rect_border_radius ?? 0
+      });
+    }
+    if (!isCoveredWithSoldermask) {
+      const holeX = hole.x + (hole.hole_offset_x ?? 0);
+      const holeY = hole.y + (hole.hole_offset_y ?? 0);
+      drawPill({
+        ctx,
+        center: { x: holeX, y: holeY },
+        width: hole.hole_width,
+        height: hole.hole_height,
+        fill: colorMap.drill,
+        realToCanvasMat
+      });
+    }
     return;
   }
   if (hole.shape === "rotated_pill_hole_with_rect_pad") {
@@ -726,17 +790,31 @@ function drawPcbPlatedHole(params) {
         copperColor
       );
     }
-    const holeX = hole.x + (hole.hole_offset_x ?? 0);
-    const holeY = hole.y + (hole.hole_offset_y ?? 0);
-    drawPill({
-      ctx,
-      center: { x: holeX, y: holeY },
-      width: hole.hole_width,
-      height: hole.hole_height,
-      fill: colorMap.drill,
-      realToCanvasMat,
-      rotation: hole.hole_ccw_rotation
-    });
+    if (isCoveredWithSoldermask) {
+      drawRect({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.rect_pad_width,
+        height: hole.rect_pad_height,
+        fill: soldermaskRingColor,
+        realToCanvasMat,
+        borderRadius: hole.rect_border_radius ?? 0,
+        rotation: hole.rect_ccw_rotation
+      });
+    }
+    if (!isCoveredWithSoldermask) {
+      const holeX = hole.x + (hole.hole_offset_x ?? 0);
+      const holeY = hole.y + (hole.hole_offset_y ?? 0);
+      drawPill({
+        ctx,
+        center: { x: holeX, y: holeY },
+        width: hole.hole_width,
+        height: hole.hole_height,
+        fill: colorMap.drill,
+        realToCanvasMat,
+        rotation: hole.hole_ccw_rotation
+      });
+    }
     return;
   }
   if (hole.shape === "hole_with_polygon_pad") {
@@ -753,44 +831,46 @@ function drawPcbPlatedHole(params) {
         realToCanvasMat
       });
     }
-    const holeX = hole.x + (hole.hole_offset_x ?? 0);
-    const holeY = hole.y + (hole.hole_offset_y ?? 0);
-    const holeShape = hole.hole_shape;
-    if (holeShape === "circle") {
-      drawCircle({
-        ctx,
-        center: { x: holeX, y: holeY },
-        radius: (hole.hole_diameter ?? 0) / 2,
-        fill: colorMap.drill,
-        realToCanvasMat
-      });
-    } else if (holeShape === "oval") {
-      drawOval({
-        ctx,
-        center: { x: holeX, y: holeY },
-        radius_x: (hole.hole_width ?? 0) / 2,
-        radius_y: (hole.hole_height ?? 0) / 2,
-        fill: colorMap.drill,
-        realToCanvasMat
-      });
-    } else if (holeShape === "pill") {
-      drawPill({
-        ctx,
-        center: { x: holeX, y: holeY },
-        width: hole.hole_width ?? 0,
-        height: hole.hole_height ?? 0,
-        fill: colorMap.drill,
-        realToCanvasMat
-      });
-    } else if (holeShape === "rotated_pill") {
-      drawPill({
-        ctx,
-        center: { x: holeX, y: holeY },
-        width: hole.hole_width ?? 0,
-        height: hole.hole_height ?? 0,
-        fill: colorMap.drill,
-        realToCanvasMat
-      });
+    if (!isCoveredWithSoldermask) {
+      const holeX = hole.x + (hole.hole_offset_x ?? 0);
+      const holeY = hole.y + (hole.hole_offset_y ?? 0);
+      const holeShape = hole.hole_shape;
+      if (holeShape === "circle") {
+        drawCircle({
+          ctx,
+          center: { x: holeX, y: holeY },
+          radius: (hole.hole_diameter ?? 0) / 2,
+          fill: colorMap.drill,
+          realToCanvasMat
+        });
+      } else if (holeShape === "oval") {
+        drawOval({
+          ctx,
+          center: { x: holeX, y: holeY },
+          radius_x: (hole.hole_width ?? 0) / 2,
+          radius_y: (hole.hole_height ?? 0) / 2,
+          fill: colorMap.drill,
+          realToCanvasMat
+        });
+      } else if (holeShape === "pill") {
+        drawPill({
+          ctx,
+          center: { x: holeX, y: holeY },
+          width: hole.hole_width ?? 0,
+          height: hole.hole_height ?? 0,
+          fill: colorMap.drill,
+          realToCanvasMat
+        });
+      } else if (holeShape === "rotated_pill") {
+        drawPill({
+          ctx,
+          center: { x: holeX, y: holeY },
+          width: hole.hole_width ?? 0,
+          height: hole.hole_height ?? 0,
+          fill: colorMap.drill,
+          realToCanvasMat
+        });
+      }
     }
     return;
   }
@@ -824,9 +904,12 @@ function getRotation(hole) {
 }
 function drawPcbHole(params) {
   const { ctx, hole, realToCanvasMat, colorMap } = params;
-  const hasSoldermask = hole.is_covered_with_solder_mask === true && hole.soldermask_margin !== void 0 && hole.soldermask_margin > 0;
-  const margin = hasSoldermask ? hole.soldermask_margin : 0;
+  const isCoveredWithSoldermask = hole.is_covered_with_solder_mask === true;
+  const margin = isCoveredWithSoldermask ? 0 : hole.soldermask_margin ?? 0;
+  const hasSoldermask = !isCoveredWithSoldermask && hole.soldermask_margin !== void 0 && hole.soldermask_margin !== 0;
   const positiveMarginColor = colorMap.substrate;
+  const soldermaskOverlayColor = colorMap.soldermask.top;
+  const soldermaskRingColor = colorMap.soldermask.top;
   if (hole.hole_shape === "circle") {
     if (hasSoldermask && margin > 0) {
       drawCircle({
@@ -837,13 +920,35 @@ function drawPcbHole(params) {
         realToCanvasMat
       });
     }
-    drawCircle({
-      ctx,
-      center: { x: hole.x, y: hole.y },
-      radius: hole.hole_diameter / 2,
-      fill: colorMap.drill,
-      realToCanvasMat
-    });
+    if (!isCoveredWithSoldermask) {
+      drawCircle({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        radius: hole.hole_diameter / 2,
+        fill: colorMap.drill,
+        realToCanvasMat
+      });
+      if (hasSoldermask && margin < 0) {
+        drawSoldermaskRingForCircle(
+          ctx,
+          { x: hole.x, y: hole.y },
+          hole.hole_diameter / 2,
+          margin,
+          realToCanvasMat,
+          soldermaskRingColor,
+          colorMap.drill
+        );
+      }
+    }
+    if (isCoveredWithSoldermask) {
+      drawCircle({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        radius: hole.hole_diameter / 2,
+        fill: soldermaskOverlayColor,
+        realToCanvasMat
+      });
+    }
     return;
   }
   if (hole.hole_shape === "square") {
@@ -859,15 +964,42 @@ function drawPcbHole(params) {
         rotation
       });
     }
-    drawRect({
-      ctx,
-      center: { x: hole.x, y: hole.y },
-      width: hole.hole_diameter,
-      height: hole.hole_diameter,
-      fill: colorMap.drill,
-      realToCanvasMat,
-      rotation
-    });
+    if (!isCoveredWithSoldermask) {
+      drawRect({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.hole_diameter,
+        height: hole.hole_diameter,
+        fill: colorMap.drill,
+        realToCanvasMat,
+        rotation
+      });
+      if (hasSoldermask && margin < 0) {
+        drawSoldermaskRingForRect(
+          ctx,
+          { x: hole.x, y: hole.y },
+          hole.hole_diameter,
+          hole.hole_diameter,
+          margin,
+          0,
+          rotation,
+          realToCanvasMat,
+          soldermaskRingColor,
+          colorMap.drill
+        );
+      }
+    }
+    if (isCoveredWithSoldermask) {
+      drawRect({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.hole_diameter,
+        height: hole.hole_diameter,
+        fill: soldermaskOverlayColor,
+        realToCanvasMat,
+        rotation
+      });
+    }
     return;
   }
   if (hole.hole_shape === "oval") {
@@ -883,15 +1015,41 @@ function drawPcbHole(params) {
         rotation
       });
     }
-    drawOval({
-      ctx,
-      center: { x: hole.x, y: hole.y },
-      radius_x: hole.hole_width / 2,
-      radius_y: hole.hole_height / 2,
-      fill: colorMap.drill,
-      realToCanvasMat,
-      rotation
-    });
+    if (!isCoveredWithSoldermask) {
+      drawOval({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        radius_x: hole.hole_width / 2,
+        radius_y: hole.hole_height / 2,
+        fill: colorMap.drill,
+        realToCanvasMat,
+        rotation
+      });
+      if (hasSoldermask && margin < 0) {
+        drawSoldermaskRingForOval(
+          ctx,
+          { x: hole.x, y: hole.y },
+          hole.hole_width / 2,
+          hole.hole_height / 2,
+          margin,
+          rotation,
+          realToCanvasMat,
+          soldermaskRingColor,
+          colorMap.drill
+        );
+      }
+    }
+    if (isCoveredWithSoldermask) {
+      drawOval({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        radius_x: hole.hole_width / 2,
+        radius_y: hole.hole_height / 2,
+        fill: soldermaskOverlayColor,
+        realToCanvasMat,
+        rotation
+      });
+    }
     return;
   }
   if (hole.hole_shape === "rect") {
@@ -907,15 +1065,42 @@ function drawPcbHole(params) {
         rotation
       });
     }
-    drawRect({
-      ctx,
-      center: { x: hole.x, y: hole.y },
-      width: hole.hole_width,
-      height: hole.hole_height,
-      fill: colorMap.drill,
-      realToCanvasMat,
-      rotation
-    });
+    if (!isCoveredWithSoldermask) {
+      drawRect({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.hole_width,
+        height: hole.hole_height,
+        fill: colorMap.drill,
+        realToCanvasMat,
+        rotation
+      });
+      if (hasSoldermask && margin < 0) {
+        drawSoldermaskRingForRect(
+          ctx,
+          { x: hole.x, y: hole.y },
+          hole.hole_width,
+          hole.hole_height,
+          margin,
+          0,
+          rotation,
+          realToCanvasMat,
+          soldermaskRingColor,
+          colorMap.drill
+        );
+      }
+    }
+    if (isCoveredWithSoldermask) {
+      drawRect({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.hole_width,
+        height: hole.hole_height,
+        fill: soldermaskOverlayColor,
+        realToCanvasMat,
+        rotation
+      });
+    }
     return;
   }
   if (hole.hole_shape === "pill") {
@@ -931,15 +1116,41 @@ function drawPcbHole(params) {
         rotation
       });
     }
-    drawPill({
-      ctx,
-      center: { x: hole.x, y: hole.y },
-      width: hole.hole_width,
-      height: hole.hole_height,
-      fill: colorMap.drill,
-      realToCanvasMat,
-      rotation
-    });
+    if (!isCoveredWithSoldermask) {
+      drawPill({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.hole_width,
+        height: hole.hole_height,
+        fill: colorMap.drill,
+        realToCanvasMat,
+        rotation
+      });
+      if (hasSoldermask && margin < 0) {
+        drawSoldermaskRingForPill(
+          ctx,
+          { x: hole.x, y: hole.y },
+          hole.hole_width,
+          hole.hole_height,
+          margin,
+          rotation,
+          realToCanvasMat,
+          soldermaskRingColor,
+          colorMap.drill
+        );
+      }
+    }
+    if (isCoveredWithSoldermask) {
+      drawPill({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.hole_width,
+        height: hole.hole_height,
+        fill: soldermaskOverlayColor,
+        realToCanvasMat,
+        rotation
+      });
+    }
     return;
   }
   if (hole.hole_shape === "rotated_pill") {
@@ -955,15 +1166,41 @@ function drawPcbHole(params) {
         rotation
       });
     }
-    drawPill({
-      ctx,
-      center: { x: hole.x, y: hole.y },
-      width: hole.hole_width,
-      height: hole.hole_height,
-      fill: colorMap.drill,
-      realToCanvasMat,
-      rotation
-    });
+    if (!isCoveredWithSoldermask) {
+      drawPill({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.hole_width,
+        height: hole.hole_height,
+        fill: colorMap.drill,
+        realToCanvasMat,
+        rotation
+      });
+      if (hasSoldermask && margin < 0) {
+        drawSoldermaskRingForPill(
+          ctx,
+          { x: hole.x, y: hole.y },
+          hole.hole_width,
+          hole.hole_height,
+          margin,
+          rotation,
+          realToCanvasMat,
+          soldermaskRingColor,
+          colorMap.drill
+        );
+      }
+    }
+    if (isCoveredWithSoldermask) {
+      drawPill({
+        ctx,
+        center: { x: hole.x, y: hole.y },
+        width: hole.hole_width,
+        height: hole.hole_height,
+        fill: soldermaskOverlayColor,
+        realToCanvasMat,
+        rotation
+      });
+    }
     return;
   }
 }
@@ -982,13 +1219,13 @@ function drawPcbSmtPad(params) {
   const { ctx, pad, realToCanvasMat, colorMap } = params;
   const color = layerToColor(pad.layer, colorMap);
   const isCoveredWithSoldermask = pad.is_covered_with_solder_mask === true;
-  const margin = isCoveredWithSoldermask && pad.soldermask_margin !== void 0 ? pad.soldermask_margin : 0;
-  const hasSoldermask = isCoveredWithSoldermask && pad.soldermask_margin !== void 0 && pad.soldermask_margin !== 0;
+  const margin = isCoveredWithSoldermask ? 0 : pad.soldermask_margin ?? 0;
+  const hasSoldermask = !isCoveredWithSoldermask && pad.soldermask_margin !== void 0 && pad.soldermask_margin !== 0;
   const soldermaskRingColor = getSoldermaskColor2(pad.layer, colorMap);
   const positiveMarginColor = colorMap.substrate;
   const soldermaskOverlayColor = getSoldermaskColor2(pad.layer, colorMap);
   if (pad.shape === "rect") {
-    if (isCoveredWithSoldermask && margin >= 0) {
+    if (hasSoldermask && margin > 0) {
       drawRect({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -1036,7 +1273,7 @@ function drawPcbSmtPad(params) {
     return;
   }
   if (pad.shape === "rotated_rect") {
-    if (isCoveredWithSoldermask && margin >= 0) {
+    if (hasSoldermask && margin > 0) {
       drawRect({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -1087,7 +1324,7 @@ function drawPcbSmtPad(params) {
     return;
   }
   if (pad.shape === "circle") {
-    if (isCoveredWithSoldermask && margin >= 0) {
+    if (hasSoldermask && margin > 0) {
       drawCircle({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -1126,7 +1363,7 @@ function drawPcbSmtPad(params) {
     return;
   }
   if (pad.shape === "pill") {
-    if (isCoveredWithSoldermask && margin >= 0) {
+    if (hasSoldermask && margin > 0) {
       drawPill({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -1170,7 +1407,7 @@ function drawPcbSmtPad(params) {
     return;
   }
   if (pad.shape === "rotated_pill") {
-    if (isCoveredWithSoldermask && margin >= 0) {
+    if (hasSoldermask && margin > 0) {
       drawPill({
         ctx,
         center: { x: pad.x, y: pad.y },
@@ -1843,9 +2080,6 @@ function drawPcbCopperPour(params) {
 // lib/drawer/elements/pcb-copper-text.ts
 import { applyToPoint as applyToPoint13 } from "transformation-matrix";
 var DEFAULT_PADDING = { left: 0.2, right: 0.2, top: 0.2, bottom: 0.2 };
-function layerToCopperColor(layer, colorMap) {
-  return colorMap.copper[layer] ?? colorMap.copper.top;
-}
 function mapAnchorAlignment2(alignment) {
   if (!alignment) return "center";
   if (alignment.includes("left")) return "center_left";
@@ -1867,13 +2101,11 @@ function drawPcbCopperText(params) {
     ...DEFAULT_PADDING,
     ...text.knockout_padding
   };
-  const textColor = layerToCopperColor(text.layer, colorMap);
+  const textColor = colorMap.copper[text.layer] ?? colorMap.copper.top;
   const layout = getAlphabetLayout(content, fontSize);
   const totalWidth = layout.width + layout.strokeWidth;
   const alignment = mapAnchorAlignment2(text.anchor_alignment);
   const startPos = getTextStartPosition(alignment, layout);
-  const startX = startPos.x;
-  const startY = startPos.y;
   ctx.save();
   ctx.translate(x, y);
   if (text.is_mirrored) ctx.scale(-1, 1);
@@ -1886,29 +2118,22 @@ function drawPcbCopperText(params) {
     const paddingRight = padding.right * scale2;
     const paddingTop = padding.top * scale2;
     const paddingBottom = padding.bottom * scale2;
-    const textBoxTop = startY - layout.strokeWidth / 2;
-    const textBoxBottom = startY + layout.height + layout.strokeWidth / 2;
-    const textBoxHeight = textBoxBottom - textBoxTop;
-    const xOffset = startX - paddingLeft;
-    const yOffset = textBoxTop - paddingTop;
-    const knockoutWidth = totalWidth + paddingLeft + paddingRight;
-    const knockoutHeight = textBoxHeight + paddingTop + paddingBottom;
+    const rectX = startPos.x - paddingLeft * 4;
+    const rectY = startPos.y - paddingTop * 4;
+    const rectWidth = totalWidth + paddingLeft * 2 + paddingRight * 2;
+    const rectHeight = layout.height + layout.strokeWidth + paddingTop * 2 + paddingBottom * 2;
     ctx.fillStyle = textColor;
-    ctx.fillRect(xOffset, yOffset, knockoutWidth, knockoutHeight);
-    const previousCompositeOperation = ctx.globalCompositeOperation;
-    ctx.globalCompositeOperation = "destination-out";
-    ctx.fillStyle = "rgba(0,0,0,1)";
-    ctx.strokeStyle = "rgba(0,0,0,1)";
-    strokeAlphabetText({ ctx, text: content, fontSize, startX, startY });
-    if (previousCompositeOperation) {
-      ctx.globalCompositeOperation = previousCompositeOperation;
-    } else {
-      ctx.globalCompositeOperation = "source-over";
-    }
+    ctx.fillRect(rectX, rectY, rectWidth, rectHeight);
   } else {
     ctx.strokeStyle = textColor;
-    strokeAlphabetText({ ctx, text: content, fontSize, startX, startY });
   }
+  strokeAlphabetText({
+    ctx,
+    text: content,
+    fontSize,
+    startX: startPos.x,
+    startY: startPos.y
+  });
   ctx.restore();
 }
 
@@ -2367,7 +2592,7 @@ var CircuitToCanvasDrawer = class {
       (el) => el.type === "pcb_plated_hole" && el.is_covered_with_solder_mask === true
     );
     for (const element of elements) {
-      if (element.type === "pcb_board" && (hasSoldermaskPads || hasSoldermaskHoles || hasSoldermaskPlatedHoles)) {
+      if (element.type === "pcb_board") {
         this.drawBoardWithSoldermask(element);
       } else {
         this.drawElement(element, options);