react-chess-puzzle-kit 1.0.5 → 1.0.7

package/dist/features/board/usePuzzleAutoAdvanceCountdown.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/features/position/Position.d.ts

@@ -9,6 +9,8 @@ export declare abstract class Position implements Traversable {
     protected i: number;
     constructor();
     getIndex(): number;
+    /** UCI of the move that produced the current position. */
+    getLastMoveUci(): string | null;
     next(): boolean;
     prev(): boolean;
     isFinished(): boolean;

package/dist/index.esm.js

@@ -1,6 +1,6 @@
 import { useState, useEffect, useRef, useMemo, useCallback } from 'react';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useBoardRevision, useCorrectMoveFeedback, useIncorrectMoveFeedback, useMissBoard, HighlightChessboard, DEFAULT_ANSWER_ARROW_COLOR, uciFromDrop, fenAtPlyFromStart, useSolutionLineRecap, ThemeProvider, AnalysisErrorBoundary, AnalysisBoardCore, AnalysisBoardLayout, AnalysisBoard, BoardCompleteCheckOverlay, DEFAULT_ANALYSIS_LAYOUT, AUTO_ADVANCE_ON_COMPLETE_DELAY_MS, lastMoveUciAtPly, evaluateExpectedMoveDrop, fenAfterUci, boardSquareHighlightColors, analysisBoardHighlightColors } from 'react-chess-core';
+import { useBoardRevision, useCorrectMoveFeedback, useIncorrectMoveFeedback, useMissBoard, HighlightChessboard, DEFAULT_ANSWER_ARROW_COLOR, uciFromDrop, fenAtPlyFromStart, useSolutionLineRecap, lastMoveUciAtPly, ThemeProvider, AnalysisErrorBoundary, AnalysisBoardCore, AnalysisBoardLayout, AnalysisBoard, BoardCompleteCheckOverlay, DEFAULT_ANALYSIS_LAYOUT, AUTO_ADVANCE_ON_COMPLETE_DELAY_MS, evaluateExpectedMoveDrop, fenAfterUci, boardSquareHighlightColors, analysisBoardHighlightColors } from 'react-chess-core';
 export { DEFAULT_ANALYSIS_LAYOUT } from 'react-chess-core';
 import { Chess } from 'chess.js';
 
@@ -61,7 +61,7 @@ const EMPTY_BOARD_FEN = '8/8/8/8/8/8/8/8 w - - 0 1';
  * visible while the next position loads so layout and perspective do not flicker.
  */
 const PuzzlePlaySurface = ({ position, onFeedback, incInteractionNum, boardWidth, onResumeCorrect, revealAnswerOnIncorrect = false, showAnswerArrowOnIncorrect = false, allowRetryOnIncorrect = true, showRefutationOnIncorrect = false, autoShowWrongMoves = true, refutationEngine, answerArrowColor = DEFAULT_ANSWER_ARROW_COLOR, positionLocked = false, onMissFeedbackChange, recapBoard = null, }) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const [showAnswerArrow, setShowAnswerArrow] = useState(false);
     const [incorrectActive, setIncorrectActive] = useState(false);
     const attemptMissedRef = useRef(false);
@@ -182,6 +182,11 @@ const PuzzlePlaySurface = ({ position, onFeedback, incInteractionNum, boardWidth
         : useRefutation && incorrectActive
             ? missBoard.boardPosition
             : boardFen;
+    const lastMoveUci = isRecapping
+        ? recapBoard.lastMoveUci
+        : useRefutation && incorrectActive
+            ? missBoard.lastMoveUci
+            : ((_e = position === null || position === void 0 ? void 0 : position.getLastMoveUci()) !== null && _e !== void 0 ? _e : null);
     const missLocked = useRefutation &&
         incorrectActive &&
         (missBoard.boardAnimating ||
@@ -296,7 +301,7 @@ const PuzzlePlaySurface = ({ position, onFeedback, incInteractionNum, boardWidth
         showCorrectMove(targetSquare, finishCorrectFeedback);
         return true;
     };
-    return hasBoard ? (jsx(HighlightChessboard, { boardWidth: boardWidth, checkSquare: isRecapping ? '' : ((_e = position === null || position === void 0 ? void 0 : position.getCheckSquare()) !== null && _e !== void 0 ? _e : ''), hintSquare: isRecapping ? null : ((_f = position === null || position === void 0 ? void 0 : position.getHintSquare()) !== null && _f !== void 0 ? _f : null), incorrectMoveSquare: isRecapping ? null : overlayIncorrectSquare, refutationMoveSquare: isRecapping ? null : refutationMoveSquare, correctMoveSquare: isRecapping ? null : correctMoveSquare, customArrows: customArrows, lastMoveUci: isRecapping ? recapBoard.lastMoveUci : null, onPieceDrop: onPieceDrop, position: displayFen, boardOrientation: boardOrientation, arePiecesDraggable: arePiecesDraggable, areArrowsAllowed: false, promotionDialogVariant: "modal", animationDuration: isRecapping ? recapBoard.animationDuration : 0 }, revision)) : null;
+    return hasBoard ? (jsx(HighlightChessboard, { boardWidth: boardWidth, checkSquare: isRecapping ? '' : ((_f = position === null || position === void 0 ? void 0 : position.getCheckSquare()) !== null && _f !== void 0 ? _f : ''), hintSquare: isRecapping ? null : ((_g = position === null || position === void 0 ? void 0 : position.getHintSquare()) !== null && _g !== void 0 ? _g : null), incorrectMoveSquare: isRecapping ? null : overlayIncorrectSquare, refutationMoveSquare: isRecapping ? null : refutationMoveSquare, correctMoveSquare: isRecapping ? null : correctMoveSquare, customArrows: customArrows, lastMoveUci: lastMoveUci, onPieceDrop: onPieceDrop, position: displayFen, boardOrientation: boardOrientation, arePiecesDraggable: arePiecesDraggable, areArrowsAllowed: false, promotionDialogVariant: "modal", animationDuration: isRecapping ? recapBoard.animationDuration : 0 }, revision)) : null;
 };
 
 const PuzzleBoard = ({ position, onFeedback, incInteractionNum, boardWidth, revealAnswerOnIncorrect = false, showAnswerArrowOnIncorrect = false, allowRetryOnIncorrect = true, answerArrowColor, }) => (jsx(PuzzlePlaySurface, { position: position, onFeedback: onFeedback, incInteractionNum: incInteractionNum, boardWidth: boardWidth, revealAnswerOnIncorrect: revealAnswerOnIncorrect, showAnswerArrowOnIncorrect: showAnswerArrowOnIncorrect, allowRetryOnIncorrect: allowRetryOnIncorrect, answerArrowColor: answerArrowColor }));
@@ -512,6 +517,10 @@ class Position {
     getIndex() {
         return this.i;
     }
+    /** UCI of the move that produced the current position. */
+    getLastMoveUci() {
+        return lastMoveUciAtPly(this.moves, this.i);
+    }
     // Common methods shared by all positions
     next() {
         if (this.i >= this.moves.length) {
@@ -1181,10 +1190,12 @@ const PuzzleBoardWithControls = ({ theme, boardTheme, apiProxy, renderControls =
             window.clearTimeout(timer);
         };
     }, [completionCheckVisible]);
+    const analysis = usePuzzleAnalysis(position, resultStatus, puzzleNum);
     const shouldAutoAdvance = autoAdvanceOnComplete &&
         resultStatus === 'complete' &&
         !(hasIncorrectAttempt && !autoAdvanceOnCompleteAfterIncorrect) &&
-        (!showCompletionRecap || completionRecapDone);
+        (!showCompletionRecap || completionRecapDone) &&
+        !analysis.isOpen;
     const autoAdvance = usePuzzleAutoAdvanceCountdown(shouldAutoAdvance, autoAdvanceOnCompleteDelayMs, handleNextPuzzle);
     const controlState = {
         canShowHint: position !== null &&
@@ -1194,7 +1205,6 @@ const PuzzleBoardWithControls = ({ theme, boardTheme, apiProxy, renderControls =
         canShowSolution: position !== null &&
             (position.isSolutionRevealed() || !position.isFinished()),
     };
-    const analysis = usePuzzleAnalysis(position, resultStatus, puzzleNum);
     const analysisSnapshot = analysis.isOpen && analysis.snapshot ? analysis.snapshot : null;
     const resolvedAnalysisBoardWidth = analysisBoardWidth !== null && analysisBoardWidth !== void 0 ? analysisBoardWidth : analysisLayout.boardWidth;
     const useHostAnalysisUi = Boolean(renderAnalysisSidebar &&

package/dist/index.js

@@ -62,7 +62,7 @@ const EMPTY_BOARD_FEN = '8/8/8/8/8/8/8/8 w - - 0 1';
  * visible while the next position loads so layout and perspective do not flicker.
  */
 const PuzzlePlaySurface = ({ position, onFeedback, incInteractionNum, boardWidth, onResumeCorrect, revealAnswerOnIncorrect = false, showAnswerArrowOnIncorrect = false, allowRetryOnIncorrect = true, showRefutationOnIncorrect = false, autoShowWrongMoves = true, refutationEngine, answerArrowColor = reactChessCore.DEFAULT_ANSWER_ARROW_COLOR, positionLocked = false, onMissFeedbackChange, recapBoard = null, }) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const [showAnswerArrow, setShowAnswerArrow] = react.useState(false);
     const [incorrectActive, setIncorrectActive] = react.useState(false);
     const attemptMissedRef = react.useRef(false);
@@ -183,6 +183,11 @@ const PuzzlePlaySurface = ({ position, onFeedback, incInteractionNum, boardWidth
         : useRefutation && incorrectActive
             ? missBoard.boardPosition
             : boardFen;
+    const lastMoveUci = isRecapping
+        ? recapBoard.lastMoveUci
+        : useRefutation && incorrectActive
+            ? missBoard.lastMoveUci
+            : ((_e = position === null || position === void 0 ? void 0 : position.getLastMoveUci()) !== null && _e !== void 0 ? _e : null);
     const missLocked = useRefutation &&
         incorrectActive &&
         (missBoard.boardAnimating ||
@@ -297,7 +302,7 @@ const PuzzlePlaySurface = ({ position, onFeedback, incInteractionNum, boardWidth
         showCorrectMove(targetSquare, finishCorrectFeedback);
         return true;
     };
-    return hasBoard ? (jsxRuntime.jsx(reactChessCore.HighlightChessboard, { boardWidth: boardWidth, checkSquare: isRecapping ? '' : ((_e = position === null || position === void 0 ? void 0 : position.getCheckSquare()) !== null && _e !== void 0 ? _e : ''), hintSquare: isRecapping ? null : ((_f = position === null || position === void 0 ? void 0 : position.getHintSquare()) !== null && _f !== void 0 ? _f : null), incorrectMoveSquare: isRecapping ? null : overlayIncorrectSquare, refutationMoveSquare: isRecapping ? null : refutationMoveSquare, correctMoveSquare: isRecapping ? null : correctMoveSquare, customArrows: customArrows, lastMoveUci: isRecapping ? recapBoard.lastMoveUci : null, onPieceDrop: onPieceDrop, position: displayFen, boardOrientation: boardOrientation, arePiecesDraggable: arePiecesDraggable, areArrowsAllowed: false, promotionDialogVariant: "modal", animationDuration: isRecapping ? recapBoard.animationDuration : 0 }, revision)) : null;
+    return hasBoard ? (jsxRuntime.jsx(reactChessCore.HighlightChessboard, { boardWidth: boardWidth, checkSquare: isRecapping ? '' : ((_f = position === null || position === void 0 ? void 0 : position.getCheckSquare()) !== null && _f !== void 0 ? _f : ''), hintSquare: isRecapping ? null : ((_g = position === null || position === void 0 ? void 0 : position.getHintSquare()) !== null && _g !== void 0 ? _g : null), incorrectMoveSquare: isRecapping ? null : overlayIncorrectSquare, refutationMoveSquare: isRecapping ? null : refutationMoveSquare, correctMoveSquare: isRecapping ? null : correctMoveSquare, customArrows: customArrows, lastMoveUci: lastMoveUci, onPieceDrop: onPieceDrop, position: displayFen, boardOrientation: boardOrientation, arePiecesDraggable: arePiecesDraggable, areArrowsAllowed: false, promotionDialogVariant: "modal", animationDuration: isRecapping ? recapBoard.animationDuration : 0 }, revision)) : null;
 };
 
 const PuzzleBoard = ({ position, onFeedback, incInteractionNum, boardWidth, revealAnswerOnIncorrect = false, showAnswerArrowOnIncorrect = false, allowRetryOnIncorrect = true, answerArrowColor, }) => (jsxRuntime.jsx(PuzzlePlaySurface, { position: position, onFeedback: onFeedback, incInteractionNum: incInteractionNum, boardWidth: boardWidth, revealAnswerOnIncorrect: revealAnswerOnIncorrect, showAnswerArrowOnIncorrect: showAnswerArrowOnIncorrect, allowRetryOnIncorrect: allowRetryOnIncorrect, answerArrowColor: answerArrowColor }));
@@ -513,6 +518,10 @@ class Position {
     getIndex() {
         return this.i;
     }
+    /** UCI of the move that produced the current position. */
+    getLastMoveUci() {
+        return reactChessCore.lastMoveUciAtPly(this.moves, this.i);
+    }
     // Common methods shared by all positions
     next() {
         if (this.i >= this.moves.length) {
@@ -1182,10 +1191,12 @@ const PuzzleBoardWithControls = ({ theme, boardTheme, apiProxy, renderControls =
             window.clearTimeout(timer);
         };
     }, [completionCheckVisible]);
+    const analysis = usePuzzleAnalysis(position, resultStatus, puzzleNum);
     const shouldAutoAdvance = autoAdvanceOnComplete &&
         resultStatus === 'complete' &&
         !(hasIncorrectAttempt && !autoAdvanceOnCompleteAfterIncorrect) &&
-        (!showCompletionRecap || completionRecapDone);
+        (!showCompletionRecap || completionRecapDone) &&
+        !analysis.isOpen;
     const autoAdvance = usePuzzleAutoAdvanceCountdown(shouldAutoAdvance, autoAdvanceOnCompleteDelayMs, handleNextPuzzle);
     const controlState = {
         canShowHint: position !== null &&
@@ -1195,7 +1206,6 @@ const PuzzleBoardWithControls = ({ theme, boardTheme, apiProxy, renderControls =
         canShowSolution: position !== null &&
             (position.isSolutionRevealed() || !position.isFinished()),
     };
-    const analysis = usePuzzleAnalysis(position, resultStatus, puzzleNum);
     const analysisSnapshot = analysis.isOpen && analysis.snapshot ? analysis.snapshot : null;
     const resolvedAnalysisBoardWidth = analysisBoardWidth !== null && analysisBoardWidth !== void 0 ? analysisBoardWidth : analysisLayout.boardWidth;
     const useHostAnalysisUi = Boolean(renderAnalysisSidebar &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-chess-puzzle-kit",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "React chess puzzle kit: play, controls, analysis, and browser Stockfish for endchess.training and other apps",
   "license": "MIT",
   "author": "Robert Blackwell",
@@ -68,11 +68,13 @@
     "@storybook/react": "^8.2.9",
     "@storybook/react-vite": "^8.2.9",
     "@storybook/test": "^8.2.9",
+    "@testing-library/react": "^16.0.1",
     "@types/jest": "^29.5.12",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "chess.js": "^1.0.0-beta.8",
     "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
     "react": "^18.3.1",
     "react-chess-core": "^0.1.8",
     "react-chessboard": "^4.7.1",