@tscircuit/pcb-viewer 1.11.298 → 1.11.299

package/dist/index.js

@@ -7718,57 +7718,6 @@ var convertElementToPrimitives = (element, allElements) => {
       });
       return primitives;
     }
-    case "pcb_fabrication_note_rect": {
-      const rectElement = element;
-      const layer = rectElement.layer === "bottom" ? "bottom_fabrication" : "top_fabrication";
-      const hasStroke = rectElement.has_stroke !== void 0 ? rectElement.has_stroke : typeof rectElement.stroke_width === "number" ? rectElement.stroke_width > 0 : void 0;
-      return [
-        {
-          _pcb_drawing_object_id: getNewPcbDrawingObjectId(
-            "pcb_fabrication_note_rect"
-          ),
-          pcb_drawing_type: "rect",
-          x: rectElement.center.x,
-          y: rectElement.center.y,
-          w: rectElement.width,
-          h: rectElement.height,
-          roundness: rectElement.corner_radius,
-          layer,
-          stroke_width: rectElement.stroke_width,
-          is_filled: rectElement.is_filled,
-          has_stroke: hasStroke,
-          is_stroke_dashed: rectElement.is_stroke_dashed,
-          color: rectElement.color,
-          _element: element,
-          _parent_pcb_component,
-          _parent_source_component,
-          _source_port
-        }
-      ];
-    }
-    case "pcb_fabrication_note_path": {
-      const { route } = element;
-      const layer = "top_fabrication";
-      return route.slice(0, -1).map((point, index) => {
-        const nextPoint = route[index + 1];
-        return {
-          _pcb_drawing_object_id: `line_${globalPcbDrawingObjectCount++}`,
-          pcb_drawing_type: "line",
-          x1: point.x,
-          y1: point.y,
-          x2: nextPoint.x,
-          y2: nextPoint.y,
-          width: element.stroke_width ?? 0.1,
-          squareCap: false,
-          layer,
-          color: element.color,
-          _element: element,
-          _parent_pcb_component,
-          _parent_source_component,
-          _source_port
-        };
-      }).filter(Boolean);
-    }
     case "pcb_copper_text": {
       return convertPcbCopperTextToPrimitive(element, {
         _parent_pcb_component,
@@ -7827,161 +7776,6 @@ var convertElementToPrimitives = (element, allElements) => {
       }
       return [];
     }
-    case "pcb_fabrication_note_dimension": {
-      const dimensionElement = element;
-      const { from, to, text, font_size, arrow_size } = dimensionElement;
-      const layer = element.layer === "bottom" ? "bottom_fabrication" : "top_fabrication";
-      const primitives = [];
-      const arrowSize = typeof arrow_size === "number" && !Number.isNaN(arrow_size) ? arrow_size : 1;
-      primitives.push({
-        _pcb_drawing_object_id: getNewPcbDrawingObjectId(
-          "pcb_fabrication_note_dimension"
-        ),
-        pcb_drawing_type: "line",
-        x1: from.x,
-        y1: from.y,
-        x2: to.x,
-        y2: to.y,
-        width: 0.05,
-        squareCap: false,
-        layer,
-        _element: element,
-        _parent_pcb_component,
-        _parent_source_component,
-        _source_port
-      });
-      const dx = to.x - from.x;
-      const dy = to.y - from.y;
-      const length = Math.sqrt(dx * dx + dy * dy) || 1;
-      const unitX = dx / length;
-      const unitY = dy / length;
-      const arrowAngle = Math.PI / 6;
-      const arrow1X1 = from.x + arrowSize * (unitX * Math.cos(arrowAngle) - unitY * Math.sin(arrowAngle));
-      const arrow1Y1 = from.y + arrowSize * (unitX * Math.sin(arrowAngle) + unitY * Math.cos(arrowAngle));
-      const arrow1X2 = from.x + arrowSize * (unitX * Math.cos(-arrowAngle) - unitY * Math.sin(-arrowAngle));
-      const arrow1Y2 = from.y + arrowSize * (unitX * Math.sin(-arrowAngle) + unitY * Math.cos(-arrowAngle));
-      primitives.push({
-        _pcb_drawing_object_id: getNewPcbDrawingObjectId(
-          "pcb_fabrication_note_dimension"
-        ),
-        pcb_drawing_type: "line",
-        x1: from.x,
-        y1: from.y,
-        x2: arrow1X1,
-        y2: arrow1Y1,
-        width: 0.05,
-        squareCap: false,
-        layer,
-        _element: element,
-        _parent_pcb_component,
-        _parent_source_component,
-        _source_port
-      });
-      primitives.push({
-        _pcb_drawing_object_id: getNewPcbDrawingObjectId(
-          "pcb_fabrication_note_dimension"
-        ),
-        pcb_drawing_type: "line",
-        x1: from.x,
-        y1: from.y,
-        x2: arrow1X2,
-        y2: arrow1Y2,
-        width: 0.05,
-        squareCap: false,
-        layer,
-        _element: element,
-        _parent_pcb_component,
-        _parent_source_component,
-        _source_port
-      });
-      const arrow2X1 = to.x - arrowSize * (unitX * Math.cos(arrowAngle) - unitY * Math.sin(arrowAngle));
-      const arrow2Y1 = to.y - arrowSize * (unitX * Math.sin(arrowAngle) + unitY * Math.cos(arrowAngle));
-      const arrow2X2 = to.x - arrowSize * (unitX * Math.cos(-arrowAngle) - unitY * Math.sin(-arrowAngle));
-      const arrow2Y2 = to.y - arrowSize * (unitX * Math.sin(-arrowAngle) + unitY * Math.cos(-arrowAngle));
-      primitives.push({
-        _pcb_drawing_object_id: getNewPcbDrawingObjectId(
-          "pcb_fabrication_note_dimension"
-        ),
-        pcb_drawing_type: "line",
-        x1: to.x,
-        y1: to.y,
-        x2: arrow2X1,
-        y2: arrow2Y1,
-        width: 0.05,
-        squareCap: false,
-        layer,
-        _element: element,
-        _parent_pcb_component,
-        _parent_source_component,
-        _source_port
-      });
-      primitives.push({
-        _pcb_drawing_object_id: getNewPcbDrawingObjectId(
-          "pcb_fabrication_note_dimension"
-        ),
-        pcb_drawing_type: "line",
-        x1: to.x,
-        y1: to.y,
-        x2: arrow2X2,
-        y2: arrow2Y2,
-        width: 0.05,
-        squareCap: false,
-        layer,
-        _element: element,
-        _parent_pcb_component,
-        _parent_source_component,
-        _source_port
-      });
-      if (text) {
-        const baseOffset = (font_size ?? 1) * 1.5;
-        const perpX = -unitY;
-        const perpY = unitX;
-        const midpointX = (from.x + to.x) / 2;
-        const midpointY = (from.y + to.y) / 2;
-        let textOffset = baseOffset;
-        if (Math.abs(unitX) > Math.abs(unitY)) {
-          textOffset = midpointY >= 0 ? baseOffset : -baseOffset;
-        } else {
-          textOffset = midpointX >= 0 ? -baseOffset : baseOffset;
-        }
-        primitives.push({
-          _pcb_drawing_object_id: getNewPcbDrawingObjectId(
-            "pcb_fabrication_note_dimension"
-          ),
-          pcb_drawing_type: "text",
-          x: (from.x + to.x) / 2 + perpX * textOffset,
-          y: (from.y + to.y) / 2 + perpY * textOffset,
-          layer,
-          align: "center",
-          text,
-          size: font_size,
-          _element: element,
-          _parent_pcb_component,
-          _parent_source_component,
-          _source_port
-        });
-      }
-      return primitives;
-    }
-    case "pcb_fabrication_note_text": {
-      return [
-        {
-          _pcb_drawing_object_id: getNewPcbDrawingObjectId("text"),
-          pcb_drawing_type: "text",
-          x: element.anchor_position.x,
-          y: element.anchor_position.y,
-          layer: element.layer === "bottom" ? "bottom_fabrication" : "top_fabrication",
-          size: element.font_size,
-          align: element.anchor_alignment ?? "center",
-          text: element.text,
-          color: element.color,
-          _element: element,
-          _parent_pcb_component,
-          _parent_source_component,
-          _source_port
-        }
-      ];
-    }
     case "pcb_cutout": {
       switch (element.shape) {
         case "rect": {
@@ -9441,6 +9235,31 @@ function drawPlatedHolePads(canvas, elements, layers, realToCanvasMat) {
   drawer.drawElements(platedHoleElements, { layers });
 }
 
+// src/lib/draw-fabrication-note.ts
+import {
+  DEFAULT_PCB_COLOR_MAP as DEFAULT_PCB_COLOR_MAP2,
+  CircuitToCanvasDrawer as CircuitToCanvasDrawer3
+} from "circuit-to-canvas";
+var PCB_VIEWER_COLOR_MAP2 = {
+  ...DEFAULT_PCB_COLOR_MAP2,
+  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);
+  drawer.configure({
+    colorOverrides: PCB_VIEWER_COLOR_MAP2
+  });
+  drawer.realToCanvasMat = realToCanvasMat;
+  const fabricationElements = elements.filter(isFabricationNote);
+  drawer.drawElements(fabricationElements, { layers });
+}
+
 // src/components/CanvasPrimitiveRenderer.tsx
 import { jsx as jsx3, jsxs } from "react/jsx-runtime";
 var orderedLayers = [
@@ -9453,6 +9272,8 @@ var orderedLayers = [
   "soldermask_with_copper_bottom",
   "soldermask_with_copper_top",
   "top_silkscreen",
+  "top_fabrication",
+  "bottom_fabrication",
   "inner1",
   "inner2",
   "inner3",
@@ -9520,6 +9341,24 @@ var CanvasPrimitiveRenderer = ({
           transform
         );
       }
+      const topFabCanvas = canvasRefs.current.top_fabrication;
+      if (topFabCanvas) {
+        drawFabricationNoteElementsForLayer(
+          topFabCanvas,
+          elements,
+          ["top_fabrication_note"],
+          transform
+        );
+      }
+      const bottomFabCanvas = canvasRefs.current.bottom_fabrication;
+      if (bottomFabCanvas) {
+        drawFabricationNoteElementsForLayer(
+          bottomFabCanvas,
+          elements,
+          ["bottom_fabrication_note"],
+          transform
+        );
+      }
     }
     drawer.orderAndFadeLayers();
   }, [primitives, elements, transform, selectedLayer, isShowingSolderMask]);
@@ -13557,7 +13396,7 @@ import { css as css3 } from "@emotion/css";
 // package.json
 var package_default = {
   name: "@tscircuit/pcb-viewer",
-  version: "1.11.297",
+  version: "1.11.298",
   main: "dist/index.js",
   type: "module",
   repository: "tscircuit/pcb-viewer",
@@ -13611,7 +13450,7 @@ var package_default = {
     "@tscircuit/math-utils": "^0.0.29",
     "@vitejs/plugin-react": "^5.0.2",
     "circuit-json": "^0.0.347",
-    "circuit-to-canvas": "^0.0.31",
+    "circuit-to-canvas": "^0.0.37",
     "circuit-to-svg": "^0.0.271",
     color: "^4.2.3",
     "react-supergrid": "^1.0.10",