@scrabble-solver/scrabble-solver 2.15.10 → 2.15.12

package/src/state/types.ts

@@ -1,21 +1,19 @@
-import {
-  boardSlice,
-  cellFilterSlice,
-  dictionarySlice,
-  rackSlice,
-  resultsSlice,
-  settingsSlice,
-  solveSlice,
-  verifySlice,
-} from './slices';
+import type { BoardState } from './board';
+import type { CellFiltersState } from './cellFilters';
+import type { DictionaryState } from './dictionary';
+import type { RackState } from './rack';
+import type { ResultsState } from './results';
+import type { SettingsState } from './settings';
+import type { SolveState } from './solve';
+import type { VerifyState } from './verify';
 
 export type RootState = {
-  board: ReturnType<typeof boardSlice.reducer>;
-  cellFilter: ReturnType<typeof cellFilterSlice.reducer>;
-  dictionary: ReturnType<typeof dictionarySlice.reducer>;
-  rack: ReturnType<typeof rackSlice.reducer>;
-  results: ReturnType<typeof resultsSlice.reducer>;
-  settings: ReturnType<typeof settingsSlice.reducer>;
-  solve: ReturnType<typeof solveSlice.reducer>;
-  verify: ReturnType<typeof verifySlice.reducer>;
+  board: BoardState;
+  cellFilters: CellFiltersState;
+  dictionary: DictionaryState;
+  rack: RackState;
+  results: ResultsState;
+  settings: SettingsState;
+  solve: SolveState;
+  verify: VerifyState;
 };

package/src/state/useTranslate.ts

@@ -1,8 +1,8 @@
 import { useCallback } from 'react';
 
-import { Translate } from 'types';
+import type { Translate } from 'types';
 
-import { selectLocale, selectTranslations } from './selectors';
+import { selectLocale, selectTranslations } from './settings';
 import { useTypedSelector } from './useTypedSelector';
 
 export const useTranslate = (): Translate => {

package/src/state/useTypedSelector.ts

@@ -1,5 +1,5 @@
-import { TypedUseSelectorHook, useSelector } from 'react-redux';
+import { type TypedUseSelectorHook, useSelector } from 'react-redux';
 
-import { RootState } from './types';
+import type { RootState } from './types';
 
 export const useTypedSelector: TypedUseSelectorHook<RootState> = useSelector;

package/src/state/verify/index.ts

@@ -0,0 +1,4 @@
+export * from './initialState';
+export * from './selectors';
+export * from './slice';
+export * from './types';

package/src/state/verify/initialState.ts

@@ -0,0 +1,12 @@
+import { boardInitialState } from '../board';
+
+import type { VerifyState } from './types';
+
+export const verifyInitialState: VerifyState = {
+  isLoading: false,
+  lastSolvedParameters: {
+    board: boardInitialState,
+  },
+  invalidWords: [],
+  validWords: [],
+};

package/src/state/verify/selectors.ts

@@ -0,0 +1,9 @@
+import { createSelector } from '@reduxjs/toolkit';
+
+import type { RootState } from '../types';
+
+export const selectVerify = (state: RootState) => state.verify;
+
+export const selectInvalidWords = createSelector([selectVerify], (verify) => verify.invalidWords);
+
+export const selectValidWords = createSelector([selectVerify], (verify) => verify.validWords);

package/src/state/{slices/verifySlice.ts → verify/slice.ts}

@@ -1,7 +1,7 @@
-import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { Board } from '@scrabble-solver/types';
+import { createSlice, type PayloadAction } from '@reduxjs/toolkit';
+import { type Board } from '@scrabble-solver/types';
 
-import { verifyInitialState } from './verifyInitialState';
+import { verifyInitialState } from './initialState';
 
 interface VerifyParameters {
   board: Board;

package/src/state/verify/types.ts

@@ -0,0 +1,10 @@
+import type { BoardState } from '../board';
+
+export interface VerifyState {
+  isLoading: boolean;
+  lastSolvedParameters: {
+    board: BoardState;
+  };
+  invalidWords: string[];
+  validWords: string[];
+}

package/src/styles/global.scss

@@ -45,3 +45,8 @@ h4 {
   -webkit-margin-after: 0;
   margin: 0;
 }
+
+/* https://github.com/vercel/next.js/discussions/13387#discussioncomment-5694715 */
+nextjs-portal {
+  display: none;
+}

package/src/types/api.ts

@@ -1,4 +1,4 @@
-import { BoardJson, ConfigJson, Game, Locale } from '@scrabble-solver/types';
+import { type BoardJson, type ConfigJson, type Game, type Locale } from '@scrabble-solver/types';
 
 export interface SolveRequestPayload {
   board: BoardJson;

package/src/types/index.ts

@@ -1,5 +1,5 @@
-import { Result } from '@scrabble-solver/types';
-import { FunctionComponent, SVGAttributes } from 'react';
+import { type Result } from '@scrabble-solver/types';
+import { type FunctionComponent, type SVGAttributes } from 'react';
 
 export type Comparator<T> = (a: T, B: T) => number;
 
@@ -7,12 +7,14 @@ export type AutoGroupTiles = 'left' | 'right' | null;
 
 export type CellFilterType = 'include' | 'exclude';
 
-export type CellFilterEntry = {
+export type CellFilter = {
   x: Point['x'];
   y: Point['y'];
   type: CellFilterType;
 };
 
+export type RemoveCellFilters = 'always' | 'never' | null;
+
 export type Direction = 'horizontal' | 'vertical';
 
 export type InputMode = 'keyboard' | 'touchscreen';
@@ -36,7 +38,7 @@ export enum SortDirection {
 
 export interface RemainingTile {
   character: string;
-  count: number;
+  count?: number;
   score: number;
   usedCount: number;
 }
@@ -141,6 +143,9 @@ export type TranslationKey =
   | 'settings.inputMode'
   | 'settings.inputMode.keyboard'
   | 'settings.inputMode.touchscreen'
+  | 'settings.removeCellFilters'
+  | 'settings.removeCellFilters.always'
+  | 'settings.removeCellFilters.never'
   | 'settings.language'
   | 'settings.showCoordinates'
   | 'settings.showCoordinates.alternative'