@tscircuit/pcb-viewer 1.11.392 → 1.11.394

package/dist/index.js

@@ -5961,27 +5961,21 @@ function drawSoldermaskElementsForLayer({
   const drawer = new CircuitToCanvasDrawer15(canvas);
   drawer.realToCanvasMat = realToCanvasMat;
   const boards = elements.filter((element) => element.type === "pcb_board");
-  if (boards.length <= 1) {
-    drawer.drawElements(elements, {
-      layers,
-      drawSoldermask: true,
-      drawSoldermaskTop,
-      drawSoldermaskBottom,
-      drawBoardMaterial: false
+  drawer.drawElements(elements, {
+    layers,
+    drawSoldermask: true,
+    drawSoldermaskTop,
+    drawSoldermaskBottom,
+    drawBoardMaterial: false
+  });
+  if (boards.length > 1) {
+    drawPcbBoardElements({
+      canvas,
+      elements: boards,
+      layers: [],
+      realToCanvasMat,
+      drawSoldermask: false
     });
-  } else {
-    const nonBoardElements = elements.filter(
-      (element) => element.type !== "pcb_board"
-    );
-    for (const board of boards) {
-      drawer.drawElements([board, ...nonBoardElements], {
-        layers,
-        drawSoldermask: true,
-        drawSoldermaskTop,
-        drawSoldermaskBottom,
-        drawBoardMaterial: false
-      });
-    }
   }
   if (!primitives) return;
   const hoveredElementIds = /* @__PURE__ */ new Set();
@@ -6089,6 +6083,22 @@ function drawPcbViaElementsForLayer({
   }
 }
 
+// src/lib/get-primitives-for-drawer.ts
+var getPrimitivesForDrawer = ({
+  primitives,
+  isShowingSolderMask,
+  isShowingSilkscreen,
+  isShowingFabricationNotes
+}) => primitives.filter(
+  (primitive) => isShowingSolderMask || !primitive.layer?.includes("soldermask")
+).filter(
+  (primitive) => isShowingSilkscreen || !primitive.layer?.includes("silkscreen")
+).filter(
+  (primitive) => isShowingFabricationNotes || !primitive.layer?.includes("fabrication")
+).filter((primitive) => primitive.layer !== "board").filter((primitive) => primitive._element?.type !== "pcb_smtpad").filter(
+  (primitive) => primitive._element?.type !== "pcb_plated_hole" || primitive.layer === "drill"
+).filter((primitive) => primitive._element?.type !== "pcb_via").filter((primitive) => primitive._element?.type !== "pcb_trace").filter((primitive) => primitive._element?.type !== "pcb_copper_text");
+
 // src/components/CanvasPrimitiveRenderer.tsx
 import { useEffect as useEffect5, useRef as useRef3 } from "react";
 import { SuperGrid, toMMSI } from "react-supergrid";
@@ -6125,9 +6135,12 @@ var CanvasPrimitiveRenderer = ({
     if (transform) drawer.transform = transform;
     drawer.clear();
     drawer.foregroundLayer = selectedLayer;
-    const filteredPrimitives = primitives.filter((p) => isShowingSolderMask || !p.layer?.includes("soldermask")).filter((p) => isShowingSilkscreen || !p.layer?.includes("silkscreen")).filter(
-      (p) => isShowingFabricationNotes || !p.layer?.includes("fabrication")
-    ).filter((p) => p.layer !== "board").filter((p) => p._element?.type !== "pcb_smtpad").filter((p) => p._element?.type !== "pcb_plated_hole").filter((p) => p._element?.type !== "pcb_via").filter((p) => p._element?.type !== "pcb_trace").filter((p) => p._element?.type !== "pcb_copper_text");
+    const filteredPrimitives = getPrimitivesForDrawer({
+      primitives,
+      isShowingSolderMask,
+      isShowingSilkscreen,
+      isShowingFabricationNotes
+    });
     drawPrimitives(drawer, filteredPrimitives);
     if (transform) {
       const copperLayers = getCopperLayerRefsFromElements(elements).map((layer) => ({
@@ -10617,7 +10630,7 @@ import { css as css2 } from "@emotion/css";
 // package.json
 var package_default = {
   name: "@tscircuit/pcb-viewer",
-  version: "1.11.391",
+  version: "1.11.393",
   main: "dist/index.js",
   type: "module",
   repository: {