@tscircuit/pcb-viewer 1.10.6 → 1.10.8

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
-import { LayerRef, AnySoupElement } from 'circuit-json';
+import { LayerRef, AnyCircuitElement } from 'circuit-json';
 import { Matrix } from 'transformation-matrix';
 
 type EditComponentLocationEvent = {
@@ -39,6 +39,7 @@ interface State {
     in_edit_mode: boolean;
     in_move_footprint_mode: boolean;
     in_draw_trace_mode: boolean;
+    is_mouse_over_container: boolean;
     is_moving_component: boolean;
     is_drawing_trace: boolean;
     is_showing_rats_nest: boolean;
@@ -47,6 +48,7 @@ interface State {
     setIsMovingComponent: (is_moving: boolean) => void;
     setIsDrawingTrace: (is_drawing: boolean) => void;
     setIsShowingRatsNest: (is_showing: boolean) => void;
+    setIsMouseOverContainer: (is_focused: boolean) => void;
 }
 type StateProps = {
     [key in keyof State]: State[key] extends boolean ? boolean : never;
@@ -63,7 +65,7 @@ type Props = {
 };
 declare const PCBViewer: ({ children, soup, height, initialState, allowEditing, editEvents: editEventsProp, onEditEventsChanged, }: Props) => react_jsx_runtime.JSX.Element;
 
-declare const applyEditEvents: (soup: AnySoupElement[], edit_events: EditEvent[]) => AnySoupElement[];
+declare const applyEditEvents: (soup: AnyCircuitElement[], edit_events: EditEvent[]) => AnyCircuitElement[];
 
 type GridConfig = {
     spacing: number;
@@ -76,7 +78,7 @@ type GridConfig = {
 };
 
 interface CanvasElementsRendererProps {
-    elements: AnySoupElement[];
+    elements: AnyCircuitElement[];
     transform?: Matrix;
     width?: number;
     height?: number;

package/dist/index.js

@@ -5097,6 +5097,7 @@ var createStore = function() {
             in_draw_trace_mode: false,
             is_moving_component: false,
             is_drawing_trace: false,
+            is_mouse_over_container: false,
             is_showing_rats_nest: false
         }, initialState), {
             selectLayer: function(layer) {
@@ -5127,6 +5128,11 @@ var createStore = function() {
                 return set({
                     is_drawing_trace: is_drawing
                 });
+            },
+            setIsMouseOverContainer: function(is_focused) {
+                return set({
+                    is_mouse_over_container: is_focused
+                });
             }
         });
     });
@@ -13374,7 +13380,7 @@ var import_css = require("@emotion/css");
 // package.json
 var package_default = {
     name: "@tscircuit/pcb-viewer",
-    version: "1.10.5",
+    version: "1.10.7",
     main: "dist/index.js",
     repository: "tscircuit/pcb-viewer",
     license: "MIT",
@@ -13437,13 +13443,20 @@ var package_default = {
 // src/hooks/useHotKey.ts
 var import_react9 = require("react");
 var useHotKey = function(key, onUse) {
+    var isMouseOverContainer = useGlobalStore(function(s) {
+        return s.is_mouse_over_container;
+    });
     (0, import_react9.useEffect)(function() {
+        if (!key || typeof onUse !== "function") return;
         var handleKeyDown = function(event) {
             var keyParts = key.split("+");
             var ctrlRequired = keyParts.includes("ctrl");
             var shiftRequired = keyParts.includes("shift");
+            var altRequired = keyParts.includes("alt");
+            var metaRequired = keyParts.includes("meta");
             var mainKey = keyParts[keyParts.length - 1];
-            if ((!ctrlRequired || ctrlRequired && event.ctrlKey) && (!shiftRequired || shiftRequired && event.shiftKey) && event.key.toLowerCase() === mainKey.toLowerCase()) {
+            if (isMouseOverContainer && (!ctrlRequired || event.ctrlKey) && (!shiftRequired || event.shiftKey) && (!altRequired || event.altKey) && (!metaRequired || event.metaKey) && event.key.toLowerCase() === mainKey.toLowerCase()) {
+                event.preventDefault();
                 onUse();
             }
         };
@@ -13452,7 +13465,8 @@ var useHotKey = function(key, onUse) {
             window.removeEventListener("keydown", handleKeyDown);
         };
     }, [
-        key
+        key,
+        onUse
     ]);
 };
 // src/components/ToolbarOverlay.tsx
@@ -13503,22 +13517,27 @@ var ToolbarButton = function(_param) {
 };
 var ToolbarOverlay = function(param) {
     var children = param.children, elements = param.elements;
-    var _ref = _sliced_to_array((0, import_react10.useState)(false), 2), isMouseOverContainer = _ref[0], setIsMouseOverContainer = _ref[1];
-    var _ref1 = _sliced_to_array((0, import_react10.useState)(false), 2), isLayerMenuOpen = _ref1[0], setLayerMenuOpen = _ref1[1];
-    var _ref2 = _sliced_to_array((0, import_react10.useState)(false), 2), isErrorsOpen = _ref2[0], setErrorsOpen = _ref2[1];
     var _useGlobalStore = _sliced_to_array(useGlobalStore(function(s) {
+        return [
+            s.is_mouse_over_container,
+            s.setIsMouseOverContainer
+        ];
+    }), 2), isMouseOverContainer = _useGlobalStore[0], setIsMouseOverContainer = _useGlobalStore[1];
+    var _ref = _sliced_to_array((0, import_react10.useState)(false), 2), isLayerMenuOpen = _ref[0], setLayerMenuOpen = _ref[1];
+    var _ref1 = _sliced_to_array((0, import_react10.useState)(false), 2), isErrorsOpen = _ref1[0], setErrorsOpen = _ref1[1];
+    var _useGlobalStore1 = _sliced_to_array(useGlobalStore(function(s) {
         return [
             s.selected_layer,
             s.selectLayer
         ];
-    }), 2), selectedLayer = _useGlobalStore[0], selectLayer = _useGlobalStore[1];
-    var _useGlobalStore1 = _sliced_to_array(useGlobalStore(function(s) {
+    }), 2), selectedLayer = _useGlobalStore1[0], selectLayer = _useGlobalStore1[1];
+    var _useGlobalStore2 = _sliced_to_array(useGlobalStore(function(s) {
         return [
             s.in_move_footprint_mode,
             s.in_draw_trace_mode,
             s.is_showing_rats_nest
         ];
-    }), 3), in_move_footprint_mode = _useGlobalStore1[0], in_draw_trace_mode = _useGlobalStore1[1], is_showing_rats_nest = _useGlobalStore1[2];
+    }), 3), in_move_footprint_mode = _useGlobalStore2[0], in_draw_trace_mode = _useGlobalStore2[1], is_showing_rats_nest = _useGlobalStore2[2];
     var setEditMode = useGlobalStore(function(s) {
         return s.setEditMode;
     });
@@ -13784,7 +13803,7 @@ var ErrorOverlay = function(param) {
         children: [
             children,
             elements === null || elements === void 0 ? void 0 : elements.filter(function(el) {
-                return el.type === "pcb_error";
+                return el.type === "pcb_trace_error";
             }).map(function(el) {
                 var pcb_port_ids = el.pcb_port_ids;
                 var port1 = elements.find(function(el2) {