@tscircuit/3d-viewer 0.0.440 → 0.0.441

package/dist/index.js

@@ -28113,12 +28113,6 @@ var defaultVisibility = {
 var LayerVisibilityContext = createContext3(void 0);
 var LayerVisibilityProvider = ({ children }) => {
   const [visibility, setVisibility] = useState5(defaultVisibility);
-  const toggleLayer = useCallback2((layer) => {
-    setVisibility((prev) => ({
-      ...prev,
-      [layer]: !prev[layer]
-    }));
-  }, []);
   const setLayerVisibility = useCallback2(
     (layer, visible) => {
       setVisibility((prev) => ({
@@ -28134,11 +28128,10 @@ var LayerVisibilityProvider = ({ children }) => {
   const value = useMemo6(
     () => ({
       visibility,
-      toggleLayer,
       setLayerVisibility,
       resetToDefaults
     }),
-    [visibility, toggleLayer, setLayerVisibility, resetToDefaults]
+    [visibility, setLayerVisibility, resetToDefaults]
   );
   return /* @__PURE__ */ jsx8(LayerVisibilityContext.Provider, { value, children });
 };
@@ -28288,7 +28281,7 @@ import * as THREE15 from "three";
 // package.json
 var package_default = {
   name: "@tscircuit/3d-viewer",
-  version: "0.0.439",
+  version: "0.0.440",
   main: "./dist/index.js",
   module: "./dist/index.js",
   type: "module",
@@ -34508,23 +34501,26 @@ import { useEffect as useEffect25, useMemo as useMemo21, useRef as useRef11, use
 var hotkeyRegistry = /* @__PURE__ */ new Map();
 var subscribers = /* @__PURE__ */ new Set();
 var isListenerAttached = false;
-var matchesKey = (eventKey, targetKey) => {
-  if (!eventKey || !targetKey) return false;
-  return eventKey.toLowerCase() === targetKey.toLowerCase();
-};
-var matchesModifiers = (event, modifiers) => {
-  if (!modifiers || modifiers.length === 0) {
-    return !event.ctrlKey && !event.metaKey && !event.shiftKey && !event.altKey;
-  }
-  const hasCtrl = modifiers.includes("Ctrl");
-  const hasCmd = modifiers.includes("Cmd");
-  const hasShift = modifiers.includes("Shift");
-  const hasAlt = modifiers.includes("Alt");
-  if (hasCtrl && !event.ctrlKey) return false;
-  if (hasCmd && !event.metaKey) return false;
-  if (hasShift && !event.shiftKey) return false;
-  if (hasAlt && !event.altKey) return false;
-  return true;
+var parseShortcut = (shortcut) => {
+  const parts = shortcut.toLowerCase().split("+");
+  const key = parts[parts.length - 1];
+  const modifierParts = parts.slice(0, -1);
+  return {
+    key,
+    ctrl: modifierParts.includes("ctrl"),
+    cmd: modifierParts.includes("cmd"),
+    shift: modifierParts.includes("shift"),
+    alt: modifierParts.includes("alt")
+  };
+};
+var matchesShortcut = (event, shortcut) => {
+  const parsed = parseShortcut(shortcut);
+  const keyMatches = event.key.toLowerCase() === parsed.key;
+  const ctrlMatches = parsed.ctrl === event.ctrlKey;
+  const cmdMatches = parsed.cmd === event.metaKey;
+  const shiftMatches = parsed.shift === event.shiftKey;
+  const altMatches = parsed.alt === event.altKey;
+  return keyMatches && ctrlMatches && cmdMatches && shiftMatches && altMatches;
 };
 var isEditableTarget = (target) => {
   if (!target || typeof target !== "object") return false;
@@ -34541,7 +34537,7 @@ var handleKeydown = (event) => {
     return;
   }
   hotkeyRegistry.forEach((entry) => {
-    if (matchesKey(event.key, entry.key) && matchesModifiers(event, entry.modifiers)) {
+    if (matchesShortcut(event, entry.shortcut)) {
       event.preventDefault();
       entry.invoke();
     }
@@ -34579,11 +34575,10 @@ var useRegisteredHotkey = (id, handler, metadata) => {
   handlerRef.current = handler;
   const normalizedMetadata = useMemo21(
     () => ({
-      key: metadata.key,
-      description: metadata.description,
-      modifiers: metadata.modifiers
+      shortcut: metadata.shortcut,
+      description: metadata.description
     }),
-    [metadata.key, metadata.description, metadata.modifiers]
+    [metadata.shortcut, metadata.description]
   );
   useEffect25(() => {
     const registration = {
@@ -40065,7 +40060,7 @@ var iconContainerStyles = {
   flexShrink: 0
 };
 var AppearanceMenu = () => {
-  const { visibility, toggleLayer } = useLayerVisibility();
+  const { visibility, setLayerVisibility } = useLayerVisibility();
   const [appearanceSubOpen, setAppearanceSubOpen] = useState33(false);
   const [hoveredItem, setHoveredItem] = useState33(null);
   return /* @__PURE__ */ jsxs7(Fragment9, { children: [
@@ -40116,7 +40111,7 @@ var AppearanceMenu = () => {
                 onSelect: (e) => e.preventDefault(),
                 onPointerDown: (e) => {
                   e.preventDefault();
-                  toggleLayer("boardBody");
+                  setLayerVisibility("boardBody", !visibility.boardBody);
                 },
                 onMouseEnter: () => setHoveredItem("boardBody"),
                 onMouseLeave: () => setHoveredItem(null),
@@ -40137,7 +40132,7 @@ var AppearanceMenu = () => {
                 onSelect: (e) => e.preventDefault(),
                 onPointerDown: (e) => {
                   e.preventDefault();
-                  toggleLayer("topCopper");
+                  setLayerVisibility("topCopper", !visibility.topCopper);
                 },
                 onMouseEnter: () => setHoveredItem("topCopper"),
                 onMouseLeave: () => setHoveredItem(null),
@@ -40158,7 +40153,7 @@ var AppearanceMenu = () => {
                 onSelect: (e) => e.preventDefault(),
                 onPointerDown: (e) => {
                   e.preventDefault();
-                  toggleLayer("bottomCopper");
+                  setLayerVisibility("bottomCopper", !visibility.bottomCopper);
                 },
                 onMouseEnter: () => setHoveredItem("bottomCopper"),
                 onMouseLeave: () => setHoveredItem(null),
@@ -40179,7 +40174,7 @@ var AppearanceMenu = () => {
                 onSelect: (e) => e.preventDefault(),
                 onPointerDown: (e) => {
                   e.preventDefault();
-                  toggleLayer("topSilkscreen");
+                  setLayerVisibility("topSilkscreen", !visibility.topSilkscreen);
                 },
                 onMouseEnter: () => setHoveredItem("topSilkscreen"),
                 onMouseLeave: () => setHoveredItem(null),
@@ -40200,7 +40195,10 @@ var AppearanceMenu = () => {
                 onSelect: (e) => e.preventDefault(),
                 onPointerDown: (e) => {
                   e.preventDefault();
-                  toggleLayer("bottomSilkscreen");
+                  setLayerVisibility(
+                    "bottomSilkscreen",
+                    !visibility.bottomSilkscreen
+                  );
                 },
                 onMouseEnter: () => setHoveredItem("bottomSilkscreen"),
                 onMouseLeave: () => setHoveredItem(null),
@@ -40221,7 +40219,7 @@ var AppearanceMenu = () => {
                 onSelect: (e) => e.preventDefault(),
                 onPointerDown: (e) => {
                   e.preventDefault();
-                  toggleLayer("smtModels");
+                  setLayerVisibility("smtModels", !visibility.smtModels);
                 },
                 onMouseEnter: () => setHoveredItem("smtModels"),
                 onMouseLeave: () => setHoveredItem(null),
@@ -40584,7 +40582,7 @@ var ContextMenu = ({
 
 // src/components/KeyboardShortcutsDialog.tsx
 import { useEffect as useEffect41, useMemo as useMemo27, useRef as useRef25, useState as useState35 } from "react";
-import { Fragment as Fragment10, jsx as jsx35, jsxs as jsxs9 } from "react/jsx-runtime";
+import { jsx as jsx35, jsxs as jsxs9 } from "react/jsx-runtime";
 var KeyboardShortcutsDialog = ({
   open,
   onClose
@@ -40616,7 +40614,7 @@ var KeyboardShortcutsDialog = ({
       return hotkeys;
     }
     return hotkeys.filter((hotkey) => {
-      const haystack = `${hotkey.key} ${hotkey.description}`;
+      const haystack = `${hotkey.shortcut} ${hotkey.description}`;
       return haystack.toLowerCase().includes(normalizedQuery);
     });
   }, [hotkeys, query]);
@@ -40751,12 +40749,10 @@ var KeyboardShortcutsDialog = ({
                               minWidth: 36,
                               padding: "4px 8px",
                               fontFamily: "monospace",
-                              fontSize: "0.95rem"
+                              fontSize: "0.95rem",
+                              textTransform: "capitalize"
                             },
-                            children: hotkey.modifiers?.length ? /* @__PURE__ */ jsxs9(Fragment10, { children: [
-                              hotkey.modifiers.map((mod) => `${mod}+`).join(""),
-                              hotkey.key.toUpperCase()
-                            ] }) : hotkey.key.toUpperCase()
+                            children: hotkey.shortcut
                           }
                         ) }),
                         /* @__PURE__ */ jsx35("td", { style: { padding: "12px 24px" }, children: hotkey.description })
@@ -40790,7 +40786,7 @@ var CadViewerInner = (props) => {
   });
   const [cameraPreset, setCameraPreset] = useState36("Custom");
   const { cameraType, setCameraType } = useCameraController();
-  const { visibility, toggleLayer } = useLayerVisibility();
+  const { visibility, setLayerVisibility } = useLayerVisibility();
   const cameraControllerRef = useRef26(null);
   const externalCameraControllerReady = props.onCameraControllerReady;
   const {
@@ -40849,9 +40845,8 @@ var CadViewerInner = (props) => {
       setIsKeyboardShortcutsDialogOpen(true);
     },
     {
-      key: "?",
-      description: "Open keyboard shortcuts",
-      modifiers: ["Shift"]
+      shortcut: "shift+?",
+      description: "Open keyboard shortcuts"
     }
   );
   useEffect42(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/3d-viewer",
-  "version": "0.0.440",
+  "version": "0.0.441",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "type": "module",