scrabble-solver 2.13.6 → 2.13.8

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

@@ -77,12 +77,5 @@
   flex: 1;
   font-size: var(--font--size--h3);
   transition: var(--transition);
-
-  [dir='ltr'] & {
-    text-align: left;
-  }
-
-  [dir='rtl'] & {
-    text-align: right;
-  }
+  text-align: start;
 }

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

@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import { ButtonHTMLAttributes, FunctionComponent, ReactNode, SVGAttributes } from 'react';
 
-import { useTooltip } from '../Tooltip';
+import { Tooltip } from '../Tooltip';
 
 import styles from './Button.module.scss';
 import Link from './Link';
@@ -23,23 +23,22 @@ const Button: FunctionComponent<Props> = ({
   variant = 'default',
   ...props
 }) => {
-  const triggerProps = useTooltip(tooltip, props);
-
   return (
-    <button
-      className={classNames(styles.button, className, {
-        [styles.default]: variant === 'default',
-        [styles.primary]: variant === 'primary',
-      })}
-      type="button"
-      {...props}
-      {...triggerProps}
-    >
-      <span className={styles.content}>
-        {Icon && <Icon className={classNames(styles.icon, iconClassName)} />}
-        {children && <span className={styles.label}>{children}</span>}
-      </span>
-    </button>
+    <Tooltip tooltip={tooltip}>
+      <button
+        className={classNames(styles.button, className, {
+          [styles.default]: variant === 'default',
+          [styles.primary]: variant === 'primary',
+        })}
+        type="button"
+        {...props}
+      >
+        <span className={styles.content}>
+          {Icon && <Icon className={classNames(styles.icon, iconClassName)} />}
+          {children && <span className={styles.label}>{children}</span>}
+        </span>
+      </button>
+    </Tooltip>
   );
 };
 

package/packages/scrabble-solver/src/components/Button/Link.tsx

@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import { AnchorHTMLAttributes, FunctionComponent, ReactNode, SVGAttributes } from 'react';
 
-import { useTooltip } from '../Tooltip';
+import { Tooltip } from '../Tooltip';
 
 import styles from './Button.module.scss';
 
@@ -23,22 +23,21 @@ const Link: FunctionComponent<Props> = ({
   variant = 'default',
   ...props
 }) => {
-  const triggerProps = useTooltip(tooltip, props);
-
   return (
-    <a
-      className={classNames(styles.button, className, {
-        [styles.default]: variant === 'default',
-        [styles.primary]: variant === 'primary',
-      })}
-      {...props}
-      {...triggerProps}
-    >
-      <span className={styles.content}>
-        {Icon && <Icon className={classNames(styles.icon, iconClassName)} />}
-        {children && <span className={styles.label}>{children}</span>}
-      </span>
-    </a>
+    <Tooltip tooltip={tooltip}>
+      <a
+        className={classNames(styles.button, className, {
+          [styles.default]: variant === 'default',
+          [styles.primary]: variant === 'primary',
+        })}
+        {...props}
+      >
+        <span className={styles.content}>
+          {Icon && <Icon className={classNames(styles.icon, iconClassName)} />}
+          {children && <span className={styles.label}>{children}</span>}
+        </span>
+      </a>
+    </Tooltip>
   );
 };
 

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

@@ -55,14 +55,7 @@
 
 .definitions {
   margin: 0;
-
-  [dir='ltr'] & {
-    padding-left: var(--spacing--l);
-  }
-
-  [dir='rtl'] & {
-    padding-right: var(--spacing--l);
-  }
+  padding-inline-start: var(--spacing--l);
 }
 
 .definition {

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

@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import { ButtonHTMLAttributes, FunctionComponent, MouseEventHandler, SVGAttributes } from 'react';
 
-import { useTooltip } from '../Tooltip';
+import { Tooltip } from '../Tooltip';
 
 import styles from './IconButton.module.scss';
 import Link from './Link';
@@ -15,14 +15,14 @@ interface Props extends ButtonHTMLAttributes<HTMLButtonElement> {
 }
 
 const IconButton: FunctionComponent<Props> = ({ className, Icon, tooltip, ...props }) => {
-  const triggerProps = useTooltip(tooltip, props);
-
   return (
-    <button className={classNames(styles.iconButton, className)} type="button" {...props} {...triggerProps}>
-      <span className={styles.content}>
-        <Icon className={styles.icon} />
-      </span>
-    </button>
+    <Tooltip tooltip={tooltip}>
+      <button className={classNames(styles.iconButton, className)} type="button" {...props}>
+        <span className={styles.content}>
+          <Icon className={styles.icon} />
+        </span>
+      </button>
+    </Tooltip>
   );
 };
 

package/packages/scrabble-solver/src/components/IconButton/Link.tsx

@@ -1,7 +1,7 @@
 import classNames from 'classnames';
 import { AnchorHTMLAttributes, FunctionComponent, SVGAttributes } from 'react';
 
-import { useTooltip } from '../Tooltip';
+import { Tooltip } from '../Tooltip';
 
 import styles from './IconButton.module.scss';
 
@@ -14,14 +14,14 @@ interface Props extends AnchorHTMLAttributes<HTMLAnchorElement> {
 }
 
 const Link: FunctionComponent<Props> = ({ className, Icon, tooltip, ...props }) => {
-  const triggerProps = useTooltip(tooltip, props);
-
   return (
-    <a className={classNames(styles.iconButton, className)} {...props} {...triggerProps}>
-      <span className={styles.content}>
-        <Icon className={styles.icon} />
-      </span>
-    </a>
+    <Tooltip tooltip={tooltip}>
+      <a className={classNames(styles.iconButton, className)} {...props}>
+        <span className={styles.content}>
+          <Icon className={styles.icon} />
+        </span>
+      </a>
+    </Tooltip>
   );
 };
 

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

@@ -1,10 +1,7 @@
 .loading,
 .dim {
   position: absolute;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  right: 0;
+  inset: 0;
 }
 
 .loading {

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

@@ -3,14 +3,7 @@
 .modal,
 .closeButton {
   top: 0;
-
-  [dir='ltr'] & {
-    right: 0;
-  }
-
-  [dir='rtl'] & {
-    left: 0;
-  }
+  inset-inline-end: 0;
 }
 
 .modal {
@@ -92,14 +85,7 @@
 .title {
   font-size: var(--font--size--h1);
   font-weight: 300;
-
-  [dir='ltr'] & {
-    padding-right: calc(var(--square-button--size) + var(--spacing--s));
-  }
-
-  [dir='rtl'] & {
-    padding-left: calc(var(--square-button--size) + var(--spacing--s));
-  }
+  padding-inline-end: calc(var(--square-button--size) + var(--spacing--s));
 }
 
 .closeButton {

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

@@ -77,25 +77,11 @@
 }
 
 .sharpLeft {
-  [dir='ltr'] & {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-
-  [dir='rtl'] & {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-  }
+  border-start-start-radius: 0;
+  border-end-start-radius: 0;
 }
 
 .sharpRight {
-  [dir='ltr'] & {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-  }
-
-  [dir='rtl'] & {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-  }
+  border-start-end-radius: 0;
+  border-end-end-radius: 0;
 }

package/packages/scrabble-solver/src/components/Rack/components/InputPrompt/InputPrompt.module.scss

@@ -10,10 +10,7 @@
   @include text-input;
 
   position: absolute;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
+  inset: 0;
   width: 100%;
   height: 100%;
   border-radius: var(--border--radius);

package/packages/scrabble-solver/src/components/Results/Cell.tsx

@@ -4,7 +4,7 @@ import { FunctionComponent, ReactNode } from 'react';
 import { selectLocale, useTranslate, useTypedSelector } from 'state';
 import { TranslationKey } from 'types';
 
-import { useTooltip } from '../Tooltip';
+import { Tooltip } from '../Tooltip';
 
 import styles from './Results.module.scss';
 
@@ -20,12 +20,11 @@ const Cell: FunctionComponent<Props> = ({ children, className, translationKey, t
   const translate = useTranslate();
   const locale = useTypedSelector(selectLocale);
   const formattedValue = value.toLocaleString(locale);
-  const triggerProps = useTooltip(`${translate(translationKey)}: ${tooltip || formattedValue}`);
 
   return (
-    <div className={classNames(styles.cell, className)} {...triggerProps}>
-      {children || formattedValue}
-    </div>
+    <Tooltip tooltip={`${translate(translationKey)}: ${tooltip || formattedValue}`}>
+      <div className={classNames(styles.cell, className)}>{children || formattedValue}</div>
+    </Tooltip>
   );
 };
 

package/packages/scrabble-solver/src/components/Results/HeaderButton.tsx

@@ -6,45 +6,48 @@ import { SortDown, SortUp } from 'icons';
 import { resultsSlice, selectResultsSort, useTranslate, useTypedSelector } from 'state';
 import { SortDirection } from 'types';
 
-import { useTooltip } from '../Tooltip';
+import { Tooltip } from '../Tooltip';
 
 import styles from './Results.module.scss';
 import { Column } from './types';
 
 interface Props {
   column: Column;
+  sortable?: boolean;
 }
 
-const HeaderButton = ({ column }: Props): ReactElement => {
+const HeaderButton = ({ column, sortable }: Props): ReactElement => {
   const dispatch = useDispatch();
   const translate = useTranslate();
   const sort = useTypedSelector(selectResultsSort);
-  const triggerProps = useTooltip(translate(column.translationKey));
 
   const handleClick = useCallback(() => {
     dispatch(resultsSlice.actions.sort(column.id));
   }, [column.id, dispatch]);
 
   return (
-    <button
-      aria-label={translate(column.translationKey)}
-      className={classNames(styles.headerButton, column.className)}
-      key={column.id}
-      type="button"
-      onClick={handleClick}
-      {...triggerProps}
-    >
-      <span className={styles.cell}>
-        <span className={styles.headerButtonLabel}>{translate(column.translationKey)}</span>
-
-        {sort.column === column.id && (
-          <>
-            {sort.direction === SortDirection.Ascending && <SortUp className={styles.sortIcon} />}
-            {sort.direction === SortDirection.Descending && <SortDown className={styles.sortIcon} />}
-          </>
-        )}
-      </span>
-    </button>
+    <Tooltip tooltip={translate(column.translationKey)}>
+      <button
+        aria-label={translate(column.translationKey)}
+        className={classNames(styles.headerButton, column.className, {
+          [styles.sortable]: sortable,
+        })}
+        key={column.id}
+        type="button"
+        onClick={sortable ? handleClick : undefined}
+      >
+        <span className={styles.cell}>
+          <span className={styles.headerButtonLabel}>{translate(column.translationKey)}</span>
+
+          {sort.column === column.id && (
+            <>
+              {sort.direction === SortDirection.Ascending && <SortUp className={styles.sortIcon} />}
+              {sort.direction === SortDirection.Descending && <SortDown className={styles.sortIcon} />}
+            </>
+          )}
+        </span>
+      </button>
+    </Tooltip>
   );
 };
 

package/packages/scrabble-solver/src/components/Results/Result.tsx

@@ -1,10 +1,16 @@
 import classNames from 'classnames';
-import { CSSProperties, FocusEventHandler, MouseEventHandler, ReactElement, useRef } from 'react';
+import { CSSProperties, FocusEventHandler, MouseEventHandler, ReactElement, useMemo, useRef } from 'react';
 import Highlighter from 'react-highlight-words';
 
 import { LOCALE_FEATURES } from 'i18n';
-import { noop } from 'lib';
-import { selectIsResultMatching, selectLocale, selectResultsQuery, useTypedSelector } from 'state';
+import { getCoordinates, noop } from 'lib';
+import {
+  selectIsResultMatching,
+  selectLocale,
+  selectResultsQuery,
+  selectShowCoordinates,
+  useTypedSelector,
+} from 'state';
 import { ResultColumn } from 'types';
 
 import Cell from './Cell';
@@ -31,12 +37,14 @@ const Result = ({ data, index, style }: Props): ReactElement => {
   const ref = useRef<HTMLButtonElement>(null);
   const columns = useColumns();
   const locale = useTypedSelector(selectLocale);
+  const showCoordinates = useTypedSelector(selectShowCoordinates);
   const query = useTypedSelector(selectResultsQuery);
   const { consonants, direction, separator, vowels } = LOCALE_FEATURES[locale];
   const result = results[index];
   const isMatching = useTypedSelector((state) => selectIsResultMatching(state, index));
   const words = direction === 'rtl' ? [...result.words].reverse() : result.words;
   const enabledColumns = Object.fromEntries(columns.map((column) => [column.id, true]));
+  const coordinates = useMemo(() => getCoordinates(result, showCoordinates), [result, showCoordinates]);
 
   const handleClick: MouseEventHandler = (event) => onClick(result, event);
   const handleMouseEnter: MouseEventHandler = (event) => onMouseEnter(result, event);
@@ -61,6 +69,10 @@ const Result = ({ data, index, style }: Props): ReactElement => {
       onMouseLeave={handleMouseLeave}
     >
       <span className={styles.resultContent}>
+        {enabledColumns[ResultColumn.Coordinates] && (
+          <Cell className={styles.coordinates} translationKey="settings.showCoordinates" value={coordinates} />
+        )}
+
         {enabledColumns[ResultColumn.Word] && (
           <Cell className={styles.word} translationKey="common.word" value={result.word}>
             <Highlighter highlightClassName={styles.highlight} searchWords={[query]} textToHighlight={result.word} />

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

@@ -24,10 +24,7 @@ $row-padding-horizontal: calc(var(--spacing--m) + var(--spacing--s));
 
 .listContainer {
   position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
+  inset: 0;
 }
 
 .list {
@@ -55,37 +52,29 @@ $row-padding-horizontal: calc(var(--spacing--m) + var(--spacing--s));
 
 .headerButton {
   @include button-reset;
-  @include focus-effect;
 
-  cursor: pointer;
   text-transform: uppercase;
   transition: var(--transition);
   background-color: var(--color--background);
 
-  &:focus,
-  &:hover {
-    background-color: var(--color--primary);
-    color: var(--color--primary--opposite);
-  }
-
   &:first-child {
-    [dir='ltr'] & {
-      border-top-left-radius: inherit;
-    }
-
-    [dir='rtl'] & {
-      border-top-right-radius: inherit;
-    }
+    border-start-start-radius: inherit;
   }
 
   &:last-child {
-    [dir='ltr'] & {
-      border-top-right-radius: inherit;
-    }
+    border-start-end-radius: inherit;
+  }
+}
 
-    [dir='rtl'] & {
-      border-top-left-radius: inherit;
-    }
+.sortable {
+  @include focus-effect;
+
+  cursor: pointer;
+
+  &:focus,
+  &:hover {
+    background-color: var(--color--primary);
+    color: var(--color--primary--opposite);
   }
 }
 
@@ -93,11 +82,7 @@ $row-padding-horizontal: calc(var(--spacing--m) + var(--spacing--s));
   @include ellipsis;
 
   flex: 0 1 auto;
-  text-align: left;
-
-  [dir='rtl'] & {
-    text-align: right;
-  }
+  text-align: start;
 }
 
 .result {
@@ -139,6 +124,7 @@ $row-padding-horizontal: calc(var(--spacing--m) + var(--spacing--s));
 
   .word {
     @include ellipsis;
+    display: flex;
   }
 }
 
@@ -151,30 +137,20 @@ $row-padding-horizontal: calc(var(--spacing--m) + var(--spacing--s));
   gap: var(--spacing--s);
   line-height: var(--results--item--height);
 
-  .result &:first-child,
-  .headerButton:first-child & {
+  &.word,
+  .headerButton.word & {
     justify-content: flex-start;
+  }
 
-    [dir='ltr'] & {
-      padding-left: $row-padding-horizontal;
-      text-align: left;
-    }
-
-    [dir='rtl'] & {
-      padding-right: $row-padding-horizontal;
-      text-align: right;
-    }
+  .result &:first-child,
+  .headerButton:first-child & {
+    text-align: start;
+    padding-inline-start: $row-padding-horizontal;
   }
 
   .result &:last-child,
   .headerButton:last-child & {
-    [dir='ltr'] & {
-      padding-right: $row-padding-horizontal;
-    }
-
-    [dir='rtl'] & {
-      padding-left: $row-padding-horizontal;
-    }
+    padding-inline-end: $row-padding-horizontal;
   }
 
   &:last-child {
@@ -203,6 +179,13 @@ $row-padding-horizontal: calc(var(--spacing--m) + var(--spacing--s));
   font-weight: bold;
 }
 
+.coordinates {
+  $width: 50px;
+
+  flex: 0 0 $width;
+  max-width: $width;
+}
+
 .solveButton {
   display: block;
   margin: var(--spacing--xl) auto 0;

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

@@ -69,7 +69,7 @@ const Results: FunctionComponent<Props> = ({ callbacks, className, highlightedIn
     <div className={classNames(styles.results, className)}>
       <div className={styles.header}>
         {columns.map((column) => (
-          <HeaderButton column={column} key={column.id} />
+          <HeaderButton column={column} key={column.id} sortable={column.sortable} />
         ))}
       </div>
 

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

@@ -0,0 +1,15 @@
+import { ResultColumn } from 'types';
+
+import styles from './Results.module.scss';
+import { Column } from './types';
+
+const getCoordinatesColumn = (): Column => {
+  return {
+    className: styles.coordinates,
+    id: ResultColumn.Coordinates,
+    translationKey: 'settings.showCoordinates',
+    sortable: false,
+  };
+};
+
+export default getCoordinatesColumn;

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

@@ -10,11 +10,13 @@ const getLocaleColumns = (options: { consonants: boolean; vowels: boolean }): Co
       className: styles.word,
       id: ResultColumn.Word,
       translationKey: 'common.word',
+      sortable: true,
     },
     {
       className: styles.stat,
       id: ResultColumn.TilesCount,
       translationKey: 'common.tiles',
+      sortable: true,
     },
   ];
 
@@ -23,6 +25,7 @@ const getLocaleColumns = (options: { consonants: boolean; vowels: boolean }): Co
       className: styles.stat,
       id: ResultColumn.ConsonantsCount,
       translationKey: 'common.consonants',
+      sortable: true,
     });
   }
 
@@ -31,6 +34,7 @@ const getLocaleColumns = (options: { consonants: boolean; vowels: boolean }): Co
       className: styles.stat,
       id: ResultColumn.VowelsCount,
       translationKey: 'common.vowels',
+      sortable: true,
     });
   }
 
@@ -39,16 +43,19 @@ const getLocaleColumns = (options: { consonants: boolean; vowels: boolean }): Co
       className: styles.stat,
       id: ResultColumn.BlanksCount,
       translationKey: 'common.blanks',
+      sortable: true,
     },
     {
       className: styles.stat,
       id: ResultColumn.WordsCount,
       translationKey: 'common.words',
+      sortable: true,
     },
     {
       className: styles.points,
       id: ResultColumn.Points,
       translationKey: 'common.points',
+      sortable: true,
     },
   );
 

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

@@ -7,6 +7,7 @@ export interface Column {
   className: string;
   id: ResultColumn;
   translationKey: TranslationKey;
+  sortable?: boolean;
 }
 
 export interface ResultCallbacks {