@tscircuit/pcb-viewer 1.9.3 → 1.10.1

package/dist/index.js

@@ -11866,7 +11866,7 @@ var LAYER_NAME_TO_COLOR = _object_spread({
     red: "red",
     black: "black",
     green: "green",
-    board: "white",
+    board: "rgb(255, 255, 255)",
     other: "#eee",
     // TODO more builtin html colors
     // Common eagle names
@@ -12340,7 +12340,7 @@ var convertTextToLines = function(text) {
 // src/lib/draw-primitives.ts
 var import_color = __toESM(require("color"));
 function getColor(primitive) {
-    if (primitive.is_mouse_over) {
+    if (primitive.is_mouse_over || primitive.is_in_highlighted_net) {
         return (0, import_color.default)(LAYER_NAME_TO_COLOR[primitive.layer]).lighten(0.5).rgb().toString();
     }
     return LAYER_NAME_TO_COLOR[primitive.layer];
@@ -12349,7 +12349,8 @@ var drawLine = function(drawer, line) {
     drawer.equip({
         size: line.zoomIndependent ? line.width / drawer.transform.a : line.width,
         shape: line.squareCap ? "square" : "circle",
-        color: line.layer
+        color: getColor(line),
+        layer: line.layer
     });
     drawer.moveTo(line.x1, line.y1);
     drawer.lineTo(line.x2, line.y2);
@@ -12414,25 +12415,29 @@ var drawRect = function(drawer, rect) {
 };
 var drawCircle = function(drawer, circle) {
     drawer.equip({
-        color: circle.layer
+        color: getColor(circle),
+        layer: circle.layer
     });
     drawer.circle(circle.x, circle.y, circle.r, circle.mesh_fill);
 };
 var drawOval = function(drawer, oval) {
     drawer.equip({
-        color: oval.layer
+        color: getColor(oval),
+        layer: oval.layer
     });
     drawer.oval(oval.x, oval.y, oval.rX, oval.rY);
 };
 var drawPill = function(drawer, pill) {
     drawer.equip({
-        color: pill.layer
+        color: getColor(pill),
+        layer: pill.layer
     });
     drawer.pill(pill.x, pill.y, pill.w, pill.h);
 };
 var drawPolygon = function(drawer, polygon) {
     drawer.equip({
-        color: polygon.layer
+        color: getColor(polygon),
+        layer: polygon.layer
     });
     drawer.polygon(polygon.points);
 };
@@ -12858,7 +12863,8 @@ var convertElementToPrimitives = function(element, allElements) {
                             y: y3,
                             r: hole_diameter1 / 2,
                             // TODO support layer on pcb_plated_hole
-                            layer: "drill"
+                            layer: "drill",
+                            _element: element
                         }
                     ];
                 } else if (element.shape === "oval") {
@@ -12880,6 +12886,7 @@ var convertElementToPrimitives = function(element, allElements) {
                         },
                         {
                             _pcb_drawing_object_id: "oval_".concat(globalPcbDrawingObjectCount++),
+                            _element: element,
                             pcb_drawing_type: "oval",
                             x: x4,
                             y: y4,
@@ -12907,6 +12914,7 @@ var convertElementToPrimitives = function(element, allElements) {
                         },
                         {
                             _pcb_drawing_object_id: "pill_".concat(globalPcbDrawingObjectCount++),
+                            _element: element,
                             pcb_drawing_type: "pill",
                             x: x5,
                             y: y5,
@@ -12970,6 +12978,7 @@ var convertElementToPrimitives = function(element, allElements) {
                     var expandedStroke = getExpandedStroke(strokeInput, 0.5);
                     primitives.push({
                         _pcb_drawing_object_id: "polygon_".concat(globalPcbDrawingObjectCount++),
+                        _element: element,
                         pcb_drawing_type: "polygon",
                         points: expandedStroke,
                         layer: element.route[0].layer
@@ -12978,6 +12987,7 @@ var convertElementToPrimitives = function(element, allElements) {
                         if (r.route_type === "via") {
                             primitives.push({
                                 _pcb_drawing_object_id: "circle_".concat(globalPcbDrawingObjectCount++),
+                                _element: element,
                                 pcb_drawing_type: "circle",
                                 x: r.x,
                                 y: r.y,
@@ -12999,6 +13009,7 @@ var convertElementToPrimitives = function(element, allElements) {
                             if (prevX !== null && prevY !== null) {
                                 primitives.push({
                                     _pcb_drawing_object_id: "line_".concat(globalPcbDrawingObjectCount++),
+                                    _element: element,
                                     pcb_drawing_type: "line",
                                     x1: prevX,
                                     y1: prevY,
@@ -13046,12 +13057,12 @@ var convertElementToPrimitives = function(element, allElements) {
                     },
                     {
                         _pcb_drawing_object_id: "circle_".concat(globalPcbDrawingObjectCount++),
+                        _element: element,
                         pcb_drawing_type: "circle",
                         x: x7,
                         y: y7,
                         r: hole_diameter2 / 2,
                         layer: "drill",
-                        _element: element,
                         _parent_pcb_component: _parent_pcb_component,
                         _parent_source_component: _parent_source_component
                     },
@@ -13345,6 +13356,7 @@ var MouseElementTracker = function(param) {
                 var _primitive__element, _primitive__element1;
                 if (((_primitive__element = primitive._element) === null || _primitive__element === void 0 ? void 0 : _primitive__element.type) === "pcb_via") return "continue";
                 if (((_primitive__element1 = primitive._element) === null || _primitive__element1 === void 0 ? void 0 : _primitive__element1.type) === "pcb_component") return "continue";
+                if ((primitive === null || primitive === void 0 ? void 0 : primitive.layer) === "drill") return "continue";
                 var screenPos = (0, import_transformation_matrix2.applyToPoint)(transform, primitive);
                 var w = "w" in primitive ? primitive.w : "r" in primitive ? primitive.r * 2 : 0;
                 var h = "h" in primitive ? primitive.h : "r" in primitive ? primitive.r * 2 : 0;
@@ -13713,7 +13725,7 @@ var import_soup2 = __toESM(require_dist());
 // package.json
 var package_default = {
     name: "@tscircuit/pcb-viewer",
-    version: "1.9.2",
+    version: "1.10.0",
     main: "dist/index.js",
     repository: "tscircuit/pcb-viewer",
     license: "MIT",
@@ -13764,6 +13776,7 @@ var package_default = {
     },
     dependencies: {
         "@emotion/css": "^11.11.2",
+        "circuit-json-to-connectivity-map": "^0.0.8",
         color: "^4.2.3",
         "react-supergrid": "^1.0.10",
         "react-toastify": "^10.0.5",
@@ -14761,37 +14774,76 @@ var RatsNestOverlay = function(param) {
     });
 };
 // src/components/CanvasElementsRenderer.tsx
+var import_circuit_json_to_connectivity_map = require("circuit-json-to-connectivity-map");
+// src/lib/util/addInteractionMetadataToPrimitives.ts
+function addInteractionMetadataToPrimitives(param) {
+    var primitivesWithoutInteractionMetadata = param.primitivesWithoutInteractionMetadata, drawingObjectIdsWithMouseOver = param.drawingObjectIdsWithMouseOver, primitiveIdsInMousedOverNet = param.primitiveIdsInMousedOverNet;
+    var newPrimitives = [];
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = primitivesWithoutInteractionMetadata[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var primitive = _step.value;
+            var newPrimitive = _object_spread({}, primitive);
+            if ((primitive === null || primitive === void 0 ? void 0 : primitive.layer) === "drill") {
+                newPrimitive.is_in_highlighted_net = false;
+                newPrimitive.is_mouse_over = false;
+            } else if (drawingObjectIdsWithMouseOver.has(primitive._pcb_drawing_object_id)) {
+                newPrimitive.is_mouse_over = true;
+            } else if (primitive._element && ("pcb_trace_id" in primitive._element && primitiveIdsInMousedOverNet.includes(primitive._element.pcb_trace_id) || "pcb_port_id" in primitive._element && primitiveIdsInMousedOverNet.includes(primitive._element.pcb_port_id))) {
+                newPrimitive.is_in_highlighted_net = true;
+            } else {
+                newPrimitive.is_in_highlighted_net = false;
+                newPrimitive.is_mouse_over = false;
+            }
+            newPrimitives.push(newPrimitive);
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return newPrimitives;
+}
+// src/components/CanvasElementsRenderer.tsx
 var import_jsx_runtime13 = require("react/jsx-runtime");
 var CanvasElementsRenderer = function(props) {
     var transform = props.transform, elements = props.elements;
-    var primitivesWithoutInteractionMetadata = (0, import_react16.useMemo)(function() {
+    var _ref = _sliced_to_array((0, import_react16.useMemo)(function() {
         var primitivesWithoutInteractionMetadata2 = props.elements.flatMap(function(elm) {
             return convertElementToPrimitives(elm, props.elements);
         });
-        return primitivesWithoutInteractionMetadata2;
+        var connectivityMap2 = (0, import_circuit_json_to_connectivity_map.getFullConnectivityMapFromCircuitJson)(props.elements);
+        return [
+            primitivesWithoutInteractionMetadata2,
+            connectivityMap2
+        ];
     }, [
         props.elements
-    ]);
-    var _ref = _sliced_to_array((0, import_react15.useState)(primitivesWithoutInteractionMetadata), 2), primitives = _ref[0], setPrimitives = _ref[1];
+    ]), 2), primitivesWithoutInteractionMetadata = _ref[0], connectivityMap = _ref[1];
+    var _ref1 = _sliced_to_array((0, import_react15.useState)(primitivesWithoutInteractionMetadata), 2), primitives = _ref1[0], setPrimitives = _ref1[1];
     return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(MouseElementTracker, {
         transform: transform,
         primitives: primitivesWithoutInteractionMetadata,
         onMouseHoverOverPrimitives: function(primitivesHoveredOver) {
-            var primitiveIdsWithMouseOver = new Set(primitivesHoveredOver.map(function(p) {
-                return p._pcb_drawing_object_id;
-            }));
-            var newPrimitives = [];
+            var primitiveIdsInMousedOverNet = [];
             var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
             try {
-                for(var _iterator = primitivesWithoutInteractionMetadata[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                for(var _iterator = primitivesHoveredOver[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                     var primitive = _step.value;
-                    var newPrimitive = _object_spread({}, primitive);
-                    if (primitiveIdsWithMouseOver.has(primitive._pcb_drawing_object_id)) {
-                        newPrimitive.is_mouse_over = true;
-                    } else {
-                        newPrimitive.is_mouse_over = false;
+                    if (primitive._element && "pcb_port_id" in primitive._element) {
+                        var _primitiveIdsInMousedOverNet;
+                        var connectedPrimitivesList = connectivityMap.getNetConnectedToId(primitive._element.pcb_port_id);
+                        (_primitiveIdsInMousedOverNet = primitiveIdsInMousedOverNet).push.apply(_primitiveIdsInMousedOverNet, _to_consumable_array(connectivityMap.getIdsConnectedToNet(connectedPrimitivesList)));
                     }
-                    newPrimitives.push(newPrimitive);
                 }
             } catch (err) {
                 _didIteratorError = true;
@@ -14807,6 +14859,14 @@ var CanvasElementsRenderer = function(props) {
                     }
                 }
             }
+            var drawingObjectIdsWithMouseOver = new Set(primitivesHoveredOver.map(function(p) {
+                return p._pcb_drawing_object_id;
+            }));
+            var newPrimitives = addInteractionMetadataToPrimitives({
+                primitivesWithoutInteractionMetadata: primitivesWithoutInteractionMetadata,
+                drawingObjectIdsWithMouseOver: drawingObjectIdsWithMouseOver,
+                primitiveIdsInMousedOverNet: primitiveIdsInMousedOverNet
+            });
             setPrimitives(newPrimitives);
         },
         children: /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(EditPlacementOverlay, {