@scrabble-solver/scrabble-solver 2.17.0 → 2.18.0

package/src/components/Solver/Solver.tsx

@@ -3,8 +3,8 @@ import classNames from 'classnames';
 import { type FunctionComponent, memo, type SyntheticEvent, useEffect, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { useAppLayout } from '@/app-layout';
-import { useIsTouchDevice } from '@/hooks';
+import { useIsTouchDevice } from '@/hooks/useIsTouchDevice';
+import { useMediaQuery } from '@/hooks/useMediaQuery';
 import {
   resultsSlice,
   selectAreResultsOutdated,
@@ -36,7 +36,7 @@ const SolverBase: FunctionComponent<Props> = ({ className, onShowResults }) => {
   const dispatch = useDispatch();
   const translate = useTranslate();
   const isTouchDevice = useIsTouchDevice();
-  const { maxControlsWidth, showCompactControls, tileSize } = useAppLayout();
+  const showCompactControls = useMediaQuery('<l');
   const error = useTypedSelector(selectSolveError);
   const isOutdated = useTypedSelector(selectAreResultsOutdated);
   const results = useTypedSelector(selectProcessedResults);
@@ -113,27 +113,25 @@ const SolverBase: FunctionComponent<Props> = ({ className, onShowResults }) => {
       <div className={styles.bottomContainer}>
         <div className={styles.bottomContent}>
           <form onSubmit={handleSubmit}>
-            <Rack className={styles.rack} tileSize={tileSize} />
+            <Rack />
             <input className={styles.submitInput} tabIndex={-1} type="submit" />
           </form>
 
-          {showCompactControls && (
-            <div className={styles.controls} style={{ maxWidth: maxControlsWidth }}>
-              <ResultCandidatePicker onResultClick={onShowResults} />
-
-              {error && (
-                <Alert className={styles.emptyState} variant="error">
-                  {error.message}
-                </Alert>
-              )}
-
-              {results && results.length === 0 && !isOutdated && (
-                <Alert className={styles.emptyState} variant="warning">
-                  {translate('results.empty-state.no-results')}
-                </Alert>
-              )}
-            </div>
-          )}
+          <div className={styles.controls}>
+            <ResultCandidatePicker onResultClick={onShowResults} />
+
+            {error && (
+              <Alert className={styles.emptyState} variant="error">
+                {error.message}
+              </Alert>
+            )}
+
+            {results && results.length === 0 && !isOutdated && (
+              <Alert className={styles.emptyState} variant="warning">
+                {translate('results.empty-state.no-results')}
+              </Alert>
+            )}
+          </div>
         </div>
       </div>
     </div>

package/src/components/Solver/components/InsertButton/InsertButton.module.scss.d.ts

@@ -0,0 +1,7 @@
+// Generated by scripts/generate-scss-types.ts - do not edit.
+declare const styles: {
+  readonly icon: string;
+  readonly insertButton: string;
+};
+
+export default styles;

package/src/components/Solver/components/InsertButton/InsertButton.tsx

@@ -2,7 +2,7 @@ import classNames from 'classnames';
 import { type FunctionComponent } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { Check } from '@/icons';
+import Check from '@/icons/Check.svg';
 import { resultsSlice, selectAreResultsOutdated, selectResultCandidate, useTranslate, useTypedSelector } from '@/state';
 
 import { Button } from '../../../Button';

package/src/components/Solver/components/ResultCandidatePicker/ResultCandidatePicker.module.scss.d.ts

@@ -0,0 +1,18 @@
+// Generated by scripts/generate-scss-types.ts - do not edit.
+declare const styles: {
+  readonly bothEnabled: string;
+  readonly button: string;
+  readonly buttons: string;
+  readonly content: string;
+  readonly icon: string;
+  readonly iconContainer: string;
+  readonly insert: string;
+  readonly loading: string;
+  readonly points: string;
+  readonly resultCandidate: string;
+  readonly resultCandidatePicker: string;
+  readonly spinnerContainer: string;
+  readonly word: string;
+};
+
+export default styles;

package/src/components/Solver/components/ResultCandidatePicker/ResultCandidatePicker.tsx

@@ -2,7 +2,9 @@ import classNames from 'classnames';
 import { type FunctionComponent, type HTMLProps, type MouseEventHandler } from 'react';
 import { useDispatch } from 'react-redux';
 
-import { ChevronDown, ChevronLeft, ChevronRight } from '@/icons';
+import ChevronDown from '@/icons/ChevronDown.svg';
+import ChevronLeft from '@/icons/ChevronLeft.svg';
+import ChevronRight from '@/icons/ChevronRight.svg';
 import {
   resultsSlice,
   selectAreResultsOutdated,

package/src/components/Spinner/Spinner.module.scss.d.ts

@@ -0,0 +1,10 @@
+// Generated by scripts/generate-scss-types.ts - do not edit.
+declare const styles: {
+  readonly hide: string;
+  readonly rotate: string;
+  readonly show: string;
+  readonly spinner: string;
+  readonly wave: string;
+};
+
+export default styles;

package/src/components/Tile/Tile.module.scss

@@ -4,6 +4,8 @@
   --background-color: transparent;
 
   position: relative;
+  width: var(--tile-size, auto);
+  height: var(--tile-size, auto);
   display: flex;
   align-items: center;
   justify-content: center;
@@ -92,6 +94,7 @@
 .points {
   @include text-stroke(var(--background-color), 1px);
 
+  font-size: max(10px, calc(var(--tile-size) * 0.25));
   position: absolute;
   inset-block-end: 1%;
   inset-inline-end: 9%;

package/src/components/Tile/Tile.module.scss.d.ts

@@ -0,0 +1,19 @@
+// Generated by scripts/generate-scss-types.ts - do not edit.
+declare const styles: {
+  readonly alert: string;
+  readonly blank: string;
+  readonly empty: string;
+  readonly highlighted: string;
+  readonly input: string;
+  readonly invalid: string;
+  readonly points: string;
+  readonly points1: string;
+  readonly points2: string;
+  readonly points3: string;
+  readonly points4: string;
+  readonly points5: string;
+  readonly raised: string;
+  readonly tile: string;
+};
+
+export default styles;

package/src/components/Tile/Tile.tsx

@@ -1,5 +1,6 @@
 import { useMergeRefs } from '@floating-ui/react';
 import { EMPTY_CELL } from '@scrabble-solver/constants';
+import { type Locale } from '@scrabble-solver/types';
 import {
   type ChangeEventHandler,
   type FocusEventHandler,
@@ -9,13 +10,10 @@ import {
   type Ref,
   type TouchEventHandler,
   useCallback,
-  useMemo,
   useRef,
 } from 'react';
 
-import { useAppLayout } from '@/app-layout';
-import { getTileSizes, noop } from '@/lib';
-import { selectLocale, useTypedSelector } from '@/state';
+import { noop } from '@/lib/noop';
 
 import { TilePure } from './TilePure';
 
@@ -29,10 +27,10 @@ interface Props {
   inputRef?: Ref<HTMLInputElement | null>;
   isBlank?: boolean;
   isValid?: boolean;
+  locale: Locale;
   placeholder?: string;
   points?: number;
   raised?: boolean;
-  size: number;
   tabIndex?: number;
   onChange?: ChangeEventHandler<HTMLInputElement>;
   onFocus?: FocusEventHandler<HTMLInputElement>;
@@ -51,10 +49,10 @@ export const Tile: FunctionComponent<Props> = ({
   inputRef,
   isBlank,
   isValid,
+  locale,
   placeholder,
   points,
   raised,
-  size,
   tabIndex,
   onChange,
   onFocus = noop,
@@ -62,15 +60,10 @@ export const Tile: FunctionComponent<Props> = ({
   onMouseDown = noop,
   onTouchStart = noop,
 }) => {
-  const locale = useTypedSelector(selectLocale);
-  const { showTilePoints } = useAppLayout();
-  const { pointsFontSize, tileSize } = getTileSizes(size);
-  const style = useMemo(() => ({ height: tileSize, width: tileSize }), [tileSize]);
-  const pointsStyle = useMemo(() => ({ fontSize: pointsFontSize }), [pointsFontSize]);
   const ref = useRef<HTMLInputElement>(null);
   const mergedRef = useMergeRefs(inputRef ? [ref, inputRef] : [ref]);
   const isEmpty = !character || character === EMPTY_CELL;
-  const canShowPoints = showTilePoints && (!isEmpty || isBlank) && typeof points !== 'undefined';
+  const canShowPoints = (!isEmpty || isBlank) && typeof points !== 'undefined';
   const pointsFormatted = typeof points === 'number' ? points.toLocaleString(locale) : '';
 
   const handleKeyDown: KeyboardEventHandler<HTMLInputElement> = useCallback(
@@ -96,9 +89,7 @@ export const Tile: FunctionComponent<Props> = ({
       placeholder={placeholder}
       points={points}
       pointsFormatted={pointsFormatted}
-      pointsStyle={pointsStyle}
       raised={raised}
-      style={style}
       tabIndex={tabIndex}
       onChange={onChange}
       onFocus={onFocus}

package/src/components/Tile/TilePure.tsx

@@ -1,7 +1,6 @@
 import classNames from 'classnames';
 import {
   type ChangeEventHandler,
-  type CSSProperties,
   type FocusEventHandler,
   type FunctionComponent,
   type KeyboardEventHandler,
@@ -11,7 +10,7 @@ import {
   type TouchEventHandler,
 } from 'react';
 
-import { ExclamationSquareFill } from '@/icons';
+import ExclamationSquareFill from '@/icons/ExclamationSquareFill.svg';
 
 import styles from './Tile.module.scss';
 
@@ -29,9 +28,7 @@ interface Props {
   placeholder?: string;
   points?: number;
   pointsFormatted?: string;
-  pointsStyle?: CSSProperties;
   raised?: boolean;
-  style?: CSSProperties;
   tabIndex?: number;
   onChange?: ChangeEventHandler<HTMLInputElement>;
   onFocus?: FocusEventHandler<HTMLInputElement>;
@@ -54,9 +51,7 @@ const TilePureBase: FunctionComponent<Props> = ({
   placeholder,
   points,
   pointsFormatted,
-  pointsStyle,
   raised,
-  style,
   tabIndex,
   onChange,
   onFocus,
@@ -78,7 +73,6 @@ const TilePureBase: FunctionComponent<Props> = ({
       [styles.raised]: raised,
     })}
     role={highlighted ? 'mark' : undefined}
-    style={style}
   >
     {character || placeholder}
 
@@ -103,11 +97,7 @@ const TilePureBase: FunctionComponent<Props> = ({
       />
     )}
 
-    {canShowPoints && (
-      <span className={styles.points} style={pointsStyle}>
-        {pointsFormatted}
-      </span>
-    )}
+    {canShowPoints && <span className={styles.points}>{pointsFormatted}</span>}
 
     {!isValid && <ExclamationSquareFill aria-hidden="true" className={styles.alert} role="img" />}
   </div>

package/src/components/Tooltip/Tooltip.module.scss.d.ts

@@ -0,0 +1,7 @@
+// Generated by scripts/generate-scss-types.ts - do not edit.
+declare const styles: {
+  readonly arrow: string;
+  readonly tooltip: string;
+};
+
+export default styles;

package/src/components/Tooltip/Tooltip.tsx

@@ -1,7 +1,8 @@
 import type { Placement } from '@floating-ui/react';
 import { type FunctionComponent, type ReactNode } from 'react';
 
-import { useIsTouchDevice } from '@/hooks';
+import { useDeferredRender } from '@/hooks/useDeferredRender';
+import { useIsTouchDevice } from '@/hooks/useIsTouchDevice';
 
 import { TooltipContext } from './context';
 import { TooltipContent } from './TooltipContent';
@@ -15,13 +16,23 @@ interface Props {
 }
 
 export const Tooltip: FunctionComponent<Props> = ({ children, placement, tooltip }) => {
-  const state = useTooltip({ placement });
+  const canRenderTooltip = useDeferredRender();
   const isTouchDevice = useIsTouchDevice();
 
-  if (!tooltip || isTouchDevice) {
+  if (!tooltip || !canRenderTooltip || isTouchDevice) {
     return children;
   }
 
+  return (
+    <TooltipBase placement={placement} tooltip={tooltip}>
+      {children}
+    </TooltipBase>
+  );
+};
+
+const TooltipBase: FunctionComponent<Props> = ({ children, placement, tooltip }) => {
+  const state = useTooltip({ placement });
+
   return (
     <TooltipContext.Provider value={state}>
       <TooltipTrigger>{children}</TooltipTrigger>

package/src/components/Tooltip/useTooltip.ts

@@ -28,6 +28,7 @@ export const useTooltip = ({ placement = 'top' }: TooltipOptions = {}) => {
   const arrowRef = useRef(null);
   const data = useFloating({
     placement,
+    strategy: 'fixed',
     open: isOpen,
     onOpenChange: setIsOpen,
     whileElementsMounted: autoUpdate,

package/src/hooks/useColumns.ts

@@ -1,8 +1,8 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { useMemo } from 'react';
 
-import { LOCALE_FEATURES } from '@/i18n';
-import { selectLocale, selectShowCoordinates, useTypedSelector } from '@/state';
+import { LOCALE_FEATURES } from '@/i18n/constants';
+import { selectLocale, useTypedSelector } from '@/state';
 import { ResultColumnId } from '@/types';
 
 import { useMediaQueries } from './useMediaQueries';
@@ -15,7 +15,7 @@ const COLUMNS_M = [...COLUMNS_XS];
 
 const COLUMNS_L = [...COLUMNS_XS];
 
-const selectColumns = createSelector([selectLocale, selectShowCoordinates], (locale, showCoordinates) => {
+const selectColumns = createSelector([selectLocale], (locale) => {
   const { consonants, vowels } = LOCALE_FEATURES[locale];
   const columns: ResultColumnId[] = [
     ResultColumnId.Word,
@@ -23,12 +23,9 @@ const selectColumns = createSelector([selectLocale, selectShowCoordinates], (loc
     ResultColumnId.BlanksCount,
     ResultColumnId.WordsCount,
     ResultColumnId.Points,
+    ResultColumnId.Coordinates,
   ];
 
-  if (showCoordinates !== 'hidden') {
-    columns.push(ResultColumnId.Coordinates);
-  }
-
   if (vowels) {
     columns.push(ResultColumnId.VowelsCount);
   }

package/src/hooks/useDeferredRender.ts

@@ -0,0 +1,20 @@
+import { useEffect, useState } from 'react';
+
+/**
+ * False during SSR and hydration.
+ */
+export const useDeferredRender = (): boolean => {
+  const [canRender, setCanRender] = useState(false);
+
+  useEffect(() => {
+    const timeoutId = window.setTimeout(() => {
+      return setCanRender(true);
+    }, 0);
+
+    return () => {
+      return window.clearTimeout(timeoutId);
+    };
+  }, []);
+
+  return canRender;
+};

package/src/hooks/useDirection.ts

@@ -1,12 +1,13 @@
+import { type TextDirection } from '@scrabble-solver/types';
 import { useEffect } from 'react';
 
-import { noop } from '@/lib';
+import { noop } from '@/lib/noop';
 
-export const useDirection = (direction: 'ltr' | 'rtl') => {
+export const useDirection = (direction: TextDirection) => {
   useEffect(() => {
     const html = document.body.parentElement;
 
-    if (!html) {
+    if (!html || html.dir === direction) {
       return noop;
     }
 

package/src/hooks/useLanguage.ts

@@ -1,12 +1,12 @@
 import { useEffect } from 'react';
 
-import { noop } from '@/lib';
+import { noop } from '@/lib/noop';
 
 export const useLanguage = (language: string) => {
   useEffect(() => {
     const html = document.body.parentElement;
 
-    if (!html) {
+    if (!html || html.lang === language) {
       return noop;
     }
 

package/src/hooks/useLocalStorage.ts

@@ -1,25 +1,49 @@
-import { useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 
-import { localStorage, selectBoard, selectRack, selectSettings, useTypedSelector } from '@/state';
+import { localStorage, selectBoard, selectIsHydrated, selectRack, selectSettings, useTypedSelector } from '@/state';
+
+type WriteFlags = {
+  board: boolean;
+  rack: boolean;
+  settings: boolean;
+};
 
 export const useLocalStorage = () => {
+  const isHydrated = useTypedSelector(selectIsHydrated);
   const board = useTypedSelector(selectBoard);
   const rack = useTypedSelector(selectRack);
   const settings = useTypedSelector(selectSettings);
+  const hasSkippedFirstWrite = useRef<WriteFlags>({
+    board: false,
+    rack: false,
+    settings: false,
+  });
 
   useEffect(() => {
-    if (board) {
+    if (isHydrated && board && !isFirstWriteAfterHydration(hasSkippedFirstWrite.current, 'board')) {
       localStorage.setBoard(board);
     }
-  }, [board]);
+  }, [isHydrated, board]);
 
   useEffect(() => {
-    if (rack) {
+    if (isHydrated && rack && !isFirstWriteAfterHydration(hasSkippedFirstWrite.current, 'rack')) {
       localStorage.setRack(rack);
     }
-  }, [rack]);
+  }, [isHydrated, rack]);
 
   useEffect(() => {
-    localStorage.setSettings(settings);
-  }, [settings]);
+    if (isHydrated && !isFirstWriteAfterHydration(hasSkippedFirstWrite.current, 'settings')) {
+      localStorage.setSettings(settings);
+    }
+  }, [isHydrated, settings]);
 };
+
+// Each effect's first post-hydration run would only write back what hydration just read, so it is skipped
+function isFirstWriteAfterHydration(flags: WriteFlags, key: keyof WriteFlags): boolean {
+  if (flags[key]) {
+    return false;
+  }
+
+  flags[key] = true;
+  return true;
+}

package/src/hooks/useMedia.ts

@@ -1,34 +1,34 @@
-import { useEffect, useState } from 'react';
+import { useCallback, useSyncExternalStore } from 'react';
 
-const getInitialState = (query: string, defaultState?: boolean) => {
-  if (typeof defaultState !== 'undefined') {
-    return defaultState;
-  }
-
-  if (typeof window === 'undefined') {
-    return false;
-  }
+export const useMedia = (query: string, defaultState = false) => {
+  const subscribe = useCallback(
+    (onChange: () => void) => {
+      const mediaQueryList = getMediaQueryList(query);
+      mediaQueryList.addEventListener('change', onChange);
 
-  return window.matchMedia(query).matches;
-};
+      return () => {
+        mediaQueryList.removeEventListener('change', onChange);
+      };
+    },
+    [query],
+  );
 
-export const useMedia = (query: string, defaultState?: boolean) => {
-  const [state, setState] = useState(getInitialState(query, defaultState));
+  const getSnapshot = useCallback(() => getMediaQueryList(query).matches, [query]);
+  const getServerSnapshot = useCallback(() => defaultState, [defaultState]);
 
-  useEffect(() => {
-    const mediaQuery = window.matchMedia(query);
+  return useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot);
+};
 
-    const handleChange = () => {
-      setState(mediaQuery.matches);
-    };
+// cache because matchMedia returns a new MediaQueryList on every call
+const mediaQueryLists = new Map<string, MediaQueryList>();
 
-    setState(mediaQuery.matches);
-    mediaQuery.addEventListener('change', handleChange);
+function getMediaQueryList(query: string): MediaQueryList {
+  let mediaQueryList = mediaQueryLists.get(query);
 
-    return () => {
-      mediaQuery.removeEventListener('change', handleChange);
-    };
-  }, [query]);
+  if (!mediaQueryList) {
+    mediaQueryList = window.matchMedia(query);
+    mediaQueryLists.set(query, mediaQueryList);
+  }
 
-  return state;
-};
+  return mediaQueryList;
+}

package/src/i18n/constants.ts

@@ -1,14 +1,10 @@
 import { COMMA_ARABIC, COMMA_LATIN } from '@scrabble-solver/constants';
-import { Locale } from '@scrabble-solver/types';
-import { type FunctionComponent, type SVGAttributes } from 'react';
-
-import { FlagDe, FlagEs, FlagFa, FlagFr, FlagGb, FlagPl, FlagRo, FlagTr, FlagUs } from '@/icons';
+import { Locale, type TextDirection } from '@scrabble-solver/types';
 
 interface LocaleFeatures {
   comma: string;
   consonants: boolean;
-  direction: 'ltr' | 'rtl';
-  Icon: FunctionComponent<SVGAttributes<SVGElement>>;
+  direction: TextDirection;
   label: string;
   locale: Locale;
   name: string;
@@ -21,7 +17,6 @@ export const LOCALE_FEATURES: Record<Locale, LocaleFeatures> = {
     comma: COMMA_LATIN,
     consonants: true,
     direction: 'ltr',
-    Icon: FlagDe,
     label: 'Deutsch',
     locale: Locale.DE_DE,
     name: 'German',
@@ -32,7 +27,6 @@ export const LOCALE_FEATURES: Record<Locale, LocaleFeatures> = {
     comma: COMMA_LATIN,
     consonants: true,
     direction: 'ltr',
-    Icon: FlagGb,
     label: 'English (GB)',
     locale: Locale.EN_GB,
     name: 'English (GB)',
@@ -43,7 +37,6 @@ export const LOCALE_FEATURES: Record<Locale, LocaleFeatures> = {
     comma: COMMA_LATIN,
     consonants: true,
     direction: 'ltr',
-    Icon: FlagUs,
     label: 'English (US)',
     locale: Locale.EN_US,
     name: 'English (US)',
@@ -54,7 +47,6 @@ export const LOCALE_FEATURES: Record<Locale, LocaleFeatures> = {
     comma: COMMA_LATIN,
     consonants: true,
     direction: 'ltr',
-    Icon: FlagEs,
     label: 'Español',
     locale: Locale.ES_ES,
     name: 'Spanish',
@@ -65,7 +57,6 @@ export const LOCALE_FEATURES: Record<Locale, LocaleFeatures> = {
     comma: COMMA_ARABIC,
     consonants: false,
     direction: 'rtl',
-    Icon: FlagFa,
     label: 'فارسی',
     locale: Locale.FA_IR,
     name: 'Persian',
@@ -76,7 +67,6 @@ export const LOCALE_FEATURES: Record<Locale, LocaleFeatures> = {
     comma: COMMA_LATIN,
     consonants: true,
     direction: 'ltr',
-    Icon: FlagFr,
     label: 'Français',
     locale: Locale.FR_FR,
     name: 'French',
@@ -87,7 +77,6 @@ export const LOCALE_FEATURES: Record<Locale, LocaleFeatures> = {
     comma: COMMA_LATIN,
     consonants: true,
     direction: 'ltr',
-    Icon: FlagPl,
     label: 'Polski',
     locale: Locale.PL_PL,
     name: 'Polish',
@@ -98,7 +87,6 @@ export const LOCALE_FEATURES: Record<Locale, LocaleFeatures> = {
     comma: COMMA_LATIN,
     consonants: true,
     direction: 'ltr',
-    Icon: FlagRo,
     label: 'Română',
     locale: Locale.RO_RO,
     name: 'Romanian',
@@ -109,7 +97,6 @@ export const LOCALE_FEATURES: Record<Locale, LocaleFeatures> = {
     comma: COMMA_LATIN,
     consonants: true,
     direction: 'ltr',
-    Icon: FlagTr,
     label: 'Türkçe',
     locale: Locale.TR_TR,
     name: 'Turkish',