@tscircuit/pcb-viewer 1.11.315 → 1.11.317

package/dist/index.js

@@ -7846,10 +7846,6 @@ var convertElementToPrimitives = (element, allElements) => {
   return [];
 };
 
-// src/components/CanvasPrimitiveRenderer.tsx
-import { SuperGrid, toMMSI } from "react-supergrid";
-import { useEffect as useEffect4, useRef as useRef2 } from "react";
-
 // src/lib/Drawer.ts
 import {
   applyToPoint as applyToPoint3,
@@ -8621,6 +8617,265 @@ var Drawer = class {
   }
 };
 
+// src/lib/draw-copper-pour.ts
+import { CircuitToCanvasDrawer } from "circuit-to-canvas";
+function isCopperPourElement(element) {
+  return element.type === "pcb_copper_pour";
+}
+function drawCopperPourElementsForLayer({
+  canvas,
+  elements,
+  layers,
+  realToCanvasMat
+}) {
+  const copperPourElements = elements.filter(isCopperPourElement);
+  if (copperPourElements.length === 0) return;
+  const drawer = new CircuitToCanvasDrawer(canvas);
+  drawer.realToCanvasMat = realToCanvasMat;
+  drawer.drawElements(copperPourElements, { layers });
+}
+
+// src/lib/draw-fabrication-note.ts
+import {
+  CircuitToCanvasDrawer as CircuitToCanvasDrawer2,
+  DEFAULT_PCB_COLOR_MAP
+} from "circuit-to-canvas";
+var PCB_VIEWER_COLOR_MAP = {
+  ...DEFAULT_PCB_COLOR_MAP,
+  silkscreen: {
+    top: colors_default.board.f_fab,
+    bottom: colors_default.board.b_fab
+  }
+};
+function isFabricationNote(element) {
+  return element.type.includes("pcb_fabrication_note");
+}
+function drawFabricationNoteElementsForLayer({
+  canvas,
+  elements,
+  layers,
+  realToCanvasMat
+}) {
+  const drawer = new CircuitToCanvasDrawer2(canvas);
+  drawer.configure({
+    colorOverrides: PCB_VIEWER_COLOR_MAP
+  });
+  drawer.realToCanvasMat = realToCanvasMat;
+  const fabricationElements = elements.filter(isFabricationNote);
+  drawer.drawElements(fabricationElements, { layers });
+}
+
+// src/lib/draw-hole.ts
+import { CircuitToCanvasDrawer as CircuitToCanvasDrawer3 } from "circuit-to-canvas";
+function isPcbHole(element) {
+  return element.type === "pcb_hole";
+}
+function drawPcbHoleElementsForLayer({
+  canvas,
+  elements,
+  layers,
+  realToCanvasMat,
+  drawSoldermask
+}) {
+  const drawer = new CircuitToCanvasDrawer3(canvas);
+  drawer.realToCanvasMat = realToCanvasMat;
+  const holeElements = elements.filter(isPcbHole);
+  drawer.drawElements(holeElements, { layers, drawSoldermask });
+}
+
+// src/lib/draw-pcb-board.ts
+import { CircuitToCanvasDrawer as CircuitToCanvasDrawer4 } from "circuit-to-canvas";
+function isPcbBoardElement(element) {
+  return element.type === "pcb_board";
+}
+function drawPcbBoardElements({
+  canvas,
+  elements,
+  layers,
+  realToCanvasMat,
+  drawSoldermask
+}) {
+  const drawer = new CircuitToCanvasDrawer4(canvas);
+  drawer.realToCanvasMat = realToCanvasMat;
+  const pcbBoardElements = elements.filter(isPcbBoardElement);
+  drawer.drawElements(pcbBoardElements, { layers, drawSoldermask });
+}
+
+// src/lib/draw-pcb-cutout.ts
+import { CircuitToCanvasDrawer as CircuitToCanvasDrawer5 } from "circuit-to-canvas";
+function isPcbCutout(element) {
+  return element.type === "pcb_cutout";
+}
+function drawPcbCutoutElementsForLayer({
+  canvas,
+  elements,
+  layers,
+  realToCanvasMat
+}) {
+  const drawer = new CircuitToCanvasDrawer5(canvas);
+  drawer.realToCanvasMat = realToCanvasMat;
+  const cutoutElements = elements.filter(isPcbCutout);
+  drawer.drawElements(cutoutElements, { layers });
+}
+
+// src/lib/draw-pcb-keepout.ts
+import { CircuitToCanvasDrawer as CircuitToCanvasDrawer6 } 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 CircuitToCanvasDrawer6(canvas);
+  drawer.realToCanvasMat = realToCanvasMat;
+  drawer.drawElements(keepoutElements, { layers: [] });
+}
+
+// src/lib/draw-pcb-note.ts
+import {
+  CircuitToCanvasDrawer as CircuitToCanvasDrawer7
+} from "circuit-to-canvas";
+function isPcbNote(element) {
+  return element.type.startsWith("pcb_note_");
+}
+function drawPcbNoteElementsForLayer({
+  canvas,
+  elements,
+  layers,
+  realToCanvasMat
+}) {
+  const drawer = new CircuitToCanvasDrawer7(canvas);
+  drawer.realToCanvasMat = realToCanvasMat;
+  const pcbNoteElements = elements.filter(isPcbNote);
+  drawer.drawElements(pcbNoteElements, { layers });
+}
+
+// src/lib/draw-pcb-smtpad.ts
+import {
+  CircuitToCanvasDrawer as CircuitToCanvasDrawer8,
+  DEFAULT_PCB_COLOR_MAP as DEFAULT_PCB_COLOR_MAP3
+} from "circuit-to-canvas";
+import color from "color";
+var HOVER_COLOR_MAP = {
+  ...DEFAULT_PCB_COLOR_MAP3,
+  copper: {
+    ...DEFAULT_PCB_COLOR_MAP3.copper,
+    top: color(colors_default.board.pad_front).lighten(0.5).toString(),
+    bottom: color(colors_default.board.pad_back).lighten(0.5).toString()
+  }
+};
+function isPcbSmtPad(element) {
+  return element.type === "pcb_smtpad";
+}
+function drawPcbSmtPadElementsForLayer({
+  canvas,
+  elements,
+  layers,
+  realToCanvasMat,
+  primitives,
+  drawSoldermask
+}) {
+  const smtPadElements = elements.filter(isPcbSmtPad).filter((element) => {
+    const elementLayer = element.layer;
+    return layers.some((layer) => {
+      if (layer === "top_copper" && elementLayer === "top") return true;
+      if (layer === "bottom_copper" && elementLayer === "bottom") return true;
+      return false;
+    });
+  });
+  if (smtPadElements.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_smtpad") {
+        highlightedElementIds.add(primitive._element.pcb_smtpad_id);
+      }
+    }
+  }
+  const highlightedElements = smtPadElements.filter(
+    (element) => highlightedElementIds.has(element.pcb_smtpad_id)
+  );
+  const nonHighlightedElements = smtPadElements.filter(
+    (element) => !highlightedElementIds.has(element.pcb_smtpad_id)
+  );
+  if (nonHighlightedElements.length > 0) {
+    const drawer = new CircuitToCanvasDrawer8(canvas);
+    drawer.realToCanvasMat = realToCanvasMat;
+    drawer.drawElements(nonHighlightedElements, { layers: [], drawSoldermask });
+  }
+  if (highlightedElements.length > 0) {
+    const highlightDrawer = new CircuitToCanvasDrawer8(canvas);
+    highlightDrawer.configure({ colorOverrides: HOVER_COLOR_MAP });
+    highlightDrawer.realToCanvasMat = realToCanvasMat;
+    highlightDrawer.drawElements(highlightedElements, {
+      layers: [],
+      drawSoldermask
+    });
+  }
+}
+
+// src/lib/draw-plated-hole.ts
+import {
+  CircuitToCanvasDrawer as CircuitToCanvasDrawer9,
+  DEFAULT_PCB_COLOR_MAP as DEFAULT_PCB_COLOR_MAP4
+} from "circuit-to-canvas";
+import color2 from "color";
+var HOVER_COLOR_MAP2 = {
+  ...DEFAULT_PCB_COLOR_MAP4,
+  copper: {
+    ...DEFAULT_PCB_COLOR_MAP4.copper,
+    top: color2(colors_default.board.pad_front).lighten(0.5).toString(),
+    bottom: color2(colors_default.board.pad_back).lighten(0.5).toString()
+  }
+};
+function isPlatedHole(element) {
+  return element.type === "pcb_plated_hole";
+}
+function drawPlatedHolePads({
+  canvas,
+  elements,
+  layers,
+  realToCanvasMat,
+  primitives,
+  drawSoldermask
+}) {
+  const platedHoleElements = elements.filter(isPlatedHole);
+  if (platedHoleElements.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_plated_hole") {
+        highlightedElementIds.add(primitive._element.pcb_plated_hole_id);
+      }
+    }
+  }
+  const highlightedElements = platedHoleElements.filter(
+    (element) => highlightedElementIds.has(element.pcb_plated_hole_id)
+  );
+  const nonHighlightedElements = platedHoleElements.filter(
+    (element) => !highlightedElementIds.has(element.pcb_plated_hole_id)
+  );
+  if (nonHighlightedElements.length > 0) {
+    const drawer = new CircuitToCanvasDrawer9(canvas);
+    drawer.realToCanvasMat = realToCanvasMat;
+    drawer.drawElements(nonHighlightedElements, { layers, drawSoldermask });
+  }
+  if (highlightedElements.length > 0) {
+    const highlightDrawer = new CircuitToCanvasDrawer9(canvas);
+    highlightDrawer.configure({ colorOverrides: HOVER_COLOR_MAP2 });
+    highlightDrawer.realToCanvasMat = realToCanvasMat;
+    highlightDrawer.drawElements(highlightedElements, {
+      layers,
+      drawSoldermask
+    });
+  }
+}
+
 // src/lib/util/rotate-text.ts
 import { compose as compose4, translate as translate8, rotate, applyToPoint as applyToPoint4 } from "transformation-matrix";
 function rotateText(rotateTextParams) {
@@ -8737,11 +8992,11 @@ var convertTextToLines = (text) => {
 };
 
 // src/lib/draw-primitives.ts
-import color from "color";
+import color3 from "color";
 function getColor(primitive) {
   const explicitColor = primitive.color;
   const baseColorString = explicitColor ?? LAYER_NAME_TO_COLOR[primitive.layer];
-  let c = color(baseColorString);
+  let c = color3(baseColorString);
   if (primitive._element?.type === "pcb_copper_pour") {
     c = c.alpha(0.7);
   }
@@ -9016,11 +9271,11 @@ var drawPrimitives = (drawer, primitives) => {
 
 // src/lib/draw-silkscreen.ts
 import {
-  DEFAULT_PCB_COLOR_MAP,
-  CircuitToCanvasDrawer
+  CircuitToCanvasDrawer as CircuitToCanvasDrawer10,
+  DEFAULT_PCB_COLOR_MAP as DEFAULT_PCB_COLOR_MAP5
 } from "circuit-to-canvas";
-var PCB_VIEWER_COLOR_MAP = {
-  ...DEFAULT_PCB_COLOR_MAP,
+var PCB_VIEWER_COLOR_MAP2 = {
+  ...DEFAULT_PCB_COLOR_MAP5,
   silkscreen: {
     top: colors_default.board.f_silks,
     bottom: colors_default.board.b_silks
@@ -9029,226 +9284,25 @@ var PCB_VIEWER_COLOR_MAP = {
 function isSilkscreenElement(element) {
   return element.type.includes("pcb_silkscreen");
 }
-function drawSilkscreenElementsForLayer(canvas, elements, layers, realToCanvasMat) {
-  const drawer = new CircuitToCanvasDrawer(canvas);
-  drawer.configure({
-    colorOverrides: PCB_VIEWER_COLOR_MAP
-  });
-  drawer.realToCanvasMat = realToCanvasMat;
-  const silkscreenElements = elements.filter(isSilkscreenElement);
-  drawer.drawElements(silkscreenElements, { layers });
-}
-
-// src/lib/draw-plated-hole.ts
-import {
-  DEFAULT_PCB_COLOR_MAP as DEFAULT_PCB_COLOR_MAP2,
-  CircuitToCanvasDrawer as CircuitToCanvasDrawer2
-} from "circuit-to-canvas";
-import color2 from "color";
-var HOVER_COLOR_MAP = {
-  ...DEFAULT_PCB_COLOR_MAP2,
-  copper: {
-    ...DEFAULT_PCB_COLOR_MAP2.copper,
-    top: color2(colors_default.board.pad_front).lighten(0.5).toString(),
-    bottom: color2(colors_default.board.pad_back).lighten(0.5).toString()
-  }
-};
-function isPlatedHole(element) {
-  return element.type === "pcb_plated_hole";
-}
-function drawPlatedHolePads({
+function drawSilkscreenElementsForLayer({
   canvas,
   elements,
   layers,
-  realToCanvasMat,
-  primitives
+  realToCanvasMat
 }) {
-  const platedHoleElements = elements.filter(isPlatedHole);
-  if (platedHoleElements.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_plated_hole") {
-        highlightedElementIds.add(primitive._element.pcb_plated_hole_id);
-      }
-    }
-  }
-  const highlightedElements = platedHoleElements.filter(
-    (element) => highlightedElementIds.has(element.pcb_plated_hole_id)
-  );
-  const nonHighlightedElements = platedHoleElements.filter(
-    (element) => !highlightedElementIds.has(element.pcb_plated_hole_id)
-  );
-  if (nonHighlightedElements.length > 0) {
-    const drawer = new CircuitToCanvasDrawer2(canvas);
-    drawer.realToCanvasMat = realToCanvasMat;
-    drawer.drawElements(nonHighlightedElements, { layers });
-  }
-  if (highlightedElements.length > 0) {
-    const highlightDrawer = new CircuitToCanvasDrawer2(canvas);
-    highlightDrawer.configure({ colorOverrides: HOVER_COLOR_MAP });
-    highlightDrawer.realToCanvasMat = realToCanvasMat;
-    highlightDrawer.drawElements(highlightedElements, { layers });
-  }
-}
-
-// src/lib/draw-fabrication-note.ts
-import {
-  DEFAULT_PCB_COLOR_MAP as DEFAULT_PCB_COLOR_MAP3,
-  CircuitToCanvasDrawer as CircuitToCanvasDrawer3
-} from "circuit-to-canvas";
-var PCB_VIEWER_COLOR_MAP2 = {
-  ...DEFAULT_PCB_COLOR_MAP3,
-  silkscreen: {
-    top: colors_default.board.f_fab,
-    bottom: colors_default.board.b_fab
-  }
-};
-function isFabricationNote(element) {
-  return element.type.includes("pcb_fabrication_note");
-}
-function drawFabricationNoteElementsForLayer(canvas, elements, layers, realToCanvasMat) {
-  const drawer = new CircuitToCanvasDrawer3(canvas);
+  const drawer = new CircuitToCanvasDrawer10(canvas);
   drawer.configure({
     colorOverrides: PCB_VIEWER_COLOR_MAP2
   });
   drawer.realToCanvasMat = realToCanvasMat;
-  const fabricationElements = elements.filter(isFabricationNote);
-  drawer.drawElements(fabricationElements, { layers });
-}
-
-// src/lib/draw-pcb-note.ts
-import {
-  CircuitToCanvasDrawer as CircuitToCanvasDrawer4
-} from "circuit-to-canvas";
-function isPcbNote(element) {
-  return element.type.startsWith("pcb_note_");
-}
-function drawPcbNoteElementsForLayer(canvas, elements, layers, realToCanvasMat) {
-  const drawer = new CircuitToCanvasDrawer4(canvas);
-  drawer.realToCanvasMat = realToCanvasMat;
-  const pcbNoteElements = elements.filter(isPcbNote);
-  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/lib/draw-pcb-cutout.ts
-import { CircuitToCanvasDrawer as CircuitToCanvasDrawer7 } from "circuit-to-canvas";
-function isPcbCutout(element) {
-  return element.type === "pcb_cutout";
-}
-function drawPcbCutoutElementsForLayer(canvas, elements, layers, realToCanvasMat) {
-  const drawer = new CircuitToCanvasDrawer7(canvas);
-  drawer.realToCanvasMat = realToCanvasMat;
-  const cutoutElements = elements.filter(isPcbCutout);
-  drawer.drawElements(cutoutElements, { layers });
-}
-
-// src/lib/draw-pcb-smtpad.ts
-import {
-  DEFAULT_PCB_COLOR_MAP as DEFAULT_PCB_COLOR_MAP5,
-  CircuitToCanvasDrawer as CircuitToCanvasDrawer8
-} from "circuit-to-canvas";
-import color3 from "color";
-var HOVER_COLOR_MAP2 = {
-  ...DEFAULT_PCB_COLOR_MAP5,
-  copper: {
-    ...DEFAULT_PCB_COLOR_MAP5.copper,
-    top: color3(colors_default.board.pad_front).lighten(0.5).toString(),
-    bottom: color3(colors_default.board.pad_back).lighten(0.5).toString()
-  }
-};
-function isPcbSmtPad(element) {
-  return element.type === "pcb_smtpad";
-}
-function drawPcbSmtPadElementsForLayer({
-  canvas,
-  elements,
-  layers,
-  realToCanvasMat,
-  primitives
-}) {
-  const smtPadElements = elements.filter(isPcbSmtPad).filter((element) => {
-    const elementLayer = element.layer;
-    return layers.some((layer) => {
-      if (layer === "top_copper" && elementLayer === "top") return true;
-      if (layer === "bottom_copper" && elementLayer === "bottom") return true;
-      return false;
-    });
-  });
-  if (smtPadElements.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_smtpad") {
-        highlightedElementIds.add(primitive._element.pcb_smtpad_id);
-      }
-    }
-  }
-  const highlightedElements = smtPadElements.filter(
-    (element) => highlightedElementIds.has(element.pcb_smtpad_id)
-  );
-  const nonHighlightedElements = smtPadElements.filter(
-    (element) => !highlightedElementIds.has(element.pcb_smtpad_id)
-  );
-  if (nonHighlightedElements.length > 0) {
-    const drawer = new CircuitToCanvasDrawer8(canvas);
-    drawer.realToCanvasMat = realToCanvasMat;
-    drawer.drawElements(nonHighlightedElements, { layers: [] });
-  }
-  if (highlightedElements.length > 0) {
-    const highlightDrawer = new CircuitToCanvasDrawer8(canvas);
-    highlightDrawer.configure({ colorOverrides: HOVER_COLOR_MAP2 });
-    highlightDrawer.realToCanvasMat = realToCanvasMat;
-    highlightDrawer.drawElements(highlightedElements, { layers: [] });
-  }
-}
-
-// 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: [] });
+  const silkscreenElements = elements.filter(isSilkscreenElement);
+  drawer.drawElements(silkscreenElements, { layers });
 }
 
 // src/lib/draw-via.ts
 import {
   DEFAULT_PCB_COLOR_MAP as DEFAULT_PCB_COLOR_MAP6,
-  CircuitToCanvasDrawer as CircuitToCanvasDrawer10
+  CircuitToCanvasDrawer as CircuitToCanvasDrawer11
 } from "circuit-to-canvas";
 import color4 from "color";
 var HOVER_COLOR_MAP3 = {
@@ -9288,37 +9342,21 @@ function drawPcbViaElementsForLayer({
     (element) => !highlightedElementIds.has(element.pcb_via_id)
   );
   if (nonHighlightedElements.length > 0) {
-    const drawer = new CircuitToCanvasDrawer10(canvas);
+    const drawer = new CircuitToCanvasDrawer11(canvas);
     drawer.realToCanvasMat = realToCanvasMat;
     drawer.drawElements(nonHighlightedElements, { layers });
   }
   if (highlightedElements.length > 0) {
-    const highlightDrawer = new CircuitToCanvasDrawer10(canvas);
+    const highlightDrawer = new CircuitToCanvasDrawer11(canvas);
     highlightDrawer.configure({ colorOverrides: HOVER_COLOR_MAP3 });
     highlightDrawer.realToCanvasMat = realToCanvasMat;
     highlightDrawer.drawElements(highlightedElements, { layers });
   }
 }
 
-// src/lib/draw-copper-pour.ts
-import { CircuitToCanvasDrawer as CircuitToCanvasDrawer11 } from "circuit-to-canvas";
-function isCopperPourElement(element) {
-  return element.type === "pcb_copper_pour";
-}
-function drawCopperPourElementsForLayer({
-  canvas,
-  elements,
-  layers,
-  realToCanvasMat
-}) {
-  const copperPourElements = elements.filter(isCopperPourElement);
-  if (copperPourElements.length === 0) return;
-  const drawer = new CircuitToCanvasDrawer11(canvas);
-  drawer.realToCanvasMat = realToCanvasMat;
-  drawer.drawElements(copperPourElements, { layers });
-}
-
 // src/components/CanvasPrimitiveRenderer.tsx
+import { useEffect as useEffect4, useRef as useRef2 } from "react";
+import { SuperGrid, toMMSI } from "react-supergrid";
 import { jsx as jsx3, jsxs } from "react/jsx-runtime";
 var orderedLayers = [
   "board",
@@ -9382,7 +9420,8 @@ var CanvasPrimitiveRenderer = ({
           elements,
           layers: ["top_copper"],
           realToCanvasMat: transform,
-          primitives
+          primitives,
+          drawSoldermask: isShowingSolderMask
         });
       }
       const bottomCanvas = canvasRefs.current.bottom;
@@ -9392,7 +9431,8 @@ var CanvasPrimitiveRenderer = ({
           elements,
           layers: ["bottom_copper"],
           realToCanvasMat: transform,
-          primitives
+          primitives,
+          drawSoldermask: isShowingSolderMask
         });
       }
       if (topCanvas) {
@@ -9401,7 +9441,8 @@ var CanvasPrimitiveRenderer = ({
           elements,
           layers: ["top_copper"],
           realToCanvasMat: transform,
-          primitives
+          primitives,
+          drawSoldermask: isShowingSolderMask
         });
       }
       if (bottomCanvas) {
@@ -9410,7 +9451,8 @@ var CanvasPrimitiveRenderer = ({
           elements,
           layers: ["bottom_copper"],
           realToCanvasMat: transform,
-          primitives
+          primitives,
+          drawSoldermask: isShowingSolderMask
         });
       }
       if (topCanvas) {
@@ -9449,74 +9491,86 @@ var CanvasPrimitiveRenderer = ({
       }
       const topSilkscreenCanvas = canvasRefs.current.top_silkscreen;
       if (topSilkscreenCanvas) {
-        drawSilkscreenElementsForLayer(
-          topSilkscreenCanvas,
+        drawSilkscreenElementsForLayer({
+          canvas: topSilkscreenCanvas,
           elements,
-          ["top_silkscreen"],
-          transform
-        );
+          layers: ["top_silkscreen"],
+          realToCanvasMat: transform
+        });
       }
       const bottomSilkscreenCanvas = canvasRefs.current.bottom_silkscreen;
       if (bottomSilkscreenCanvas) {
-        drawSilkscreenElementsForLayer(
-          bottomSilkscreenCanvas,
+        drawSilkscreenElementsForLayer({
+          canvas: bottomSilkscreenCanvas,
           elements,
-          ["bottom_silkscreen"],
-          transform
-        );
+          layers: ["bottom_silkscreen"],
+          realToCanvasMat: transform
+        });
       }
       const topFabCanvas = canvasRefs.current.top_fabrication;
       if (topFabCanvas) {
-        drawFabricationNoteElementsForLayer(
-          topFabCanvas,
+        drawFabricationNoteElementsForLayer({
+          canvas: topFabCanvas,
           elements,
-          ["top_fabrication_note"],
-          transform
-        );
+          layers: ["top_fabrication_note"],
+          realToCanvasMat: transform
+        });
       }
       const bottomFabCanvas = canvasRefs.current.bottom_fabrication;
       if (bottomFabCanvas) {
-        drawFabricationNoteElementsForLayer(
-          bottomFabCanvas,
+        drawFabricationNoteElementsForLayer({
+          canvas: bottomFabCanvas,
           elements,
-          ["bottom_fabrication_note"],
-          transform
-        );
+          layers: ["bottom_fabrication_note"],
+          realToCanvasMat: transform
+        });
       }
       const bottomNotesCanvas = canvasRefs.current.bottom_notes;
       if (bottomNotesCanvas) {
-        drawPcbNoteElementsForLayer(
-          bottomNotesCanvas,
+        drawPcbNoteElementsForLayer({
+          canvas: bottomNotesCanvas,
           elements,
-          ["bottom_user_note"],
-          transform
-        );
+          layers: ["bottom_user_note"],
+          realToCanvasMat: transform
+        });
       }
       const topNotesCanvas = canvasRefs.current.top_notes;
       if (topNotesCanvas) {
-        drawPcbNoteElementsForLayer(
-          topNotesCanvas,
+        drawPcbNoteElementsForLayer({
+          canvas: topNotesCanvas,
           elements,
-          ["top_user_note"],
-          transform
-        );
+          layers: ["top_user_note"],
+          realToCanvasMat: transform
+        });
       }
       const drillCanvas = canvasRefs.current.drill;
       if (drillCanvas) {
-        drawPcbHoleElementsForLayer(drillCanvas, elements, ["drill"], transform);
+        drawPcbHoleElementsForLayer({
+          canvas: drillCanvas,
+          elements,
+          layers: ["drill"],
+          realToCanvasMat: transform,
+          drawSoldermask: isShowingSolderMask
+        });
       }
       const boardCanvas = canvasRefs.current.board;
       if (boardCanvas) {
-        drawPcbBoardElements(boardCanvas, elements, [], transform);
+        drawPcbBoardElements({
+          canvas: boardCanvas,
+          elements,
+          layers: [],
+          realToCanvasMat: transform,
+          drawSoldermask: isShowingSolderMask
+        });
       }
       const edgeCutsCanvas = canvasRefs.current.edge_cuts;
       if (edgeCutsCanvas) {
-        drawPcbCutoutElementsForLayer(
-          edgeCutsCanvas,
+        drawPcbCutoutElementsForLayer({
+          canvas: edgeCutsCanvas,
           elements,
-          ["edge_cuts"],
-          transform
-        );
+          layers: ["edge_cuts"],
+          realToCanvasMat: transform
+        });
       }
       if (topCanvas) {
         drawPcbKeepoutElementsForLayer({
@@ -10574,6 +10628,10 @@ var DimensionOverlay = ({
   );
   useEffect7(() => {
     const down = (e) => {
+      const target = e.target;
+      if (target.tagName === "INPUT" || target.tagName === "TEXTAREA" || target.isContentEditable) {
+        return;
+      }
       const containerHasFocus = containerRef.current?.contains(document.activeElement) || document.activeElement === containerRef.current;
       if (!isMouseOverContainer && !containerHasFocus) return;
       if (e.key === "d") {
@@ -13565,7 +13623,7 @@ import { css as css3 } from "@emotion/css";
 // package.json
 var package_default = {
   name: "@tscircuit/pcb-viewer",
-  version: "1.11.314",
+  version: "1.11.316",
   main: "dist/index.js",
   type: "module",
   repository: "tscircuit/pcb-viewer",
@@ -13619,7 +13677,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.29",
     "@vitejs/plugin-react": "^5.0.2",
     "circuit-json": "^0.0.356",
-    "circuit-to-canvas": "^0.0.50",
+    "circuit-to-canvas": "^0.0.52",
     "circuit-to-svg": "^0.0.271",
     color: "^4.2.3",
     "react-supergrid": "^1.0.10",
@@ -13646,6 +13704,10 @@ var useHotKey = (key, onUse, containerRef) => {
   useEffect13(() => {
     if (!key) return;
     const handleKeyDown = (event) => {
+      const target = event.target;
+      if (target.tagName === "INPUT" || target.tagName === "TEXTAREA" || target.isContentEditable) {
+        return;
+      }
       const keyParts = key.split("+");
       const ctrlRequired = keyParts.includes("ctrl");
       const shiftRequired = keyParts.includes("shift");