Merge branch 'master' of github.com:crosshare-org/crosshare

app/components/AlternateSolutionEditor.tsx

@@ -26,11 +26,8 @@ import {
 } from '../lib/types';
 import { logAsyncErrors } from '../lib/utils';
 import { fromCells } from '../lib/viewableGrid';
-import {
-  KeypressAction,
-  PasteAction,
-  gridInterfaceReducer,
-} from '../reducers/gridReducer';
+import { KeypressAction } from '../reducers/commonActions';
+import { PasteAction, gridInterfaceReducer } from '../reducers/gridReducer';
 import styles from './AlternateSolutionEditor.module.css';
 import { GridView } from './Grid';
 import { EscapeKey, Rebus } from './Icons';

app/components/Builder.tsx

@@ -81,12 +81,11 @@ import {
   getClueProps,
   initialBuilderState,
 } from '../reducers/builderReducer';
-import { PuzzleAction } from '../reducers/commonActions';
+import { KeypressAction, PuzzleAction } from '../reducers/commonActions';
 import {
   ClickedEntryAction,
   CopyAction,
   CutAction,
-  KeypressAction,
   PasteAction,
 } from '../reducers/gridReducer';
 import { AuthProps } from './AuthHelpers';

app/components/Page.tsx

@@ -11,7 +11,8 @@ import { FaAngleDoubleLeft, FaAngleDoubleRight } from 'react-icons/fa';
 import { usePolyfilledResizeObserver } from '../lib/hooks';
 import { KeyK } from '../lib/types';
 import { clsx } from '../lib/utils';
-import { KeypressAction, PasteAction } from '../reducers/gridReducer';
+import { KeypressAction } from '../reducers/commonActions';
+import { PasteAction } from '../reducers/gridReducer';
 import { EmbedContext } from './EmbedContext';
 import styles from './Page.module.css';
 

app/components/Preview.tsx

@@ -21,7 +21,7 @@ import {
   getClueProps,
   initialBuilderState,
 } from '../reducers/builderReducer';
-import { KeypressAction } from '../reducers/gridReducer';
+import { KeypressAction } from '../reducers/commonActions';
 import { AuthProps } from './AuthHelpers';
 import { ClueList } from './ClueList';
 import { ClueMode } from './ClueMode';

app/components/Puzzle.tsx

@@ -78,8 +78,8 @@ import {
   getEntryToClueMap,
   getRefs,
 } from '../lib/viewableGrid';
-import { PuzzleAction } from '../reducers/commonActions';
-import { KeypressAction, PasteAction } from '../reducers/gridReducer';
+import { KeypressAction, PuzzleAction } from '../reducers/commonActions';
+import { PasteAction } from '../reducers/gridReducer';
 import {
   CheatAction,
   LoadPlayAction,

app/components/PuzzleStats.tsx

@@ -25,7 +25,7 @@ import {
   builderReducer,
   initialBuilderState,
 } from '../reducers/builderReducer';
-import { KeypressAction } from '../reducers/gridReducer';
+import { KeypressAction } from '../reducers/commonActions';
 import { ButtonAsLink } from './Buttons';
 import { ClueList } from './ClueList';
 import { CopyableInput } from './CopyableInput';

app/lib/gridBase.ts

@@ -129,6 +129,22 @@ export function isInBounds<Entry extends EntryBase>(
   );
 }
 
+export function isIndexInBounds<Entry extends EntryBase>(
+  grid: GridBase<Entry>,
+  index: number
+): boolean {
+  return index >= 0 && index < grid.width * grid.height;
+}
+
+export function isInDirection(posA: PosAndDir, posB: Position): boolean {
+  switch (posA.dir) {
+    case Direction.Across:
+      return posA.row === posB.row;
+    case Direction.Down:
+      return posA.col === posB.col;
+  }
+}
+
 export function clampInBounds<Entry extends EntryBase>(
   grid: GridBase<Entry>,
   pos: PosAndDir

app/lib/viewableGrid.ts

@@ -7,6 +7,8 @@ import {
   cellIndex,
   entriesFromCells,
   entryAtPosition,
+  isInDirection,
+  isIndexInBounds,
   posForIndex,
   valAt,
 } from './gridBase';
@@ -16,9 +18,11 @@ import {
   BLOCK,
   ClueT,
   Direction,
+  EMPTY,
   PosAndDir,
   Position,
   Symmetry,
+  isSamePosition,
 } from './types';
 
 export interface ViewableEntry extends EntryBase {
@@ -344,6 +348,86 @@ export function moveToNextEntry<Entry extends ViewableEntry>(
   };
 }
 
+export function moveToEntryInActiveDirection<Entry extends ViewableEntry>(
+  grid: ViewableGrid<Entry>,
+  pos: PosAndDir,
+  reverse = false
+): Position {
+  const [currentEntry] = entryAtPosition(grid, pos);
+  if (!currentEntry) {
+    return pos;
+  }
+
+  const { cells } = currentEntry;
+  const startCell = reverse ? cells[0] : cells[cells.length - 1];
+  if (!startCell) {
+    return pos;
+  }
+
+  const xincr = pos.dir === Direction.Across ? 1 : 0;
+  const yincr = pos.dir === Direction.Down ? 1 : 0;
+  let iincr = xincr + yincr * grid.width;
+  if (reverse) {
+    iincr *= -1;
+  }
+
+  let ci = cellIndex(grid, startCell) + iincr;
+  let newPos = posForIndex(grid, ci);
+  while (isIndexInBounds(grid, ci) && isInDirection(pos, newPos)) {
+    const [newEntry] = entryAtPosition(grid, { ...newPos, dir: pos.dir });
+    if (newEntry && newEntry !== currentEntry) {
+      return newPos;
+    }
+    newPos = posForIndex(grid, (ci += iincr));
+  }
+
+  return pos;
+}
+
+export function moveToEntry<Entry extends ViewableEntry>(
+  grid: ViewableGrid<Entry>,
+  pos: PosAndDir,
+  move: (grid: ViewableGrid<Entry>, active: Position) => Position
+): Position {
+  let oldPos: Position = { ...pos };
+  let newPos = move(grid, oldPos);
+  while (!isSamePosition(newPos, oldPos)) {
+    const [newEntry] = entryAtPosition(grid, { ...newPos, dir: pos.dir });
+    if (newEntry) {
+      return newPos;
+    }
+    oldPos = newPos;
+    newPos = move(grid, oldPos);
+  }
+
+  return pos;
+}
+
+export function advanceTo<Entry extends ViewableEntry>(
+  grid: ViewableGrid<Entry>,
+  pos: PosAndDir,
+  newPos: Position,
+  wrongCells: Set<number>
+): PosAndDir {
+  if (isSamePosition(pos, newPos)) {
+    return pos;
+  }
+
+  const { dir } = pos;
+  const [entry] = entryAtPosition(grid, { ...newPos, dir });
+  if (!entry) {
+    return pos;
+  }
+
+  for (const cell of entry.cells) {
+    if (valAt(grid, cell) === EMPTY || wrongCells.has(cellIndex(grid, cell))) {
+      return { ...cell, dir };
+    }
+  }
+
+  return { ...newPos, dir };
+}
+
 export function gridWithNewChar<
   Entry extends ViewableEntry,
   Grid extends ViewableGrid<Entry>

app/reducers/builderReducer.ts

@@ -7,6 +7,7 @@ import { Timestamp } from '../lib/timestamp';
 import {
   Direction,
   EMPTY,
+  KeyK,
   Position,
   PrefillSquares,
   PuzzleInProgressT,
@@ -17,9 +18,13 @@ import {
   ViewableGrid,
   fromCells,
   gridEqual,
+  moveDown,
+  moveLeft,
+  moveRight,
+  moveUp,
 } from '../lib/viewableGrid';
-import { postEdit, validateGrid } from './builderUtils';
-import { PuzzleAction } from './commonActions';
+import { hasSelection, postEdit, validateGrid } from './builderUtils';
+import { PuzzleAction, isKeypressAction } from './commonActions';
 import {
   GridInterfaceState,
   closeRebus,
@@ -510,6 +515,59 @@ function _builderReducer(
   state: BuilderState,
   action: PuzzleAction
 ): BuilderState {
+  if (isKeypressAction(action)) {
+    const key = action.key;
+    if (key.k === KeyK.ShiftArrowRight) {
+      const { start, end } = hasSelection(state)
+        ? state.selection
+        : emptySelection(state.active);
+      return {
+        ...state,
+        wasEntryClick: false,
+        selection: {
+          start,
+          end: moveRight(state.grid, end),
+        },
+      };
+    } else if (key.k === KeyK.ShiftArrowLeft) {
+      const { start, end } = hasSelection(state)
+        ? state.selection
+        : emptySelection(state.active);
+      return {
+        ...state,
+        wasEntryClick: false,
+        selection: {
+          start,
+          end: moveLeft(state.grid, end),
+        },
+      };
+    } else if (key.k === KeyK.ShiftArrowUp) {
+      const { start, end } = hasSelection(state)
+        ? state.selection
+        : emptySelection(state.active);
+      return {
+        ...state,
+        wasEntryClick: false,
+        selection: {
+          start,
+          end: moveUp(state.grid, end),
+        },
+      };
+    } else if (key.k === KeyK.ShiftArrowDown) {
+      const { start, end } = hasSelection(state)
+        ? state.selection
+        : emptySelection(state.active);
+      return {
+        ...state,
+        wasEntryClick: false,
+        selection: {
+          start,
+          end: moveDown(state.grid, end),
+        },
+      };
+    }
+    return state;
+  }
   if (isStartSelectionAction(action)) {
     return {
       ...closeRebus(state),

app/reducers/commonActions.ts

@@ -1,3 +1,15 @@
+import { Key } from '../lib/types';
+
 export interface PuzzleAction {
   type: string;
 }
+
+export interface KeypressAction extends PuzzleAction {
+  type: 'KEYPRESS';
+  key: Key;
+}
+export function isKeypressAction(
+  action: PuzzleAction
+): action is KeypressAction {
+  return action.type === 'KEYPRESS';
+}