@tscircuit/pcb-viewer 1.11.234 → 1.11.235

package/dist/index.js

@@ -7043,8 +7043,13 @@ function getExpandedStroke(strokeInput, defaultWidth) {
 }
 
 // src/lib/convert-element-to-primitive.ts
+import { distance as distance2 } from "circuit-json";
 var globalPcbDrawingObjectCount = 0;
 var getNewPcbDrawingObjectId = (prefix) => `${prefix}_${globalPcbDrawingObjectCount++}`;
+var normalizePolygonPoints = (points) => (points ?? []).map((point) => ({
+  x: distance2.parse(point.x),
+  y: distance2.parse(point.y)
+}));
 var convertElementToPrimitives = (element, allElements) => {
   const _parent_pcb_component = "pcb_component_id" in element ? allElements.find(
     (elm) => elm.type === "pcb_component" && elm.pcb_component_id === element.pcb_component_id
@@ -7174,7 +7179,7 @@ var convertElementToPrimitives = (element, allElements) => {
           {
             _pcb_drawing_object_id: `polygon_${globalPcbDrawingObjectCount++}`,
             pcb_drawing_type: "polygon",
-            points,
+            points: normalizePolygonPoints(points),
             layer: layer || "top",
             _element: element,
             _parent_pcb_component,
@@ -7724,7 +7729,7 @@ var convertElementToPrimitives = (element, allElements) => {
                 "pcb_copper_pour_polygon"
               ),
               pcb_drawing_type: "polygon",
-              points,
+              points: normalizePolygonPoints(points),
               layer,
               _element: element
             }
@@ -7925,7 +7930,7 @@ var convertElementToPrimitives = (element, allElements) => {
             {
               _pcb_drawing_object_id: getNewPcbDrawingObjectId("pcb_cutout_polygon"),
               pcb_drawing_type: "polygon",
-              points: cutoutElement.points,
+              points: normalizePolygonPoints(cutoutElement.points),
               layer: "drill",
               _element: element,
               _parent_pcb_component,
@@ -8692,8 +8697,10 @@ var Drawer = class {
     ctx.closePath();
     ctx.fill("evenodd");
     const lineWidth = scaleOnly(this.transform, this.aperture.size);
-    ctx.lineWidth = lineWidth;
-    ctx.stroke();
+    if (lineWidth > 0) {
+      ctx.lineWidth = lineWidth;
+      ctx.stroke();
+    }
   }
   /* NOTE: This is not gerber compatible */
   debugText(text, x, y) {
@@ -10282,10 +10289,10 @@ var isInsideOfSmtpad = (elm, point, padding = 0) => {
 };
 var isInsideOfPlatedHole = (hole, point, padding = 0) => {
   if (hole.shape === "circle") {
-    const distance3 = Math.sqrt(
+    const distance5 = Math.sqrt(
       (point.x - hole.x) ** 2 + (point.y - hole.y) ** 2
     );
-    return distance3 <= hole.outer_diameter / 2 + padding;
+    return distance5 <= hole.outer_diameter / 2 + padding;
   } else if (hole.shape === "circular_hole_with_rect_pad") {
     const dx = Math.abs(point.x - hole.x);
     const dy = Math.abs(point.y - hole.y);
@@ -11386,6 +11393,9 @@ var ElementOverlayBox = ({
   )) });
 };
 
+// src/components/MouseElementTracker.tsx
+import { distance as distance4 } from "circuit-json";
+
 // src/lib/util/if-sets-match-exactly.ts
 function ifSetsMatchExactly(set1, set2) {
   if (set1.size !== set2.size) return false;
@@ -11395,16 +11405,16 @@ function ifSetsMatchExactly(set1, set2) {
 // node_modules/@tscircuit/math-utils/dist/chunk-EFLPMB4J.js
 function pointToSegmentDistance2(p, v, w) {
   const l2 = (w.x - v.x) ** 2 + (w.y - v.y) ** 2;
-  if (l2 === 0) return distance2(p, v);
+  if (l2 === 0) return distance3(p, v);
   let t = ((p.x - v.x) * (w.x - v.x) + (p.y - v.y) * (w.y - v.y)) / l2;
   t = Math.max(0, Math.min(1, t));
   const projection = {
     x: v.x + t * (w.x - v.x),
     y: v.y + t * (w.y - v.y)
   };
-  return distance2(p, projection);
+  return distance3(p, projection);
 }
-function distance2(p1, p2) {
+function distance3(p1, p2) {
   const dx = p1.x - p2.x;
   const dy = p1.y - p2.y;
   return Math.sqrt(dx * dx + dy * dy);
@@ -11412,19 +11422,85 @@ function distance2(p1, p2) {
 
 // src/components/MouseElementTracker.tsx
 import { jsx as jsx12, jsxs as jsxs9 } from "react/jsx-runtime";
+var getPolygonBoundingBox = (points) => {
+  if (points.length === 0) return null;
+  let minX = points[0].x;
+  let minY = points[0].y;
+  let maxX = points[0].x;
+  let maxY = points[0].y;
+  for (const point of points) {
+    if (point.x < minX) minX = point.x;
+    if (point.y < minY) minY = point.y;
+    if (point.x > maxX) maxX = point.x;
+    if (point.y > maxY) maxY = point.y;
+  }
+  return {
+    center: {
+      x: (minX + maxX) / 2,
+      y: (minY + maxY) / 2
+    },
+    width: maxX - minX,
+    height: maxY - minY
+  };
+};
+var isPointInsidePolygon = (point, polygon) => {
+  if (polygon.length < 3) return false;
+  let isInside = false;
+  for (let i = 0, j = polygon.length - 1; i < polygon.length; j = i++) {
+    const xi = polygon[i].x;
+    const yi = polygon[i].y;
+    const xj = polygon[j].x;
+    const yj = polygon[j].y;
+    const intersects = yi > point.y !== yj > point.y && point.x < (xj - xi) * (point.y - yi) / (yj - yi || Number.EPSILON) + xi;
+    if (intersects) {
+      isInside = !isInside;
+    }
+  }
+  return isInside;
+};
 var getPrimitivesUnderPoint = (primitives, rwPoint, transform) => {
   const newMousedPrimitives = [];
   for (const primitive of primitives) {
     if (!primitive._element) continue;
     if ("x1" in primitive && primitive._element?.type === "pcb_trace") {
-      const distance3 = pointToSegmentDistance2(
+      const distance5 = pointToSegmentDistance2(
         { x: rwPoint.x, y: rwPoint.y },
         { x: primitive.x1, y: primitive.y1 },
         { x: primitive.x2, y: primitive.y2 }
       );
       const lineWidth = primitive.width || 0.5;
       const detectionThreshold = Math.max(lineWidth * 25, 2) / transform.a;
-      if (distance3 < detectionThreshold) {
+      if (distance5 < detectionThreshold) {
+        newMousedPrimitives.push(primitive);
+      }
+      continue;
+    }
+    if (primitive.pcb_drawing_type === "polygon") {
+      const points = primitive.points.map((point) => ({
+        x: distance4.parse(point.x),
+        y: distance4.parse(point.y)
+      }));
+      const boundingBox = getPolygonBoundingBox(points);
+      if (!boundingBox) continue;
+      if (rwPoint.x < boundingBox.center.x - boundingBox.width / 2 || rwPoint.x > boundingBox.center.x + boundingBox.width / 2 || rwPoint.y < boundingBox.center.y - boundingBox.height / 2 || rwPoint.y > boundingBox.center.y + boundingBox.height / 2) {
+        continue;
+      }
+      if (isPointInsidePolygon(rwPoint, points)) {
+        newMousedPrimitives.push(primitive);
+      }
+      continue;
+    }
+    if (primitive.pcb_drawing_type === "polygon_with_arcs") {
+      const points = primitive.brep_shape.outer_ring.vertices.map((v) => ({
+        x: distance4.parse(v.x),
+        y: distance4.parse(v.y)
+      }));
+      const boundingBox = getPolygonBoundingBox(points);
+      if (!boundingBox) continue;
+      if (rwPoint.x < boundingBox.center.x - boundingBox.width / 2 || rwPoint.x > boundingBox.center.x + boundingBox.width / 2 || rwPoint.y < boundingBox.center.y - boundingBox.height / 2 || rwPoint.y > boundingBox.center.y + boundingBox.height / 2) {
+        continue;
+      }
+      if (isPointInsidePolygon(rwPoint, points)) {
         newMousedPrimitives.push(primitive);
       }
       continue;
@@ -11462,12 +11538,32 @@ var MouseElementTracker = ({
       if (primitive._element?.type === "pcb_via") continue;
       if (primitive._element?.type === "pcb_component") continue;
       if (primitive?.layer === "drill") continue;
-      const screenPos = applyToPoint12(
-        transform,
-        primitive
-      );
-      const w = "w" in primitive ? primitive.w : "r" in primitive ? primitive.r * 2 : 0;
-      const h = "h" in primitive ? primitive.h : "r" in primitive ? primitive.r * 2 : 0;
+      let basePoint = null;
+      let w = 0;
+      let h = 0;
+      if (primitive.pcb_drawing_type === "polygon") {
+        const boundingBox = getPolygonBoundingBox(primitive.points);
+        if (!boundingBox) continue;
+        basePoint = boundingBox.center;
+        w = boundingBox.width;
+        h = boundingBox.height;
+      } else if (primitive.pcb_drawing_type === "polygon_with_arcs") {
+        const points = primitive.brep_shape.outer_ring.vertices.map((v) => ({
+          x: v.x,
+          y: v.y
+        }));
+        const boundingBox = getPolygonBoundingBox(points);
+        if (!boundingBox) continue;
+        basePoint = boundingBox.center;
+        w = boundingBox.width;
+        h = boundingBox.height;
+      } else if ("x" in primitive && "y" in primitive) {
+        basePoint = { x: primitive.x, y: primitive.y };
+        w = "w" in primitive ? primitive.w : "r" in primitive ? primitive.r * 2 : 0;
+        h = "h" in primitive ? primitive.h : "r" in primitive ? primitive.r * 2 : 0;
+      }
+      if (!basePoint) continue;
+      const screenPos = applyToPoint12(transform, basePoint);
       const screenSize = {
         w: w * transform.a,
         h: h * transform.a
@@ -11477,6 +11573,10 @@ var MouseElementTracker = ({
       ).length;
       highlightedPrimitives2.push({
         ...primitive,
+        x: basePoint.x,
+        y: basePoint.y,
+        w,
+        h,
         screen_x: screenPos.x,
         screen_y: screenPos.y,
         screen_w: screenSize.w,
@@ -11820,11 +11920,11 @@ var RatsNestOverlay = ({ transform, soup, children }) => {
       connectedIds.forEach((id) => {
         const pos = getElementPosition(id);
         if (pos) {
-          const distance3 = Math.sqrt(
+          const distance5 = Math.sqrt(
             (sourcePoint.x - pos.x) ** 2 + (sourcePoint.y - pos.y) ** 2
           );
-          if (distance3 < minDistance && distance3 > 0) {
-            minDistance = distance3;
+          if (distance5 < minDistance && distance5 > 0) {
+            minDistance = distance5;
             nearestPoint = pos;
           }
         }
@@ -11909,7 +12009,7 @@ import { css as css3 } from "@emotion/css";
 // package.json
 var package_default = {
   name: "@tscircuit/pcb-viewer",
-  version: "1.11.233",
+  version: "1.11.234",
   main: "dist/index.js",
   type: "module",
   repository: "tscircuit/pcb-viewer",