@octanejs/tanstack-hotkeys 0.0.21 → 0.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octanejs/tanstack-hotkeys",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "license": "MIT",
   "type": "module",
   "engines": {
@@ -33,13 +33,25 @@
     "@tanstack/hotkeys": "0.8.0"
   },
   "peerDependencies": {
-    "@octanejs/tanstack-store": "0.0.26",
-    "octane": "0.1.32"
+    "@octanejs/tanstack-store": "0.0.28",
+    "octane": "0.1.34"
   },
   "devDependencies": {
+    "@tanstack/react-hotkeys": "0.10.0",
+    "@tsrx/react": "^0.2.56",
+    "esbuild": "^0.28.1",
+    "react": "^19.2.7",
+    "react-dom": "^19.2.7",
     "vitest": "^4.1.10",
-    "@octanejs/tanstack-store": "0.0.26",
-    "octane": "0.1.32"
+    "@testing-library/react": "16.3.2",
+    "@vitejs/plugin-react": "^6.0.3",
+    "happy-dom": "^20.11.0",
+    "@tanstack/react-store": "^0.11.0",
+    "@types/react": "^19.2.17",
+    "@types/react-dom": "^19.2.3",
+    "@octanejs/tanstack-store": "0.0.28",
+    "octane": "0.1.34",
+    "@octanejs/testing-library": "0.1.31"
   },
   "scripts": {
     "test": "vitest run --project tanstack-hotkeys",

package/src/useHotkey.ts

@@ -1,7 +1,7 @@
 import { useEffect, useRef } from 'octane';
 import { detectPlatform, getHotkeyManager, normalizeRegisterableHotkey } from '@tanstack/hotkeys';
 import { useDefaultHotkeysOptions } from './context';
-import { isRef } from './utils';
+import { isRef, withoutSlotOption } from './utils';
 import type { RefObjectLike } from './utils';
 import type {
 	HotkeyCallback,
@@ -55,9 +55,10 @@ export function useHotkey(
 	callback: HotkeyCallback,
 	options: UseHotkeyOptions = {},
 ): void {
+	const resolvedOptions = withoutSlotOption(options) ?? {};
 	const mergedOptions = {
 		...useDefaultHotkeysOptions().hotkey,
-		...options,
+		...resolvedOptions,
 	} as UseHotkeyOptions;
 
 	const manager = getHotkeyManager();

package/src/useHotkeySequence.ts

@@ -1,7 +1,7 @@
 import { useEffect, useRef } from 'octane';
 import { formatHotkeySequence, getSequenceManager } from '@tanstack/hotkeys';
 import { useDefaultHotkeysOptions } from './context';
-import { isRef } from './utils';
+import { isRef, withoutSlotOption } from './utils';
 import type { RefObjectLike } from './utils';
 import type {
 	HotkeyCallback,
@@ -58,9 +58,10 @@ export function useHotkeySequence(
 	callback: HotkeyCallback,
 	options: UseHotkeySequenceOptions = {},
 ): void {
+	const resolvedOptions = withoutSlotOption(options) ?? {};
 	const mergedOptions = {
 		...useDefaultHotkeysOptions().hotkeySequence,
-		...options,
+		...resolvedOptions,
 	} as UseHotkeySequenceOptions;
 
 	const manager = getSequenceManager();

package/src/useHotkeySequences.ts

@@ -1,7 +1,7 @@
 import { useEffect, useRef } from 'octane';
 import { formatHotkeySequence, getSequenceManager } from '@tanstack/hotkeys';
 import { useDefaultHotkeysOptions } from './context';
-import { isRef } from './utils';
+import { isRef, withoutSlotOption } from './utils';
 import type { UseHotkeySequenceOptions } from './useHotkeySequence';
 import type { HotkeyCallback, HotkeySequence, SequenceRegistrationHandle } from '@tanstack/hotkeys';
 
@@ -56,13 +56,14 @@ export function useHotkeySequences(
 		target: Document | HTMLElement | Window;
 	};
 
+	const resolvedCommonOptions = withoutSlotOption(commonOptions) ?? {};
 	const defaultOptions = useDefaultHotkeysOptions().hotkeySequence;
 	const manager = getSequenceManager();
 
 	const registrationsRef = useRef<Map<string, RegistrationRecord>>(new Map());
 	const definitionsRef = useRef(definitions);
 	const sequenceStringsRef = useRef<Array<string>>([]);
-	const commonOptionsRef = useRef(commonOptions);
+	const commonOptionsRef = useRef(resolvedCommonOptions);
 	const defaultOptionsRef = useRef(defaultOptions);
 	const managerRef = useRef(manager);
 
@@ -70,7 +71,7 @@ export function useHotkeySequences(
 
 	definitionsRef.current = definitions;
 	sequenceStringsRef.current = sequenceStrings;
-	commonOptionsRef.current = commonOptions;
+	commonOptionsRef.current = resolvedCommonOptions;
 	defaultOptionsRef.current = defaultOptions;
 	managerRef.current = manager;
 
@@ -177,7 +178,7 @@ export function useHotkeySequences(
 			handle.callback = def.callback;
 			const mergedOptions = {
 				...defaultOptions,
-				...commonOptions,
+				...resolvedCommonOptions,
 				...def.options,
 			} as UseHotkeySequenceOptions;
 			const { target: _target, ...optionsWithoutTarget } = mergedOptions;

package/src/useHotkeys.ts

@@ -1,7 +1,7 @@
 import { useEffect, useRef } from 'octane';
 import { detectPlatform, getHotkeyManager, normalizeRegisterableHotkey } from '@tanstack/hotkeys';
 import { useDefaultHotkeysOptions } from './context';
-import { isRef } from './utils';
+import { isRef, withoutSlotOption } from './utils';
 import type { UseHotkeyOptions } from './useHotkey';
 import type {
 	Hotkey,
@@ -60,14 +60,15 @@ export function useHotkeys(
 		target: Document | HTMLElement | Window;
 	};
 
+	const resolvedCommonOptions = withoutSlotOption(commonOptions) ?? {};
 	const defaultOptions = useDefaultHotkeysOptions().hotkey;
 	const manager = getHotkeyManager();
-	const platform = commonOptions.platform ?? defaultOptions?.platform ?? detectPlatform();
+	const platform = resolvedCommonOptions.platform ?? defaultOptions?.platform ?? detectPlatform();
 
 	const registrationsRef = useRef<Map<string, RegistrationRecord>>(new Map());
 	const hotkeysRef = useRef(hotkeys);
 	const hotkeyStringsRef = useRef<Array<Hotkey>>([]);
-	const commonOptionsRef = useRef(commonOptions);
+	const commonOptionsRef = useRef(resolvedCommonOptions);
 	const defaultOptionsRef = useRef(defaultOptions);
 	const managerRef = useRef(manager);
 
@@ -75,7 +76,7 @@ export function useHotkeys(
 
 	hotkeysRef.current = hotkeys;
 	hotkeyStringsRef.current = hotkeyStrings;
-	commonOptionsRef.current = commonOptions;
+	commonOptionsRef.current = resolvedCommonOptions;
 	defaultOptionsRef.current = defaultOptions;
 	managerRef.current = manager;
 
@@ -176,7 +177,7 @@ export function useHotkeys(
 			handle.callback = def.callback;
 			const mergedOptions = {
 				...defaultOptions,
-				...commonOptions,
+				...resolvedCommonOptions,
 				...def.options,
 			} as UseHotkeyOptions;
 			const { target: _target, ...optionsWithoutTarget } = mergedOptions;

package/src/utils.ts

@@ -1,6 +1,8 @@
 /**
  * A React-19-style ref object shape (Octane refs are ordinary objects with a
  * mutable `current`).
+ *
+ * OCTANE DIVERGENCE[plain-ref-target][types:adapted-octane]
  */
 export interface RefObjectLike<T> {
 	current: T;
@@ -12,3 +14,14 @@ export interface RefObjectLike<T> {
 export function isRef(value: unknown): value is RefObjectLike<HTMLElement | null> {
 	return value !== null && typeof value === 'object' && 'current' in value;
 }
+
+/**
+ * Octane call sites append a compiler slot Symbol after optional trailing
+ * parameters. Treat that Symbol as "argument omitted" so `= {}` defaults apply.
+ */
+export function withoutSlotOption<T extends object>(
+	options: T | symbol | undefined,
+): T | undefined {
+	if (typeof options === 'symbol' || options === undefined) return undefined;
+	return options;
+}