@multiplatform.one/core 7.2.0 → 7.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@multiplatform.one/core",
-  "version": "7.2.0",
+  "version": "7.2.2",
   "description": "Core framework shell, provider composition, and layout factories for multiplatform.one",
   "keywords": [
     "app",
@@ -47,11 +47,11 @@
     "@tanstack/react-devtools": "^0.10.2",
     "@tanstack/react-form-devtools": "0.2.22",
     "react-cookie": "^8.1.2",
-    "@multiplatform.one/platform": "7.2.0",
-    "@multiplatform.one/logger": "7.2.0",
-    "@multiplatform.one/i18n": "7.2.0",
-    "@multiplatform.one/theme": "7.2.0",
-    "@multiplatform.one/store": "7.2.0"
+    "@multiplatform.one/i18n": "7.2.2",
+    "@multiplatform.one/logger": "7.2.2",
+    "@multiplatform.one/platform": "7.2.2",
+    "@multiplatform.one/store": "7.2.2",
+    "@multiplatform.one/theme": "7.2.2"
   },
   "devDependencies": {
     "@sentry/react": "^10.51.0",
@@ -69,8 +69,8 @@
     "tamagui": "2.7.6",
     "typescript": "~5.9.3",
     "vitest": "^4.1.5",
-    "@multiplatform.one/web3": "7.2.0",
-    "@multiplatform.one/frappe": "7.2.0"
+    "@multiplatform.one/frappe": "7.2.2",
+    "@multiplatform.one/web3": "7.2.2"
   },
   "peerDependencies": {
     "@sentry/react": "^9.0.0",
@@ -86,10 +86,10 @@
     "react-native-gesture-handler": ">=2.0.0",
     "react-native-safe-area-context": ">=4.0.0",
     "tamagui": "^2.0.0-rc",
-    "@multiplatform.one/frappe": "^7.2.0",
-    "@multiplatform.one/frappe-ui": "^7.2.0",
-    "@multiplatform.one/keycloak": "^7.2.0",
-    "@multiplatform.one/web3": "^7.2.0"
+    "@multiplatform.one/frappe": "^7.2.2",
+    "@multiplatform.one/frappe-ui": "^7.2.2",
+    "@multiplatform.one/keycloak": "^7.2.2",
+    "@multiplatform.one/web3": "^7.2.2"
   },
   "peerDependenciesMeta": {
     "@multiplatform.one/web3": {

package/src/app/CreateApp.tsx

@@ -57,7 +57,7 @@ export interface TanstackConfig {
    * `debug`). Defaults to true whenever the devtools mount. On iOS 13+
    * WebKit the motion permission is requested once from the user's first
    * tap; Android and desktop need no permission (desktop simply never
-   * fires devicemotion — use the Ctrl/Cmd+` shortcut there). Set false to
+   * fires devicemotion — use Cmd/Ctrl+Shift+` there). Set false to
    * keep the keyboard shortcut as the only trigger.
    */
   shakeToOpen?: boolean;

package/src/app/TanstackDevtools.tsx

@@ -14,7 +14,7 @@ import { ThemeDevtoolsPanel } from "@multiplatform.one/theme";
 import { storage } from "@multiplatform.one/store";
 import { useEffect, useState } from "react";
 import type { TanstackConfig } from "./CreateApp";
-import { devtoolsOpenHotkey, useShakeToOpen } from "./devtoolsTrigger";
+import { devtoolsOpenHotkey, useDevtoolsKeyboardTrigger, useShakeToOpen } from "./devtoolsTrigger";
 
 const devtoolsSettingsKey = "tanstack_devtools_settings";
 
@@ -133,6 +133,9 @@ export default function TanstackDevtoolsWrapper({
   // keyboard shortcut. Ships whenever the devtools mount unless the app
   // opts out with `tanstack: { shakeToOpen: false }`.
   useShakeToOpen(tanstackConfig.shakeToOpen !== false);
+  // Cmd/Ctrl+Shift+` — capture-phase so apps cannot swallow it. TanStack
+  // still receives openHotkey (US-layout e.key sequence) as a fallback.
+  useDevtoolsKeyboardTrigger(true);
 
   const plugins = [
     {

package/src/app/devtoolsTrigger.spec.ts

@@ -16,6 +16,7 @@ import {
   devtoolsOpenHotkey,
   devtoolsShellPluginId,
   devtoolsTriggerToggledEvent,
+  isDevtoolsOpenHotkeyEvent,
   isMotionPermissionRequired,
   motionMagnitude,
   openDevtoolsShell,
@@ -30,6 +31,70 @@ function sample(magnitude: number) {
   return { acceleration: { x: magnitude, y: 0, z: 0 } };
 }
 
+function keyEvent(init: {
+  metaKey?: boolean;
+  ctrlKey?: boolean;
+  shiftKey?: boolean;
+  altKey?: boolean;
+  key?: string;
+  code?: string;
+}): KeyboardEvent {
+  return {
+    metaKey: false,
+    ctrlKey: false,
+    shiftKey: false,
+    altKey: false,
+    key: "",
+    code: "",
+    ...init,
+  } as KeyboardEvent;
+}
+
+describe("isDevtoolsOpenHotkeyEvent", () => {
+  it("matches Cmd+Shift+Backquote and Ctrl+Shift+Backquote", () => {
+    expect(
+      isDevtoolsOpenHotkeyEvent(
+        keyEvent({ metaKey: true, shiftKey: true, code: "Backquote", key: "~" }),
+      ),
+    ).toBe(true);
+    expect(
+      isDevtoolsOpenHotkeyEvent(
+        keyEvent({ ctrlKey: true, shiftKey: true, code: "Backquote", key: "~" }),
+      ),
+    ).toBe(true);
+  });
+
+  it("matches by physical Backquote even when e.key is not tilde", () => {
+    // UK / ISO layouts produce ¬ or ` for Shift+Backquote; the physical key
+    // is still the one left of 1.
+    expect(
+      isDevtoolsOpenHotkeyEvent(
+        keyEvent({ metaKey: true, shiftKey: true, code: "Backquote", key: "¬" }),
+      ),
+    ).toBe(true);
+  });
+
+  it("rejects the unshifted Cmd/Ctrl+` combo macOS steals for window cycle", () => {
+    expect(
+      isDevtoolsOpenHotkeyEvent(keyEvent({ metaKey: true, code: "Backquote", key: "`" })),
+    ).toBe(false);
+    expect(
+      isDevtoolsOpenHotkeyEvent(keyEvent({ ctrlKey: true, code: "Backquote", key: "`" })),
+    ).toBe(false);
+  });
+
+  it("rejects Shift+Backquote without Ctrl/Cmd and other keys with the modifiers", () => {
+    expect(
+      isDevtoolsOpenHotkeyEvent(keyEvent({ shiftKey: true, code: "Backquote", key: "~" })),
+    ).toBe(false);
+    expect(
+      isDevtoolsOpenHotkeyEvent(
+        keyEvent({ metaKey: true, shiftKey: true, code: "KeyK", key: "K" }),
+      ),
+    ).toBe(false);
+  });
+});
+
 describe("motionMagnitude", () => {
   it("prefers the gravity-excluded acceleration reading", () => {
     expect(
@@ -424,10 +489,17 @@ describe("devtools shell wiring", () => {
     expect(shellSource).toContain("useShakeToOpen(tanstackConfig.shakeToOpen !== false)");
   });
 
-  it("keeps the existing Ctrl/Cmd+` shortcut", () => {
-    expect(devtoolsOpenHotkey).toEqual(["CtrlOrMeta", "`"]);
-    // The shell config must spread the pinned constant, not restate it.
+  it("binds Cmd/Ctrl+Shift+` (TanStack e.key for Shift+Backquote is ~)", () => {
+    // Unshifted Ctrl/Cmd+` is the macOS "cycle windows" shortcut — the
+    // page never sees it. Shift+Backquote produces e.key "~", and
+    // @solid-primitives/keyboard matches an exact e.key sequence, so the
+    // TanStack combo must include both Shift and "~". The capture-phase
+    // physical-key listener (e.code === "Backquote") is the source of
+    // truth across layouts; this constant is what TanStack's own matcher
+    // gets so it agrees on US keyboards.
+    expect(devtoolsOpenHotkey).toEqual(["CtrlOrMeta", "Shift", "~"]);
     expect(shellSource).toContain("openHotkey: [...devtoolsOpenHotkey]");
+    expect(shellSource).toContain("useDevtoolsKeyboardTrigger(");
   });
 
   it("mounts shake-to-open with the config opt-out", () => {

package/src/app/devtoolsTrigger.ts

@@ -6,12 +6,56 @@ import { useEffect } from "react";
 // ---------------------------------------------------------------------------
 
 /**
- * Keyboard shortcut that toggles the devtools shell (Ctrl+` / Cmd+`).
- * Handled inside `@tanstack/react-devtools`, which skips editable targets
- * (inputs, textareas, contentEditable), so it cannot collide with app
- * typing. Exported so tests pin the binding.
+ * Keyboard shortcut that opens the devtools shell: Cmd+Shift+` on Mac,
+ * Ctrl+Shift+` elsewhere.
+ *
+ * Why this combo, and why `~`: unshifted Ctrl/Cmd+` is macOS "cycle
+ * windows" and never reaches the page. Shift+Backquote is the physical
+ * key the ticket names. `@tanstack/react-devtools` matches an exact
+ * `e.key` sequence via `@solid-primitives/keyboard`, and Shift+Backquote
+ * produces `e.key === "~"` on US layouts — so the TanStack config must
+ * be Shift + "~", not unshifted "`". The capture-phase listener in
+ * `useDevtoolsKeyboardTrigger` matches `e.code === "Backquote"` so
+ * non-US layouts (where Shift+Backquote is ¬ or `) still fire.
+ *
+ * Exported so tests pin the binding.
+ */
+export const devtoolsOpenHotkey = ["CtrlOrMeta", "Shift", "~"] as const;
+
+/**
+ * True when the event is the documented debugger shortcut. Prefers the
+ * physical Backquote key so it does not depend on keyboard layout;
+ * `e.key` of "`" or "~" is accepted as a fallback when `code` is absent
+ * (jsdom / synthetic events).
+ */
+export function isDevtoolsOpenHotkeyEvent(event: KeyboardEvent): boolean {
+  if (!(event.metaKey || event.ctrlKey) || !event.shiftKey || event.altKey) {
+    return false;
+  }
+  if (event.code === "Backquote") return true;
+  return event.key === "`" || event.key === "~";
+}
+
+/**
+ * Capture-phase window listener that opens the shell on the documented
+ * shortcut. Capture runs before app-level keydown handlers, so a page
+ * that stopPropagation's cannot swallow it. preventDefault +
+ * stopImmediatePropagation keep TanStack's own createShortcut from
+ * also firing (which would toggle the panel shut again).
  */
-export const devtoolsOpenHotkey = ["CtrlOrMeta", "`"] as const;
+export function useDevtoolsKeyboardTrigger(enabled: boolean) {
+  useEffect(() => {
+    if (!enabled || typeof window === "undefined") return;
+    const onKeyDown = (event: KeyboardEvent) => {
+      if (!isDevtoolsOpenHotkeyEvent(event)) return;
+      event.preventDefault();
+      event.stopImmediatePropagation();
+      openDevtoolsShell();
+    };
+    window.addEventListener("keydown", onKeyDown, { capture: true });
+    return () => window.removeEventListener("keydown", onKeyDown, { capture: true });
+  }, [enabled]);
+}
 
 // ---------------------------------------------------------------------------
 // Programmatic open — the same event the devtools shell's own trigger emits

package/types/app/CreateApp.d.ts

@@ -20,7 +20,7 @@ export interface TanstackConfig {
      * `debug`). Defaults to true whenever the devtools mount. On iOS 13+
      * WebKit the motion permission is requested once from the user's first
      * tap; Android and desktop need no permission (desktop simply never
-     * fires devicemotion — use the Ctrl/Cmd+` shortcut there). Set false to
+     * fires devicemotion — use Cmd/Ctrl+Shift+` there). Set false to
      * keep the keyboard shortcut as the only trigger.
      */
     shakeToOpen?: boolean;

package/types/app/TanstackDevtools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TanstackDevtools.d.ts","sourceRoot":"","sources":["../../src/app/TanstackDevtools.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAoClD,MAAM,WAAW,qBAAqB;IACpC,cAAc,EAAE,OAAO,GAAG,MAAM,CAAC;IACjC,cAAc,EAAE,cAAc,CAAC;CAChC;AAkED,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,EAC9C,cAAc,EACd,cAAc,GACf,EAAE,qBAAqB,2CAiEvB"}
+{"version":3,"file":"TanstackDevtools.d.ts","sourceRoot":"","sources":["../../src/app/TanstackDevtools.tsx"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAoClD,MAAM,WAAW,qBAAqB;IACpC,cAAc,EAAE,OAAO,GAAG,MAAM,CAAC;IACjC,cAAc,EAAE,cAAc,CAAC;CAChC;AAkED,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAAC,EAC9C,cAAc,EACd,cAAc,GACf,EAAE,qBAAqB,2CAoEvB"}

package/types/app/devtoolsTrigger.d.ts

@@ -1,10 +1,34 @@
 /**
- * Keyboard shortcut that toggles the devtools shell (Ctrl+` / Cmd+`).
- * Handled inside `@tanstack/react-devtools`, which skips editable targets
- * (inputs, textareas, contentEditable), so it cannot collide with app
- * typing. Exported so tests pin the binding.
+ * Keyboard shortcut that opens the devtools shell: Cmd+Shift+` on Mac,
+ * Ctrl+Shift+` elsewhere.
+ *
+ * Why this combo, and why `~`: unshifted Ctrl/Cmd+` is macOS "cycle
+ * windows" and never reaches the page. Shift+Backquote is the physical
+ * key the ticket names. `@tanstack/react-devtools` matches an exact
+ * `e.key` sequence via `@solid-primitives/keyboard`, and Shift+Backquote
+ * produces `e.key === "~"` on US layouts — so the TanStack config must
+ * be Shift + "~", not unshifted "`". The capture-phase listener in
+ * `useDevtoolsKeyboardTrigger` matches `e.code === "Backquote"` so
+ * non-US layouts (where Shift+Backquote is ¬ or `) still fire.
+ *
+ * Exported so tests pin the binding.
+ */
+export declare const devtoolsOpenHotkey: readonly ["CtrlOrMeta", "Shift", "~"];
+/**
+ * True when the event is the documented debugger shortcut. Prefers the
+ * physical Backquote key so it does not depend on keyboard layout;
+ * `e.key` of "`" or "~" is accepted as a fallback when `code` is absent
+ * (jsdom / synthetic events).
+ */
+export declare function isDevtoolsOpenHotkeyEvent(event: KeyboardEvent): boolean;
+/**
+ * Capture-phase window listener that opens the shell on the documented
+ * shortcut. Capture runs before app-level keydown handlers, so a page
+ * that stopPropagation's cannot swallow it. preventDefault +
+ * stopImmediatePropagation keep TanStack's own createShortcut from
+ * also firing (which would toggle the panel shut again).
  */
-export declare const devtoolsOpenHotkey: readonly ["CtrlOrMeta", "`"];
+export declare function useDevtoolsKeyboardTrigger(enabled: boolean): void;
 /**
  * Plugin id of the TanStack Devtools shell's internal event client
  * (`devtoolsEventClient` in `@tanstack/devtools-client`). The shell

package/types/app/devtoolsTrigger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"devtoolsTrigger.d.ts","sourceRoot":"","sources":["../../src/app/devtoolsTrigger.ts"],"names":[],"mappings":"AAOA;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,8BAA+B,CAAC;AAM/D;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,2BAA2B,CAAC;AAE9D,sEAAsE;AACtE,eAAO,MAAM,2BAA2B,oBAAoB,CAAC;AAQ7D;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,SAKhC;AAQD,gFAAgF;AAChF,eAAO,MAAM,aAAa;IACxB,0DAA0D;;IAE1D,iFAAiF;;IAEjF,wDAAwD;;IAExD,kDAAkD;;IAElD,+DAA+D;;CAEvD,CAAC;AAEX,UAAU,UAAU;IAClB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACnB;AAED,oFAAoF;AACpF,MAAM,WAAW,eAAe;IAC9B,YAAY,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;IACjC,4BAA4B,CAAC,EAAE,UAAU,GAAG,IAAI,CAAC;CAClD;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CAUrE;AAED,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B,iEAAiE;IACjE,YAAY,EAAE,CAAC,KAAK,EAAE,eAAe,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7D,yCAAyC;IACzC,KAAK,EAAE,MAAM,IAAI,CAAC;CACnB;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,OAAO,EACP,SAAmC,EACnC,YAAyC,EACzC,SAAmC,EACnC,QAAiC,EACjC,UAAqC,GACtC,EAAE,oBAAoB,GAAG,aAAa,CA2BtC;AAMD,MAAM,MAAM,qBAAqB,GAAG,SAAS,GAAG,kBAAkB,GAAG,YAAY,GAAG,QAAQ,CAAC;AAE7F,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,KAAK,EAAE,qBAAqB,CAAC;IACtC;;;OAGG;IACH,aAAa,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CAAC,EACzC,iBAAiB,EACjB,SAAS,EACT,QAAQ,GACT,EAAE;IACD,iBAAiB,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,SAAS,EAAE,MAAM,IAAI,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;CACvB,GAAG,oBAAoB,CA8BvB;AAcD;;;;;GAKG;AACH,wBAAgB,0BAA0B,IAAI,OAAO,CAEpD;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,sBAAsB,4BAA4B,CAAC;AAEhE;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,8BAA8B,CAAC;AA4BpE,oEAAoE;AACpE,wBAAgB,mBAAmB,SAGlC;AAED;;;;;;GAMG;AACH,wBAAsB,kCAAkC,IAAI,OAAO,CAAC,qBAAqB,CAAC,CAqBzF;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,IAAI,IAAI,CAGxC;AAMD;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,GAAE,MAAM,IAAwB,QA+BvF"}
+{"version":3,"file":"devtoolsTrigger.d.ts","sourceRoot":"","sources":["../../src/app/devtoolsTrigger.ts"],"names":[],"mappings":"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"}