@scrabble-solver/scrabble-solver 2.13.10 → 2.13.11

package/src/i18n/languages/german.json

@@ -5,7 +5,7 @@
   "cell.set-blank": "Als Blanko markieren",
   "cell.set-not-blank": "Nicht als Blanko markieren",
   "cell.tile.location": "Brett: Stein ({{x}}, {{y}})",
-  "cell.toggle-direction": "Schreibrichtung",
+  "common.arrows": "Pfeiltasten",
   "common.blanks": "Blankos",
   "common.clear": "Löschen",
   "common.close": "Schließen",
@@ -14,6 +14,7 @@
   "common.next": "Weiter",
   "common.points": "Punkte",
   "common.previous": "Zurück",
+  "common.space": "Leertaste",
   "common.tiles": "Steine",
   "common.two-letter-tiles": "Zwei-Buchstaben",
   "common.vowels": "Vokale",
@@ -34,6 +35,7 @@
   "keyMap": "Tastaturkürzel",
   "keyMap.board": "Brett",
   "keyMap.board.toggle-blank": "Als Blanko markieren / aufheben",
+  "keyMap.board.toggle-cell-filter": "Zielfilter umschalten",
   "keyMap.board.toggle-direction": "Schreibrichtung umschalten",
   "keyMap.board-and-rack": "Brett & Ablage",
   "keyMap.board-and-rack.insert-two-letter-tile": "Zwei-Buchstaben Stein hinzufügen",
@@ -41,7 +43,7 @@
   "keyMap.board-and-rack.remove-tile": "Stein entfernen",
   "keyMap.board-and-rack.submit": "Lösen starten",
   "keyMap.rack": "Ablage",
-  "keyMap.rack.insert-blank": "Blanko hinzufügen (Leertaste)",
+  "keyMap.rack.insert-blank": "Blanko hinzufügen",
   "menu": "Menü",
   "rack.placeholder": "Steine…",
   "rack.tile.location": "Ablage: Stein ({{index}})",

package/src/i18n/languages/persian.json

@@ -5,7 +5,7 @@
   "cell.set-blank": "علامت گذاری به عنوان خالی",
   "cell.set-not-blank": "علامت گذاری به عنوان غیر خالی",
   "cell.tile.location": "({{x}}، {{y}}) کاشی: صفحه",
-  "cell.toggle-direction": "جهت تایپ",
+  "common.arrows": "کلیدهای جهت دار",
   "common.blanks": "خالی",
   "common.clear": "پاک کردن",
   "common.close": "بستن",
@@ -14,6 +14,7 @@
   "common.next": "بعدی",
   "common.points": "امتیازات",
   "common.previous": "قبلی",
+  "common.space": "دکمه اسپیس",
   "common.tiles": "کاشی ها",
   "common.two-letter-tiles": "دو حرفی",
   "common.vowels": "حروف مصوت",
@@ -34,6 +35,7 @@
   "keyMap": "میانبر های کیبورد",
   "keyMap.board": "صفحه",
   "keyMap.board.toggle-blank": "علامت/عدم علامت گذاری کاشی به عنوان خالی",
+  "keyMap.board.toggle-cell-filter": "فیلتر هدف را تغییر دهید",
   "keyMap.board.toggle-direction": "تغییر جهت تایپ",
   "keyMap.board-and-rack": "صفحه و طاقچه",
   "keyMap.board-and-rack.insert-two-letter-tile": "وارد کردن کاشی دو حرفی",
@@ -41,7 +43,7 @@
   "keyMap.board-and-rack.remove-tile": "حذف کاشی",
   "keyMap.board-and-rack.submit": "حل کردن",
   "keyMap.rack": "طاقچه",
-  "keyMap.rack.insert-blank": "وارد کردن کاشی خالی (دکمه اسپیس)",
+  "keyMap.rack.insert-blank": "وارد کردن کاشی خالی",
   "menu": "منو",
   "rack.placeholder": "لیستحرف",
   "rack.tile.location": "({{index}}) کاشی: طاقچه",

package/src/i18n/languages/polish.json

@@ -5,7 +5,7 @@
   "cell.set-blank": "Oznacz jako blank",
   "cell.set-not-blank": "Oznacz jako nie blank",
   "cell.tile.location": "Plansza: płytka ({{x}}, {{y}})",
-  "cell.toggle-direction": "Kierunek wpisywania",
+  "common.arrows": "Klawisze strzałek",
   "common.blanks": "Blanki",
   "common.clear": "Wyczyść",
   "common.close": "Zamknij",
@@ -14,6 +14,7 @@
   "common.next": "Następne",
   "common.points": "Punkty",
   "common.previous": "Poprzednie",
+  "common.space": "Spacja",
   "common.tiles": "Płytki",
   "common.two-letter-tiles": "Dwuliterowe",
   "common.vowels": "Samogłoski",
@@ -34,6 +35,7 @@
   "keyMap": "Skróty klawiszowe",
   "keyMap.board": "Plansza",
   "keyMap.board.toggle-blank": "Oznacz/odznacz płytkę jako blank",
+  "keyMap.board.toggle-cell-filter": "Zmień filtr miejsca docelowego",
   "keyMap.board.toggle-direction": "Zmień kierunek wpisywania",
   "keyMap.board-and-rack": "Plansza i stojak",
   "keyMap.board-and-rack.insert-two-letter-tile": "Wstaw dwuliterową płytkę",
@@ -41,7 +43,7 @@
   "keyMap.board-and-rack.remove-tile": "Zdejmij płytkę",
   "keyMap.board-and-rack.submit": "Rozpocznij wyszukiwanie",
   "keyMap.rack": "Stojak",
-  "keyMap.rack.insert-blank": "Wstaw blanka (spacja)",
+  "keyMap.rack.insert-blank": "Wstaw blanka",
   "menu": "Menu",
   "rack.placeholder": "Literki",
   "rack.tile.location": "Stojak: płytka ({{index}})",

package/src/i18n/languages/romanian.json

@@ -5,7 +5,7 @@
   "cell.set-blank": "Marcare camp liber",
   "cell.set-not-blank": "Marcare camp ocupat ",
   "cell.tile.location": "Tabla: camp ({{x}}, {{y}})",
-  "cell.toggle-direction": "Directie scriere",
+  "common.arrows": "Sagetile",
   "common.blanks": "Jokeri",
   "common.clear": "Stergere",
   "common.close": "Inchidere",
@@ -14,6 +14,7 @@
   "common.next": "Pasul urmator",
   "common.points": "Puncte",
   "common.previous": "Pasul anterior",
+  "common.space": "Bara de spațiu",
   "common.tiles": "Litere",
   "common.two-letter-tiles": "2 litere",
   "common.vowels": "Vocale",
@@ -34,6 +35,7 @@
   "keyMap": "Comanda rapida la tastatura",
   "keyMap.board": "Tabla joc",
   "keyMap.board.toggle-blank": "Marcheaza/Deselecteaza campul ca liber",
+  "keyMap.board.toggle-cell-filter": "Comutați filtrul țintă",
   "keyMap.board.toggle-direction": "Schimbati directia de tastare",
   "keyMap.board-and-rack": "Tabla si literele extrase",
   "keyMap.board-and-rack.insert-two-letter-tile": "Introducere piesa 2 litere",

package/src/i18n/languages/spanish.json

@@ -5,7 +5,7 @@
   "cell.set-blank": "Marcar como en blanco",
   "cell.set-not-blank": "Marcar como no en blanco",
   "cell.tile.location": "Tablero: espacio ({{x}}, {{y}})",
-  "cell.toggle-direction": "Dirección de escritura",
+  "common.arrows": "Teclas de flecha",
   "common.blanks": "Blancos",
   "common.clear": "Borrar",
   "common.close": "Cerrar",
@@ -14,6 +14,7 @@
   "common.next": "Siguiente",
   "common.points": "Puntos",
   "common.previous": "Anterior",
+  "common.space": "Barra espaciadora",
   "common.tiles": "Longitud",
   "common.two-letter-tiles": "Dos letras",
   "common.vowels": "Vocales",
@@ -34,6 +35,7 @@
   "keyMap": "Atajos de teclado",
   "keyMap.board": "Tablero",
   "keyMap.board.toggle-blank": "Marcar / desmarcar un espacio en blanco",
+  "keyMap.board.toggle-cell-filter": "Alternar filtro de destino",
   "keyMap.board.toggle-direction": "Alternar dirección de escritura",
   "keyMap.board-and-rack": "Tablero y estante",
   "keyMap.board-and-rack.insert-two-letter-tile": "Insertar mosaico de dos letras",
@@ -41,7 +43,7 @@
   "keyMap.board-and-rack.remove-tile": "Quitar Letra",
   "keyMap.board-and-rack.submit": "Empezar a resolver",
   "keyMap.rack": "Estante",
-  "keyMap.rack.insert-blank": "Insertar espacio en blanco (barra espaciadora)",
+  "keyMap.rack.insert-blank": "Insertar espacio en blanco",
   "menu": "Menú",
   "rack.placeholder": "Letras…",
   "rack.tile.location": "Estante: espacio ({{index}})",

package/src/lib/getCellSize.ts

@@ -3,8 +3,8 @@ import { Config } from '@scrabble-solver/types';
 import { BOARD_CELL_BORDER_WIDTH, BOARD_TILE_SIZE_MAX } from 'parameters';
 
 const getCellSize = (config: Config, width: number, height: number): number => {
-  const maxWidth = (width - BOARD_CELL_BORDER_WIDTH) / config.boardWidth - BOARD_CELL_BORDER_WIDTH;
-  const maxHeight = (height - BOARD_CELL_BORDER_WIDTH) / config.boardHeight - BOARD_CELL_BORDER_WIDTH;
+  const maxWidth = (width - BOARD_CELL_BORDER_WIDTH) / config.boardSize - BOARD_CELL_BORDER_WIDTH;
+  const maxHeight = (height - BOARD_CELL_BORDER_WIDTH) / config.boardSize - BOARD_CELL_BORDER_WIDTH;
   const cellSize = Math.min(maxWidth, maxHeight);
   return Math.floor(Math.min(cellSize, BOARD_TILE_SIZE_MAX));
 };

package/src/lib/sortGroupedResults.ts

@@ -1,4 +1,4 @@
-import { Locale } from '@scrabble-solver/types';
+import { Locale, ShowCoordinates } from '@scrabble-solver/types';
 
 import { GroupedResults, Sort } from 'types';
 
@@ -8,14 +8,15 @@ const sortGroupedResults = (
   results: GroupedResults | undefined,
   sort: Sort,
   locale: Locale,
+  showCoordinates: ShowCoordinates,
 ): GroupedResults | undefined => {
   if (typeof results === 'undefined') {
     return results;
   }
 
   return {
-    matching: sortResults(results.matching, sort, locale) ?? [],
-    other: sortResults(results.other, sort, locale) ?? [],
+    matching: sortResults(results.matching, sort, locale, showCoordinates) ?? [],
+    other: sortResults(results.other, sort, locale, showCoordinates) ?? [],
   };
 };
 

package/src/lib/sortResults.ts

@@ -1,14 +1,21 @@
-import { Result } from '@scrabble-solver/types';
+import { Result, ShowCoordinates } from '@scrabble-solver/types';
 
 import { Comparator, ResultColumn, Sort, SortDirection } from 'types';
 
 import createKeyComparator from './createKeyComparator';
+import createStringComparator from './createStringComparator';
+import getCoordinates from './getCoordinates';
 import reverseComparator from './reverseComparator';
 
-const comparators: Record<ResultColumn, (locale: string) => Comparator<Result>> = {
+const comparators: Record<ResultColumn, (locale: string, showCoordinates: ShowCoordinates) => Comparator<Result>> = {
   [ResultColumn.BlanksCount]: (locale: string) => createKeyComparator('blanksCount', locale),
   [ResultColumn.ConsonantsCount]: (locale: string) => createKeyComparator('consonantsCount', locale),
-  [ResultColumn.Coordinates]: () => () => 0,
+  [ResultColumn.Coordinates]: (locale: string, showCoordinates: ShowCoordinates) => (a, b) => {
+    const stringComparator = createStringComparator(locale);
+    const aValue = getCoordinates(a, showCoordinates);
+    const bValue = getCoordinates(b, showCoordinates);
+    return stringComparator(aValue, bValue);
+  },
   [ResultColumn.Points]: (locale: string) => createKeyComparator('points', locale),
   [ResultColumn.TilesCount]: (locale: string) => createKeyComparator('tilesCount', locale),
   [ResultColumn.VowelsCount]: (locale: string) => createKeyComparator('vowelsCount', locale),
@@ -16,13 +23,18 @@ const comparators: Record<ResultColumn, (locale: string) => Comparator<Result>>
   [ResultColumn.WordsCount]: (locale: string) => createKeyComparator('wordsCount', locale),
 };
 
-const sortResults = (results: Result[] | undefined, sort: Sort, locale: string): Result[] | undefined => {
+const sortResults = (
+  results: Result[] | undefined,
+  sort: Sort,
+  locale: string,
+  showCoordinates: ShowCoordinates,
+): Result[] | undefined => {
   if (typeof results === 'undefined') {
     return results;
   }
 
   const createComparator = comparators[sort.column];
-  const comparator = createComparator(locale);
+  const comparator = createComparator(locale, showCoordinates);
   const finalComparator = sort.direction === SortDirection.Descending ? reverseComparator(comparator) : comparator;
   const sortedResults = [...results].sort(finalComparator);
   return sortedResults;

package/src/modals/KeyMapModal/KeyMapModal.tsx

@@ -1,10 +1,9 @@
 import { FunctionComponent, memo } from 'react';
 
-import { Key, Modal } from 'components';
+import { Arrows, Backspace, Ctrl, Del, Enter, Key, Modal, Space } from 'components';
 import { selectConfig, useTranslate, useTypedSelector } from 'state';
 
 import { Mapping } from './components';
-import { ARROWS, BACKSPACE, CTRL, DEL, ENTER, SPACE } from './keys';
 
 interface Props {
   className?: string;
@@ -19,15 +18,26 @@ const KeyMapModal: FunctionComponent<Props> = ({ className, isOpen, onClose }) =
   return (
     <Modal className={className} isOpen={isOpen} title={translate('keyMap')} onClose={onClose}>
       <Modal.Section title={translate('keyMap.board-and-rack')}>
-        <Mapping description={translate('keyMap.board-and-rack.navigate')} mapping={[ARROWS]} />
-        <Mapping description={translate('keyMap.board-and-rack.remove-tile')} mapping={[DEL, BACKSPACE]} />
-        <Mapping description={translate('keyMap.board-and-rack.submit')} mapping={[ENTER]} />
+        <Mapping description={translate('keyMap.board-and-rack.navigate')} mapping={[<Arrows key="arrows" />]} />
+
+        <Mapping
+          description={translate('keyMap.board-and-rack.remove-tile')}
+          mapping={[<Del key="del" />, <Backspace key="backspace" />]}
+        />
+
+        <Mapping description={translate('keyMap.board-and-rack.submit')} mapping={[<Enter key="del" />]} />
+
+        <Mapping
+          description={translate('keyMap.board.toggle-cell-filter')}
+          mapping={[[<Ctrl key="ctrl" />, <Key key="g">G</Key>]]}
+        />
+
         {config.twoCharacterTiles.length > 0 && (
           <Mapping
             description={translate('keyMap.board-and-rack.insert-two-letter-tile')}
             mapping={[
               [
-                CTRL,
+                <Ctrl key="ctrl" />,
                 <>
                   {config.twoCharacterTiles.map(([firstLetter]) => (
                     <Key key={firstLetter}>{firstLetter.toUpperCase()}</Key>
@@ -40,12 +50,12 @@ const KeyMapModal: FunctionComponent<Props> = ({ className, isOpen, onClose }) =
       </Modal.Section>
 
       <Modal.Section title={translate('keyMap.board')}>
-        <Mapping description={translate('keyMap.board.toggle-blank')} mapping={[SPACE, [CTRL, <Key key="b">B</Key>]]} />
-        <Mapping description={translate('keyMap.board.toggle-direction')} mapping={[ARROWS]} />
+        <Mapping description={translate('keyMap.board.toggle-blank')} mapping={[<Space key="space" />]} />
+        <Mapping description={translate('keyMap.board.toggle-direction')} mapping={[<Arrows key="arrows" />]} />
       </Modal.Section>
 
       <Modal.Section title={translate('keyMap.rack')}>
-        <Mapping description={translate('keyMap.rack.insert-blank')} mapping={[SPACE]} />
+        <Mapping description={translate('keyMap.rack.insert-blank')} mapping={[<Space key="space" />]} />
       </Modal.Section>
     </Modal>
   );

package/src/modals/SettingsModal/components/ShowCoordinatesSetting/ShowCoordinatesSetting.tsx

@@ -45,7 +45,7 @@ const ShowCoordinatesSetting: FunctionComponent<Props> = ({ className, disabled
           className={styles.option}
           disabled={disabled}
           key={option.value}
-          name="inputMode"
+          name="showCoordinates"
           value={option.value}
           onChange={handleChange}
         >

package/src/pages/api/dictionary/[locale]/[word].ts

@@ -13,10 +13,7 @@ interface RequestData {
   words: string[];
 }
 
-const MAXIMUM_COLLISIONS_COUNT = Object.values(games).reduce(
-  (result, game) => Math.max(result, game.maximumCharactersCount),
-  0,
-);
+const MAXIMUM_COLLISIONS_COUNT = Object.values(games).reduce((result, game) => Math.max(result, game.rackSize), 0);
 const MAXIMUM_WORDS_COUNT = MAXIMUM_COLLISIONS_COUNT + 1;
 
 const dictionary = async (request: NextApiRequest, response: NextApiResponse): Promise<void> => {

package/src/state/sagas.ts

@@ -123,7 +123,7 @@ function* onInitialize(): AnyGenerator {
 function* onReset(): AnyGenerator {
   const config = yield select(selectConfig);
 
-  yield put(boardSlice.actions.init(Board.create(config.boardWidth, config.boardHeight)));
+  yield put(boardSlice.actions.init(Board.create(config.boardSize)));
   yield put(cellFilterSlice.actions.reset());
   yield put(dictionarySlice.actions.reset());
   yield put(rackSlice.actions.reset());
@@ -214,12 +214,12 @@ function* ensureProperTilesCount(): AnyGenerator {
   const { config } = yield select(selectConfig);
   const rack = yield select(selectRack);
 
-  if (config.maximumCharactersCount > rack.length) {
-    const differenceCount = Math.abs(config.maximumCharactersCount - rack.length);
+  if (config.rackSize > rack.length) {
+    const differenceCount = Math.abs(config.rackSize - rack.length);
     yield put(rackSlice.actions.init([...rack, ...Array(differenceCount).fill(null)]));
-  } else if (config.maximumCharactersCount < rack.length) {
-    const nonNulls = rack.filter(Boolean).slice(0, config.maximumCharactersCount);
-    const differenceCount = Math.abs(config.maximumCharactersCount - nonNulls.length);
+  } else if (config.rackSize < rack.length) {
+    const nonNulls = rack.filter(Boolean).slice(0, config.rackSize);
+    const differenceCount = Math.abs(config.rackSize - nonNulls.length);
     const autoGroupTiles = yield select(selectLocaleAutoGroupTiles);
     yield put(rackSlice.actions.init([...nonNulls, ...Array(differenceCount).fill(null)]));
     yield put(rackSlice.actions.groupTiles(autoGroupTiles));

package/src/state/selectors.ts

@@ -100,7 +100,7 @@ export const selectGroupedResults = createSelector(
 );
 
 export const selectGroupedSortedResults = createSelector(
-  [selectGroupedResults, selectResultsSort, selectLocale],
+  [selectGroupedResults, selectResultsSort, selectLocale, selectShowCoordinates],
   sortGroupedResults,
 );
 

package/src/state/slices/boardInitialState.ts

@@ -8,8 +8,8 @@ import settingsInitialState from './settingsInitialState';
 export type BoardState = Board;
 
 const { game, locale } = settingsInitialState;
-const { boardHeight, boardWidth } = getConfig(game, locale);
-export const boardDefaultState = Board.create(boardWidth, boardHeight);
+const { boardSize } = getConfig(game, locale);
+export const boardDefaultState = Board.create(boardSize);
 
 const boardInitialState: BoardState = localStorage.getBoard() || boardDefaultState;
 

package/src/state/slices/boardSlice.ts

@@ -65,8 +65,8 @@ const boardSlice = createSlice({
         throw new Error(`Cannot find config for game "${game}"`);
       }
 
-      if (state.rows.length !== config.boardHeight || state.rows[0].length !== config.boardWidth) {
-        return Board.create(config.boardWidth, config.boardHeight);
+      if (state.rows.length !== config.boardSize || state.rows[0].length !== config.boardSize) {
+        return Board.create(config.boardSize);
       }
 
       return state;

package/src/styles/variables.scss

@@ -58,7 +58,7 @@ $easeOutSine: cubic-bezier(0.61, 1, 0.88, 1);
   --color--bonus--start: var(--color--violet--light);
   --color--bonus--word-multiplier--2: #fbc997;
   --color--bonus--word-multiplier--3: #f19393;
-  --color--tooltip--background: #222;
+  --color--tooltip--background: #444;
   --color--tooltip--foreground: var(--color--white);
 
   --font--family: system-ui, sans-serif;
@@ -110,7 +110,7 @@ $easeOutSine: cubic-bezier(0.61, 1, 0.88, 1);
   --solver-column--width: 580px;
   --square-button--size: 32px;
   --text-input--height: 40px;
-  --tooltip--max-width: 360px;
+  --tooltip--max-width: 500px;
 
   @include media('<l') {
     --dictionary--height: var(--dictionary--height--mobile);

package/src/types/index.ts

@@ -69,8 +69,8 @@ export type TranslationKey =
   | 'cell.filter-cell.include'
   | 'cell.set-blank'
   | 'cell.set-not-blank'
-  | 'cell.toggle-direction'
   | 'cell.tile.location'
+  | 'common.arrows'
   | 'common.clear'
   | 'common.close'
   | 'common.loading'
@@ -79,6 +79,7 @@ export type TranslationKey =
   | 'common.next'
   | 'common.points'
   | 'common.previous'
+  | 'common.space'
   | 'common.tiles'
   | 'common.two-letter-tiles'
   | 'common.vowels'
@@ -99,6 +100,7 @@ export type TranslationKey =
   | 'keyMap'
   | 'keyMap.board'
   | 'keyMap.board.toggle-blank'
+  | 'keyMap.board.toggle-cell-filter'
   | 'keyMap.board.toggle-direction'
   | 'keyMap.board-and-rack'
   | 'keyMap.board-and-rack.insert-two-letter-tile'