scrabble-solver 2.15.12 → 2.15.14

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

@@ -1,6 +1,7 @@
 import classNames from 'classnames';
-import { type CSSProperties, type FocusEventHandler, type MouseEventHandler, type ReactElement, useRef } from 'react';
+import { type FocusEventHandler, type MouseEventHandler, type ReactElement, useRef } from 'react';
 import Highlighter from 'react-highlight-words';
+import { type RowComponentProps } from 'react-window';
 
 import { useAppLayout, useColumns } from 'hooks';
 import { LOCALE_FEATURES } from 'i18n';
@@ -18,22 +19,17 @@ import { Cell } from './Cell';
 import styles from './Results.module.scss';
 import { type ResultData } from './types';
 
-interface Props {
-  data: ResultData;
-  index: number;
-  style?: CSSProperties;
-}
-
-export const Result = ({ data, index, style }: Props): ReactElement => {
-  const {
-    highlightedIndex,
-    results = [],
-    onBlur = noop,
-    onClick = noop,
-    onFocus = noop,
-    onMouseEnter = noop,
-    onMouseLeave = noop,
-  } = data;
+export const Result = ({
+  index,
+  highlightedIndex,
+  results = [],
+  onBlur = noop,
+  onClick = noop,
+  onFocus = noop,
+  onMouseEnter = noop,
+  onMouseLeave = noop,
+  style,
+}: RowComponentProps<ResultData>): ReactElement => {
   const { resultWordWidth } = useAppLayout();
   const ref = useRef<HTMLButtonElement>(null);
   const columns = useColumns();

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

@@ -1,17 +1,17 @@
 import classNames from 'classnames';
-import { type FunctionComponent, useEffect, useMemo, useState } from 'react';
-import { FixedSizeList } from 'react-window';
+import { useEffect, useMemo, type FunctionComponent } from 'react';
+import { List, useListRef } from 'react-window';
 import { useDebounce } from 'use-debounce';
 
-import { useAppLayout, useLatest } from 'hooks';
+import { useLatest } from 'hooks';
 import { LOCALE_FEATURES } from 'i18n';
-import { BORDER_WIDTH, RESULTS_HEADER_HEIGHT, RESULTS_ITEM_HEIGHT, TEXT_INPUT_HEIGHT } from 'parameters';
+import { RESULTS_ITEM_HEIGHT } from 'parameters';
 import {
   selectAreResultsOutdated,
-  selectSolveIsLoading,
   selectLocale,
   selectProcessedResults,
   selectSolveError,
+  selectSolveIsLoading,
   useTranslate,
   useTypedSelector,
 } from 'state';
@@ -36,7 +36,6 @@ const IS_LOADING_DEBOUNCE = 100;
 
 export const Results: FunctionComponent<Props> = ({ callbacks, className, highlightedIndex }) => {
   const translate = useTranslate();
-  const { resultsHeight, resultsWidth } = useAppLayout();
   const locale = useTypedSelector(selectLocale);
   const { direction } = LOCALE_FEATURES[locale];
   const results = useTypedSelector(selectProcessedResults);
@@ -44,22 +43,25 @@ export const Results: FunctionComponent<Props> = ({ callbacks, className, highli
   const [isLoadingDebounced] = useDebounce(isLoading, IS_LOADING_DEBOUNCE);
   const isOutdated = useTypedSelector(selectAreResultsOutdated);
   const error = useTypedSelector(selectSolveError);
-  const itemData = useMemo(() => ({ ...callbacks, highlightedIndex, results }), [callbacks, highlightedIndex, results]);
-  const [listRef, setListRef] = useState<FixedSizeList<ResultData> | null>(null);
+  const itemData = useMemo<ResultData>(
+    () => ({ ...callbacks, highlightedIndex, results }),
+    [callbacks, highlightedIndex, results],
+  );
+  const listRef = useListRef(null);
   const scrollToIndex = typeof highlightedIndex === 'number' ? highlightedIndex : 0;
   const scrollToIndexRef = useLatest(scrollToIndex);
   const hasResults = typeof error === 'undefined' && typeof results !== 'undefined';
   const showInput = hasResults && results.length > 0 && !isOutdated;
-  const height = resultsHeight - RESULTS_HEADER_HEIGHT - (showInput ? TEXT_INPUT_HEIGHT : 0) - 2 * BORDER_WIDTH;
-  const width = resultsWidth - 2 * BORDER_WIDTH;
 
   useEffect(() => {
     // without setTimeout, the initial scrolling offset is calculated
     // incorrectly, as the list is not fully rendered by the browser yet
     const timeout = globalThis.setTimeout(() => {
-      if (listRef) {
-        listRef.scrollToItem(scrollToIndexRef.current, 'center');
-      }
+      listRef.current?.scrollToRow({
+        align: 'center',
+        behavior: 'instant',
+        index: scrollToIndexRef.current,
+      });
     }, 0);
 
     return () => {
@@ -104,20 +106,17 @@ export const Results: FunctionComponent<Props> = ({ callbacks, className, highli
 
             {!isOutdated && results.length > 0 && (
               <div className={styles.listContainer}>
-                <FixedSizeList
+                <List
                   className={classNames(styles.list, {
                     [styles.outdated]: isOutdated,
                   })}
-                  direction={direction}
-                  height={height}
-                  itemCount={results.length}
-                  itemData={itemData}
-                  itemSize={RESULTS_ITEM_HEIGHT}
-                  ref={setListRef}
-                  width={width}
-                >
-                  {Result}
-                </FixedSizeList>
+                  dir={direction}
+                  listRef={listRef}
+                  rowComponent={Result}
+                  rowCount={results.length}
+                  rowHeight={RESULTS_ITEM_HEIGHT}
+                  rowProps={itemData}
+                />
               </div>
             )}
           </>

package/packages/solver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/solver",
-  "version": "2.15.12",
+  "version": "2.15.14",
   "description": "Scrabble Solver 2 - Solver",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -24,12 +24,12 @@
   },
   "dependencies": {
     "@kamilmielnik/trie": "^4.0.0",
-    "@scrabble-solver/types": "^2.15.12"
+    "@scrabble-solver/types": "^2.15.14"
   },
   "devDependencies": {
-    "@scrabble-solver/configs": "^2.15.12",
-    "@scrabble-solver/constants": "^2.15.12",
-    "@scrabble-solver/dictionaries": "^2.15.12"
+    "@scrabble-solver/configs": "^2.15.14",
+    "@scrabble-solver/constants": "^2.15.14",
+    "@scrabble-solver/dictionaries": "^2.15.14"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

package/packages/types/build/Board.js

@@ -136,6 +136,6 @@ const getHorizontalWords = (cells) => {
     }
     return words;
 };
-const wordToString = (currentWord) => {
-    return currentWord.map((cell) => cell.tile.character).join('');
+const wordToString = (word) => {
+    return word.map((cell) => cell.tile.character).join('');
 };

package/packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/types",
-  "version": "2.15.12",
+  "version": "2.15.14",
   "description": "Scrabble Solver 2 - Types",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -23,7 +23,7 @@
     "clean": "rimraf build/"
   },
   "dependencies": {
-    "@scrabble-solver/constants": "^2.15.12"
+    "@scrabble-solver/constants": "^2.15.14"
   },
   "gitHead": "1e2d1ad49a288d4a44196d8e3336740da132c637"
 }

package/packages/types/src/Board.ts

@@ -177,6 +177,6 @@ const getHorizontalWords = (cells: Cell[][]): string[] => {
   return words;
 };
 
-const wordToString = (currentWord: Cell[]): string => {
-  return currentWord.map((cell) => cell.tile.character).join('');
+const wordToString = (word: Cell[]): string => {
+  return word.map((cell) => cell.tile.character).join('');
 };

package/packages/word-definitions/build/languages/romanian.js

@@ -15,7 +15,7 @@ const parse = (html) => {
     const $ = (0, cheerio_1.load)(html);
     const $activeTab = $('.tab-pane.show.active');
     $('.type-example').remove();
-    const $definitions = $activeTab.find('li.type-meaning.depth-0 > .meaningContainer .def.html');
+    const $definitions = $activeTab.find('li.type-meaning.depth-0 > .meaningContainer .tree-def.html');
     $definitions.find('.meaningTree').remove();
     const definitions = Array.from($definitions).map((definition) => $(definition).text().replace(/\n/g, ''));
     return {

package/packages/word-definitions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrabble-solver/word-definitions",
-  "version": "2.15.12",
+  "version": "2.15.14",
   "description": "Scrabble Solver 2 - Word definitions",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -23,9 +23,9 @@
     "clean": "rimraf build/"
   },
   "dependencies": {
-    "@scrabble-solver/types": "^2.15.12",
-    "cheerio": "^1.0.0",
-    "follow-redirects": "^1.15.9",
+    "@scrabble-solver/types": "^2.15.14",
+    "cheerio": "^1.1.2",
+    "follow-redirects": "^1.15.11",
     "striptags": "^3.2.0"
   },
   "devDependencies": {