@tscircuit/pcb-viewer 1.11.391 → 1.11.393

package/dist/index.js

@@ -4852,23 +4852,23 @@ var Drawer = class {
   }
   applyAperture() {
     const { transform, aperture } = this;
-    let { size, mode, color: color7, fontSize, layer } = aperture;
+    let { size, mode, color: color8, 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 (!color7) color7 = "undefined";
+    if (!color8) color8 = "undefined";
     ctx.lineWidth = scaleOnly(transform, size);
     ctx.lineCap = "round";
     if (mode === "add") {
       ctx.globalCompositeOperation = "source-over";
-      let colorString = LAYER_NAME_TO_COLOR[color7.toLowerCase()];
+      let colorString = LAYER_NAME_TO_COLOR[color8.toLowerCase()];
       if (!colorString)
         try {
-          colorString = colorParser(color7).rgb().toString();
+          colorString = colorParser(color8).rgb().toString();
         } catch (error) {
-          console.warn(`Invalid color format: '${color7}'`);
+          console.warn(`Invalid color format: '${color8}'`);
           colorString = "white";
         }
       ctx.fillStyle = colorString;
@@ -5183,20 +5183,41 @@ function drawPcbCutoutElementsForLayer({
 
 // src/lib/draw-pcb-keepout.ts
 import { CircuitToCanvasDrawer as CircuitToCanvasDrawer8 } from "circuit-to-canvas";
+import color from "color";
 function isPcbKeepout(element) {
   return element.type === "pcb_keepout";
 }
+function getPcbKeepoutElementsForLayer({
+  elements,
+  layer
+}) {
+  return elements.filter(isPcbKeepout).filter((keepout) => keepout.layers.includes(layer));
+}
+function getPcbKeepoutColorForLayer(layer) {
+  return color(LAYER_NAME_TO_COLOR[layer]).lighten(0.4).hex();
+}
 function drawPcbKeepoutElementsForLayer({
   canvas,
   elements,
-  layers,
+  layer,
   realToCanvasMat
 }) {
-  const keepoutElements = elements.filter(isPcbKeepout);
+  const keepoutElements = getPcbKeepoutElementsForLayer({ elements, layer });
   if (keepoutElements.length === 0) return;
   const drawer = new CircuitToCanvasDrawer8(canvas);
+  const keepoutColor = getPcbKeepoutColorForLayer(layer);
+  drawer.configure({
+    colorOverrides: {
+      keepout: {
+        top: keepoutColor,
+        bottom: keepoutColor
+      }
+    }
+  });
   drawer.realToCanvasMat = realToCanvasMat;
-  drawer.drawElements(keepoutElements, { layers: [] });
+  drawer.drawElements(keepoutElements, {
+    layers: [getCopperRenderLayer(layer)]
+  });
 }
 
 // src/lib/draw-pcb-note.ts
@@ -5243,21 +5264,21 @@ import {
   CircuitToCanvasDrawer as CircuitToCanvasDrawer11,
   DEFAULT_PCB_COLOR_MAP as DEFAULT_PCB_COLOR_MAP4
 } from "circuit-to-canvas";
-import color from "color";
+import color2 from "color";
 var HOVER_COLOR_MAP = {
   ...DEFAULT_PCB_COLOR_MAP4,
   copper: {
     ...DEFAULT_PCB_COLOR_MAP4.copper,
-    top: color(colors_default.board.pad_front).lighten(0.5).toString(),
-    bottom: color(colors_default.board.pad_back).lighten(0.5).toString(),
-    inner1: color(colors_default.board.copper.in1).lighten(0.5).toString(),
-    inner2: color(colors_default.board.copper.in2).lighten(0.5).toString(),
-    inner3: color(colors_default.board.copper.in3).lighten(0.5).toString(),
-    inner4: color(colors_default.board.copper.in4).lighten(0.5).toString(),
-    inner5: color(colors_default.board.copper.in5).lighten(0.5).toString(),
-    inner6: color(colors_default.board.copper.in6).lighten(0.5).toString(),
-    inner7: color(colors_default.board.copper.in7).lighten(0.5).toString(),
-    inner8: color(colors_default.board.copper.in8).lighten(0.5).toString()
+    top: color2(colors_default.board.pad_front).lighten(0.5).toString(),
+    bottom: color2(colors_default.board.pad_back).lighten(0.5).toString(),
+    inner1: color2(colors_default.board.copper.in1).lighten(0.5).toString(),
+    inner2: color2(colors_default.board.copper.in2).lighten(0.5).toString(),
+    inner3: color2(colors_default.board.copper.in3).lighten(0.5).toString(),
+    inner4: color2(colors_default.board.copper.in4).lighten(0.5).toString(),
+    inner5: color2(colors_default.board.copper.in5).lighten(0.5).toString(),
+    inner6: color2(colors_default.board.copper.in6).lighten(0.5).toString(),
+    inner7: color2(colors_default.board.copper.in7).lighten(0.5).toString(),
+    inner8: color2(colors_default.board.copper.in8).lighten(0.5).toString()
   }
 };
 function isPcbSmtPad(element) {
@@ -5309,13 +5330,13 @@ import {
   CircuitToCanvasDrawer as CircuitToCanvasDrawer12,
   DEFAULT_PCB_COLOR_MAP as DEFAULT_PCB_COLOR_MAP5
 } from "circuit-to-canvas";
-import color2 from "color";
+import color3 from "color";
 var HOVER_COLOR_MAP2 = {
   ...DEFAULT_PCB_COLOR_MAP5,
   copper: Object.fromEntries(
     Object.entries(DEFAULT_PCB_COLOR_MAP5.copper).map(([layer, layerColor]) => [
       layer,
-      color2(layerColor).lighten(0.5).toString()
+      color3(layerColor).lighten(0.5).toString()
     ])
   )
 };
@@ -5418,21 +5439,21 @@ import {
   CircuitToCanvasDrawer as CircuitToCanvasDrawer13,
   DEFAULT_PCB_COLOR_MAP as DEFAULT_PCB_COLOR_MAP6
 } from "circuit-to-canvas";
-import color3 from "color";
+import color4 from "color";
 var HOVER_COLOR_MAP3 = {
   ...DEFAULT_PCB_COLOR_MAP6,
   copper: {
     ...DEFAULT_PCB_COLOR_MAP6.copper,
-    top: color3(colors_default.board.pad_front).lighten(0.5).toString(),
-    bottom: color3(colors_default.board.pad_back).lighten(0.5).toString(),
-    inner1: color3(colors_default.board.copper.in1).lighten(0.5).toString(),
-    inner2: color3(colors_default.board.copper.in2).lighten(0.5).toString(),
-    inner3: color3(colors_default.board.copper.in3).lighten(0.5).toString(),
-    inner4: color3(colors_default.board.copper.in4).lighten(0.5).toString(),
-    inner5: color3(colors_default.board.copper.in5).lighten(0.5).toString(),
-    inner6: color3(colors_default.board.copper.in6).lighten(0.5).toString(),
-    inner7: color3(colors_default.board.copper.in7).lighten(0.5).toString(),
-    inner8: color3(colors_default.board.copper.in8).lighten(0.5).toString()
+    top: color4(colors_default.board.pad_front).lighten(0.5).toString(),
+    bottom: color4(colors_default.board.pad_back).lighten(0.5).toString(),
+    inner1: color4(colors_default.board.copper.in1).lighten(0.5).toString(),
+    inner2: color4(colors_default.board.copper.in2).lighten(0.5).toString(),
+    inner3: color4(colors_default.board.copper.in3).lighten(0.5).toString(),
+    inner4: color4(colors_default.board.copper.in4).lighten(0.5).toString(),
+    inner5: color4(colors_default.board.copper.in5).lighten(0.5).toString(),
+    inner6: color4(colors_default.board.copper.in6).lighten(0.5).toString(),
+    inner7: color4(colors_default.board.copper.in7).lighten(0.5).toString(),
+    inner8: color4(colors_default.board.copper.in8).lighten(0.5).toString()
   }
 };
 function isPlatedHole(element) {
@@ -5594,11 +5615,11 @@ var convertTextToLines = (text) => {
 };
 
 // src/lib/draw-primitives.ts
-import color4 from "color";
+import color5 from "color";
 function getColor(primitive) {
   const explicitColor = primitive.color;
   const baseColorString = explicitColor ?? LAYER_NAME_TO_COLOR[primitive.layer];
-  let c = color4(baseColorString);
+  let c = color5(baseColorString);
   if (primitive._element?.type === "pcb_copper_pour") {
     c = c.alpha(0.7);
   }
@@ -5906,26 +5927,26 @@ import {
   CircuitToCanvasDrawer as CircuitToCanvasDrawer15,
   DEFAULT_PCB_COLOR_MAP as DEFAULT_PCB_COLOR_MAP8
 } from "circuit-to-canvas";
-import color5 from "color";
+import color6 from "color";
 var HOVER_SOLDERMASK_COLOR_MAP = {
   ...DEFAULT_PCB_COLOR_MAP8,
   copper: {
     ...DEFAULT_PCB_COLOR_MAP8.copper,
-    top: color5(colors_default.board.pad_front).lighten(0.5).toString(),
-    bottom: color5(colors_default.board.pad_back).lighten(0.5).toString(),
-    inner1: color5(colors_default.board.copper.in1).lighten(0.5).toString(),
-    inner2: color5(colors_default.board.copper.in2).lighten(0.5).toString(),
-    inner3: color5(colors_default.board.copper.in3).lighten(0.5).toString(),
-    inner4: color5(colors_default.board.copper.in4).lighten(0.5).toString(),
-    inner5: color5(colors_default.board.copper.in5).lighten(0.5).toString(),
-    inner6: color5(colors_default.board.copper.in6).lighten(0.5).toString(),
-    inner7: color5(colors_default.board.copper.in7).lighten(0.5).toString(),
-    inner8: color5(colors_default.board.copper.in8).lighten(0.5).toString()
+    top: color6(colors_default.board.pad_front).lighten(0.5).toString(),
+    bottom: color6(colors_default.board.pad_back).lighten(0.5).toString(),
+    inner1: color6(colors_default.board.copper.in1).lighten(0.5).toString(),
+    inner2: color6(colors_default.board.copper.in2).lighten(0.5).toString(),
+    inner3: color6(colors_default.board.copper.in3).lighten(0.5).toString(),
+    inner4: color6(colors_default.board.copper.in4).lighten(0.5).toString(),
+    inner5: color6(colors_default.board.copper.in5).lighten(0.5).toString(),
+    inner6: color6(colors_default.board.copper.in6).lighten(0.5).toString(),
+    inner7: color6(colors_default.board.copper.in7).lighten(0.5).toString(),
+    inner8: color6(colors_default.board.copper.in8).lighten(0.5).toString()
   },
   soldermask: {
     ...DEFAULT_PCB_COLOR_MAP8.soldermask,
-    top: color5(colors_default.board.soldermask.top).lighten(0.35).toString(),
-    bottom: color5(colors_default.board.soldermask.bottom).lighten(0.35).toString()
+    top: color6(colors_default.board.soldermask.top).lighten(0.35).toString(),
+    bottom: color6(colors_default.board.soldermask.bottom).lighten(0.35).toString()
   }
 };
 function drawSoldermaskElementsForLayer({
@@ -6006,21 +6027,21 @@ import {
   DEFAULT_PCB_COLOR_MAP as DEFAULT_PCB_COLOR_MAP9,
   CircuitToCanvasDrawer as CircuitToCanvasDrawer16
 } from "circuit-to-canvas";
-import color6 from "color";
+import color7 from "color";
 var HOVER_COLOR_MAP4 = {
   ...DEFAULT_PCB_COLOR_MAP9,
   copper: {
     ...DEFAULT_PCB_COLOR_MAP9.copper,
-    top: color6(colors_default.board.pad_front).lighten(0.5).toString(),
-    bottom: color6(colors_default.board.pad_back).lighten(0.5).toString(),
-    inner1: color6(colors_default.board.copper.in1).lighten(0.5).toString(),
-    inner2: color6(colors_default.board.copper.in2).lighten(0.5).toString(),
-    inner3: color6(colors_default.board.copper.in3).lighten(0.5).toString(),
-    inner4: color6(colors_default.board.copper.in4).lighten(0.5).toString(),
-    inner5: color6(colors_default.board.copper.in5).lighten(0.5).toString(),
-    inner6: color6(colors_default.board.copper.in6).lighten(0.5).toString(),
-    inner7: color6(colors_default.board.copper.in7).lighten(0.5).toString(),
-    inner8: color6(colors_default.board.copper.in8).lighten(0.5).toString()
+    top: color7(colors_default.board.pad_front).lighten(0.5).toString(),
+    bottom: color7(colors_default.board.pad_back).lighten(0.5).toString(),
+    inner1: color7(colors_default.board.copper.in1).lighten(0.5).toString(),
+    inner2: color7(colors_default.board.copper.in2).lighten(0.5).toString(),
+    inner3: color7(colors_default.board.copper.in3).lighten(0.5).toString(),
+    inner4: color7(colors_default.board.copper.in4).lighten(0.5).toString(),
+    inner5: color7(colors_default.board.copper.in5).lighten(0.5).toString(),
+    inner6: color7(colors_default.board.copper.in6).lighten(0.5).toString(),
+    inner7: color7(colors_default.board.copper.in7).lighten(0.5).toString(),
+    inner8: color7(colors_default.board.copper.in8).lighten(0.5).toString()
   }
 };
 function isPcbVia(element) {
@@ -6068,6 +6089,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";
@@ -6104,13 +6141,14 @@ 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 topCanvas = canvasRefs.current.top;
-      const bottomCanvas = canvasRefs.current.bottom;
       const copperLayers = getCopperLayerRefsFromElements(elements).map((layer) => ({
         canvas: canvasRefs.current[layer],
         layer,
@@ -6322,16 +6360,12 @@ var CanvasPrimitiveRenderer = ({
           realToCanvasMat: transform
         });
       }
-      const keepoutLayers = [
-        { canvas: topCanvas, layer: "top" },
-        { canvas: bottomCanvas, layer: "bottom" }
-      ];
-      for (const { canvas, layer } of keepoutLayers) {
+      for (const { canvas, layer } of copperLayers) {
         if (!canvas) continue;
         drawPcbKeepoutElementsForLayer({
           canvas,
           elements,
-          layers: [layer],
+          layer,
           realToCanvasMat: transform
         });
       }
@@ -7023,10 +7057,10 @@ function drawGraphicsToCanvas(graphics, target, options = {}) {
       const geometry = getArrowGeometry(arrow);
       const shaftStart = applyToPoint7(matrix, geometry.shaftStart);
       const shaftEnd = applyToPoint7(matrix, geometry.shaftEnd);
-      const color7 = arrow.color || defaultColors[arrowIndex % defaultColors.length];
+      const color8 = arrow.color || defaultColors[arrowIndex % defaultColors.length];
       const scaleFactor = Math.hypot(matrix.a, matrix.b);
-      ctx.strokeStyle = color7;
-      ctx.fillStyle = color7;
+      ctx.strokeStyle = color8;
+      ctx.fillStyle = color8;
       ctx.lineWidth = geometry.shaftWidth * (scaleFactor || 1);
       ctx.lineCap = "round";
       ctx.setLineDash([]);
@@ -7060,7 +7094,7 @@ function drawGraphicsToCanvas(graphics, target, options = {}) {
         normalPadding: 12,
         alongOffset: arrow.inlineLabel ? -alongSeparation : 0
       });
-      ctx.fillStyle = color7;
+      ctx.fillStyle = color8;
       ctx.font = `${fontSize}px sans-serif`;
       if (!labelsDisabled && arrow.label) {
         const labelX = arrowLabelLayout.x;
@@ -9787,7 +9821,7 @@ var HighlightedPrimitiveBoxWithText = ({
   ];
   const si = primitive.same_space_index ?? 0;
   const sip = 26;
-  const color7 = layerColorHightlightMap[primitive?._element?.layer] ?? "red";
+  const color8 = layerColorHightlightMap[primitive?._element?.layer] ?? "red";
   let rotation = 0;
   if (primitiveElement.type === "pcb_smtpad" && primitiveElement?.shape === "rotated_rect") {
     rotation = primitiveElement?.ccw_rotation ?? 0;
@@ -9808,7 +9842,7 @@ var HighlightedPrimitiveBoxWithText = ({
           position: "absolute",
           left: mousePos.x + 12,
           top: mousePos.y + 12,
-          color: color7,
+          color: color8,
           pointerEvents: "none"
         },
         children: /* @__PURE__ */ jsxs9(
@@ -9858,7 +9892,7 @@ var HighlightedPrimitiveBoxWithText = ({
         top: y - h / 2 - 8,
         width: w + 16,
         height: h + 16,
-        color: color7,
+        color: color8,
         transform: `rotate(${-rotation}deg)`,
         transformOrigin: "center center"
       },
@@ -9874,7 +9908,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 ${color7}`,
+            border: `1px solid ${color8}`,
             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"
           },
@@ -10602,7 +10636,7 @@ import { css as css2 } from "@emotion/css";
 // package.json
 var package_default = {
   name: "@tscircuit/pcb-viewer",
-  version: "1.11.390",
+  version: "1.11.392",
   main: "dist/index.js",
   type: "module",
   repository: {