@tscircuit/pcb-viewer 1.11.301 → 1.11.303

package/dist/index.js

@@ -7393,120 +7393,6 @@ var convertElementToPrimitives = (element, allElements) => {
         }
       ];
     }
-    case "pcb_board": {
-      const { width, height, center, outline } = element;
-      const primitives = [];
-      const hasSolderMask = allElements.some(
-        (elm) => elm.type === "pcb_smtpad" && elm.is_covered_with_solder_mask === true
-      );
-      if (hasSolderMask) {
-        if (outline && outline.length > 2) {
-          primitives.push({
-            _pcb_drawing_object_id: `polygon_${globalPcbDrawingObjectCount++}`,
-            pcb_drawing_type: "polygon",
-            points: normalizePolygonPoints(outline),
-            layer: "soldermask_top",
-            _element: element
-          });
-          primitives.push({
-            _pcb_drawing_object_id: `polygon_${globalPcbDrawingObjectCount++}`,
-            pcb_drawing_type: "polygon",
-            points: normalizePolygonPoints(outline),
-            layer: "soldermask_bottom",
-            _element: element
-          });
-        } else if (width && height) {
-          primitives.push({
-            _pcb_drawing_object_id: `rect_${globalPcbDrawingObjectCount++}`,
-            pcb_drawing_type: "rect",
-            x: center.x,
-            y: center.y,
-            w: width,
-            h: height,
-            layer: "soldermask_top",
-            _element: element
-          });
-          primitives.push({
-            _pcb_drawing_object_id: `rect_${globalPcbDrawingObjectCount++}`,
-            pcb_drawing_type: "rect",
-            x: center.x,
-            y: center.y,
-            w: width,
-            h: height,
-            layer: "soldermask_bottom",
-            _element: element
-          });
-        }
-      }
-      if (outline && outline.length > 2) {
-        primitives.push(
-          ...outline.map((point, index, array) => ({
-            _pcb_drawing_object_id: `line_${globalPcbDrawingObjectCount++}`,
-            pcb_drawing_type: "line",
-            x1: point.x,
-            y1: point.y,
-            x2: index === array.length - 1 ? array[0].x : array[index + 1].x,
-            y2: index === array.length - 1 ? array[0].y : array[index + 1].y,
-            width: 1,
-            zoomIndependent: true,
-            layer: "board",
-            _element: element
-          }))
-        );
-      } else {
-        primitives.push(
-          {
-            _pcb_drawing_object_id: `line_${globalPcbDrawingObjectCount++}`,
-            pcb_drawing_type: "line",
-            x1: center.x - width / 2,
-            y1: center.y - height / 2,
-            x2: center.x + width / 2,
-            y2: center.y - height / 2,
-            width: 1,
-            zoomIndependent: true,
-            layer: "board",
-            _element: element
-          },
-          {
-            _pcb_drawing_object_id: `line_${globalPcbDrawingObjectCount++}`,
-            pcb_drawing_type: "line",
-            x1: center.x - width / 2,
-            y1: center.y + height / 2,
-            x2: center.x + width / 2,
-            y2: center.y + height / 2,
-            width: 1,
-            zoomIndependent: true,
-            layer: "board",
-            _element: element
-          },
-          {
-            _pcb_drawing_object_id: `line_${globalPcbDrawingObjectCount++}`,
-            pcb_drawing_type: "line",
-            x1: center.x - width / 2,
-            y1: center.y - height / 2,
-            x2: center.x - width / 2,
-            y2: center.y + height / 2,
-            width: 1,
-            zoomIndependent: true,
-            layer: "board",
-            _element: element
-          },
-          {
-            _pcb_drawing_object_id: `line_${globalPcbDrawingObjectCount++}`,
-            pcb_drawing_type: "line",
-            x1: center.x + width / 2,
-            y1: center.y - height / 2,
-            x2: center.x + width / 2,
-            y2: center.y + height / 2,
-            width: 1,
-            zoomIndependent: true,
-            layer: "board",
-            _element: element
-          }
-        );
-      }
-      return primitives;
-    }
     case "pcb_smtpad": {
       const metadata = {
         _parent_pcb_component,
@@ -7526,64 +7412,6 @@ var convertElementToPrimitives = (element, allElements) => {
       }
       return [];
     }
-    case "pcb_hole": {
-      if (element.hole_shape === "circle" || !element.hole_shape) {
-        const { x, y, hole_diameter } = element;
-        return [
-          {
-            _pcb_drawing_object_id: `circle_${globalPcbDrawingObjectCount++}`,
-            pcb_drawing_type: "circle",
-            x,
-            y,
-            r: hole_diameter / 2,
-            layer: "drill",
-            _element: element,
-            _parent_pcb_component,
-            _parent_source_component
-          }
-        ];
-      } else if (element.hole_shape === "pill" || element.hole_shape === "rotated_pill") {
-        const { x, y, hole_width, hole_height } = element;
-        if (typeof hole_width !== "number" || typeof hole_height !== "number") {
-          return [];
-        }
-        return [
-          {
-            _pcb_drawing_object_id: `pill_${globalPcbDrawingObjectCount++}`,
-            pcb_drawing_type: "pill",
-            x,
-            y,
-            w: hole_width,
-            h: hole_height,
-            layer: "drill",
-            _element: element,
-            _parent_pcb_component,
-            _parent_source_component,
-            ccw_rotation: element.ccw_rotation
-          }
-        ];
-      } else if (element.hole_shape === "rect") {
-        const { x, y, hole_width, hole_height } = element;
-        if (typeof hole_width !== "number" || typeof hole_height !== "number") {
-          return [];
-        }
-        return [
-          {
-            _pcb_drawing_object_id: `rect_${globalPcbDrawingObjectCount++}`,
-            pcb_drawing_type: "rect",
-            x,
-            y,
-            w: hole_width,
-            h: hole_height,
-            layer: "drill",
-            _element: element,
-            _parent_pcb_component,
-            _parent_source_component
-          }
-        ];
-      }
-      return [];
-    }
     case "pcb_keepout": {
       if (element.shape === "circle") {
         const { center, radius } = element;
@@ -9084,6 +8912,30 @@ function drawPcbNoteElementsForLayer(canvas, elements, layers, realToCanvasMat)
   drawer.drawElements(pcbNoteElements, { layers });
 }
 
+// src/lib/draw-hole.ts
+import { CircuitToCanvasDrawer as CircuitToCanvasDrawer5 } from "circuit-to-canvas";
+function isPcbHole(element) {
+  return element.type === "pcb_hole";
+}
+function drawPcbHoleElementsForLayer(canvas, elements, layers, realToCanvasMat) {
+  const drawer = new CircuitToCanvasDrawer5(canvas);
+  drawer.realToCanvasMat = realToCanvasMat;
+  const holeElements = elements.filter(isPcbHole);
+  drawer.drawElements(holeElements, { layers });
+}
+
+// src/lib/draw-pcb-board.ts
+import { CircuitToCanvasDrawer as CircuitToCanvasDrawer6 } from "circuit-to-canvas";
+function isPcbBoardElement(element) {
+  return element.type === "pcb_board";
+}
+function drawPcbBoardElements(canvas, elements, layers, realToCanvasMat) {
+  const drawer = new CircuitToCanvasDrawer6(canvas);
+  drawer.realToCanvasMat = realToCanvasMat;
+  const pcbBoardElements = elements.filter(isPcbBoardElement);
+  drawer.drawElements(pcbBoardElements, { layers });
+}
+
 // src/components/CanvasPrimitiveRenderer.tsx
 import { jsx as jsx3, jsxs } from "react/jsx-runtime";
 var orderedLayers = [
@@ -9137,7 +8989,7 @@ var CanvasPrimitiveRenderer = ({
     if (transform) drawer.transform = transform;
     drawer.clear();
     drawer.foregroundLayer = selectedLayer;
-    const filteredPrimitives = isShowingSolderMask ? primitives : primitives.filter((p) => !p.layer?.includes("soldermask"));
+    const filteredPrimitives = primitives.filter((p) => isShowingSolderMask || !p.layer?.includes("soldermask")).filter((p) => p.layer !== "board");
     drawPrimitives(drawer, filteredPrimitives);
     if (transform) {
       const topCanvas = canvasRefs.current.top;
@@ -9202,6 +9054,14 @@ var CanvasPrimitiveRenderer = ({
           transform
         );
       }
+      const drillCanvas = canvasRefs.current.drill;
+      if (drillCanvas) {
+        drawPcbHoleElementsForLayer(drillCanvas, elements, ["drill"], transform);
+      }
+      const boardCanvas = canvasRefs.current.board;
+      if (boardCanvas) {
+        drawPcbBoardElements(boardCanvas, elements, [], transform);
+      }
     }
     drawer.orderAndFadeLayers();
   }, [primitives, elements, transform, selectedLayer, isShowingSolderMask]);
@@ -13239,7 +13099,7 @@ import { css as css3 } from "@emotion/css";
 // package.json
 var package_default = {
   name: "@tscircuit/pcb-viewer",
-  version: "1.11.300",
+  version: "1.11.302",
   main: "dist/index.js",
   type: "module",
   repository: "tscircuit/pcb-viewer",
@@ -13292,7 +13152,7 @@ var package_default = {
     "@tscircuit/alphabet": "^0.0.9",
     "@tscircuit/math-utils": "^0.0.29",
     "@vitejs/plugin-react": "^5.0.2",
-    "circuit-json": "^0.0.351",
+    "circuit-json": "^0.0.353",
     "circuit-to-canvas": "^0.0.37",
     "circuit-to-svg": "^0.0.271",
     color: "^4.2.3",