@tscircuit/pcb-viewer 1.11.336 → 1.11.337

package/dist/index.js

@@ -8098,6 +8098,7 @@ var LAYER_NAME_TO_COLOR = {
   ...colors_default.board
 };
 var DEFAULT_DRAW_ORDER = [
+  "board",
   "inner6",
   "inner5",
   "inner4",
@@ -8109,15 +8110,12 @@ var DEFAULT_DRAW_ORDER = [
   "bottom_silkscreen",
   "top",
   "soldermask_top",
-  "soldermask_with_copper_bottom",
-  "soldermask_with_copper_top",
   "bottom_courtyard",
   "bottom_fabrication",
   "top_courtyard",
   "top_fabrication",
   "edge_cuts",
-  "top_silkscreen",
-  "board"
+  "top_silkscreen"
 ];
 var Drawer = class {
   canvasLayerMap;
@@ -8408,35 +8406,38 @@ var Drawer = class {
    */
   orderAndFadeLayers() {
     const { canvasLayerMap, foregroundLayer } = this;
+    const associatedSoldermask = foregroundLayer === "top" ? "soldermask_top" : foregroundLayer === "bottom" ? "soldermask_bottom" : void 0;
     const associatedSilkscreen = foregroundLayer === "top" ? "top_silkscreen" : foregroundLayer === "bottom" ? "bottom_silkscreen" : void 0;
     const associatedNotes = foregroundLayer === "top" ? "top_notes" : foregroundLayer === "bottom" ? "bottom_notes" : void 0;
     const associatedFabrication = foregroundLayer === "top" ? "top_fabrication" : foregroundLayer === "bottom" ? "bottom_fabrication" : void 0;
-    const maskWithCopperLayerForForeground = foregroundLayer === "top" ? "soldermask_with_copper_top" : foregroundLayer === "bottom" ? "soldermask_with_copper_bottom" : void 0;
     const opaqueLayers = /* @__PURE__ */ new Set([
       foregroundLayer,
       "drill",
       "edge_cuts",
       "other",
       "board",
+      ...associatedSoldermask ? [associatedSoldermask] : [],
       ...associatedSilkscreen ? [associatedSilkscreen] : [],
       ...associatedNotes ? [associatedNotes] : [],
-      ...associatedFabrication ? [associatedFabrication] : [],
-      ...maskWithCopperLayerForForeground ? [maskWithCopperLayerForForeground] : []
+      ...associatedFabrication ? [associatedFabrication] : []
     ]);
     const layersToShiftToTop = [
       foregroundLayer,
       "edge_cuts",
+      ...associatedSoldermask ? [associatedSoldermask] : [],
       ...associatedSilkscreen ? [associatedSilkscreen] : [],
       ...associatedNotes ? [associatedNotes] : [],
-      ...associatedFabrication ? [associatedFabrication] : [],
-      ...maskWithCopperLayerForForeground ? [maskWithCopperLayerForForeground] : []
+      ...associatedFabrication ? [associatedFabrication] : []
     ];
+    const drillBeforeForeground = foregroundLayer === "drill" ? [] : ["drill"];
+    const drillAfterForeground = foregroundLayer === "drill" ? ["drill"] : [];
     const order = [
       ...DEFAULT_DRAW_ORDER.filter((l) => !layersToShiftToTop.includes(l)),
+      ...drillBeforeForeground,
       foregroundLayer,
-      ...maskWithCopperLayerForForeground ? [maskWithCopperLayerForForeground] : [],
+      ...associatedSoldermask ? [associatedSoldermask] : [],
+      ...drillAfterForeground,
       "edge_cuts",
-      "drill",
       ...associatedSilkscreen ? [associatedSilkscreen] : [],
       ...associatedNotes ? [associatedNotes] : [],
       ...associatedFabrication ? [associatedFabrication] : []
@@ -8660,7 +8661,8 @@ function drawPcbBoardElements({
   for (const element of pcbBoardElements) {
     drawer.drawElements([element], {
       layers,
-      drawSoldermask,
+      drawSoldermask: false,
+      drawBoardMaterial: drawSoldermask ?? false,
       minBoardOutlineStrokePx: 2
     });
   }
@@ -8736,7 +8738,7 @@ function drawPcbPanelElements({
   drawer.realToCanvasMat = realToCanvasMat;
   const pcbPanelElements = elements.filter(isPcbPanelElement);
   for (const element of pcbPanelElements) {
-    drawer.drawElements([element], { layers, drawSoldermask });
+    drawer.drawElements([element], { layers });
   }
 }
 
@@ -9367,7 +9369,25 @@ function drawSoldermaskElementsForLayer({
 }) {
   const drawer = new CircuitToCanvasDrawer12(canvas);
   drawer.realToCanvasMat = realToCanvasMat;
-  drawer.drawElements(elements, { layers, drawSoldermask: true });
+  const boards = elements.filter((element) => element.type === "pcb_board");
+  if (boards.length <= 1) {
+    drawer.drawElements(elements, {
+      layers,
+      drawSoldermask: true,
+      drawBoardMaterial: false
+    });
+  } else {
+    const nonBoardElements = elements.filter(
+      (element) => element.type !== "pcb_board"
+    );
+    for (const board of boards) {
+      drawer.drawElements([board, ...nonBoardElements], {
+        layers,
+        drawSoldermask: true,
+        drawBoardMaterial: false
+      });
+    }
+  }
   if (!primitives) return;
   const hoveredElementIds = /* @__PURE__ */ new Set();
   for (const primitive of primitives) {
@@ -9398,7 +9418,11 @@ function drawSoldermaskElementsForLayer({
   const hoverDrawer = new CircuitToCanvasDrawer12(canvas);
   hoverDrawer.configure({ colorOverrides: HOVER_SOLDERMASK_COLOR_MAP });
   hoverDrawer.realToCanvasMat = realToCanvasMat;
-  hoverDrawer.drawElements(hoveredElements, { layers, drawSoldermask: true });
+  hoverDrawer.drawElements(hoveredElements, {
+    layers,
+    drawSoldermask: true,
+    drawBoardMaterial: false
+  });
 }
 
 // src/lib/draw-silkscreen.ts
@@ -9656,15 +9680,6 @@ var CanvasPrimitiveRenderer = ({
           primitives,
           drawSoldermask: isShowingSolderMask
         });
-        if (isShowingSolderMask) {
-          drawSoldermaskElementsForLayer({
-            canvas,
-            elements,
-            layers: [copperLayer],
-            realToCanvasMat: transform,
-            primitives
-          });
-        }
       }
       if (topCanvas) {
         drawPcbViaElementsForLayer({
@@ -9732,15 +9747,6 @@ var CanvasPrimitiveRenderer = ({
           layers: ["drill"],
           realToCanvasMat: transform
         });
-        if (isShowingSolderMask) {
-          drawSoldermaskElementsForLayer({
-            canvas: drillCanvas,
-            elements,
-            layers: ["drill"],
-            realToCanvasMat: transform,
-            primitives
-          });
-        }
       }
       const topSilkscreenCanvas = canvasRefs.current.top_silkscreen;
       if (topSilkscreenCanvas) {
@@ -13891,7 +13897,7 @@ import { css as css3 } from "@emotion/css";
 // package.json
 var package_default = {
   name: "@tscircuit/pcb-viewer",
-  version: "1.11.335",
+  version: "1.11.336",
   main: "dist/index.js",
   type: "module",
   repository: "tscircuit/pcb-viewer",
@@ -13945,7 +13951,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.29",
     "@vitejs/plugin-react": "^5.0.2",
     "circuit-json": "^0.0.374",
-    "circuit-to-canvas": "^0.0.69",
+    "circuit-to-canvas": "^0.0.72",
     "circuit-to-svg": "^0.0.323",
     color: "^4.2.3",
     "react-supergrid": "^1.0.10",