@tscircuit/pcb-viewer 1.10.24 → 1.10.25

package/dist/index.js

@@ -616,20 +616,20 @@ var require_dist = __commonJS({
         });
         module2.exports = __toCommonJS2(src_exports2);
         var import_transformation_matrix12 = require("transformation-matrix");
-        var import_react21 = require("react");
+        var import_react22 = require("react");
         var useMouseMatrixTransform2 = function() {
             var props = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
-            var extRef = (0, import_react21.useRef)(null);
-            var _ref = _sliced_to_array((0, import_react21.useState)(0), 2), lastDragCancelTime = _ref[0], setLastDragCancelTime = _ref[1];
+            var extRef = (0, import_react22.useRef)(null);
+            var _ref = _sliced_to_array((0, import_react22.useState)(0), 2), lastDragCancelTime = _ref[0], setLastDragCancelTime = _ref[1];
             var _props_canvasElm;
             var outerCanvasElm = (_props_canvasElm = props.canvasElm) !== null && _props_canvasElm !== void 0 ? _props_canvasElm : extRef.current;
             var _props_initialTransform;
-            var _ref1 = _sliced_to_array((0, import_react21.useState)((_props_initialTransform = props.initialTransform) !== null && _props_initialTransform !== void 0 ? _props_initialTransform : (0, import_transformation_matrix12.identity)()), 2), internalTransform = _ref1[0], setInternalTransform = _ref1[1];
-            var _ref2 = _sliced_to_array((0, import_react21.useState)(0), 2), waitCounter = _ref2[0], setWaitCounter = _ref2[1];
-            var _ref3 = _sliced_to_array((0, import_react21.useReducer)(function(s) {
+            var _ref1 = _sliced_to_array((0, import_react22.useState)((_props_initialTransform = props.initialTransform) !== null && _props_initialTransform !== void 0 ? _props_initialTransform : (0, import_transformation_matrix12.identity)()), 2), internalTransform = _ref1[0], setInternalTransform = _ref1[1];
+            var _ref2 = _sliced_to_array((0, import_react22.useState)(0), 2), waitCounter = _ref2[0], setWaitCounter = _ref2[1];
+            var _ref3 = _sliced_to_array((0, import_react22.useReducer)(function(s) {
                 return s + 1;
             }, 0), 2), extChangeCounter = _ref3[0], incExtChangeCounter = _ref3[1];
-            var setTransform = (0, import_react21.useCallback)(function(newTransform) {
+            var setTransform = (0, import_react22.useCallback)(function(newTransform) {
                 if (props.onSetTransform) {
                     props.onSetTransform(newTransform);
                 }
@@ -640,7 +640,7 @@ var require_dist = __commonJS({
                 props.onSetTransform,
                 setInternalTransform
             ]);
-            var setTransformExt = (0, import_react21.useCallback)(function(newTransform) {
+            var setTransformExt = (0, import_react22.useCallback)(function(newTransform) {
                 setTransform(newTransform);
                 incExtChangeCounter();
             }, [
@@ -648,10 +648,10 @@ var require_dist = __commonJS({
             ]);
             var _props_transform;
             var transform = (_props_transform = props.transform) !== null && _props_transform !== void 0 ? _props_transform : internalTransform;
-            var cancelDrag = (0, import_react21.useCallback)(function() {
+            var cancelDrag = (0, import_react22.useCallback)(function() {
                 setLastDragCancelTime(Date.now());
             }, []);
-            (0, import_react21.useEffect)(function() {
+            (0, import_react22.useEffect)(function() {
                 var handleMouseDown = function handleMouseDown(e) {
                     m0 = getMousePos(e);
                     if (Date.now() - lastDragCancelTime < 100) return;
@@ -743,7 +743,7 @@ var require_dist = __commonJS({
                 extChangeCounter,
                 lastDragCancelTime
             ]);
-            var applyTransformToPoint = (0, import_react21.useCallback)(function(obj) {
+            var applyTransformToPoint = (0, import_react22.useCallback)(function(obj) {
                 return (0, import_transformation_matrix12.applyToPoint)(transform, obj);
             }, [
                 transform
@@ -9673,7 +9673,7 @@ var ToastContainer = function() {
     });
 };
 // src/PCBViewer.tsx
-var import_react20 = require("react");
+var import_react21 = require("react");
 // node_modules/react-use/esm/misc/util.js
 var noop = function noop() {};
 var isBrowser = typeof window !== "undefined";
@@ -9737,7 +9737,7 @@ var useMeasure_default = isBrowser && typeof window.ResizeObserver !== "undefine
 var import_transformation_matrix11 = require("transformation-matrix");
 var import_use_mouse_matrix_transform = __toESM(require_dist());
 // src/components/CanvasElementsRenderer.tsx
-var import_react18 = require("react");
+var import_react19 = require("react");
 // src/components/CanvasPrimitiveRenderer.tsx
 var import_react_supergrid = require("react-supergrid");
 var import_react7 = require("react");
@@ -10754,7 +10754,7 @@ var CanvasPrimitiveRenderer = function(param) {
     });
 };
 // src/components/CanvasElementsRenderer.tsx
-var import_react19 = require("react");
+var import_react20 = require("react");
 // src/lib/util/expand-stroke.ts
 function getExpandedStroke(strokeInput, defaultWidth) {
     if (strokeInput.length < 2) {
@@ -11886,7 +11886,7 @@ var import_css = require("@emotion/css");
 // package.json
 var package_default = {
     name: "@tscircuit/pcb-viewer",
-    version: "1.10.23",
+    version: "1.10.24",
     main: "dist/index.js",
     repository: "tscircuit/pcb-viewer",
     license: "MIT",
@@ -12885,28 +12885,103 @@ var EditTraceHintOverlay = function(param) {
 };
 // src/components/RatsNestOverlay.tsx
 var import_transformation_matrix10 = require("transformation-matrix");
+var import_circuit_json_to_connectivity_map = require("circuit-json-to-connectivity-map");
+var import_react18 = require("react");
 var import_jsx_runtime12 = require("react/jsx-runtime");
 var RatsNestOverlay = function(param) {
     var transform = param.transform, soup = param.soup, children = param.children;
     var isShowingRatsNest = useGlobalStore(function(s) {
         return s.is_showing_rats_nest;
     });
+    var _ref = (0, import_react18.useMemo)(function() {
+        return (0, import_circuit_json_to_connectivity_map.getFullConnectivityMapFromCircuitJson)(soup || []);
+    }, [
+        soup
+    ]), netMap = _ref.netMap, idToNetMap = _ref.idToNetMap;
+    var ratsNestLines = (0, import_react18.useMemo)(function() {
+        if (!soup || !isShowingRatsNest) return [];
+        var getElementPosition = function(id) {
+            var element = su_default(soup)[id.replace(/_\d+$/, "")].get(id);
+            if (element && "x" in element && "y" in element) {
+                return {
+                    x: element.x,
+                    y: element.y
+                };
+            }
+            return null;
+        };
+        var findNearestPointInNet = function(sourcePoint, netId) {
+            var connectedIds = netMap[netId] || [];
+            var nearestPoint = null;
+            var minDistance = Infinity;
+            connectedIds.forEach(function(id) {
+                var pos = getElementPosition(id);
+                if (pos) {
+                    var distance2 = Math.sqrt(Math.pow(sourcePoint.x - pos.x, 2) + Math.pow(sourcePoint.y - pos.y, 2));
+                    if (distance2 < minDistance && distance2 > 0) {
+                        minDistance = distance2;
+                        nearestPoint = pos;
+                    }
+                }
+            });
+            return nearestPoint;
+        };
+        var pcbPorts = su_default(soup).pcb_port.list();
+        var sourceTraces = su_default(soup).source_trace.list();
+        var lines = [];
+        pcbPorts.forEach(function(port, index) {
+            var portId = port.pcb_port_id;
+            var netId = idToNetMap[portId];
+            var isInNet = false;
+            var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+            try {
+                for(var _iterator = sourceTraces[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                    var trace = _step.value;
+                    var _su_default_source_port_getUsing;
+                    var sourceTrace = trace.connected_source_port_ids.includes((_su_default_source_port_getUsing = su_default(soup).source_port.getUsing({
+                        pcb_port_id: portId
+                    })) === null || _su_default_source_port_getUsing === void 0 ? void 0 : _su_default_source_port_getUsing.source_port_id);
+                    if (sourceTrace && trace.connected_source_net_ids.length > 0) {
+                        isInNet = true;
+                    }
+                }
+            } catch (err) {
+                _didIteratorError = true;
+                _iteratorError = err;
+            } finally{
+                try {
+                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                        _iterator.return();
+                    }
+                } finally{
+                    if (_didIteratorError) {
+                        throw _iteratorError;
+                    }
+                }
+            }
+            if (!netId) return;
+            var startPoint = {
+                x: port.x,
+                y: port.y
+            };
+            var nearestPoint = findNearestPointInNet(startPoint, netId);
+            if (!nearestPoint) return;
+            lines.push({
+                key: "".concat(portId, "-").concat(index),
+                startPoint: startPoint,
+                endPoint: nearestPoint,
+                isInNet: isInNet
+            });
+        });
+        return lines;
+    }, [
+        soup,
+        netMap,
+        idToNetMap,
+        isShowingRatsNest
+    ]);
     if (!soup || !isShowingRatsNest) return children;
     if (!transform) transform = (0, import_transformation_matrix10.identity)();
-    var sourceTraces = su_default(soup).source_trace.list();
-    var groups = [];
-    sourceTraces.forEach(function(sourceTrace) {
-        if (sourceTrace.connected_source_port_ids) {
-            var group = [];
-            sourceTrace.connected_source_port_ids.forEach(function(source_port_id) {
-                var pcbPort = su_default(soup).pcb_port.getWhere({
-                    source_port_id: source_port_id
-                });
-                if (pcbPort) group.push(pcbPort);
-            });
-            groups.push(group);
-        }
-    });
     return /* @__PURE__ */ (0, import_jsx_runtime12.jsxs)("div", {
         style: {
             position: "relative"
@@ -12924,40 +12999,26 @@ var RatsNestOverlay = function(param) {
                     opacity: 0.5,
                     zIndex: zIndexMap.ratsNestOverlay
                 },
-                children: groups.map(function(group, index) {
-                    var points = group.map(function(port) {
-                        return (0, import_transformation_matrix10.applyToPoint)(transform, {
-                            x: port.x,
-                            y: port.y
-                        });
-                    });
-                    var lines = [];
-                    for(var i = 0; i < points.length; i++){
-                        for(var j = i + 1; j < points.length; j++){
-                            lines.push([
-                                points[i],
-                                points[j]
-                            ]);
-                        }
-                    }
-                    return lines.map(function(param, index2) {
-                        var _param = _sliced_to_array(param, 2), start = _param[0], end = _param[1];
-                        return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("line", {
-                            x1: start.x,
-                            y1: start.y,
-                            x2: end.x,
-                            y2: end.y,
-                            stroke: "white",
-                            strokeWidth: "1"
-                        }, index2);
-                    });
+                children: ratsNestLines.map(function(param) {
+                    var key = param.key, startPoint = param.startPoint, endPoint = param.endPoint, isInNet = param.isInNet;
+                    var transformedStart = (0, import_transformation_matrix10.applyToPoint)(transform, startPoint);
+                    var transformedEnd = (0, import_transformation_matrix10.applyToPoint)(transform, endPoint);
+                    return /* @__PURE__ */ (0, import_jsx_runtime12.jsx)("line", {
+                        x1: transformedStart.x,
+                        y1: transformedStart.y,
+                        x2: transformedEnd.x,
+                        y2: transformedEnd.y,
+                        stroke: "white",
+                        strokeWidth: "1",
+                        strokeDasharray: isInNet ? "6,6" : void 0
+                    }, key);
                 })
             })
         ]
     });
 };
 // src/components/CanvasElementsRenderer.tsx
-var import_circuit_json_to_connectivity_map = require("circuit-json-to-connectivity-map");
+var import_circuit_json_to_connectivity_map2 = require("circuit-json-to-connectivity-map");
 // src/lib/util/addInteractionMetadataToPrimitives.ts
 function addInteractionMetadataToPrimitives(param) {
     var primitivesWithoutInteractionMetadata = param.primitivesWithoutInteractionMetadata, drawingObjectIdsWithMouseOver = param.drawingObjectIdsWithMouseOver, primitiveIdsInMousedOverNet = param.primitiveIdsInMousedOverNet;
@@ -13000,11 +13061,11 @@ function addInteractionMetadataToPrimitives(param) {
 var import_jsx_runtime13 = require("react/jsx-runtime");
 var CanvasElementsRenderer = function(props) {
     var transform = props.transform, elements = props.elements;
-    var _ref = _sliced_to_array((0, import_react19.useMemo)(function() {
+    var _ref = _sliced_to_array((0, import_react20.useMemo)(function() {
         var primitivesWithoutInteractionMetadata2 = props.elements.flatMap(function(elm) {
             return convertElementToPrimitives(elm, props.elements);
         });
-        var connectivityMap2 = (0, import_circuit_json_to_connectivity_map.getFullConnectivityMapFromCircuitJson)(props.elements);
+        var connectivityMap2 = (0, import_circuit_json_to_connectivity_map2.getFullConnectivityMapFromCircuitJson)(props.elements);
         return [
             primitivesWithoutInteractionMetadata2,
             connectivityMap2
@@ -13012,7 +13073,7 @@ var CanvasElementsRenderer = function(props) {
     }, [
         props.elements
     ]), 2), primitivesWithoutInteractionMetadata = _ref[0], connectivityMap = _ref[1];
-    var _ref1 = _sliced_to_array((0, import_react18.useState)(primitivesWithoutInteractionMetadata), 2), primitives = _ref1[0], setPrimitives = _ref1[1];
+    var _ref1 = _sliced_to_array((0, import_react19.useState)(primitivesWithoutInteractionMetadata), 2), primitives = _ref1[0], setPrimitives = _ref1[1];
     return /* @__PURE__ */ (0, import_jsx_runtime13.jsx)(MouseElementTracker, {
         transform: transform,
         primitives: primitivesWithoutInteractionMetadata,
@@ -13100,12 +13161,12 @@ var PCBViewer = function(param) {
     soup !== null && soup !== void 0 ? soup : soup = circuitJson;
     var _ref = (0, import_core.useRenderedCircuit)(children), circuitJsonFromChildren = _ref.circuitJson, errorFromChildren = _ref.error, isLoading = _ref.isLoading;
     var _useMeasure_default = _sliced_to_array(useMeasure_default(), 2), ref = _useMeasure_default[0], refDimensions = _useMeasure_default[1];
-    var _ref1 = _sliced_to_array((0, import_react20.useState)(defaultTransform), 2), transform = _ref1[0], setTransformInternal = _ref1[1];
+    var _ref1 = _sliced_to_array((0, import_react21.useState)(defaultTransform), 2), transform = _ref1[0], setTransformInternal = _ref1[1];
     var _ref2 = (0, import_use_mouse_matrix_transform.default)({
         transform: transform,
         onSetTransform: setTransformInternal
     }), transformRef = _ref2.ref, setTransform = _ref2.setTransform, cancelPanDrag = _ref2.cancelDrag;
-    var _ref3 = _sliced_to_array((0, import_react20.useState)([]), 2), editEvents = _ref3[0], setEditEvents = _ref3[1];
+    var _ref3 = _sliced_to_array((0, import_react21.useState)([]), 2), editEvents = _ref3[0], setEditEvents = _ref3[1];
     editEvents = editEventsProp !== null && editEventsProp !== void 0 ? editEventsProp : editEvents;
     var _ref4;
     var stateElements = (_ref4 = circuitJsonFromChildren !== null && circuitJsonFromChildren !== void 0 ? circuitJsonFromChildren : soup) !== null && _ref4 !== void 0 ? _ref4 : [];
@@ -13131,7 +13192,7 @@ var PCBViewer = function(param) {
         var _elmBounds_width1, _elmBounds_height1;
         setTransform((0, import_transformation_matrix11.compose)((0, import_transformation_matrix11.translate)(((_elmBounds_width1 = elmBounds.width) !== null && _elmBounds_width1 !== void 0 ? _elmBounds_width1 : 0) / 2, ((_elmBounds_height1 = elmBounds.height) !== null && _elmBounds_height1 !== void 0 ? _elmBounds_height1 : 0) / 2), (0, import_transformation_matrix11.scale)(scaleFactor, -scaleFactor, 0, 0), (0, import_transformation_matrix11.translate)(-center.x, -center.y)));
     };
-    (0, import_react20.useEffect)(function() {
+    (0, import_react21.useEffect)(function() {
         if (refDimensions && refDimensions.width !== 0 && (children || soup)) {
             resetTransform();
         }
@@ -13143,7 +13204,7 @@ var PCBViewer = function(param) {
     var pcbElmsPreEdit = ((_ref5 = circuitJson !== null && circuitJson !== void 0 ? circuitJson : soup) !== null && _ref5 !== void 0 ? _ref5 : stateElements).filter(function(e) {
         return e.type.startsWith("pcb_") || e.type.startsWith("source_");
     });
-    var elements = (0, import_react20.useMemo)(function() {
+    var elements = (0, import_react21.useMemo)(function() {
         return applyEditEvents(pcbElmsPreEdit, editEvents);
     }, [
         pcbElmsPreEdit,