feat: implement vim anchor moves and motion system
Added complete vim motion system with anchor moves: New Files: - src/useCursor/useVimMotions.ts: Vim motion processor - Handles number prefixes (counts) - Special 0 handling: anchor when alone, count when prefixed - Tracks last motion for repeat (.) Anchor Moves: - 0 or ^ → Move to start of row (col 0) - $ → Move to end of row (col 8) - gg → Move to top of column (row 0) - G → Move to bottom of column (row 8) Count Support: - 5j → Move down 5 cells - 10l → Move right 10 cells (bounded to 8) - Works with all directional moves (h/j/k/l) Repeat Motion: - . → Repeat last motion with same count Key Logic (0 handling): - If 0 pressed with empty count buffer → anchor to start - If 0 pressed with existing count → add to count (10j, 20k) - Prevents conflict between anchor and counted moves Updated: - useCursor.ts: Integrated useVimMotions processor - types.ts: Added Motion and VimMotionSystem types - CursorManager: Added anchor and repeat methods All moves respect 9x9 bounds with red flash on invalid.
This commit is contained in:
@@ -1,10 +1,12 @@
|
||||
import { useState, useEffect } from 'react';
|
||||
import type { Coord, CursorManager } from './types';
|
||||
import type { GameStatusManager } from '../useGameStatus/types';
|
||||
import { useVimMotions } from './useVimMotions';
|
||||
|
||||
export function useCursor(gameStatusManager: GameStatusManager, containerRef: React.RefObject<HTMLDivElement | null>) {
|
||||
const [position, setPosition] = useState<Coord>({ row: 0, col: 0 });
|
||||
const { gameStatus } = gameStatusManager;
|
||||
const vimMotions = useVimMotions();
|
||||
|
||||
function flashInvalidMove(): void {
|
||||
const container = containerRef.current;
|
||||
@@ -52,20 +54,78 @@ export function useCursor(gameStatusManager: GameStatusManager, containerRef: Re
|
||||
move(1, 0, count);
|
||||
}
|
||||
|
||||
function moveToStart(): void {
|
||||
setPosition(prev => ({ ...prev, col: 0 }));
|
||||
}
|
||||
|
||||
function moveToEnd(): void {
|
||||
setPosition(prev => ({ ...prev, col: 8 }));
|
||||
}
|
||||
|
||||
function moveToTop(): void {
|
||||
setPosition(prev => ({ row: 0, col: prev.col }));
|
||||
}
|
||||
|
||||
function moveToBottom(): void {
|
||||
setPosition(prev => ({ row: 8, col: prev.col }));
|
||||
}
|
||||
|
||||
function repeatLastMotion(): void {
|
||||
const motion = vimMotions.repeatLastMotion();
|
||||
if (!motion) return;
|
||||
|
||||
setPosition(currentPos => {
|
||||
const newRow = currentPos.row + (motion.dr * motion.steps);
|
||||
const newCol = currentPos.col + (motion.dc * motion.steps);
|
||||
|
||||
if (newRow < 0 || newRow > 8 || newCol < 0 || newCol > 8) {
|
||||
flashInvalidMove();
|
||||
return currentPos;
|
||||
}
|
||||
|
||||
return { row: newRow, col: newCol };
|
||||
});
|
||||
}
|
||||
|
||||
useEffect(() => {
|
||||
if (gameStatus !== 'started') return;
|
||||
|
||||
function handleKeyDown(e: KeyboardEvent) {
|
||||
const key = e.key;
|
||||
const result = vimMotions.processKey(key);
|
||||
|
||||
if (key === 'h') {
|
||||
moveLeft();
|
||||
} else if (key === 'j') {
|
||||
moveDown();
|
||||
} else if (key === 'k') {
|
||||
moveUp();
|
||||
} else if (key === 'l') {
|
||||
moveRight();
|
||||
if (!result) return;
|
||||
|
||||
switch (result.type) {
|
||||
case 'move':
|
||||
move(result.data.dr, result.data.dc, result.data.steps);
|
||||
break;
|
||||
|
||||
case 'anchor':
|
||||
switch (result.data) {
|
||||
case 'start':
|
||||
moveToStart();
|
||||
break;
|
||||
case 'end':
|
||||
moveToEnd();
|
||||
break;
|
||||
case 'top':
|
||||
moveToTop();
|
||||
break;
|
||||
case 'bottom':
|
||||
moveToBottom();
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case 'repeat':
|
||||
if (result.data) {
|
||||
move(result.data.dr, result.data.dc, result.data.steps);
|
||||
}
|
||||
break;
|
||||
|
||||
case 'count':
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -79,6 +139,11 @@ export function useCursor(gameStatusManager: GameStatusManager, containerRef: Re
|
||||
moveRight,
|
||||
moveUp,
|
||||
moveDown,
|
||||
moveToStart,
|
||||
moveToEnd,
|
||||
moveToTop,
|
||||
moveToBottom,
|
||||
repeatLastMotion,
|
||||
};
|
||||
|
||||
return cursor;
|
||||
|
||||
Reference in New Issue
Block a user