@scrabble-solver/scrabble-solver 2.13.8 → 2.13.9

package/src/state/slices/cellFilterSlice.ts

@@ -1,6 +1,6 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 
-import { Point } from 'types';
+import { CellFilterType, Point } from 'types';
 
 import cellFilterInitialState from './cellFilterInitialState';
 
@@ -10,17 +10,42 @@ const cellFilterSlice = createSlice({
   reducers: {
     toggle: (state, action: PayloadAction<Point>) => {
       const { x, y } = action.payload;
-      const has = state.some((point) => point.x === x && point.y === y);
+      const currentEntry = state.find((point) => point.x === x && point.y === y);
+      const has = Boolean(currentEntry);
+      const nextType = currentEntry ? toggleCellFilterState(currentEntry.type) : 'include';
 
-      if (has) {
+      if (nextType === null) {
         return state.filter((point) => point.x !== x || point.y !== y);
       }
 
-      return [...state, action.payload];
+      if (!has) {
+        return [...state, { ...action.payload, type: nextType }];
+      }
+
+      return state.map((entry) => {
+        if (entry.x === x && entry.y === y) {
+          return { ...entry, type: nextType };
+        }
+
+        return entry;
+      });
+    },
+
+    cancel: (state, action: PayloadAction<Point>) => {
+      const { x, y } = action.payload;
+
+      return state.filter((point) => point.x !== x || point.y !== y);
     },
 
     reset: () => cellFilterInitialState,
   },
 });
 
+const toggleCellFilterState = (type: CellFilterType): CellFilterType | null => {
+  const chain: (CellFilterType | null)[] = ['include', 'exclude', null];
+  const index = chain.indexOf(type);
+  const nextIndex = (index + 1) % chain.length;
+  return chain[nextIndex];
+};
+
 export default cellFilterSlice;

package/src/types/index.ts

@@ -2,6 +2,14 @@ export type Comparator<T> = (a: T, B: T) => number;
 
 export type AutoGroupTiles = 'left' | 'right' | null;
 
+export type CellFilterType = 'include' | 'exclude';
+
+export type CellFilterEntry = {
+  x: Point['x'];
+  y: Point['y'];
+  type: CellFilterType;
+};
+
 export type Direction = 'horizontal' | 'vertical';
 
 export type InputMode = 'keyboard' | 'touchscreen';
@@ -49,7 +57,8 @@ export enum ResultColumn {
 }
 export type TranslationKey =
   | 'cell.enter-word'
-  | 'cell.filter-cell'
+  | 'cell.filter-cell.exclude'
+  | 'cell.filter-cell.include'
   | 'cell.set-blank'
   | 'cell.set-not-blank'
   | 'cell.toggle-direction'