@hexdspace/react 0.1.47 → 0.1.49

package/dist/index.d.ts

@@ -901,19 +901,37 @@ declare class VimHandleKeyUseCase {
     private afterCursorChange;
     private applyFallbackCursor;
     private getCursorIndex;
+    private hasSelection;
     private findNextNonEmptyRegion;
     private resolveInterRegionFallback;
 }
 
+type VimMovementModifier = 'ctrl' | 'shift' | 'ctrlShift';
+type VimModifierMovementActionArgs = {
+    scopeId: ScopeId;
+    key: RegionKey;
+    itemId: ItemId | null;
+    direction: VimDirection;
+    event: KeyboardEvent;
+};
+type VimModifierMovementAction = (args: VimModifierMovementActionArgs) => void;
+type VimModifierMovementActions = {
+    ctrl?: Partial<Record<VimDirection, VimModifierMovementAction>>;
+    shift?: Partial<Record<VimDirection, VimModifierMovementAction>>;
+    ctrlShift?: Partial<Record<VimDirection, VimModifierMovementAction>>;
+};
 declare class VimController {
     private readonly regions;
     private readonly handleKey;
     private readonly selection;
+    private readonly modifierMovementActionsByScope;
     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;
+    handleModifiedMovement(dir: VimDirection, modifier: VimMovementModifier, e: KeyboardEvent): void;
     resetActiveScope(): void;
     getSelection(): SelectionController;
 }
@@ -934,6 +952,7 @@ declare function useVimController(): VimController;
 type VimBindingOptions = {
     enabled?: boolean;
     allowArrowKeys?: boolean;
+    modifierMovementActions?: VimModifierMovementActions;
 };
 declare function useVimBindings(keyboardScopeId: string, options?: VimBindingOptions): void;
 
@@ -951,6 +970,7 @@ type UseVimRegionArgs = {
     keyboardScopeId?: string;
     bindKeys?: boolean;
     allowArrowKeys?: boolean;
+    modifierMovementActions?: VimModifierMovementActions;
     refreshDeps?: React__default.DependencyList;
 };
 type UseVimRegionResult = {
@@ -1138,4 +1158,4 @@ declare const Kbd: React.ForwardRefExoticComponent<KbdProps & React.RefAttribute
 
 declare function useMotionDuration(varName: string, fallbackSeconds: number): number;
 
-export { AuthController, AuthControllerCtx, type AuthControllerDeps, AuthControllerProvider, AuthDispatchCtx, AuthProvider, type AuthState, AuthStateCtx, Button, type ButtonProps, type CacheInstruction, type ClearSelectionArgs, type ClearTarget, type CombineMode, ConfirmDialog, type ConfirmDialogProps, type ConfirmPayload, type CursorFallback, CustomDialog, type CustomDialogPayload, type CustomDialogProps, type CustomInstruction, DEFAULT_NOTIFICATION_CHANNEL, type DefaultDialogPayloads, type DefaultDialogTemplateKey, DefaultDialogTemplateKeys, Dialog, DialogContent, DialogController, DialogHost, type DialogInstance, type DialogOptions, type DialogProps, type DialogTemplate, type DisableScope, DisableScopeUseCase, DropdownMenu, DropdownMenuItem, type DropdownMenuItemProps, type DropdownMenuProps, DropdownMenuSeparator, type EnableScope, EnableScopeUseCase, type ErrorResponse, Field, type FieldProps, type GenericResponse, type GroupedShortcuts, type HandleSelection, type HttpClient, HttpError, type HttpMethod, type HttpResponse, InMemorySelectionStore, InfoDialog, type InfoDialogProps, type InfoPayload, Input, type InputProps, type Instruction, type InstructionContext, type ItemId, Kbd, type KbdProps, KeyboardController, KeyboardProvider, type ListShortcuts, ListShortcutsUseCase, type ListedShortcut, MockAuthHttpClient, MockHttpClient, type Mode, type MutationFn, type Notification, type NotificationAction, NotificationHost, type NotificationInstruction, type NotificationVariant, NotifierController, type OnSuccessFn, type OptimisticSnapshot, type OptimisticUpdateFn, Popover, type PopoverProps, type QuerySelection, RedirectIfAuthed, type RedirectIfAuthedProps, type RegionId, type RegionKey, type RegionSelection, type RegisterRegionArgs, type RegisterShortcut, RegisterShortcutUseCase, type RequestConfig, RequireAuth, type RequireAuthProps, type ResolvedToastTheme, type ResponsiveMutation, type ScopeId, ScopeManager, type ScopeState, SelectionController, type SelectionControllerDeps, SelectionControllerProvider, type SelectionState, type SelectionStore, type ShortcutBinding, type ShortcutHandler, type ShortcutRegistration, type ShortcutScope, Skeleton, type SkeletonProps, Textarea, type TextareaProps, type ToastActionTheme, type ToastTheme, type ToastTransition, type ToastifyCSSVars, Tooltip, type UIFail, type UIOk, type UIResult, type UnregisterShortcut, UnregisterShortcutUseCase, type UseVimRegionArgs, type UseVimRegionResult, type User, VimController, type VimControllerDeps, VimControllerProvider, type VimDirection, type VimInterDirection, type VimKeyState, type VimPending, type VimRegionMeta, VimRegionRegistry, authController, controllerFactory, createAuthController, createSelectionController, createVimController, dialogController, httpClient as fetchHttpClient, getDialogTemplate, keyboardController, notifierController, registerDefaultDialogs, registerDialogTemplate, resolveToastTheme, ui, unregisterDialogTemplate, useAuth, useAuthActions, useAuthController, useAuthDispatch, useAuthedUser, useDialog, useKeyboardController, useMotionDuration, useResponsiveMutation, useSelectionController, useShortcut, useShortcutScope, useVimBindings, useVimController, useVimRegion };
+export { AuthController, AuthControllerCtx, type AuthControllerDeps, AuthControllerProvider, AuthDispatchCtx, AuthProvider, type AuthState, AuthStateCtx, Button, type ButtonProps, type CacheInstruction, type ClearSelectionArgs, type ClearTarget, type CombineMode, ConfirmDialog, type ConfirmDialogProps, type ConfirmPayload, type CursorFallback, CustomDialog, type CustomDialogPayload, type CustomDialogProps, type CustomInstruction, DEFAULT_NOTIFICATION_CHANNEL, type DefaultDialogPayloads, type DefaultDialogTemplateKey, DefaultDialogTemplateKeys, Dialog, DialogContent, DialogController, DialogHost, type DialogInstance, type DialogOptions, type DialogProps, type DialogTemplate, type DisableScope, DisableScopeUseCase, DropdownMenu, DropdownMenuItem, type DropdownMenuItemProps, type DropdownMenuProps, DropdownMenuSeparator, type EnableScope, EnableScopeUseCase, type ErrorResponse, Field, type FieldProps, type GenericResponse, type GroupedShortcuts, type HandleSelection, type HttpClient, HttpError, type HttpMethod, type HttpResponse, InMemorySelectionStore, InfoDialog, type InfoDialogProps, type InfoPayload, Input, type InputProps, type Instruction, type InstructionContext, type ItemId, Kbd, type KbdProps, KeyboardController, KeyboardProvider, type ListShortcuts, ListShortcutsUseCase, type ListedShortcut, MockAuthHttpClient, MockHttpClient, type Mode, type MutationFn, type Notification, type NotificationAction, NotificationHost, type NotificationInstruction, type NotificationVariant, NotifierController, type OnSuccessFn, type OptimisticSnapshot, type OptimisticUpdateFn, Popover, type PopoverProps, type QuerySelection, RedirectIfAuthed, type RedirectIfAuthedProps, type RegionId, type RegionKey, type RegionSelection, type RegisterRegionArgs, type RegisterShortcut, RegisterShortcutUseCase, type RequestConfig, RequireAuth, type RequireAuthProps, type ResolvedToastTheme, type ResponsiveMutation, type ScopeId, ScopeManager, type ScopeState, SelectionController, type SelectionControllerDeps, SelectionControllerProvider, type SelectionState, type SelectionStore, type ShortcutBinding, type ShortcutHandler, type ShortcutRegistration, type ShortcutScope, Skeleton, type SkeletonProps, Textarea, type TextareaProps, type ToastActionTheme, type ToastTheme, type ToastTransition, type ToastifyCSSVars, Tooltip, type UIFail, type UIOk, type UIResult, type UnregisterShortcut, UnregisterShortcutUseCase, type UseVimRegionArgs, type UseVimRegionResult, type User, VimController, type VimControllerDeps, VimControllerProvider, type VimDirection, type VimInterDirection, type VimKeyState, type VimModifierMovementAction, type VimModifierMovementActionArgs, type VimModifierMovementActions, type VimMovementModifier, type VimPending, type VimRegionMeta, VimRegionRegistry, authController, controllerFactory, createAuthController, createSelectionController, createVimController, dialogController, httpClient as fetchHttpClient, getDialogTemplate, keyboardController, notifierController, registerDefaultDialogs, registerDialogTemplate, resolveToastTheme, ui, unregisterDialogTemplate, useAuth, useAuthActions, useAuthController, useAuthDispatch, useAuthedUser, useDialog, useKeyboardController, useMotionDuration, useResponsiveMutation, useSelectionController, useShortcut, useShortcutScope, useVimBindings, useVimController, useVimRegion };

package/dist/index.js

@@ -3370,7 +3370,13 @@ var VimHandleKeyUseCase = class {
     if (e.ctrlKey || e.metaKey || e.altKey) return;
     const scopeId = this.query.getActiveScope();
     if (!scopeId) return;
+    const activeKey = this.query.getActiveRegion(scopeId);
+    if (!activeKey) return;
+    const hasSelection = this.hasSelection(activeKey);
     this.selection.clearSelection({ kind: "activeScope" });
+    if (!hasSelection) {
+      this.selection.setCursor(activeKey, null);
+    }
     const st = this.stateByScope.get(scopeId);
     if (st) {
       st.count = "";
@@ -3451,6 +3457,9 @@ var VimHandleKeyUseCase = class {
     const index = items.indexOf(cursor);
     return index >= 0 ? index : null;
   }
+  hasSelection(key) {
+    return this.query.getSelectedIds(key).length > 0 || this.query.getToggledIds(key).length > 0 || this.query.getRangeIds(key).length > 0;
+  }
   findNextNonEmptyRegion(scopeId, activeKey, dir, count) {
     const regs = this.regions.list(scopeId);
     if (regs.length === 0) return null;
@@ -3560,6 +3569,7 @@ var VimController = class {
   regions;
   handleKey;
   selection;
+  modifierMovementActionsByScope = /* @__PURE__ */ new Map();
   constructor(selection, regions = new VimRegionRegistry(), handleKey = new VimHandleKeyUseCase(
     selection.getHandle(),
     selection.getQuery(),
@@ -3582,6 +3592,24 @@ var VimController = class {
   handleEscape(e) {
     this.handleKey.handleEscape(e);
   }
+  setModifierMovementActions(scopeId, actions) {
+    if (!actions) {
+      this.modifierMovementActionsByScope.delete(scopeId);
+      return;
+    }
+    this.modifierMovementActionsByScope.set(scopeId, 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 action = actions?.[modifier]?.[dir];
+    if (!action) return;
+    const itemId = this.selection.getActiveItem(activeKey);
+    action({ scopeId, key: activeKey, itemId, direction: dir, event: e });
+  }
   resetActiveScope() {
     const scopeId = this.selection.getActiveScope();
     if (!scopeId) return;
@@ -3638,6 +3666,7 @@ function useVimBindings(keyboardScopeId, options = {}) {
   const vim = useVimController();
   const enabled = options.enabled ?? true;
   const allowArrowKeys = options.allowArrowKeys ?? true;
+  const modifierMovementActions = options.modifierMovementActions;
   const ownerIdRef = useRef3(Symbol("vim-binding-owner"));
   const [isOwner, setIsOwner] = useState5(false);
   const handleOwnerChange = useCallback5((ownerId) => {
@@ -3675,6 +3704,13 @@ function useVimBindings(keyboardScopeId, options = {}) {
       }
     };
   }, [enabled, handleOwnerChange, keyboardScopeId]);
+  useEffect7(() => {
+    if (!enabled || !isOwner) {
+      return;
+    }
+    vim.setModifierMovementActions(keyboardScopeId, modifierMovementActions ?? null);
+    return () => vim.setModifierMovementActions(keyboardScopeId, null);
+  }, [enabled, isOwner, keyboardScopeId, modifierMovementActions, vim]);
   const bindings = useMemo6(() => {
     if (!enabled || !isOwner) {
       return [];
@@ -3697,6 +3733,36 @@ function useVimBindings(keyboardScopeId, options = {}) {
       up: "ArrowUp",
       right: "ArrowRight"
     } : { left: null, down: null, up: null, right: null };
+    const movementEntries = [
+      { dir: "left", char: "h", arrow: arrowCombos.left },
+      { dir: "down", char: "j", arrow: arrowCombos.down },
+      { dir: "up", char: "k", arrow: arrowCombos.up },
+      { dir: "right", char: "l", arrow: arrowCombos.right }
+    ];
+    const modifierLabels = {
+      ctrl: { label: "Ctrl", prefix: "Control" },
+      shift: { label: "Shift", prefix: "Shift" },
+      ctrlShift: { label: "Ctrl+Shift", prefix: "Control+Shift" }
+    };
+    const modifierBindings = (modifier, actions) => {
+      if (!actions) return [];
+      const { label, prefix } = modifierLabels[modifier];
+      return movementEntries.flatMap((entry) => {
+        if (!actions?.[entry.dir]) return [];
+        const combos = [`${prefix}+${entry.char.toUpperCase()}`];
+        if (entry.arrow) {
+          combos.push(`${prefix}+${entry.arrow}`);
+        }
+        return [
+          {
+            combos,
+            handler: (e) => vim.handleModifiedMovement(entry.dir, modifier, e),
+            description: `vim: ${label.toLowerCase()}+${entry.dir}`,
+            group: "vim"
+          }
+        ];
+      });
+    };
     return [
       ...digitBindings,
       {
@@ -3737,9 +3803,12 @@ function useVimBindings(keyboardScopeId, options = {}) {
         description: "vim: toggle item",
         group: "vim"
       },
-      { combos: ["Escape"], handler: (e) => vim.handleEscape(e), description: "vim: escape", group: "vim" }
+      { combos: ["Escape"], handler: (e) => vim.handleEscape(e), description: "vim: escape", group: "vim" },
+      ...modifierBindings("ctrl", modifierMovementActions?.ctrl),
+      ...modifierBindings("shift", modifierMovementActions?.shift),
+      ...modifierBindings("ctrlShift", modifierMovementActions?.ctrlShift)
     ];
-  }, [allowArrowKeys, enabled, isOwner, vim]);
+  }, [allowArrowKeys, enabled, isOwner, modifierMovementActions, vim]);
   useShortcut(keyboardScopeId, bindings, { ignoreTyping: true, preventDefault: true });
 }
 
@@ -3822,7 +3891,11 @@ function useVimRegion(containerRef, args) {
     keyboard.handleEnableScope(keyboardScopeId);
     return () => keyboard.handleDisableScope(keyboardScopeId);
   }, [bindKeys, keyboard, keyboardScopeId]);
-  useVimBindings(keyboardScopeId, { enabled: bindKeys, allowArrowKeys: args.allowArrowKeys });
+  useVimBindings(keyboardScopeId, {
+    enabled: bindKeys,
+    allowArrowKeys: args.allowArrowKeys,
+    modifierMovementActions: args.modifierMovementActions
+  });
   useSyncExternalStore(
     (listener) => selection.subscribe(listener),
     () => selection.getVersion(),

package/package.json

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