@hexdspace/react 0.1.49 → 0.1.51

package/dist/index.d.ts

@@ -894,6 +894,7 @@ declare class VimHandleKeyUseCase {
     reset(scopeId?: ScopeId): void;
     handleChar(char: string, e: KeyboardEvent): void;
     handleEscape(e: KeyboardEvent): void;
+    consumeCount(scopeId: ScopeId, def: number): number;
     private applyDirectional;
     private goToLast;
     private goToIndex;
@@ -912,6 +913,7 @@ type VimModifierMovementActionArgs = {
     key: RegionKey;
     itemId: ItemId | null;
     direction: VimDirection;
+    count: number;
     event: KeyboardEvent;
 };
 type VimModifierMovementAction = (args: VimModifierMovementActionArgs) => void;
@@ -924,13 +926,13 @@ declare class VimController {
     private readonly regions;
     private readonly handleKey;
     private readonly selection;
-    private readonly modifierMovementActionsByScope;
+    private readonly modifierMovementActionsByRegion;
     constructor(selection: SelectionController, regions?: VimRegionRegistry, handleKey?: VimHandleKeyUseCase);
     handleRegisterRegionMeta(meta: VimRegionMeta): void;
     handleUnregisterRegionMeta(key: RegionKey): void;
     handleCharKey(char: string, e: KeyboardEvent): void;
     handleEscape(e: KeyboardEvent): void;
-    setModifierMovementActions(scopeId: ScopeId, actions: VimModifierMovementActions | null): void;
+    setModifierMovementActions(key: RegionKey, actions: VimModifierMovementActions | null): void;
     handleModifiedMovement(dir: VimDirection, modifier: VimMovementModifier, e: KeyboardEvent): void;
     resetActiveScope(): void;
     getSelection(): SelectionController;
@@ -954,7 +956,7 @@ type VimBindingOptions = {
     allowArrowKeys?: boolean;
     modifierMovementActions?: VimModifierMovementActions;
 };
-declare function useVimBindings(keyboardScopeId: string, options?: VimBindingOptions): void;
+declare function useVimBindings(regionKey: RegionKey, keyboardScopeId: string, options?: VimBindingOptions): void;
 
 type UseVimRegionArgs = {
     key: RegionKey;

package/dist/index.js

@@ -3383,6 +3383,13 @@ var VimHandleKeyUseCase = class {
       st.pending = null;
     }
   }
+  consumeCount(scopeId, def) {
+    const st = this.stateByScope.get(scopeId);
+    if (!st) return def;
+    const count = consumeCount(st, def);
+    st.pending = null;
+    return count;
+  }
   applyDirectional(scopeId, activeKey, dir, count) {
     const meta = this.regions.get(activeKey);
     if (meta?.intra.has(dir)) {
@@ -3569,7 +3576,7 @@ var VimController = class {
   regions;
   handleKey;
   selection;
-  modifierMovementActionsByScope = /* @__PURE__ */ new Map();
+  modifierMovementActionsByRegion = /* @__PURE__ */ new Map();
   constructor(selection, regions = new VimRegionRegistry(), handleKey = new VimHandleKeyUseCase(
     selection.getHandle(),
     selection.getQuery(),
@@ -3592,23 +3599,25 @@ var VimController = class {
   handleEscape(e) {
     this.handleKey.handleEscape(e);
   }
-  setModifierMovementActions(scopeId, actions) {
+  setModifierMovementActions(key, actions) {
+    const regionKey = toRegionKeyString(key);
     if (!actions) {
-      this.modifierMovementActionsByScope.delete(scopeId);
+      this.modifierMovementActionsByRegion.delete(regionKey);
       return;
     }
-    this.modifierMovementActionsByScope.set(scopeId, actions);
+    this.modifierMovementActionsByRegion.set(regionKey, actions);
   }
   handleModifiedMovement(dir, modifier, e) {
     const scopeId = this.selection.getActiveScope();
     if (!scopeId) return;
     const activeKey = this.selection.getActiveRegion(scopeId);
     if (!activeKey) return;
-    const actions = this.modifierMovementActionsByScope.get(scopeId);
+    const actions = this.modifierMovementActionsByRegion.get(toRegionKeyString(activeKey));
     const action = actions?.[modifier]?.[dir];
     if (!action) return;
     const itemId = this.selection.getActiveItem(activeKey);
-    action({ scopeId, key: activeKey, itemId, direction: dir, event: e });
+    const count = this.handleKey.consumeCount(scopeId, 1);
+    action({ scopeId, key: activeKey, itemId, direction: dir, count, event: e });
   }
   resetActiveScope() {
     const scopeId = this.selection.getActiveScope();
@@ -3640,6 +3649,9 @@ var createVimController = controllerFactory(
     };
   }
 );
+function toRegionKeyString(key) {
+  return `${key.scopeId}.${key.regionId}`;
+}
 
 // src/feature/vim-navigation/infra/web/react/VimControllerProvider.tsx
 import { createContext as createContext5, useContext as useContext6 } from "react";
@@ -3662,7 +3674,7 @@ function notify(entry) {
     notifySub(entry.ownerId);
   }
 }
-function useVimBindings(keyboardScopeId, options = {}) {
+function useVimBindings(regionKey, keyboardScopeId, options = {}) {
   const vim = useVimController();
   const enabled = options.enabled ?? true;
   const allowArrowKeys = options.allowArrowKeys ?? true;
@@ -3705,12 +3717,13 @@ function useVimBindings(keyboardScopeId, options = {}) {
     };
   }, [enabled, handleOwnerChange, keyboardScopeId]);
   useEffect7(() => {
-    if (!enabled || !isOwner) {
+    if (!enabled) {
+      vim.setModifierMovementActions(regionKey, null);
       return;
     }
-    vim.setModifierMovementActions(keyboardScopeId, modifierMovementActions ?? null);
-    return () => vim.setModifierMovementActions(keyboardScopeId, null);
-  }, [enabled, isOwner, keyboardScopeId, modifierMovementActions, vim]);
+    vim.setModifierMovementActions(regionKey, modifierMovementActions ?? null);
+    return () => vim.setModifierMovementActions(regionKey, null);
+  }, [enabled, modifierMovementActions, regionKey, vim]);
   const bindings = useMemo6(() => {
     if (!enabled || !isOwner) {
       return [];
@@ -3891,7 +3904,7 @@ function useVimRegion(containerRef, args) {
     keyboard.handleEnableScope(keyboardScopeId);
     return () => keyboard.handleDisableScope(keyboardScopeId);
   }, [bindKeys, keyboard, keyboardScopeId]);
-  useVimBindings(keyboardScopeId, {
+  useVimBindings(args.key, keyboardScopeId, {
     enabled: bindKeys,
     allowArrowKeys: args.allowArrowKeys,
     modifierMovementActions: args.modifierMovementActions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hexdspace/react",
-  "version": "0.1.49",
+  "version": "0.1.51",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",