@scrabble-solver/scrabble-solver 2.11.7 → 2.11.9

package/src/hooks/useLocalStorage.ts

@@ -5,6 +5,7 @@ import {
   selectAutoGroupTiles,
   selectBoard,
   selectConfigId,
+  selectInputMode,
   selectLocale,
   selectRack,
   useTypedSelector,
@@ -14,6 +15,7 @@ const useLocalStorage = () => {
   const autoGroupTiles = useTypedSelector(selectAutoGroupTiles);
   const board = useTypedSelector(selectBoard);
   const configId = useTypedSelector(selectConfigId);
+  const inputMode = useTypedSelector(selectInputMode);
   const locale = useTypedSelector(selectLocale);
   const rack = useTypedSelector(selectRack);
 
@@ -35,6 +37,12 @@ const useLocalStorage = () => {
     }
   }, [configId]);
 
+  useEffect(() => {
+    if (inputMode) {
+      localStorage.setInputMode(inputMode);
+    }
+  }, [inputMode]);
+
   useEffect(() => {
     if (locale) {
       localStorage.setLocale(locale);

package/src/i18n/de.json

@@ -1,4 +1,5 @@
 {
+  "cell.enter-word": "Wort eingeben",
   "cell.filter-cell": "Zielort",
   "cell.set-blank": "Als Blanko markieren",
   "cell.set-not-blank": "Nicht als Blanko markieren",
@@ -22,7 +23,7 @@
   "dictionary.empty-state.no-results": "Wort kann nicht im Wörterbuch gefunden werden.",
   "dictionary.empty-state.not-allowed": "Dieses Wort ist nicht erlaubt.",
   "dictionary.empty-state.uninitialized": "Die Wörterbuchdéfinition wird hier angezeigt.",
-  "dictionary.input.placeholder": "Durchsuche Wörterbuch...",
+  "dictionary.input.placeholder": "Durchsuche Wörterbuch…",
   "dictionary.input.title": "Durch Kommas getrennte Wörter",
   "empty-state.error": "Fehler",
   "empty-state.info": "Info",
@@ -43,6 +44,7 @@
   "menu": "Menü",
   "rack.placeholder": "Steine…",
   "rack.tile.location": "Ablage: Stein ({{index}})",
+  "rack.touchscreen.placeholder": "Steine…",
   "remaining-tiles": "Restliche Steine",
   "results": "Ergebnisse",
   "results.empty-state.no-results": "Keine Ergebnisse - kein Wort konnte generiert werden.",
@@ -58,6 +60,9 @@
   "settings.autoGroupTiles.right": "Rechte Seite",
   "settings.autoGroupTiles.null": "Nicht gruppieren",
   "settings.game": "Spiel",
+  "settings.inputMode": "Eingabemodus",
+  "settings.inputMode.keyboard": "Tastatur",
+  "settings.inputMode.touchscreen": "Touchscreen",
   "settings.language": "Sprache",
   "words": "Gebildete Wörter",
   "words.invalid": "Falsch",

package/src/i18n/en.json

@@ -1,4 +1,5 @@
 {
+  "cell.enter-word": "Enter word",
   "cell.filter-cell": "Target destination",
   "cell.set-blank": "Mark it a blank",
   "cell.set-not-blank": "Mark it not a blank",
@@ -22,7 +23,7 @@
   "dictionary.empty-state.no-results": "Unable to find word definition in the dictionary.",
   "dictionary.empty-state.not-allowed": "This word is not allowed.",
   "dictionary.empty-state.uninitialized": "Word definition will be shown here.",
-  "dictionary.input.placeholder": "Search dictionary...",
+  "dictionary.input.placeholder": "Search dictionary…",
   "dictionary.input.title": "Comma-separated words",
   "empty-state.error": "Error",
   "empty-state.info": "Info",
@@ -43,6 +44,7 @@
   "menu": "Menu",
   "rack.placeholder": "Letters",
   "rack.tile.location": "Rack: tile ({{index}})",
+  "rack.touchscreen.placeholder": "Letters…",
   "remaining-tiles": "Remaining tiles",
   "results": "Results",
   "results.empty-state.no-results": "No results - unable to generate any words.",
@@ -58,6 +60,9 @@
   "settings.autoGroupTiles.right": "On the right",
   "settings.autoGroupTiles.null": "Do not group",
   "settings.game": "Game",
+  "settings.inputMode": "Input mode",
+  "settings.inputMode.keyboard": "Keyboard",
+  "settings.inputMode.touchscreen": "Touchscreen",
   "settings.language": "Language",
   "words": "Created words",
   "words.invalid": "Invalid",

package/src/i18n/es.json

@@ -1,4 +1,5 @@
 {
+  "cell.enter-word": "Ingresar palabra",
   "cell.filter-cell": "Destino objetivo",
   "cell.set-blank": "Marcar como en blanco",
   "cell.set-not-blank": "Marcar como no en blanco",
@@ -22,7 +23,7 @@
   "dictionary.empty-state.no-results": "No se puede encontrar la definición de palabra en el diccionario.",
   "dictionary.empty-state.not-allowed": "Esta palabra no es aceptable.",
   "dictionary.empty-state.uninitialized": "Aquí se mostrará la definición del diccionario.",
-  "dictionary.input.placeholder": "Busca el diccionario...",
+  "dictionary.input.placeholder": "Busca el diccionario…",
   "dictionary.input.title": "Palabras separadas por comas",
   "empty-state.error": "Error",
   "empty-state.info": "Info",
@@ -43,6 +44,7 @@
   "menu": "Menú",
   "rack.placeholder": "Letras…",
   "rack.tile.location": "Estante: espacio ({{index}})",
+  "rack.touchscreen.placeholder": "Letras… (p.ej. LLabcCHhRR)",
   "remaining-tiles": "Casillas restantes",
   "results": "Resultados",
   "results.empty-state.no-results": "No hay resultados; no se pueden generar palabras",
@@ -58,6 +60,9 @@
   "settings.autoGroupTiles.right": "A la derecha",
   "settings.autoGroupTiles.null": "No agrupar",
   "settings.game": "Juego",
+  "settings.inputMode": "Modo de entrada",
+  "settings.inputMode.keyboard": "Teclado",
+  "settings.inputMode.touchscreen": "Pantalla táctil",
   "settings.language": "Idioma",
   "words": "Palabras creadas",
   "words.invalid": "Incorrecto",

package/src/i18n/fa.json

@@ -1,4 +1,5 @@
 {
+  "cell.enter-word": "کلمه را وارد کنید",
   "cell.filter-cell": "مقصد",
   "cell.set-blank": "علامت گذاری به عنوان خالی",
   "cell.set-not-blank": "علامت گذاری به عنوان غیر خالی",
@@ -22,7 +23,7 @@
   "dictionary.empty-state.no-results": "کلمه در فرهنگ لغت یافت نشد.",
   "dictionary.empty-state.not-allowed": "این کلمه مجاز نیست.",
   "dictionary.empty-state.uninitialized": "معنی لغت اینجا نمایش داده خواهد شد.",
-  "dictionary.input.placeholder": "جستجو در فرهنگ لغت ...",
+  "dictionary.input.placeholder": "جستجو در فرهنگ لغت …",
   "dictionary.input.title": "کلمات جدا شده با کاما",
   "empty-state.error": "خطا",
   "empty-state.info": "اطلاعات",
@@ -43,6 +44,7 @@
   "menu": "منو",
   "rack.placeholder": "لیستحرف",
   "rack.tile.location": "({{index}}) کاشی: طاقچه",
+  "rack.touchscreen.placeholder": "لیستحرف…",
   "remaining-tiles": "کاشی های باقی مانده",
   "results": "نتایج",
   "results.empty-state.no-results": "کلمه قابل استفاده پیدا نشد.",
@@ -58,6 +60,9 @@
   "settings.autoGroupTiles.right": "در سمت راست",
   "settings.autoGroupTiles.null": "کنار هم قرار  نده",
   "settings.game": "بازی",
+  "settings.inputMode": "حالت ورودی",
+  "settings.inputMode.keyboard": "صفحه کلید",
+  "settings.inputMode.touchscreen": "صفحه لمسی",
   "settings.language": "زبان",
   "words": "کلمات ساخته شده",
   "words.invalid": "نا معتبر",

package/src/i18n/fr.json

@@ -1,4 +1,5 @@
 {
+  "cell.enter-word": "Entrez un mot",
   "cell.filter-cell": "Destination cible",
   "cell.set-blank": "Marquer comme vide",
   "cell.set-not-blank": "Marquer comme non vide",
@@ -22,7 +23,7 @@
   "dictionary.empty-state.no-results": "Impossible de trouver une définition pour ce mot dans le dictionaire.",
   "dictionary.empty-state.not-allowed": "Ce mot n'est pas pas acceptable.",
   "dictionary.empty-state.uninitialized": "La définition dictionaire sera affichée ici.",
-  "dictionary.input.placeholder": "Rechercher dans le dictionnaire...",
+  "dictionary.input.placeholder": "Rechercher dans le dictionnaire…",
   "dictionary.input.title": "Mots séparées par des virgules",
   "empty-state.error": "Erreur",
   "empty-state.info": "Info",
@@ -43,6 +44,7 @@
   "menu": "Menu",
   "rack.placeholder": "Lettres",
   "rack.tile.location": "Chevalet: la case ({{index}})",
+  "rack.touchscreen.placeholder": "Lettres…",
   "remaining-tiles": "Cases restantes",
   "results": "Résultats",
   "results.empty-state.no-results": "Pas de résultats - impossible de générer des mots.",
@@ -58,6 +60,9 @@
   "settings.autoGroupTiles.right": "Vers la gauche",
   "settings.autoGroupTiles.null": "Ne pas grouper",
   "settings.game": "Jeu",
+  "settings.inputMode": "Mode de saisie",
+  "settings.inputMode.keyboard": "Clavier",
+  "settings.inputMode.touchscreen": "Écran tactile",
   "settings.language": "Langue",
   "words": "Mots créés",
   "words.invalid": "Incorrect",

package/src/i18n/pl.json

@@ -1,4 +1,5 @@
 {
+  "cell.enter-word": "Wprowadź słowo",
   "cell.filter-cell": "Miejsce docelowe",
   "cell.set-blank": "Oznacz jako blank",
   "cell.set-not-blank": "Oznacz jako nie blank",
@@ -22,7 +23,7 @@
   "dictionary.empty-state.no-results": "Nie udało się znaleźć definicji słowa w słowniku.",
   "dictionary.empty-state.not-allowed": "To słowo nie jest dopuszczalne w grach.",
   "dictionary.empty-state.uninitialized": "Tu zostanie wyświetlona definicja słowa.",
-  "dictionary.input.placeholder": "Szukaj w słowniku...",
+  "dictionary.input.placeholder": "Szukaj w słowniku…",
   "dictionary.input.title": "Słowa rozdzielone przecinkiem",
   "empty-state.error": "Błąd",
   "empty-state.info": "Info",
@@ -43,6 +44,7 @@
   "menu": "Menu",
   "rack.placeholder": "Literki",
   "rack.tile.location": "Stojak: płytka ({{index}})",
+  "rack.touchscreen.placeholder": "Literki…",
   "remaining-tiles": "Pozostałe płytki",
   "results": "Wyniki",
   "results.empty-state.no-results": "Brak wyników - nie można wygenerować żadnego słowa.",
@@ -58,6 +60,9 @@
   "settings.autoGroupTiles.right": "Po prawej",
   "settings.autoGroupTiles.null": "Nie grupuj",
   "settings.game": "Gra",
+  "settings.inputMode": "Tryb wpisywania",
+  "settings.inputMode.keyboard": "Klawiatura",
+  "settings.inputMode.touchscreen": "Ekran dotykowy",
   "settings.language": "Język",
   "words": "Utworzone słowa",
   "words.invalid": "Niepoprawne",

package/src/icons/Keyboard.svg

@@ -1,4 +1,5 @@
-<!-- https://icons.getbootstrap.com/icons/keyboard-fill/ -->
-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-  <path d="M0 6a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V6zm13 .25v.5c0 .138.112.25.25.25h.5a.25.25 0 0 0 .25-.25v-.5a.25.25 0 0 0-.25-.25h-.5a.25.25 0 0 0-.25.25zM2.25 8a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h.5A.25.25 0 0 0 3 8.75v-.5A.25.25 0 0 0 2.75 8h-.5zM4 8.25v.5c0 .138.112.25.25.25h.5A.25.25 0 0 0 5 8.75v-.5A.25.25 0 0 0 4.75 8h-.5a.25.25 0 0 0-.25.25zM6.25 8a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h.5A.25.25 0 0 0 7 8.75v-.5A.25.25 0 0 0 6.75 8h-.5zM8 8.25v.5c0 .138.112.25.25.25h.5A.25.25 0 0 0 9 8.75v-.5A.25.25 0 0 0 8.75 8h-.5a.25.25 0 0 0-.25.25zM13.25 8a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h.5a.25.25 0 0 0 .25-.25v-.5a.25.25 0 0 0-.25-.25h-.5zm0 2a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h.5a.25.25 0 0 0 .25-.25v-.5a.25.25 0 0 0-.25-.25h-.5zm-3-2a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h1.5a.25.25 0 0 0 .25-.25v-.5a.25.25 0 0 0-.25-.25h-1.5zm.75 2.25v.5c0 .138.112.25.25.25h.5a.25.25 0 0 0 .25-.25v-.5a.25.25 0 0 0-.25-.25h-.5a.25.25 0 0 0-.25.25zM11.25 6a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h.5a.25.25 0 0 0 .25-.25v-.5a.25.25 0 0 0-.25-.25h-.5zM9 6.25v.5c0 .138.112.25.25.25h.5a.25.25 0 0 0 .25-.25v-.5A.25.25 0 0 0 9.75 6h-.5a.25.25 0 0 0-.25.25zM7.25 6a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h.5A.25.25 0 0 0 8 6.75v-.5A.25.25 0 0 0 7.75 6h-.5zM5 6.25v.5c0 .138.112.25.25.25h.5A.25.25 0 0 0 6 6.75v-.5A.25.25 0 0 0 5.75 6h-.5a.25.25 0 0 0-.25.25zM2.25 6a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h1.5A.25.25 0 0 0 4 6.75v-.5A.25.25 0 0 0 3.75 6h-1.5zM2 10.25v.5c0 .138.112.25.25.25h.5a.25.25 0 0 0 .25-.25v-.5a.25.25 0 0 0-.25-.25h-.5a.25.25 0 0 0-.25.25zM4.25 10a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h5.5a.25.25 0 0 0 .25-.25v-.5a.25.25 0 0 0-.25-.25h-5.5z" fill="currentColor" />
+<!-- https://icons.getbootstrap.com/icons/keyboard/ -->
+<svg fill="currentColor" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <path d="M14 5a1 1 0 0 1 1 1v5a1 1 0 0 1-1 1H2a1 1 0 0 1-1-1V6a1 1 0 0 1 1-1h12zM2 4a2 2 0 0 0-2 2v5a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2H2z" />
+  <path d="M13 10.25a.25.25 0 0 1 .25-.25h.5a.25.25 0 0 1 .25.25v.5a.25.25 0 0 1-.25.25h-.5a.25.25 0 0 1-.25-.25v-.5zm0-2a.25.25 0 0 1 .25-.25h.5a.25.25 0 0 1 .25.25v.5a.25.25 0 0 1-.25.25h-.5a.25.25 0 0 1-.25-.25v-.5zm-5 0A.25.25 0 0 1 8.25 8h.5a.25.25 0 0 1 .25.25v.5a.25.25 0 0 1-.25.25h-.5A.25.25 0 0 1 8 8.75v-.5zm2 0a.25.25 0 0 1 .25-.25h1.5a.25.25 0 0 1 .25.25v.5a.25.25 0 0 1-.25.25h-1.5a.25.25 0 0 1-.25-.25v-.5zm1 2a.25.25 0 0 1 .25-.25h.5a.25.25 0 0 1 .25.25v.5a.25.25 0 0 1-.25.25h-.5a.25.25 0 0 1-.25-.25v-.5zm-5-2A.25.25 0 0 1 6.25 8h.5a.25.25 0 0 1 .25.25v.5a.25.25 0 0 1-.25.25h-.5A.25.25 0 0 1 6 8.75v-.5zm-2 0A.25.25 0 0 1 4.25 8h.5a.25.25 0 0 1 .25.25v.5a.25.25 0 0 1-.25.25h-.5A.25.25 0 0 1 4 8.75v-.5zm-2 0A.25.25 0 0 1 2.25 8h.5a.25.25 0 0 1 .25.25v.5a.25.25 0 0 1-.25.25h-.5A.25.25 0 0 1 2 8.75v-.5zm11-2a.25.25 0 0 1 .25-.25h.5a.25.25 0 0 1 .25.25v.5a.25.25 0 0 1-.25.25h-.5a.25.25 0 0 1-.25-.25v-.5zm-2 0a.25.25 0 0 1 .25-.25h.5a.25.25 0 0 1 .25.25v.5a.25.25 0 0 1-.25.25h-.5a.25.25 0 0 1-.25-.25v-.5zm-2 0A.25.25 0 0 1 9.25 6h.5a.25.25 0 0 1 .25.25v.5a.25.25 0 0 1-.25.25h-.5A.25.25 0 0 1 9 6.75v-.5zm-2 0A.25.25 0 0 1 7.25 6h.5a.25.25 0 0 1 .25.25v.5a.25.25 0 0 1-.25.25h-.5A.25.25 0 0 1 7 6.75v-.5zm-2 0A.25.25 0 0 1 5.25 6h.5a.25.25 0 0 1 .25.25v.5a.25.25 0 0 1-.25.25h-.5A.25.25 0 0 1 5 6.75v-.5zm-3 0A.25.25 0 0 1 2.25 6h1.5a.25.25 0 0 1 .25.25v.5a.25.25 0 0 1-.25.25h-1.5A.25.25 0 0 1 2 6.75v-.5zm0 4a.25.25 0 0 1 .25-.25h.5a.25.25 0 0 1 .25.25v.5a.25.25 0 0 1-.25.25h-.5a.25.25 0 0 1-.25-.25v-.5zm2 0a.25.25 0 0 1 .25-.25h5.5a.25.25 0 0 1 .25.25v.5a.25.25 0 0 1-.25.25h-5.5a.25.25 0 0 1-.25-.25v-.5z" />
 </svg>

package/src/icons/KeyboardFill.svg

@@ -0,0 +1,4 @@
+<!-- https://icons.getbootstrap.com/icons/keyboard-fill/ -->
+<svg fill="currentColor" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <path d="M0 6a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V6zm13 .25v.5c0 .138.112.25.25.25h.5a.25.25 0 0 0 .25-.25v-.5a.25.25 0 0 0-.25-.25h-.5a.25.25 0 0 0-.25.25zM2.25 8a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h.5A.25.25 0 0 0 3 8.75v-.5A.25.25 0 0 0 2.75 8h-.5zM4 8.25v.5c0 .138.112.25.25.25h.5A.25.25 0 0 0 5 8.75v-.5A.25.25 0 0 0 4.75 8h-.5a.25.25 0 0 0-.25.25zM6.25 8a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h.5A.25.25 0 0 0 7 8.75v-.5A.25.25 0 0 0 6.75 8h-.5zM8 8.25v.5c0 .138.112.25.25.25h.5A.25.25 0 0 0 9 8.75v-.5A.25.25 0 0 0 8.75 8h-.5a.25.25 0 0 0-.25.25zM13.25 8a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h.5a.25.25 0 0 0 .25-.25v-.5a.25.25 0 0 0-.25-.25h-.5zm0 2a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h.5a.25.25 0 0 0 .25-.25v-.5a.25.25 0 0 0-.25-.25h-.5zm-3-2a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h1.5a.25.25 0 0 0 .25-.25v-.5a.25.25 0 0 0-.25-.25h-1.5zm.75 2.25v.5c0 .138.112.25.25.25h.5a.25.25 0 0 0 .25-.25v-.5a.25.25 0 0 0-.25-.25h-.5a.25.25 0 0 0-.25.25zM11.25 6a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h.5a.25.25 0 0 0 .25-.25v-.5a.25.25 0 0 0-.25-.25h-.5zM9 6.25v.5c0 .138.112.25.25.25h.5a.25.25 0 0 0 .25-.25v-.5A.25.25 0 0 0 9.75 6h-.5a.25.25 0 0 0-.25.25zM7.25 6a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h.5A.25.25 0 0 0 8 6.75v-.5A.25.25 0 0 0 7.75 6h-.5zM5 6.25v.5c0 .138.112.25.25.25h.5A.25.25 0 0 0 6 6.75v-.5A.25.25 0 0 0 5.75 6h-.5a.25.25 0 0 0-.25.25zM2.25 6a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h1.5A.25.25 0 0 0 4 6.75v-.5A.25.25 0 0 0 3.75 6h-1.5zM2 10.25v.5c0 .138.112.25.25.25h.5a.25.25 0 0 0 .25-.25v-.5a.25.25 0 0 0-.25-.25h-.5a.25.25 0 0 0-.25.25zM4.25 10a.25.25 0 0 0-.25.25v.5c0 .138.112.25.25.25h5.5a.25.25 0 0 0 .25-.25v-.5a.25.25 0 0 0-.25-.25h-5.5z" />
+</svg>

package/src/icons/index.ts

@@ -31,6 +31,7 @@ export { default as FlagUs } from './FlagUs.svg';
 export { default as Github } from './Github.svg';
 export { default as InfoCircleFill } from './InfoCircleFill.svg';
 export { default as Keyboard } from './Keyboard.svg';
+export { default as KeyboardFill } from './KeyboardFill.svg';
 export { default as List } from './List.svg';
 export { default as Sack } from './Sack.svg';
 export { default as Search } from './Search.svg';

package/src/lib/extractCharacters.test.ts

@@ -0,0 +1,26 @@
+import { scrabble } from '@scrabble-solver/configs';
+import { BLANK } from '@scrabble-solver/constants';
+import { Locale } from '@scrabble-solver/types';
+
+import extractCharacters from './extractCharacters';
+
+const tests = [
+  { input: 'ab ', expected: ['a', 'b', BLANK] },
+  { input: 'śćźa', expected: ['a'] },
+  { input: 'bueno', expected: ['b', 'u', 'e', 'n', 'o'] },
+  { input: 'bellas', expected: ['b', 'e', 'll', 'a', 's'] },
+  { input: 'BELLAS', expected: ['b', 'e', 'll', 'a', 's'] },
+  { input: 'churro', expected: ['ch', 'u', 'rr', 'o'] },
+  { input: 'challulla', expected: ['ch', 'a', 'll', 'u', 'll', 'a'] },
+];
+
+describe('extractCharacters', () => {
+  const locale = Locale.ES_ES;
+  const config = scrabble[locale];
+
+  for (const { input, expected } of tests) {
+    it(`[${locale}] "${input}"`, () => {
+      expect(extractCharacters(config, input)).toEqual(expected);
+    });
+  }
+});

package/src/lib/extractCharacters.ts

@@ -4,20 +4,22 @@ import { Config } from '@scrabble-solver/types';
 const extractCharacters = (config: Config, value: string): string[] => {
   let index = 0;
   const characters: string[] = [];
+  const valueLowercase = value.toLocaleLowerCase(config.locale);
 
-  while (index < value.length) {
-    const character = value[index];
-    const nextCharacter = value[index + 1];
-    const twoCharacterTileCandidate = `${character}${nextCharacter}`;
+  while (index < valueLowercase.length) {
+    const character = valueLowercase[index];
+    const nextCharacter = valueLowercase[index + 1];
+    const digraph = `${character}${nextCharacter}`;
 
-    if (config.twoCharacterTiles.includes(twoCharacterTileCandidate)) {
-      characters.push(twoCharacterTileCandidate);
-      ++index;
+    if (config.twoCharacterTiles.includes(digraph)) {
+      characters.push(digraph);
+      index += digraph.length;
     } else if (config.hasCharacter(character) || character === BLANK) {
       characters.push(character);
+      ++index;
+    } else {
+      ++index;
     }
-
-    ++index;
   }
 
   return characters;

package/src/lib/extractCharactersByCase.test.ts

@@ -0,0 +1,31 @@
+import { scrabble } from '@scrabble-solver/configs';
+import { BLANK } from '@scrabble-solver/constants';
+import { Locale } from '@scrabble-solver/types';
+
+import extractCharactersByCase from './extractCharactersByCase';
+
+const tests = [
+  { input: 'ab ', expected: ['a', 'b', BLANK] },
+  { input: 'śćźa', expected: ['a'] },
+  { input: 'bueno', expected: ['b', 'u', 'e', 'n', 'o'] },
+  { input: 'bellas', expected: ['b', 'e', 'l', 'l', 'a', 's'] },
+  { input: 'churro', expected: ['c', 'h', 'u', 'r', 'r', 'o'] },
+  { input: 'challulla', expected: ['c', 'h', 'a', 'l', 'l', 'u', 'l', 'l', 'a'] },
+  { input: 'beLlas', expected: ['b', 'e', 'l', 'l', 'a', 's'] },
+  { input: 'belLas', expected: ['b', 'e', 'l', 'l', 'a', 's'] },
+  { input: 'beLLas', expected: ['b', 'e', 'll', 'a', 's'] },
+  { input: 'chuRRo', expected: ['c', 'h', 'u', 'rr', 'o'] },
+  { input: 'CHuRRo', expected: ['ch', 'u', 'rr', 'o'] },
+  { input: 'CHaLLuLLa', expected: ['ch', 'a', 'll', 'u', 'll', 'a'] },
+];
+
+describe('extractCharactersByCase', () => {
+  const locale = Locale.ES_ES;
+  const config = scrabble[locale];
+
+  for (const { input, expected } of tests) {
+    it(`[${locale}] "${input}"`, () => {
+      expect(extractCharactersByCase(config, input)).toEqual(expected);
+    });
+  }
+});

package/src/lib/extractCharactersByCase.ts

@@ -0,0 +1,31 @@
+import { BLANK } from '@scrabble-solver/constants';
+import { Config } from '@scrabble-solver/types';
+
+import isUpperCase from './isUpperCase';
+
+const extractCharactersByCase = (config: Config, value: string): string[] => {
+  let index = 0;
+  const characters: string[] = [];
+
+  while (index < value.length) {
+    const character = value[index];
+    const characterLowercase = value[index].toLocaleLowerCase(config.locale);
+    const nextCharacter = value[index + 1];
+    const digraph = `${character}${nextCharacter}`;
+    const digraphLowercase = digraph.toLocaleLowerCase(config.locale);
+
+    if (isUpperCase(config.locale, digraph) && config.twoCharacterTiles.includes(digraphLowercase)) {
+      characters.push(digraphLowercase);
+      index += digraphLowercase.length;
+    } else if (config.hasCharacter(characterLowercase) || characterLowercase === BLANK) {
+      characters.push(characterLowercase);
+      ++index;
+    } else {
+      ++index;
+    }
+  }
+
+  return characters;
+};
+
+export default extractCharactersByCase;

package/src/lib/index.ts

@@ -3,14 +3,15 @@ export { default as canUseDom } from './canUseDom';
 export { default as createArray } from './createArray';
 export { default as createComparator } from './createComparator';
 export { default as createGridOf } from './createGridOf';
-export { default as createKeyboardNavigation } from './createKeyboardNavigation';
 export { default as createKeyComparator } from './createKeyComparator';
+export { default as createKeyboardNavigation } from './createKeyboardNavigation';
 export { default as createNullMovingComparator } from './createNullMovingComparator';
 export { default as createRegExp } from './createRegExp';
 export { default as createStringComparator } from './createStringComparator';
 export { default as dataUrlToBlob } from './dataUrlToBlob';
 export { default as detectLocale } from './detectLocale';
 export { default as extractCharacters } from './extractCharacters';
+export { default as extractCharactersByCase } from './extractCharactersByCase';
 export { default as extractInputValue } from './extractInputValue';
 export { default as findCell } from './findCell';
 export { default as getCellSize } from './getCellSize';
@@ -22,9 +23,11 @@ export { default as getTotalRemainingTilesCount } from './getTotalRemainingTiles
 export { default as groupResults } from './groupResults';
 export { default as guessLocale } from './guessLocale';
 export { default as inverseDirection } from './inverseDirection';
+export { default as isCtrl } from './isCtrl';
 export { default as isMac } from './isMac';
 export { default as isRegExp } from './isRegExp';
 export { default as isStringArray } from './isStringArray';
+export { default as isUpperCase } from './isUpperCase';
 export { default as memoize } from './memoize';
 export { default as noop } from './noop';
 export { default as numberComparator } from './numberComparator';

package/src/lib/isCtrl.ts

@@ -0,0 +1,7 @@
+import { KeyboardEvent } from 'react';
+
+const isCtrl = <T>(event: KeyboardEvent<T> | globalThis.KeyboardEvent): boolean => {
+  return event.ctrlKey || event.metaKey;
+};
+
+export default isCtrl;

package/src/lib/isUpperCase.ts

@@ -0,0 +1,7 @@
+import { Locale } from '@scrabble-solver/types';
+
+const isUpperCase = (locale: Locale, value: string): boolean => {
+  return value === value.toLocaleUpperCase(locale);
+};
+
+export default isUpperCase;

package/src/modals/KeyMapModal/KeyMapModal.tsx

@@ -1,10 +1,10 @@
 import { FunctionComponent, memo } from 'react';
 
-import { Modal } from 'components';
-import { useTranslate } from 'state';
+import { Key, Modal } from 'components';
+import { selectConfig, useTranslate, useTypedSelector } from 'state';
 
 import { Mapping } from './components';
-import { ARROWS, BACKSPACE, DEL, ENTER, SPACE } from './keys';
+import { ARROWS, BACKSPACE, CTRL, DEL, ENTER, SPACE } from './keys';
 
 interface Props {
   className?: string;
@@ -14,6 +14,7 @@ interface Props {
 
 const KeyMapModal: FunctionComponent<Props> = ({ className, isOpen, onClose }) => {
   const translate = useTranslate();
+  const config = useTypedSelector(selectConfig);
 
   return (
     <Modal className={className} isOpen={isOpen} title={translate('keyMap')} onClose={onClose}>
@@ -21,10 +22,25 @@ const KeyMapModal: FunctionComponent<Props> = ({ className, isOpen, onClose }) =
         <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]} />
+        {config.twoCharacterTiles.length > 0 && (
+          <Mapping
+            description={translate('keyMap.board-and-rack.insert-two-letter-tile')}
+            mapping={[
+              [
+                CTRL,
+                <>
+                  {config.twoCharacterTiles.map(([firstLetter]) => (
+                    <Key key={firstLetter}>{firstLetter.toUpperCase()}</Key>
+                  ))}
+                </>,
+              ],
+            ]}
+          />
+        )}
       </Modal.Section>
 
       <Modal.Section title={translate('keyMap.board')}>
-        <Mapping description={translate('keyMap.board.toggle-blank')} mapping={[SPACE]} />
+        <Mapping description={translate('keyMap.board.toggle-blank')} mapping={[SPACE, [CTRL, <Key key="b">B</Key>]]} />
         <Mapping description={translate('keyMap.board.toggle-direction')} mapping={[ARROWS]} />
       </Modal.Section>
 

package/src/modals/KeyMapModal/components/Mapping/Mapping.module.scss

@@ -18,13 +18,19 @@
   flex-wrap: wrap;
 }
 
-.group,
-.plus {
+.group {
   margin: 0 var(--spacing--s);
 }
 
-.slash {
-  margin: 0 var(--spacing--m);
+.slash,
+.plus {
+  min-width: var(--key--height);
+  height: var(--key--height);
+  padding: var(--spacing--s) var(--spacing--m);
+  font-family: var(--font--family--monospace);
+  line-height: calc(var(--key--height) - 2 * (var(--spacing--s) + var(--border--width)));
+  vertical-align: middle;
+  text-align: center;
 }
 
 .group {

package/src/modals/SettingsModal/SettingsModal.tsx

@@ -3,7 +3,7 @@ import { FunctionComponent, memo } from 'react';
 import { Modal } from 'components';
 import { useTranslate } from 'state';
 
-import { AutoGroupTilesSetting, ConfigSetting, LocaleSetting } from './components';
+import { AutoGroupTilesSetting, ConfigSetting, InputModeSetting, LocaleSetting } from './components';
 
 interface Props {
   className?: string;
@@ -24,6 +24,10 @@ const SettingsModal: FunctionComponent<Props> = ({ className, isOpen, onClose })
         <LocaleSetting disabled={!isOpen} />
       </Modal.Section>
 
+      <Modal.Section title={translate('settings.inputMode')}>
+        <InputModeSetting disabled={!isOpen} />
+      </Modal.Section>
+
       <Modal.Section title={translate('settings.autoGroupTiles')}>
         <AutoGroupTilesSetting disabled={!isOpen} />
       </Modal.Section>

package/src/modals/SettingsModal/components/InputModeSetting/InputModeSetting.module.scss

@@ -0,0 +1,12 @@
+.option {
+  margin-bottom: var(--spacing--m);
+
+  &:last-child {
+    margin-bottom: 0;
+  }
+}
+
+.label {
+  display: flex;
+  align-items: center;
+}

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

@@ -0,0 +1,55 @@
+import { ChangeEvent, FunctionComponent } from 'react';
+import { useDispatch } from 'react-redux';
+
+import { Radio } from 'components';
+import { selectInputMode, settingsSlice, useTranslate, useTypedSelector } from 'state';
+
+import styles from './InputModeSetting.module.scss';
+import { parseValue } from './lib';
+
+interface Props {
+  className?: string;
+  disabled?: boolean;
+}
+
+const InputModeSetting: FunctionComponent<Props> = ({ className, disabled }) => {
+  const dispatch = useDispatch();
+  const translate = useTranslate();
+  const value = useTypedSelector(selectInputMode);
+
+  const options = [
+    {
+      label: translate('settings.inputMode.keyboard'),
+      value: 'keyboard',
+    },
+    {
+      label: translate('settings.inputMode.touchscreen'),
+      value: 'touchscreen',
+    },
+  ];
+
+  const handleChange = (event: ChangeEvent<HTMLInputElement>) => {
+    const inputMode = parseValue(event.target.value);
+    dispatch(settingsSlice.actions.changeInputMode(inputMode));
+  };
+
+  return (
+    <div className={className}>
+      {options.map((option) => (
+        <Radio
+          checked={value === option.value}
+          className={styles.option}
+          disabled={disabled}
+          key={option.value}
+          name="inputMode"
+          value={option.value}
+          onChange={handleChange}
+        >
+          <div className={styles.label}>{option.label}</div>
+        </Radio>
+      ))}
+    </div>
+  );
+};
+
+export default InputModeSetting;

package/src/modals/SettingsModal/components/InputModeSetting/index.ts

@@ -0,0 +1 @@
+export { default } from './InputModeSetting';

package/src/modals/SettingsModal/components/InputModeSetting/lib.ts

@@ -0,0 +1,13 @@
+import { InputMode } from 'types';
+
+export const parseValue = (value: string): InputMode => {
+  if (value === 'keyboard') {
+    return 'keyboard';
+  }
+
+  if (value === 'touchscreen') {
+    return 'touchscreen';
+  }
+
+  throw new Error(`"${value}" is not valid. Should be "keyboard" or "touchscreen"`);
+};

package/src/modals/SettingsModal/components/InputModeSetting/types.ts

@@ -0,0 +1,7 @@
+import { InputMode } from 'types';
+
+export interface Option {
+  className: string;
+  label: string;
+  value: InputMode;
+}

package/src/modals/SettingsModal/components/index.ts

@@ -1,3 +1,4 @@
 export { default as AutoGroupTilesSetting } from './AutoGroupTilesSetting';
 export { default as ConfigSetting } from './ConfigSetting';
+export { default as InputModeSetting } from './InputModeSetting';
 export { default as LocaleSetting } from './LocaleSetting';