scrabble-solver 2.13.6 → 2.13.8

package/packages/scrabble-solver/src/components/Results/useColumns.ts

@@ -1,12 +1,13 @@
 import { useMediaQueries } from 'hooks';
 import { LOCALE_FEATURES } from 'i18n';
-import { selectLocale, useTypedSelector } from 'state';
+import { selectLocale, selectShowCoordinates, useTypedSelector } from 'state';
 import { ResultColumn } from 'types';
 
+import getCoordinatesColumn from './getCoordinatesColumn';
 import getLocaleColumns from './getLocaleColumns';
 import { Column } from './types';
 
-const COLUMNS_XS = [ResultColumn.Word, ResultColumn.Points];
+const COLUMNS_XS = [ResultColumn.Coordinates, ResultColumn.Word, ResultColumn.Points];
 
 const COLUMNS_S = [...COLUMNS_XS, ResultColumn.BlanksCount, ResultColumn.WordsCount];
 
@@ -17,25 +18,27 @@ const COLUMNS_L = [...COLUMNS_XS];
 const useColumns = (): Column[] => {
   const locale = useTypedSelector(selectLocale);
   const localeColumns = getLocaleColumns(LOCALE_FEATURES[locale]);
+  const showCoordinates = useTypedSelector(selectShowCoordinates);
+  const columns = showCoordinates === 'hidden' ? localeColumns : [getCoordinatesColumn(), ...localeColumns];
   const { isLessThanXs, isLessThanS, isLessThanM, isLessThanL } = useMediaQueries();
 
   if (isLessThanXs) {
-    return localeColumns.filter((column) => COLUMNS_XS.includes(column.id));
+    return columns.filter((column) => COLUMNS_XS.includes(column.id));
   }
 
   if (isLessThanS) {
-    return localeColumns.filter((column) => COLUMNS_S.includes(column.id));
+    return columns.filter((column) => COLUMNS_S.includes(column.id));
   }
 
   if (isLessThanM) {
-    return localeColumns.filter((column) => COLUMNS_M.includes(column.id));
+    return columns.filter((column) => COLUMNS_M.includes(column.id));
   }
 
   if (isLessThanL) {
-    return localeColumns.filter((column) => COLUMNS_L.includes(column.id));
+    return columns.filter((column) => COLUMNS_L.includes(column.id));
   }
 
-  return localeColumns;
+  return columns;
 };
 
 export default useColumns;

package/packages/scrabble-solver/src/components/Solver/components/ResultCandidatePicker/ResultCandidatePicker.module.scss

@@ -82,23 +82,11 @@
 .points {
   flex: 0 0 auto;
   font-weight: bold;
+  border-inline-end: var(--border);
 
-  [dir='ltr'] & {
-    border-right: var(--border);
-
-    @include media('<xs') {
-      border-right: none;
-      padding-right: var(--spacing--xs);
-    }
-  }
-
-  [dir='rtl'] & {
-    border-left: var(--border);
-
-    @include media('<xs') {
-      border-left: none;
-      padding-left: var(--spacing--xs);
-    }
+  @include media('<xs') {
+    border-inline-end: none;
+    padding-inline-end: var(--spacing--xs);
   }
 }
 
@@ -110,40 +98,21 @@
   text-align: center;
   white-space: pre-wrap;
 
-  [dir='ltr'] & {
-    @include media('<xs') {
-      padding: var(--spacing--m);
-      text-align: left;
-    }
-  }
-
-  [dir='rtl'] & {
-    @include media('<xs') {
-      padding: var(--spacing--m);
-      text-align: right;
-    }
+  @include media('<xs') {
+    padding: var(--spacing--m);
+    text-align: start;
   }
 }
 
 .iconContainer {
   flex: 0 0 auto;
   display: flex;
-
-  [dir='ltr'] & {
-    padding-right: var(--spacing--l);
-  }
-
-  [dir='rtl'] & {
-    padding-left: var(--spacing--l);
-  }
+  padding-inline-end: var(--spacing--l);
 }
 
 .spinnerContainer {
   position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
+  inset: 0;
   display: flex;
   align-items: center;
   justify-content: center;

package/packages/scrabble-solver/src/components/Tile/Tile.module.scss

@@ -76,10 +76,7 @@
 
 .input {
   position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
+  inset: 0;
   width: 100%;
   height: 100%;
   border: none;
@@ -98,6 +95,8 @@
   @include text-stroke(var(--background-color), 1px);
 
   position: absolute;
+  inset-block-end: 1%;
+  inset-inline-end: 9%;
   font-weight: bold;
   user-select: none;
   pointer-events: none;
@@ -106,16 +105,6 @@
   @include media('<xs') {
     display: none;
   }
-
-  [dir='ltr'] & {
-    bottom: 1%;
-    right: 9%;
-  }
-
-  [dir='rtl'] & {
-    top: 1%;
-    left: 9%;
-  }
 }
 
 .alert {
@@ -124,6 +113,9 @@
   position: absolute;
   width: var(--size);
   height: var(--size);
+  inset-block-start: 0;
+  inset-inline-end: 0;
+  border-start-end-radius: inherit;
   background: radial-gradient(
     var(--color--error--opposite),
     var(--color--error--opposite) 85%,
@@ -132,16 +124,4 @@
   );
   color: var(--color--error);
   pointer-events: none;
-
-  [dir='ltr'] & {
-    top: 0;
-    right: 0;
-    border-top-right-radius: inherit;
-  }
-
-  [dir='rtl'] & {
-    top: 0;
-    left: 0;
-    border-top-left-radius: inherit;
-  }
 }

package/packages/scrabble-solver/src/components/Tooltip/Tooltip.tsx

@@ -0,0 +1,28 @@
+import type { Placement } from '@floating-ui/react';
+import { FunctionComponent, ReactNode } from 'react';
+
+import { TooltipContext } from './context';
+import { TooltipContent } from './TooltipContent';
+import { TooltipTrigger } from './TooltipTrigger';
+import { useTooltip } from './useTooltip';
+
+interface Props {
+  children: ReactNode;
+  placement?: Placement;
+  tooltip?: ReactNode;
+}
+
+export const Tooltip: FunctionComponent<Props> = ({ children, placement, tooltip }) => {
+  const state = useTooltip({ placement });
+
+  if (!tooltip) {
+    return children;
+  }
+
+  return (
+    <TooltipContext.Provider value={state}>
+      <TooltipTrigger>{children}</TooltipTrigger>
+      <TooltipContent>{tooltip}</TooltipContent>
+    </TooltipContext.Provider>
+  );
+};

package/packages/scrabble-solver/src/components/Tooltip/TooltipContent.tsx

@@ -0,0 +1,53 @@
+import { FloatingArrow, FloatingPortal, useDelayGroup, useMergeRefs, useTransitionStyles } from '@floating-ui/react';
+import { forwardRef, HTMLProps } from 'react';
+
+import { TOOLTIP_DURATION } from 'parameters';
+
+import { useTooltipContext } from './context';
+import styles from './Tooltip.module.scss';
+
+type Props = HTMLProps<HTMLDivElement>;
+
+const INSTANT_DURATION = 0;
+
+export const TooltipContent = forwardRef<HTMLDivElement, Props>((props, ref) => {
+  const state = useTooltipContext();
+  const { context } = state;
+  const { isInstantPhase, currentId } = useDelayGroup(context, { id: context.floatingId });
+  const finalRef = useMergeRefs([state.refs.setFloating, ref]);
+
+  const instantPhaseDuration = {
+    open: INSTANT_DURATION,
+    close: currentId === context.floatingId ? TOOLTIP_DURATION : INSTANT_DURATION,
+  };
+
+  const { isMounted, styles: transitionStyles } = useTransitionStyles(context, {
+    duration: isInstantPhase ? instantPhaseDuration : TOOLTIP_DURATION,
+    initial: {
+      opacity: 0,
+    },
+  });
+
+  if (!isMounted) {
+    return null;
+  }
+
+  return (
+    <FloatingPortal>
+      <div
+        className={styles.tooltip}
+        ref={finalRef}
+        style={{
+          ...state.floatingStyles,
+          ...props.style,
+          ...transitionStyles,
+        }}
+        {...state.getFloatingProps(props)}
+      >
+        <div>{props.children}</div>
+
+        <FloatingArrow className={styles.arrow} context={context} ref={state.arrowRef} />
+      </div>
+    </FloatingPortal>
+  );
+});

package/packages/scrabble-solver/src/components/Tooltip/TooltipTrigger.tsx

@@ -0,0 +1,26 @@
+import { useMergeRefs } from '@floating-ui/react';
+import { HTMLProps, cloneElement, forwardRef, isValidElement } from 'react';
+
+import { useTooltipContext } from './context';
+
+type Props = HTMLProps<HTMLElement>;
+
+export const TooltipTrigger = forwardRef<HTMLElement, Props>(({ children, ...props }, ref) => {
+  const state = useTooltipContext();
+  const childrenElement = children as any; // eslint-disable-line @typescript-eslint/no-explicit-any
+  const finalRef = useMergeRefs([state.refs.setReference, ref, childrenElement.ref]);
+
+  if (!isValidElement(children)) {
+    throw new Error("TooltipTrigger's children are not a valid element");
+  }
+
+  return cloneElement(
+    children,
+    state.getReferenceProps({
+      ref: finalRef,
+      ...props,
+      ...children.props,
+      'data-state': state.open ? 'open' : 'closed',
+    }),
+  );
+});

package/packages/scrabble-solver/src/components/Tooltip/context.ts

@@ -0,0 +1,17 @@
+import { createContext, useContext } from 'react';
+
+import { useTooltip } from './useTooltip';
+
+type TooltipContextType = ReturnType<typeof useTooltip> | null;
+
+export const TooltipContext = createContext<TooltipContextType>(null);
+
+export const useTooltipContext = () => {
+  const context = useContext(TooltipContext);
+
+  if (context === null) {
+    throw new Error('Tooltip components must be wrapped in <Tooltip />');
+  }
+
+  return context;
+};

package/packages/scrabble-solver/src/components/Tooltip/index.ts

@@ -1 +1 @@
-export { default as useTooltip } from './useTooltip';
+export { Tooltip } from './Tooltip';

package/packages/scrabble-solver/src/components/Tooltip/useTooltip.ts

@@ -0,0 +1,54 @@
+import {
+  Placement,
+  arrow,
+  autoUpdate,
+  flip,
+  offset,
+  shift,
+  useDelayGroup,
+  useDismiss,
+  useFloating,
+  useFocus,
+  useHover,
+  useInteractions,
+  useRole,
+} from '@floating-ui/react';
+import { useMemo, useRef, useState } from 'react';
+
+const ARROW_SIZE = 7;
+const ARROW_GAP = 3;
+const PADDING = 10;
+
+interface TooltipOptions {
+  placement?: Placement;
+}
+
+export const useTooltip = ({ placement = 'top' }: TooltipOptions = {}) => {
+  const [isOpen, setIsOpen] = useState(false);
+  const arrowRef = useRef(null);
+  const data = useFloating({
+    placement,
+    open: isOpen,
+    onOpenChange: setIsOpen,
+    whileElementsMounted: autoUpdate,
+    middleware: [flip(), shift({ padding: PADDING }), offset(ARROW_SIZE + ARROW_GAP), arrow({ element: arrowRef })],
+  });
+  const { context } = data;
+  const { delay } = useDelayGroup(context);
+  const hover = useHover(context, { move: false, delay });
+  const focus = useFocus(context);
+  const dismiss = useDismiss(context);
+  const role = useRole(context, { role: 'tooltip' });
+  const interactions = useInteractions([hover, focus, dismiss, role]);
+
+  return useMemo(
+    () => ({
+      arrowRef,
+      open: isOpen,
+      setOpen: setIsOpen,
+      ...interactions,
+      ...data,
+    }),
+    [arrowRef, isOpen, setIsOpen, interactions, data],
+  );
+};

package/packages/scrabble-solver/src/components/index.ts

@@ -2,7 +2,6 @@ export { default as Alert } from './Alert';
 export { default as Badge } from './Badge';
 export { default as Board } from './Board';
 export { default as Button } from './Button';
-export { default as Checkbox } from './Checkbox';
 export { default as Dictionary } from './Dictionary';
 export { default as DictionaryInput } from './DictionaryInput';
 export { default as EmptyState } from './EmptyState';
@@ -23,4 +22,4 @@ export { default as SeoMessage } from './SeoMessage';
 export { default as Solver } from './Solver';
 export { default as Spinner } from './Spinner';
 export { default as Tile } from './Tile';
-export { useTooltip } from './Tooltip';
+export * from './Tooltip';

package/packages/scrabble-solver/src/hooks/index.ts

@@ -9,5 +9,4 @@ export { default as useMedia } from './useMedia';
 export { default as useMediaQueries } from './useMediaQueries';
 export { default as useMediaQuery } from './useMediaQuery';
 export { default as useOnWindowResize } from './useOnWindowResize';
-export { default as usePortal } from './usePortal';
 export { default as useViewportSize } from './useViewportSize';

package/packages/scrabble-solver/src/i18n/languages/german.json

@@ -22,7 +22,7 @@
   "dictionary.empty-state.no-definitions": "Wort existiert im Wörterbuch aber hat keine Definition.",
   "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.empty-state.uninitialized": "Die Wörterbuchdefinition wird hier angezeigt.",
   "dictionary.input.placeholder": "Durchsuche Wörterbuch…",
   "dictionary.input.title": "Durch Kommas getrennte Wörter",
   "empty-state.error": "Fehler",

package/packages/scrabble-solver/src/icons/index.ts

@@ -5,8 +5,6 @@ export { default as ArrowUp } from './ArrowUp.svg';
 export { default as BookHalf } from './BookHalf.svg';
 export { default as CardChecklist } from './CardChecklist.svg';
 export { default as Check } from './Check.svg';
-export { default as CheckboxChecked } from './CheckboxChecked.svg';
-export { default as CheckboxEmpty } from './CheckboxEmpty.svg';
 export { default as ChevronDown } from './ChevronDown.svg';
 export { default as ChevronLeft } from './ChevronLeft.svg';
 export { default as ChevronRight } from './ChevronRight.svg';

package/packages/scrabble-solver/src/lib/getCoordinates.ts

@@ -0,0 +1,18 @@
+import { Result, ShowCoordinates } from '@scrabble-solver/types';
+
+import getCoordinate from './getCoordinate';
+
+const getCoordinates = (result: Result, showCoordinates: ShowCoordinates): string => {
+  if (showCoordinates === 'hidden') {
+    return '';
+  }
+
+  const firstCell = result.cells[0];
+  const isHorizontal = firstCell.x !== result.cells[1].x;
+  const x = getCoordinate(firstCell.x, showCoordinates === 'original' ? 'letter' : 'number');
+  const y = getCoordinate(firstCell.y, showCoordinates === 'original' ? 'number' : 'letter');
+
+  return isHorizontal ? `${y}${x}` : `${x}${y}`;
+};
+
+export default getCoordinates;

package/packages/scrabble-solver/src/lib/groupResults.ts

@@ -18,18 +18,23 @@ const groupResults = (
     return results;
   }
 
+  const regExp = createRegExp(query);
+
   return results.reduce<GroupedResults>(
-    ({ matching, other }, result) => {
-      const matchesQuery = createRegExp(query).test(result.word);
-      const matchesCellFilter = cellFilter.every(({ x, y }) => {
-        return result.cells.some((cell) => cell.x === x && cell.y === y);
-      });
-      const isMatching = matchesQuery && matchesCellFilter;
-
-      return {
-        matching: isMatching ? [...matching, result] : matching,
-        other: isMatching ? other : [...other, result],
-      };
+    (groupedResults, result) => {
+      const matchesQuery = () => regExp.test(result.word);
+      const matchesCellFilter = () =>
+        cellFilter.every(({ x, y }) => {
+          return result.cells.some((cell) => cell.x === x && cell.y === y);
+        });
+
+      if (matchesCellFilter() && matchesQuery()) {
+        groupedResults.matching.push(result);
+      } else {
+        groupedResults.other.push(result);
+      }
+
+      return groupedResults;
     },
     { matching: [], other: [] },
   );

package/packages/scrabble-solver/src/lib/index.ts

@@ -1,5 +1,4 @@
 export { default as arrayEquals } from './arrayEquals';
-export { default as canUseDom } from './canUseDom';
 export { default as createArray } from './createArray';
 export { default as createComparator } from './createComparator';
 export { default as createGridOf } from './createGridOf';
@@ -15,6 +14,8 @@ export { default as extractCharactersByCase } from './extractCharactersByCase';
 export { default as extractInputValue } from './extractInputValue';
 export { default as findCell } from './findCell';
 export { default as getCellSize } from './getCellSize';
+export { default as getCoordinate } from './getCoordinate';
+export { default as getCoordinates } from './getCoordinates';
 export { default as getRemainingTiles } from './getRemainingTiles';
 export { default as getRemainingTilesCount } from './getRemainingTilesCount';
 export { default as getRemainingTilesGroups } from './getRemainingTilesGroups';

package/packages/scrabble-solver/src/lib/sortResults.ts

@@ -8,6 +8,7 @@ import reverseComparator from './reverseComparator';
 const comparators: Record<ResultColumn, (locale: string) => Comparator<Result>> = {
   [ResultColumn.BlanksCount]: (locale: string) => createKeyComparator('blanksCount', locale),
   [ResultColumn.ConsonantsCount]: (locale: string) => createKeyComparator('consonantsCount', locale),
+  [ResultColumn.Coordinates]: () => () => 0,
   [ResultColumn.Points]: (locale: string) => createKeyComparator('points', locale),
   [ResultColumn.TilesCount]: (locale: string) => createKeyComparator('tilesCount', locale),
   [ResultColumn.VowelsCount]: (locale: string) => createKeyComparator('vowelsCount', locale),

package/packages/scrabble-solver/src/modals/KeyMapModal/components/Mapping/Mapping.module.scss

@@ -39,10 +39,10 @@
   }
 
   &:first-child {
-    margin-left: 0;
+    margin-inline-start: 0;
   }
 
   &:last-child {
-    margin-right: 0;
+    margin-inline-end: 0;
   }
 }

package/packages/scrabble-solver/src/modals/MenuModal/MenuModal.module.scss

@@ -31,13 +31,7 @@
   --aspect-ratio: var(--highest-flag-aspect-ratio);
   --padding: calc(var(--spacing--l) + var(--button--icon--size) * var(--aspect-ratio));
 
-  [dir='ltr'] & {
-    padding-right: var(--padding);
-  }
-
-  [dir='rtl'] & {
-    padding-left: var(--padding);
-  }
+  padding-inline-end: var(--padding);
 }
 
 .flag {
@@ -45,12 +39,5 @@
   height: var(--button--icon--size);
   border-radius: var(--border--radius);
   box-shadow: 0 0 0 1px var(--box-shadow--color);
-
-  [dir='ltr'] & {
-    right: calc(2 * var(--spacing--l));
-  }
-
-  [dir='rtl'] & {
-    left: calc(2 * var(--spacing--l));
-  }
+  inset-inline-end: calc(2 * var(--spacing--l));
 }

package/packages/scrabble-solver/src/modals/RemainingTilesModal/RemainingTilesModal.module.scss

@@ -12,13 +12,7 @@
 }
 
 .badge {
-  [dir='ltr'] & {
-    margin-left: var(--spacing--m);
-  }
-
-  [dir='rtl'] & {
-    margin-right: var(--spacing--m);
-  }
+  margin-inline-start: var(--spacing--m);
 }
 
 .character {

package/packages/scrabble-solver/src/modals/WordsModal/WordsModal.module.scss

@@ -6,13 +6,7 @@
 }
 
 .badge {
-  [dir='ltr'] & {
-    margin-left: var(--spacing--m);
-  }
-
-  [dir='rtl'] & {
-    margin-right: var(--spacing--m);
-  }
+  margin-inline-start: var(--spacing--m);
 }
 
 .word {
@@ -37,12 +31,5 @@
 
   width: $size;
   height: $size;
-
-  [dir='ltr'] & {
-    margin-right: var(--spacing--s);
-  }
-
-  [dir='rtl'] & {
-    margin-left: var(--spacing--s);
-  }
+  margin-inline-end: var(--spacing--s);
 }

package/packages/scrabble-solver/src/pages/_app.tsx

@@ -1,3 +1,4 @@
+import { FloatingDelayGroup } from '@floating-ui/react';
 import { AppProps } from 'next/app';
 import Head from 'next/head';
 import { FunctionComponent } from 'react';
@@ -64,7 +65,10 @@ const App: FunctionComponent<AppProps> = ({ Component, pageProps }) => (
 
     <Provider store={store}>
       <SeoMessage />
-      <Component {...pageProps} />
+
+      <FloatingDelayGroup delay={0}>
+        <Component {...pageProps} />
+      </FloatingDelayGroup>
     </Provider>
   </>
 );

package/packages/scrabble-solver/src/parameters/index.ts

@@ -90,6 +90,7 @@ export const MODAL_HEADER_HEIGHT = 45;
 export const NAV_PADDING = SPACING_L;
 
 export const TILE_SIZE = 80;
+export const TOOLTIP_DURATION = TRANSITION_DURATION;
 
 export const PLAIN_TILES_COLOR_DEFAULT = COLOR_GREEN;
 export const PLAIN_TILES_PADDING_HORIZONTAL = 0;

package/packages/scrabble-solver/src/styles/mixins.scss

@@ -14,7 +14,7 @@ $media-expressions: (
 
 @mixin scrollbars {
   scrollbar-color: var(--scrollbar--thumb--color) var(--scrollbar--thumb--track);
-  scrollbar-width: auto;
+  scrollbar-width: thin;
 
   &::-webkit-scrollbar {
     width: var(--scrollbar--size);
@@ -44,10 +44,7 @@ $media-expressions: (
 
   &::after {
     position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
+    inset: 0;
     z-index: var(--z-index--focus-effect);
     transition: var(--transition);
     border-radius: var(--border--radius);

package/packages/scrabble-solver/src/types/index.ts

@@ -40,6 +40,7 @@ export interface RemainingTilesGroup {
 export enum ResultColumn {
   BlanksCount = 'blanks-count',
   ConsonantsCount = 'consonants-count',
+  Coordinates = 'coordinates',
   Points = 'points',
   TilesCount = 'tiles-count',
   VowelsCount = 'vowels-count',

package/packages/solver/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.13.6",
+  "version": "2.13.8",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@scrabble-solver/solver",
-      "version": "2.13.6",
+      "version": "2.13.8",
       "license": "CC-BY-NC-ND-4.0",
       "dependencies": {
         "@kamilmielnik/trie": "^3.0.0"