@tanstack/ember-hotkeys 0.4.1 → 0.6.0

package/dist/index.d.ts

@@ -7,10 +7,11 @@ import { useHeldKeyCodes } from "./useHeldKeyCodes.js";
 import { useKeyHold } from "./useKeyHold.js";
 import { useHotkeyHint } from "./useHotkeyHint.js";
 import { useHotkeyRegistrations } from "./useHotkeyRegistrations.js";
+import { useHotkeyScopesState } from "./useHotkeyScopesState.js";
 import { useHotkeyRecorder } from "./useHotkeyRecorder.js";
 import { useAppHotkeyList, useAppHotkeys, useCustomHotkeys } from "./useAppHotkeys.js";
 import { ElementHotkeyOptions, OnHotkeys } from "./onHotkeys.js";
 import { OnHotkey } from "./onHotkey.js";
 import { EmberHotkeysScope, createHotkeysScope } from "./createHotkeysScope.js";
 export * from "@tanstack/hotkeys";
-export { DefaultHotkeysOptions, type ElementHotkeyOptions, EmberAppHotkeyList, EmberCustomHotkeys, EmberHotkeyCommonOptions, EmberHotkeyDefinition, EmberHotkeyRecorder, EmberHotkeyState, EmberHotkeyTarget, EmberHotkeysScope, HotkeyRegistrationsResult, type MaybeGetter, createHotkeysScope, OnHotkey as onHotkey, OnHotkeys as onHotkeys, useAppHotkeyList, useAppHotkeys, useCustomHotkeys, useHeldKeyCodes, useHeldKeys, UseHotkey as useHotkey, useHotkeyHint, useHotkeyRecorder, useHotkeyRegistrations, UseHotkeys as useHotkeys, useKeyHold };
+export { DefaultHotkeysOptions, type ElementHotkeyOptions, EmberAppHotkeyList, EmberCustomHotkeys, EmberHotkeyCommonOptions, EmberHotkeyDefinition, EmberHotkeyRecorder, EmberHotkeyState, EmberHotkeyTarget, EmberHotkeysScope, HotkeyRegistrationsResult, type MaybeGetter, createHotkeysScope, OnHotkey as onHotkey, OnHotkeys as onHotkeys, useAppHotkeyList, useAppHotkeys, useCustomHotkeys, useHeldKeyCodes, useHeldKeys, UseHotkey as useHotkey, useHotkeyHint, useHotkeyRecorder, useHotkeyRegistrations, useHotkeyScopesState, UseHotkeys as useHotkeys, useKeyHold };

package/dist/index.js

@@ -5,6 +5,7 @@ import { useHeldKeyCodes } from "./useHeldKeyCodes.js";
 import { useKeyHold } from "./useKeyHold.js";
 import { useHotkeyHint } from "./useHotkeyHint.js";
 import { useHotkeyRegistrations } from "./useHotkeyRegistrations.js";
+import { useHotkeyScopesState } from "./useHotkeyScopesState.js";
 import { useHotkeyRecorder } from "./useHotkeyRecorder.js";
 import { useAppHotkeyList, useAppHotkeys, useCustomHotkeys } from "./useAppHotkeys.js";
 import { OnHotkey } from "./onHotkey.js";
@@ -13,4 +14,4 @@ import { createHotkeysScope } from "./createHotkeysScope.js";
 
 export * from "@tanstack/hotkeys"
 
-export { createHotkeysScope, OnHotkey as onHotkey, OnHotkeys as onHotkeys, useAppHotkeyList, useAppHotkeys, useCustomHotkeys, useHeldKeyCodes, useHeldKeys, UseHotkey as useHotkey, useHotkeyHint, useHotkeyRecorder, useHotkeyRegistrations, UseHotkeys as useHotkeys, useKeyHold };
+export { createHotkeysScope, OnHotkey as onHotkey, OnHotkeys as onHotkeys, useAppHotkeyList, useAppHotkeys, useCustomHotkeys, useHeldKeyCodes, useHeldKeys, UseHotkey as useHotkey, useHotkeyHint, useHotkeyRecorder, useHotkeyRegistrations, useHotkeyScopesState, UseHotkeys as useHotkeys, useKeyHold };

package/dist/useHotkeyHint.d.ts

@@ -4,8 +4,10 @@ import { AppHotkey, HeldModifierOptions, RegisterableHotkey } from "@tanstack/ho
 //#region src/useHotkeyHint.d.ts
 /**
  * Recomputes for held modifiers and tracked changes to the hotkey or options.
- * A sequence reveals its hint from its first step, and an app hotkey uses its
- * effective hotkey (false while unbound).
+ * The hint shows only while the hotkey can fire: some registration of it is
+ * enabled and in an active scope. A sequence reveals its hint from its first
+ * step, and an app hotkey matches its registrations by id and uses its
+ * effective hotkey (false while unbound). A hotkey on an element counts only while focus is inside it.
  */
 export declare function useHotkeyHint(owner: object, hotkey: MaybeGetter<RegisterableHotkey | AppHotkey>, options?: MaybeGetter<HeldModifierOptions>): EmberHotkeyState<boolean>;
 //#endregion

package/dist/useHotkeyHint.js

@@ -1,18 +1,22 @@
 import { read, select, trackPublishedAppHotkeys } from "./utils.js";
-import { getKeyStateTracker, isAppHotkey, matchesHeldModifiers, resolveAppHotkey } from "@tanstack/hotkeys";
+import { getHotkeyManager, getKeyStateTracker, isAppHotkey, matchesHeldModifiers, resolveAppHotkey } from "@tanstack/hotkeys";
 
 //#region src/useHotkeyHint.ts
 /**
 * Recomputes for held modifiers and tracked changes to the hotkey or options.
-* A sequence reveals its hint from its first step, and an app hotkey uses its
-* effective hotkey (false while unbound).
+* The hint shows only while the hotkey can fire: some registration of it is
+* enabled and in an active scope. A sequence reveals its hint from its first
+* step, and an app hotkey matches its registrations by id and uses its
+* effective hotkey (false while unbound). A hotkey on an element counts only while focus is inside it.
 */
 function useHotkeyHint(owner, hotkey, options = {}) {
 	const appHotkeys = trackPublishedAppHotkeys(owner);
+	const manager = getHotkeyManager();
+	const registrations = select(owner, manager.registrations, (state) => state);
 	return select(owner, getKeyStateTracker().store, (state) => {
 		const value = read(hotkey);
 		const resolved = isAppHotkey(value) ? resolveAppHotkey(value, appHotkeys()).hotkey : value;
-		return resolved !== null && matchesHeldModifiers(resolved, state.heldKeys, read(options));
+		return resolved !== null && matchesHeldModifiers(resolved, state.heldKeys, read(options)) && registrations.value.size > 0 && manager.hasActiveRegistration(value);
 	});
 }
 

package/dist/useHotkeyScopesState.d.ts

@@ -0,0 +1,10 @@
+import { EmberHotkeyState } from "./types.js";
+import { HotkeyScopesState } from "@tanstack/hotkeys";
+//#region src/useHotkeyScopesState.d.ts
+/**
+ * Reads the hotkey manager's scope state: the active scopes, the exclusive
+ * scope that owns the keyboard, and the scopes it allows or suspends. Pass the
+ * containing component as owner to release the subscription on destruction.
+ */
+export declare function useHotkeyScopesState(owner: object): EmberHotkeyState<HotkeyScopesState>;
+//#endregion

package/dist/useHotkeyScopesState.js

@@ -0,0 +1,15 @@
+import { select } from "./utils.js";
+import { getHotkeyManager } from "@tanstack/hotkeys";
+
+//#region src/useHotkeyScopesState.ts
+/**
+* Reads the hotkey manager's scope state: the active scopes, the exclusive
+* scope that owns the keyboard, and the scopes it allows or suspends. Pass the
+* containing component as owner to release the subscription on destruction.
+*/
+function useHotkeyScopesState(owner) {
+	return select(owner, getHotkeyManager().scopes, (state) => state);
+}
+
+//#endregion
+export { useHotkeyScopesState };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/ember-hotkeys",
-  "version": "0.4.1",
+  "version": "0.6.0",
   "description": "Ember adapter for TanStack Hotkeys",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -17,7 +17,8 @@
   "keywords": [
     "ember",
     "tanstack",
-    "hotkeys"
+    "hotkeys",
+    "tanstack-intent"
   ],
   "type": "module",
   "types": "./dist/index.d.ts",
@@ -34,11 +35,12 @@
   },
   "files": [
     "dist",
-    "addon-main.cjs"
+    "addon-main.cjs",
+    "skills"
   ],
   "dependencies": {
     "@embroider/addon-shim": "^1.10.3",
-    "@tanstack/hotkeys": "0.16.1",
+    "@tanstack/hotkeys": "0.18.0",
     "@tanstack/store": "^0.11.2",
     "ember-modifier": "4.2.2"
   },

package/skills/ember-hotkeys/SKILL.md

@@ -0,0 +1,92 @@
+---
+name: ember-hotkeys
+description: >-
+  Use when adding or fixing keyboard shortcuts in an Ember app with
+  @tanstack/ember-hotkeys: the useHotkey and useHotkeys template helpers,
+  onHotkey and onHotkeys element modifiers, createHotkeysScope defaults,
+  scopes activated from the hotkey manager, app hotkeys, recorders, and held
+  keys in strict-mode .gts components, or replacing keydown event listeners.
+metadata:
+  purpose: >-
+    Ember bindings for TanStack Hotkeys: template helpers, element modifiers,
+    owner-bound state readers, manager-activated scopes, and the
+    Ember-specific mistakes to avoid.
+  type: framework
+  framework: ember
+  library: '@tanstack/ember-hotkeys'
+  library_version: '0.4.0'
+sources:
+  - src/useHotkey.ts
+  - src/useHotkeys.ts
+  - src/onHotkey.ts
+  - src/onHotkeys.ts
+  - src/createHotkeysScope.ts
+  - src/useAppHotkeys.ts
+  - TanStack/hotkeys:docs/framework/ember/quick-start.md
+  - TanStack/hotkeys:docs/framework/ember/guides/app-hotkeys.md
+requires:
+  - '@tanstack/hotkeys#hotkeys-core'
+---
+
+# TanStack Hotkeys in Ember
+
+Before starting, load the `@tanstack/hotkeys#hotkeys-core` skill (`npx @tanstack/intent@latest load @tanstack/hotkeys#hotkeys-core`).
+
+```gts
+import Component from '@glimmer/component'
+import { tracked } from '@glimmer/tracking'
+import { array } from '@ember/helper'
+import { onHotkey, useHotkey } from '@tanstack/ember-hotkeys'
+
+export default class Editor extends Component {
+  @tracked dirty = false
+  save = () => saveDocument()
+  close = () => closePanel()
+  scrollToTop = () => window.scrollTo({ top: 0 })
+
+  <template>
+    {{useHotkey "Mod+S" this.save enabled=this.dirty}}
+    {{useHotkey (array "G" "G") this.scrollToTop}}
+    <div tabindex="0" {{onHotkey "Escape" this.close}}>Panel</div>
+  </template>
+}
+```
+
+## API
+
+| API                                                 | What it's for                                                                                                                                                                          |
+| --------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `{{useHotkey hotkey callback ...options}}`          | Register one chord, sequence, or app hotkey while the template renders the helper.                                                                                                     |
+| `{{useHotkeys definitions}}`                        | Register several hotkeys, or a list built from data, in one helper.                                                                                                                    |
+| `{{onHotkey hotkey callback ...options}}`           | Attach a hotkey to the element the modifier is on, so it fires while focus is inside that element.                                                                                     |
+| `{{onHotkeys definitions}}`                         | Attach several hotkeys to one element.                                                                                                                                                 |
+| `createHotkeysScope(defaults?)`                     | Create `useHotkey`, `useHotkeys`, `onHotkey`, `onHotkeys`, and `useHotkeyRecorder` that share default options.                                                                         |
+| `provideAppHotkeys(appHotkeys, options?)`           | Declare app hotkeys and load the user's custom hotkeys before the app boots, since Ember has no provider.                                                                              |
+| `getHotkeyManager().activateScope(scope, options?)` | Turn on a scope, such as an exclusive one for a dialog; it returns the function that turns the scope off.                                                                              |
+| `useAppHotkeys(this)`                               | Get the declared app hotkeys with the user's custom hotkeys applied.                                                                                                                   |
+| `useAppHotkeyList(this)`                            | List every app hotkey with its status, for a cheat sheet or settings screen.                                                                                                           |
+| `useCustomHotkeys(this)`                            | Read, change, and reset the user's custom hotkeys, and check a new one for conflicts.                                                                                                  |
+| `useHotkeyRecorder(this, options)`                  | Record a chord or sequence the user presses, for a settings screen.                                                                                                                    |
+| `useHotkeyRegistrations(this)`                      | Read `.hotkeys`, every registered hotkey with its options, `meta`, and `status` (whether it's enabled and in an active scope).                                                         |
+| `useHotkeyScopesState(this)`                        | Get the active scopes and the exclusive scope that owns the keyboard.                                                                                                                  |
+| `useHotkeyHint(this, hotkey, options?)`             | Get whether held modifiers should reveal a shortcut's hint. False unless a registration of the hotkey can fire: enabled, in an active scope, and with focus inside its element target. |
+| `useKeyHold(this, key)`                             | Get whether one key is held.                                                                                                                                                           |
+| `useHeldKeys(this)`                                 | Get every key that's held right now.                                                                                                                                                   |
+| `useHeldKeyCodes(this)`                             | Map each held key to its physical `event.code`.                                                                                                                                        |
+
+The package also re-exports `@tanstack/hotkeys`, such as `formatForDisplay`, `matchesKeyboardEvent`, and `defineAppHotkeys`.
+
+The helpers are template helpers, not JavaScript functions. State readers take the component as their owner, and their state is read through `.value`, or `.hotkeys` for registrations. Use Ember 6.8 or newer and strict-mode `.gts` components.
+
+## Pitfalls
+
+- **Use arrow-function fields, or `@action`, for callbacks.** The helpers call a callback without the component as `this`, so a plain method throws when the key is pressed.
+- **Build template sequences with `array`.** `{{useHotkey "G G" ...}}` registers a single key named `G G`, which never matches.
+- **`createHotkeysScope` isn't a hotkey scope.** It only sets defaults for its helpers. For a dialog, call `getHotkeyManager().activateScope(name, { exclusive: true })` in the constructor, pass the result to `registerDestructor(this, release)`, and put `scope=name` on the dialog's hotkeys. Give each open dialog its own name.
+- **Read app hotkeys through getters.** Template paths can't index ids that contain dots.
+
+When declaring app hotkeys, building a cheat sheet, or letting users rebind shortcuts, load `@tanstack/hotkeys#app-hotkeys` and read [app hotkeys in Ember](references/app-hotkeys.md).
+
+## API discovery and docs
+
+Signatures: `node_modules/@tanstack/ember-hotkeys/dist/*.d.ts`, with state shapes in `types.d.ts`. Guides: `https://tanstack.com/hotkeys/latest/docs/framework/ember/guides/<page>.md`, such as `hotkeys` or `app-hotkeys`.

package/skills/ember-hotkeys/references/app-hotkeys.md

@@ -0,0 +1,68 @@
+# App hotkeys in Ember
+
+The `@tanstack/hotkeys#app-hotkeys` skill owns the rules. This is the Ember wiring.
+
+```ts
+// app/app-hotkeys.ts
+import { defineAppHotkeys } from '@tanstack/ember-hotkeys'
+
+export const appHotkeys = defineAppHotkeys({
+  'doc.save': { hotkey: 'Mod+S', meta: { name: 'Save' } },
+  'help.shortcuts': { hotkey: 'Mod+/', meta: { name: 'Keyboard shortcuts' } },
+})
+
+declare module '@tanstack/ember-hotkeys' {
+  interface Register {
+    appHotkeys: typeof appHotkeys
+  }
+}
+```
+
+```ts
+// app/app.ts, before the application boots
+import { provideAppHotkeys } from '@tanstack/ember-hotkeys'
+import { appHotkeys } from './app-hotkeys'
+
+provideAppHotkeys(appHotkeys, {
+  customHotkeys: JSON.parse(localStorage.getItem('hotkeys') ?? '{}'),
+  onCustomHotkeysChange: (custom) =>
+    localStorage.setItem('hotkeys', JSON.stringify(custom)),
+})
+```
+
+The app hotkey utilities throw until `provideAppHotkeys` has run. When saved shortcuts come from a server, await them first. Register through a getter: `get saveHotkey() { return this.appHotkeys.value['doc.save'] }` with `appHotkeys = useAppHotkeys(this)`, then `{{useHotkey this.saveHotkey this.save}}`. Build a cheat sheet from `useAppHotkeyList(this).value`.
+
+A settings row records with `useHotkeyRecorder` and saves through `useCustomHotkeys`:
+
+```gts
+import Component from '@glimmer/component'
+import { on } from '@ember/modifier'
+import { formatForDisplay, useAppHotkeys, useCustomHotkeys, useHotkeyRecorder } from '@tanstack/ember-hotkeys'
+import type { AppHotkeyId } from '@tanstack/ember-hotkeys'
+
+export default class ShortcutRow extends Component<{ Args: { id: AppHotkeyId } }> {
+  appHotkeys = useAppHotkeys(this)
+  custom = useCustomHotkeys(this)
+  recorder = useHotkeyRecorder(this, () => ({
+    maxSteps: Infinity,
+    validate: (hotkey) => {
+      const [conflict] = this.custom.findConflicts(this.args.id, hotkey)
+      return conflict ? `Used by ${conflict.meta?.name ?? conflict.id}` : true
+    },
+    onRecord: (hotkey) => this.custom.setCustomHotkey(this.args.id, hotkey),
+    onClear: () => this.custom.setCustomHotkey(this.args.id, null),
+  }))
+
+  get label() {
+    const { meta, hotkey } = this.appHotkeys.value[this.args.id]
+    return `${meta?.name}: ${hotkey ? formatForDisplay(hotkey) : 'Unassigned'}`
+  }
+  reset = () => this.custom.resetCustomHotkey(this.args.id)
+
+  <template>
+    {{this.label}}
+    <button type="button" {{on "click" this.recorder.startRecording}}>Change</button>
+    <button type="button" {{on "click" this.reset}}>Reset</button>
+  </template>
+}
+```