@tscircuit/pcb-viewer 1.11.307 → 1.11.309

package/dist/index.js

@@ -7412,43 +7412,6 @@ var convertElementToPrimitives = (element, allElements) => {
       }
       return [];
     }
-    case "pcb_keepout": {
-      if (element.shape === "circle") {
-        const { center, radius } = element;
-        return [
-          {
-            _pcb_drawing_object_id: `circle_${globalPcbDrawingObjectCount++}`,
-            pcb_drawing_type: "circle",
-            x: center.x,
-            y: center.y,
-            r: radius,
-            layer: "top",
-            _element: element,
-            _parent_pcb_component,
-            _parent_source_component,
-            mesh_fill: true
-          }
-        ];
-      } else if (element.shape === "rect") {
-        const { center, width, height } = element;
-        return [
-          {
-            _pcb_drawing_object_id: `rect_${globalPcbDrawingObjectCount++}`,
-            pcb_drawing_type: "rect",
-            x: center.x,
-            y: center.y,
-            w: width,
-            h: height,
-            layer: "top",
-            _element: element,
-            _parent_pcb_component,
-            _parent_source_component,
-            mesh_fill: true
-          }
-        ];
-      }
-      break;
-    }
     case "pcb_trace": {
       const primitives = [];
       if (element.route_thickness_mode === "interpolated") {
@@ -8586,23 +8549,23 @@ var Drawer = class {
   }
   applyAperture() {
     const { transform, aperture } = this;
-    let { size, mode, color: color4, fontSize, layer } = aperture;
+    let { size, mode, color: color5, fontSize, layer } = aperture;
     if (!(layer in this.ctxLayerMap)) this.aperture.layer = "other";
     const ctx = this.getLayerCtx();
     if (!ctx) {
       throw new Error(`No context for layer "${this.foregroundLayer}"`);
     }
-    if (!color4) color4 = "undefined";
+    if (!color5) color5 = "undefined";
     ctx.lineWidth = scaleOnly(transform, size);
     ctx.lineCap = "round";
     if (mode === "add") {
       ctx.globalCompositeOperation = "source-over";
-      let colorString = LAYER_NAME_TO_COLOR[color4.toLowerCase()];
+      let colorString = LAYER_NAME_TO_COLOR[color5.toLowerCase()];
       if (!colorString)
         try {
-          colorString = colorParser(color4).rgb().toString();
+          colorString = colorParser(color5).rgb().toString();
         } catch (error) {
-          console.warn(`Invalid color format: '${color4}'`);
+          console.warn(`Invalid color format: '${color5}'`);
           colorString = "white";
         }
       ctx.fillStyle = colorString;
@@ -9318,6 +9281,79 @@ function drawPcbSmtPadElementsForLayer({
   }
 }
 
+// src/lib/draw-pcb-keepout.ts
+import { CircuitToCanvasDrawer as CircuitToCanvasDrawer9 } from "circuit-to-canvas";
+function isPcbKeepout(element) {
+  return element.type === "pcb_keepout";
+}
+function drawPcbKeepoutElementsForLayer({
+  canvas,
+  elements,
+  layers,
+  realToCanvasMat
+}) {
+  const keepoutElements = elements.filter(isPcbKeepout);
+  if (keepoutElements.length === 0) return;
+  const drawer = new CircuitToCanvasDrawer9(canvas);
+  drawer.realToCanvasMat = realToCanvasMat;
+  drawer.drawElements(keepoutElements, { layers: [] });
+}
+
+// src/lib/draw-via.ts
+import {
+  DEFAULT_PCB_COLOR_MAP as DEFAULT_PCB_COLOR_MAP6,
+  CircuitToCanvasDrawer as CircuitToCanvasDrawer10
+} from "circuit-to-canvas";
+import color4 from "color";
+var HOVER_COLOR_MAP3 = {
+  ...DEFAULT_PCB_COLOR_MAP6,
+  copper: {
+    ...DEFAULT_PCB_COLOR_MAP6.copper,
+    top: color4(colors_default.board.pad_front).lighten(0.5).toString(),
+    bottom: color4(colors_default.board.pad_back).lighten(0.5).toString()
+  }
+};
+function isPcbVia(element) {
+  return element.type === "pcb_via";
+}
+function drawPcbViaElementsForLayer({
+  canvas,
+  elements,
+  layers,
+  realToCanvasMat,
+  primitives
+}) {
+  const viaElements = elements.filter(isPcbVia).filter((element) => {
+    return layers.some((layer) => layer.includes("copper"));
+  });
+  if (viaElements.length === 0) return;
+  const highlightedElementIds = /* @__PURE__ */ new Set();
+  if (primitives) {
+    for (const primitive of primitives) {
+      if ((primitive.is_mouse_over || primitive.is_in_highlighted_net) && primitive._element?.type === "pcb_via") {
+        highlightedElementIds.add(primitive._element.pcb_via_id);
+      }
+    }
+  }
+  const highlightedElements = viaElements.filter(
+    (element) => highlightedElementIds.has(element.pcb_via_id)
+  );
+  const nonHighlightedElements = viaElements.filter(
+    (element) => !highlightedElementIds.has(element.pcb_via_id)
+  );
+  if (nonHighlightedElements.length > 0) {
+    const drawer = new CircuitToCanvasDrawer10(canvas);
+    drawer.realToCanvasMat = realToCanvasMat;
+    drawer.drawElements(nonHighlightedElements, { layers });
+  }
+  if (highlightedElements.length > 0) {
+    const highlightDrawer = new CircuitToCanvasDrawer10(canvas);
+    highlightDrawer.configure({ colorOverrides: HOVER_COLOR_MAP3 });
+    highlightDrawer.realToCanvasMat = realToCanvasMat;
+    highlightDrawer.drawElements(highlightedElements, { layers });
+  }
+}
+
 // src/components/CanvasPrimitiveRenderer.tsx
 import { jsx as jsx3, jsxs } from "react/jsx-runtime";
 var orderedLayers = [
@@ -9372,7 +9408,7 @@ var CanvasPrimitiveRenderer = ({
     if (transform) drawer.transform = transform;
     drawer.clear();
     drawer.foregroundLayer = selectedLayer;
-    const filteredPrimitives = primitives.filter((p) => isShowingSolderMask || !p.layer?.includes("soldermask")).filter((p) => p.layer !== "board").filter((p) => p._element?.type !== "pcb_smtpad").filter((p) => p._element?.type !== "pcb_plated_hole");
+    const filteredPrimitives = primitives.filter((p) => isShowingSolderMask || !p.layer?.includes("soldermask")).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");
     drawPrimitives(drawer, filteredPrimitives);
     if (transform) {
       const topCanvas = canvasRefs.current.top;
@@ -9413,6 +9449,24 @@ var CanvasPrimitiveRenderer = ({
           primitives
         });
       }
+      if (topCanvas) {
+        drawPcbViaElementsForLayer({
+          canvas: topCanvas,
+          elements,
+          layers: ["top_copper"],
+          realToCanvasMat: transform,
+          primitives
+        });
+      }
+      if (bottomCanvas) {
+        drawPcbViaElementsForLayer({
+          canvas: bottomCanvas,
+          elements,
+          layers: ["bottom_copper"],
+          realToCanvasMat: transform,
+          primitives
+        });
+      }
       const topSilkscreenCanvas = canvasRefs.current.top_silkscreen;
       if (topSilkscreenCanvas) {
         drawSilkscreenElementsForLayer(
@@ -9484,6 +9538,22 @@ var CanvasPrimitiveRenderer = ({
           transform
         );
       }
+      if (topCanvas) {
+        drawPcbKeepoutElementsForLayer({
+          canvas: topCanvas,
+          elements,
+          layers: ["top"],
+          realToCanvasMat: transform
+        });
+      }
+      if (bottomCanvas) {
+        drawPcbKeepoutElementsForLayer({
+          canvas: bottomCanvas,
+          elements,
+          layers: ["bottom"],
+          realToCanvasMat: transform
+        });
+      }
     }
     drawer.orderAndFadeLayers();
   }, [primitives, elements, transform, selectedLayer, isShowingSolderMask]);
@@ -12084,7 +12154,7 @@ var HighlightedPrimitiveBoxWithText = ({
   ];
   const si = primitive.same_space_index ?? 0;
   const sip = 26;
-  const color4 = layerColorHightlightMap[primitive?._element?.layer] ?? "red";
+  const color5 = layerColorHightlightMap[primitive?._element?.layer] ?? "red";
   let rotation = 0;
   if (primitiveElement.type === "pcb_smtpad" && primitiveElement?.shape === "rotated_rect") {
     rotation = primitiveElement?.ccw_rotation ?? 0;
@@ -12106,7 +12176,7 @@ var HighlightedPrimitiveBoxWithText = ({
           position: "absolute",
           left: mousePos.x,
           top: yOffset,
-          color: color4,
+          color: color5,
           pointerEvents: "none",
           transform: "translateX(-50%)"
         },
@@ -12146,7 +12216,7 @@ var HighlightedPrimitiveBoxWithText = ({
         top: y - h / 2 - 8,
         width: w + 16,
         height: h + 16,
-        color: color4,
+        color: color5,
         transform: `rotate(${-rotation}deg)`,
         transformOrigin: "center center"
       },
@@ -12162,7 +12232,7 @@ var HighlightedPrimitiveBoxWithText = ({
             height: finalState ? `calc(100% + ${sip * 2 * si}px)` : "100%",
             marginLeft: finalState ? `${-sip * si}px` : 0,
             marginTop: finalState ? `${-sip * si}px` : 0,
-            border: `1px solid ${color4}`,
+            border: `1px solid ${color5}`,
             opacity: finalState ? 1 : si === 0 ? 1 : 0,
             transition: "width 0.2s, height 0.2s, margin-left 0.2s, margin-top 0.2s, opacity 0.2s"
           },
@@ -13521,7 +13591,7 @@ import { css as css3 } from "@emotion/css";
 // package.json
 var package_default = {
   name: "@tscircuit/pcb-viewer",
-  version: "1.11.306",
+  version: "1.11.308",
   main: "dist/index.js",
   type: "module",
   repository: "tscircuit/pcb-viewer",
@@ -13575,7 +13645,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.29",
     "@vitejs/plugin-react": "^5.0.2",
     "circuit-json": "^0.0.353",
-    "circuit-to-canvas": "^0.0.41",
+    "circuit-to-canvas": "^0.0.43",
     "circuit-to-svg": "^0.0.271",
     color: "^4.2.3",
     "react-supergrid": "^1.0.10",