vimazing/vim-maze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove invalid hook call in anchor movement validation

Browse Source 
Remove validateAnchorMove function that called useMazeNavigation hook inside a regular function, which violates React's rules of hooks. Use the existing navigator instance directly in anchor movement methods instead.
This commit is contained in:
pastilhas
2025-10-23 20:30:07 +01:00
parent 1b9d963f46
commit f79d9d1c65
1 changed files with 64 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/useCursor/useCursor.ts
+64 -47
View File
@@ -7,25 +7,6 @@ import { useGameKeys } from './useGameKeys';
import { useMazeNavigation } from '../useBoard'; import { useMazeNavigation } from '../useBoard';
import { useVimMotions } from './useVimMotions'; import { useVimMotions } from './useVimMotions';
function validateAnchorMove(direction: 'start' | 'end' | 'top' | 'bottom', currentPos: Coord, board: BoardManager): boolean {
const navDirection = direction === 'start' ? 'left' :
direction === 'end' ? 'right' :
direction === 'top' ? 'top' : 'bottom';
const navigator = useMazeNavigation(board.mazeRef.current);
const target = navigator.findAnchorTarget(currentPos, navDirection);
if (!target) return false;
const dr = target.row > currentPos.row ? 1 :
target.row < currentPos.row ? -1 : 0;
const dc = target.col > currentPos.col ? 1 :
target.col < currentPos.col ? -1 : 0;
const steps = Math.abs(target.row - currentPos.row) + Math.abs(target.col - currentPos.col);
return navigator.validatePath(currentPos, { row: dr, col: dc }, steps);
}
export function useCursor(board: BoardManager, gameStatusManager: GameStatusManager) { export function useCursor(board: BoardManager, gameStatusManager: GameStatusManager) {
const position = useRef<Coord>({ row: 0, col: 0 }) const position = useRef<Coord>({ row: 0, col: 0 })
const mode = useRef<CursorMode>('normal') const mode = useRef<CursorMode>('normal')
@@ -104,37 +85,73 @@ export function useCursor(board: BoardManager, gameStatusManager: GameStatusMana
} }
} }
function moveToStart(): void { function moveToStart(): void {
if (!validateAnchorMove('start', position.current, board)) { const currentPos = position.current;
window.dispatchEvent(new Event("maze-invalid")); const target = navigator.findAnchorTarget(currentPos, 'left');
return; if (!target) {
} window.dispatchEvent(new Event("maze-invalid"));
moveToAnchor('start'); return;
} }
const dr = target.row > currentPos.row ? 1 : target.row < currentPos.row ? -1 : 0;
const dc = target.col > currentPos.col ? 1 : target.col < currentPos.col ? -1 : 0;
const steps = Math.abs(target.row - currentPos.row) + Math.abs(target.col - currentPos.col);
if (!navigator.validatePath(currentPos, { row: dr, col: dc }, steps)) {
window.dispatchEvent(new Event("maze-invalid"));
return;
}
moveToAnchor('start');
}
function moveToEnd(): void { function moveToEnd(): void {
if (!validateAnchorMove('end', position.current, board)) { const currentPos = position.current;
window.dispatchEvent(new Event("maze-invalid")); const target = navigator.findAnchorTarget(currentPos, 'right');
return; if (!target) {
} window.dispatchEvent(new Event("maze-invalid"));
moveToAnchor('end'); return;
} }
const dr = target.row > currentPos.row ? 1 : target.row < currentPos.row ? -1 : 0;
const dc = target.col > currentPos.col ? 1 : target.col < currentPos.col ? -1 : 0;
const steps = Math.abs(target.row - currentPos.row) + Math.abs(target.col - currentPos.col);
if (!navigator.validatePath(currentPos, { row: dr, col: dc }, steps)) {
window.dispatchEvent(new Event("maze-invalid"));
return;
}
moveToAnchor('end');
}
function moveToTop(): void { function moveToTop(): void {
if (!validateAnchorMove('top', position.current, board)) { const currentPos = position.current;
window.dispatchEvent(new Event("maze-invalid")); const target = navigator.findAnchorTarget(currentPos, 'top');
return; if (!target) {
} window.dispatchEvent(new Event("maze-invalid"));
moveToAnchor('top'); return;
} }
const dr = target.row > currentPos.row ? 1 : target.row < currentPos.row ? -1 : 0;
const dc = target.col > currentPos.col ? 1 : target.col < currentPos.col ? -1 : 0;
const steps = Math.abs(target.row - currentPos.row) + Math.abs(target.col - currentPos.col);
if (!navigator.validatePath(currentPos, { row: dr, col: dc }, steps)) {
window.dispatchEvent(new Event("maze-invalid"));
return;
}
moveToAnchor('top');
}
function moveToBottom(): void { function moveToBottom(): void {
if (!validateAnchorMove('bottom', position.current, board)) { const currentPos = position.current;
window.dispatchEvent(new Event("maze-invalid")); const target = navigator.findAnchorTarget(currentPos, 'bottom');
return; if (!target) {
} window.dispatchEvent(new Event("maze-invalid"));
moveToAnchor('bottom'); return;
} }
const dr = target.row > currentPos.row ? 1 : target.row < currentPos.row ? -1 : 0;
const dc = target.col > currentPos.col ? 1 : target.col < currentPos.col ? -1 : 0;
const steps = Math.abs(target.row - currentPos.row) + Math.abs(target.col - currentPos.col);
if (!navigator.validatePath(currentPos, { row: dr, col: dc }, steps)) {
window.dispatchEvent(new Event("maze-invalid"));
return;
}
moveToAnchor('bottom');
}
function repeatLastMotion(): void { function repeatLastMotion(): void {
const motion = vimMotions.repeatLastMotion(); const motion = vimMotions.repeatLastMotion();