@tanstack/hotkeys 0.16.0 → 0.16.1

package/dist/_keyboard-event.js

@@ -8,14 +8,19 @@ function normalizeKeyboardEvent(event, platform) {
 		altGraph = platform !== "mac" && typeof event.getModifierState === "function" && event.getModifierState("AltGraph");
 	} catch {}
 	const key = (event.key || "").normalize("NFC");
+	const normalizedKey = normalizeKeyName(key);
+	const controlAlt = platform === "windows" && altGraph && !altGraphTypedCharacter({
+		key: normalizedKey,
+		altGraph
+	});
 	return {
-		key: normalizeKeyName(key),
+		key: normalizedKey,
 		code: event.code || "",
-		ctrl: Boolean(event.ctrlKey),
+		ctrl: controlAlt || Boolean(event.ctrlKey),
 		shift: Boolean(event.shiftKey),
-		alt: Boolean(event.altKey),
+		alt: controlAlt || Boolean(event.altKey),
 		meta: Boolean(event.metaKey),
-		altGraph,
+		altGraph: altGraph && !controlAlt,
 		location: event.location,
 		isComposing: Boolean(event.isComposing) || key === "Process" || key === "Unidentified"
 	};
@@ -41,6 +46,17 @@ function codeToLogicalKey(code) {
 		Space: "Space"
 	}[code];
 }
+/**
+* Whether AltGr changed what a key typed, as in AltGr+Q typing `@`. False when
+* AltGr is not held, or when the key typed its plain value: a named key such
+* as Home, or an ASCII letter or digit (AltGr+F typing `f` on layouts with
+* nothing on that key).
+*/
+function altGraphTypedCharacter(event) {
+	if (!event.altGraph) return false;
+	if (event.key === "Dead") return true;
+	return isPrintableKey(event.key) && !/^[A-Za-z0-9]$/.test(event.key);
+}
 /** Tests for one Unicode code point, including characters represented by a surrogate pair. */
 function isPrintableKey(key) {
 	return key !== "" && Array.from(key).length === 1;
@@ -88,4 +104,4 @@ function assertLogicalKey(key) {
 }
 
 //#endregion
-export { assertLogicalKey, codeToLogicalKey, isAsciiLetter, isCodeName, isLatinLetter, isPrintableKey, keysEqual, modifierAlias, normalizeKeyboardEvent, physicalCodeOf, splitChordParts };
+export { altGraphTypedCharacter, assertLogicalKey, codeToLogicalKey, isAsciiLetter, isCodeName, isLatinLetter, isPrintableKey, keysEqual, modifierAlias, normalizeKeyboardEvent, physicalCodeOf, splitChordParts };

package/dist/_match.js

@@ -1,5 +1,5 @@
 import { detectPlatform } from "./platform.js";
-import { codeToLogicalKey, isAsciiLetter, isLatinLetter, isPrintableKey, keysEqual, normalizeKeyboardEvent } from "./_keyboard-event.js";
+import { altGraphTypedCharacter, codeToLogicalKey, isAsciiLetter, isLatinLetter, isPrintableKey, keysEqual, normalizeKeyboardEvent } from "./_keyboard-event.js";
 import { parseHotkey } from "./parse.js";
 
 //#region src/_match.ts
@@ -13,6 +13,7 @@ function matchKeyboardEvent(event, hotkey, platform = detectPlatform()) {
 	};
 	if (normalized.isComposing && (parsed.code !== void 0 || isPrintableKey(parsed.key))) return noMatch;
 	if (normalized.altGraph && (parsed.ctrl || parsed.alt)) return noMatch;
+	if (normalized.altGraph && !altGraphTypedCharacter(normalized)) return noMatch;
 	if (parsed.code !== void 0) {
 		if (normalized.altGraph) return noMatch;
 		if (!modifiersMatch(normalized, parsed, false)) return noMatch;

package/dist/hotkey-recorder.js

@@ -113,7 +113,8 @@ var HotkeyRecorder = class {
 			if (!this.#keydownHandler) return;
 			if (this.#options.ignoreInputs !== false && event.key !== "Escape" && isTypingEvent(event, document)) return;
 			const platform = this.#options.platform ?? this.#platform;
-			if (normalizeKeyboardEvent(event, platform).isComposing) return;
+			const normalized = normalizeKeyboardEvent(event, platform);
+			if (normalized.isComposing) return;
 			captureRecordingEvent(event);
 			event.preventDefault();
 			event.stopPropagation();
@@ -122,7 +123,7 @@ var HotkeyRecorder = class {
 				this.cancel();
 				return;
 			}
-			const unmodified = !event.ctrlKey && !event.shiftKey && !event.altKey && !event.metaKey;
+			const unmodified = !normalized.ctrl && !normalized.shift && !normalized.alt && !normalized.meta && !normalized.altGraph;
 			const multiStep = this.#maxSteps > 1;
 			if ((event.key === "Backspace" || event.key === "Delete") && unmodified) {
 				if (this.store.state.steps.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/hotkeys",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "description": "Type-safe, framework-agnostic keyboard hotkey management for the browser",
   "author": "Tanner Linsley",
   "license": "MIT",