react-chess-core 0.1.3 → 0.1.5

package/dist/features/analysis/core/AnalysisPosition.d.ts

@@ -49,6 +49,7 @@ export declare class AnalysisPosition {
         from: string;
         to: string;
     } | null;
+    getLastMoveUci(): string | null;
     fen(): string;
     getCheckSquare(): string;
 }

package/dist/features/analysis/core/useAnalysisBoardModel.d.ts

@@ -25,6 +25,7 @@ export type AnalysisBoardModel = {
         from: string;
         to: string;
     } | null;
+    lastMoveUci: string | null;
     checkSquare: string | null;
     onSelectPly: (ply: number) => void;
     onSelectHistoryRow: (row: AnalysisHistoryRow) => void;

package/dist/features/chessboard/HighlightChessboard.d.ts

@@ -4,8 +4,12 @@ export interface HighlightChessboardProps {
     incorrectMoveSquare: string | null;
     /** Destination square of the last correct training move — shows a green check. */
     correctMoveSquare?: string | null;
+    /** UCI of the move that led to the current position (shows a last-move arrow). */
+    lastMoveUci?: string | null;
+    /** Override the default last-move arrow color. */
+    lastMoveArrowColor?: string;
     /** Enable click-to-move when `onPieceDrop` is provided. Defaults to true. */
     clickToMove?: boolean;
     [key: string]: any;
 }
-export declare const HighlightChessboard: ({ checkSquare, hintSquare, incorrectMoveSquare, correctMoveSquare, clickToMove, customSquareStyles: extraSquareStyles, customBoardStyle, onPieceDrop, position, arePiecesDraggable, autoPromoteToQueen, isDraggablePiece, onPromotionCheck, onSquareClick, onPromotionPieceSelect, onPieceDragBegin, showPromotionDialog: showPromotionDialogProp, promotionToSquare: promotionToSquareProp, ...props }: HighlightChessboardProps) => import("react").JSX.Element;
+export declare const HighlightChessboard: ({ checkSquare, hintSquare, incorrectMoveSquare, correctMoveSquare, lastMoveUci, lastMoveArrowColor, clickToMove, customSquareStyles: extraSquareStyles, customArrows, customBoardStyle, onPieceDrop, position, arePiecesDraggable, autoPromoteToQueen, isDraggablePiece, onPromotionCheck, onSquareClick, onPromotionPieceSelect, onPieceDragBegin, showPromotionDialog: showPromotionDialogProp, promotionToSquare: promotionToSquareProp, ...props }: HighlightChessboardProps) => import("react").JSX.Element;

package/dist/features/chessboard/index.d.ts

@@ -4,3 +4,4 @@ export * from './ChessboardDnDProvider';
 export * from './HighlightChessboard';
 export * from './CorrectMoveCheckBadge';
 export * from './boardSquareHighlightColors';
+export * from './lastMoveArrow';

package/dist/features/chessboard/lastMoveArrow.d.ts

@@ -0,0 +1,8 @@
+export type ChessboardArrow = [string, string, string];
+/** Subtle green arrow visible on light and dark boards (Lichess-style). */
+export declare const DEFAULT_LAST_MOVE_ARROW_COLOR = "rgba(155, 199, 0, 0.85)";
+export declare const uciToArrow: (uci: string, color?: string) => ChessboardArrow;
+export declare const lastMoveArrowFromUci: (uci: string | null | undefined, color?: string) => ChessboardArrow[];
+/** UCI of the move that produced the position at {@link plyIndex}. */
+export declare const lastMoveUciAtPly: (movesUci: readonly string[], plyIndex: number) => string | null;
+export declare const mergeCustomArrowsWithLastMove: (customArrows: ChessboardArrow[] | undefined, lastMoveUci: string | null | undefined, lastMoveArrowColor?: string) => ChessboardArrow[];

package/dist/features/training/miss/missDisplay.d.ts

@@ -7,6 +7,7 @@ export type MissSequenceState = {
 export type MissDisplay = {
     fen: string | null;
     arrows: [string, string, string][];
+    lastMoveUci: string | null;
     animating: boolean;
 };
 export declare const MISS_WRONG_PAUSE_MS = 450;

package/dist/features/training/miss/useMissBoard.d.ts

@@ -19,6 +19,7 @@ export declare function useMissBoard({ feedback, expectedUci, positionFen, answe
     customArrows: [string, string, string][];
     boardPosition: string;
     boardAnimating: boolean;
+    lastMoveUci: string | null;
     wrapDropHandler: (onDrop: (source: string, target: string, piece: string) => boolean, { enabled, dropFen, expectedMoveUci, }: {
         enabled: boolean;
         dropFen?: string;

package/dist/index.esm.js

@@ -1781,6 +1781,31 @@ function createFeedbackSquareRenderer(correctMoveSquare) {
     };
 }
 
+/** Subtle green arrow visible on light and dark boards (Lichess-style). */
+const DEFAULT_LAST_MOVE_ARROW_COLOR = 'rgba(155, 199, 0, 0.85)';
+const uciToArrow = (uci, color = DEFAULT_LAST_MOVE_ARROW_COLOR) => [uci.slice(0, 2), uci.slice(2, 4), color];
+const lastMoveArrowFromUci = (uci, color = DEFAULT_LAST_MOVE_ARROW_COLOR) => {
+    if (!uci || uci.length < 4) {
+        return [];
+    }
+    return [uciToArrow(uci, color)];
+};
+/** UCI of the move that produced the position at {@link plyIndex}. */
+const lastMoveUciAtPly = (movesUci, plyIndex) => {
+    var _a;
+    if (plyIndex <= 0) {
+        return null;
+    }
+    return (_a = movesUci[plyIndex - 1]) !== null && _a !== void 0 ? _a : null;
+};
+const mergeCustomArrowsWithLastMove = (customArrows, lastMoveUci, lastMoveArrowColor) => {
+    const lastMove = lastMoveArrowFromUci(lastMoveUci, lastMoveArrowColor);
+    if (!lastMove.length) {
+        return customArrows !== null && customArrows !== void 0 ? customArrows : [];
+    }
+    return [...lastMove, ...(customArrows !== null && customArrows !== void 0 ? customArrows : [])];
+};
+
 function defaultPromotionCheck(sourceSquare, targetSquare, piece) {
     return (((piece === 'wP' && sourceSquare[1] === '7' && targetSquare[1] === '8') ||
         (piece === 'bP' && sourceSquare[1] === '2' && targetSquare[1] === '1')) &&
@@ -1953,7 +1978,7 @@ const getFeedbackHighlighting = (hintSquare, incorrectMoveSquare) => {
     return styles;
 };
 const HighlightChessboard = (_a) => {
-    var { checkSquare, hintSquare, incorrectMoveSquare, correctMoveSquare = null, clickToMove, customSquareStyles: extraSquareStyles, customBoardStyle, onPieceDrop, position, arePiecesDraggable, autoPromoteToQueen, isDraggablePiece, onPromotionCheck, onSquareClick, onPromotionPieceSelect, onPieceDragBegin, showPromotionDialog: showPromotionDialogProp, promotionToSquare: promotionToSquareProp } = _a, props = __rest(_a, ["checkSquare", "hintSquare", "incorrectMoveSquare", "correctMoveSquare", "clickToMove", "customSquareStyles", "customBoardStyle", "onPieceDrop", "position", "arePiecesDraggable", "autoPromoteToQueen", "isDraggablePiece", "onPromotionCheck", "onSquareClick", "onPromotionPieceSelect", "onPieceDragBegin", "showPromotionDialog", "promotionToSquare"]);
+    var { checkSquare, hintSquare, incorrectMoveSquare, correctMoveSquare = null, lastMoveUci = null, lastMoveArrowColor, clickToMove, customSquareStyles: extraSquareStyles, customArrows, customBoardStyle, onPieceDrop, position, arePiecesDraggable, autoPromoteToQueen, isDraggablePiece, onPromotionCheck, onSquareClick, onPromotionPieceSelect, onPieceDragBegin, showPromotionDialog: showPromotionDialogProp, promotionToSquare: promotionToSquareProp } = _a, props = __rest(_a, ["checkSquare", "hintSquare", "incorrectMoveSquare", "correctMoveSquare", "lastMoveUci", "lastMoveArrowColor", "clickToMove", "customSquareStyles", "customArrows", "customBoardStyle", "onPieceDrop", "position", "arePiecesDraggable", "autoPromoteToQueen", "isDraggablePiece", "onPromotionCheck", "onSquareClick", "onPromotionPieceSelect", "onPieceDragBegin", "showPromotionDialog", "promotionToSquare"]);
     const { customDarkSquareStyle, customLightSquareStyle } = useChessboardTheme();
     const clickToMoveEnabled = clickToMove !== false && typeof onPieceDrop === 'function';
     const { clickSquareStyles, handleSquareClick, handlePromotionPieceSelect, handlePieceDragBegin, showPromotionDialog: clickPromotionDialog, promotionToSquare: clickPromotionToSquare, } = useClickToMove({
@@ -1974,6 +1999,7 @@ const HighlightChessboard = (_a) => {
     const customSquare = useMemo(() => correctMoveSquare
         ? createFeedbackSquareRenderer(correctMoveSquare)
         : undefined, [correctMoveSquare]);
+    const mergedCustomArrows = useMemo(() => mergeCustomArrowsWithLastMove(customArrows, lastMoveUci, lastMoveArrowColor), [customArrows, lastMoveArrowColor, lastMoveUci]);
     const promotionControlProps = clickPromotionDialog
         ? {
             showPromotionDialog: true,
@@ -1986,7 +2012,7 @@ const HighlightChessboard = (_a) => {
                 promotionToSquare: promotionToSquareProp,
             }
             : {};
-    return (jsx(Chessboard, Object.assign({ customDarkSquareStyle: customDarkSquareStyle, customLightSquareStyle: customLightSquareStyle, customSquareStyles: customSquareStyles, customSquare: customSquare, customBoardStyle: Object.assign(Object.assign({}, nonSelectableBoardStyle), customBoardStyle), position: position, arePiecesDraggable: arePiecesDraggable, autoPromoteToQueen: autoPromoteToQueen, isDraggablePiece: isDraggablePiece, onPromotionCheck: onPromotionCheck, onPieceDrop: onPieceDrop, onSquareClick: clickToMoveEnabled ? handleSquareClick : onSquareClick, onPromotionPieceSelect: clickToMoveEnabled ? handlePromotionPieceSelect : onPromotionPieceSelect, onPieceDragBegin: clickToMoveEnabled ? handlePieceDragBegin : onPieceDragBegin }, promotionControlProps, props)));
+    return (jsx(Chessboard, Object.assign({ customDarkSquareStyle: customDarkSquareStyle, customLightSquareStyle: customLightSquareStyle, customSquareStyles: customSquareStyles, customSquare: customSquare, customBoardStyle: Object.assign(Object.assign({}, nonSelectableBoardStyle), customBoardStyle), position: position, arePiecesDraggable: arePiecesDraggable, autoPromoteToQueen: autoPromoteToQueen, isDraggablePiece: isDraggablePiece, onPromotionCheck: onPromotionCheck, onPieceDrop: onPieceDrop, onSquareClick: clickToMoveEnabled ? handleSquareClick : onSquareClick, onPromotionPieceSelect: clickToMoveEnabled ? handlePromotionPieceSelect : onPromotionPieceSelect, onPieceDragBegin: clickToMoveEnabled ? handlePieceDragBegin : onPieceDragBegin, customArrows: mergedCustomArrows }, promotionControlProps, props)));
 };
 
 const emptyEngineEvaluation = () => ({
@@ -2914,9 +2940,7 @@ const PlyNavigation = ({ plyIndex, totalPly, canPrev, canNext, onGoFirst, onGoPr
 /** Draggable analysis board (no surrounding layout chrome). */
 const AnalysisChessboardView = ({ model }) => {
     var _a;
-    return (jsx(ChessboardDnDProvider, { children: jsx(HighlightChessboard, { checkSquare: (_a = model.checkSquare) !== null && _a !== void 0 ? _a : '', hintSquare: null, incorrectMoveSquare: null, position: model.fen, boardOrientation: model.boardOrientation, boardWidth: model.boardWidth, arePiecesDraggable: true, onPieceDrop: model.onPieceDrop, promotionDialogVariant: "modal", customSquareStyles: model.lastMove
-                ? getLastMoveSquareStyles(model.lastMove.from, model.lastMove.to, model.theme)
-                : {} }) }));
+    return (jsx(ChessboardDnDProvider, { children: jsx(HighlightChessboard, { checkSquare: (_a = model.checkSquare) !== null && _a !== void 0 ? _a : '', hintSquare: null, incorrectMoveSquare: null, position: model.fen, boardOrientation: model.boardOrientation, boardWidth: model.boardWidth, arePiecesDraggable: true, onPieceDrop: model.onPieceDrop, promotionDialogVariant: "modal", lastMoveUci: model.lastMoveUci }) }));
 };
 
 class AnalysisPosition {
@@ -3172,22 +3196,26 @@ class AnalysisPosition {
         return true;
     }
     getLastMoveSquares() {
-        const navPly = this.getNavPly();
-        if (navPly === 0) {
+        const uci = this.getLastMoveUci();
+        if (!uci) {
             return null;
         }
-        let uci;
-        if (this.variation && this.variationCursor > 0) {
-            uci = this.variation.moves[this.variationCursor - 1];
-        }
-        else {
-            uci = this.solutionMoves[this.mainPly - 1];
-        }
         return {
             from: uci.slice(0, 2),
             to: uci.slice(2, 4),
         };
     }
+    getLastMoveUci() {
+        var _a;
+        const navPly = this.getNavPly();
+        if (navPly === 0) {
+            return null;
+        }
+        if (this.variation && this.variationCursor > 0) {
+            return this.variation.moves[this.variationCursor - 1];
+        }
+        return (_a = this.solutionMoves[this.mainPly - 1]) !== null && _a !== void 0 ? _a : null;
+    }
     fen() {
         return this.chess.fen();
     }
@@ -3197,7 +3225,7 @@ class AnalysisPosition {
 }
 
 const useAnalysisBoardModel = ({ analysisContext, onClose, theme, boardWidth, engine, }) => {
-    var _a, _b, _c, _d;
+    var _a;
     const skipBackdropCloseRef = useRef(true);
     const analysisPosition = useMemo(() => new AnalysisPosition(analysisContext), [analysisContext]);
     const [navRevision, setNavRevision] = useState(0);
@@ -3213,12 +3241,7 @@ const useAnalysisBoardModel = ({ analysisContext, onClose, theme, boardWidth, en
     }, [analysisContext, analysisPosition]);
     const fen = analysisPosition.fen();
     const engineEnabled = (_a = engine === null || engine === void 0 ? void 0 : engine.enabled) !== null && _a !== void 0 ? _a : true;
-    const engineEvaluation = useAnalysisEngine(fen, {
-        enabled: engineEnabled,
-        depth: (_b = engine === null || engine === void 0 ? void 0 : engine.depth) !== null && _b !== void 0 ? _b : 16,
-        multiPv: (_c = engine === null || engine === void 0 ? void 0 : engine.multiPv) !== null && _c !== void 0 ? _c : 2,
-        scriptUrl: (_d = engine === null || engine === void 0 ? void 0 : engine.scriptUrl) !== null && _d !== void 0 ? _d : DEFAULT_STOCKFISH_SCRIPT_URL,
-    });
+    const engineEvaluation = useAnalysisEngine(fen, Object.assign(Object.assign({ depth: 16, multiPv: 2, scriptUrl: DEFAULT_STOCKFISH_SCRIPT_URL }, engine), { enabled: engineEnabled }));
     return {
         theme,
         boardWidth,
@@ -3232,6 +3255,7 @@ const useAnalysisBoardModel = ({ analysisContext, onClose, theme, boardWidth, en
         engineEvaluation,
         engineEnabled,
         lastMove: analysisPosition.getLastMoveSquares(),
+        lastMoveUci: analysisPosition.getLastMoveUci(),
         checkSquare: analysisPosition.getCheckSquare(),
         onSelectPly: (ply) => {
             analysisPosition.goToNavPly(ply);
@@ -3846,6 +3870,7 @@ function getMissDisplay(sequence, expectedUci, refutationUci, answerArrowColor)
         return {
             fen: null,
             arrows: [],
+            lastMoveUci: null,
             animating: false,
         };
     }
@@ -3856,6 +3881,7 @@ function getMissDisplay(sequence, expectedUci, refutationUci, answerArrowColor)
             return {
                 fen: fenAfterWrong !== null && fenAfterWrong !== void 0 ? fenAfterWrong : setupFen,
                 arrows: [],
+                lastMoveUci: attemptedUci,
                 animating: false,
             };
         case 'refutation': {
@@ -3865,6 +3891,7 @@ function getMissDisplay(sequence, expectedUci, refutationUci, answerArrowColor)
             return {
                 fen: (_a = fenAfterRefutation !== null && fenAfterRefutation !== void 0 ? fenAfterRefutation : fenAfterWrong) !== null && _a !== void 0 ? _a : setupFen,
                 arrows: [],
+                lastMoveUci: refutationUci,
                 animating: Boolean(fenAfterRefutation),
             };
         }
@@ -3872,18 +3899,21 @@ function getMissDisplay(sequence, expectedUci, refutationUci, answerArrowColor)
             return {
                 fen: setupFen,
                 arrows: [],
+                lastMoveUci: null,
                 animating: false,
             };
         case 'answer':
             return {
                 fen: setupFen,
                 arrows: expectedMoveArrow(expectedUci, answerArrowColor),
+                lastMoveUci: null,
                 animating: false,
             };
         default:
             return {
                 fen: setupFen,
                 arrows: [],
+                lastMoveUci: null,
                 animating: false,
             };
     }
@@ -4056,8 +4086,9 @@ function useMissBoard({ feedback, expectedUci, positionFen, answerArrowColor, au
         customArrows,
         boardPosition,
         boardAnimating: missSequence.display.animating,
+        lastMoveUci: missSequence.display.lastMoveUci,
         wrapDropHandler,
     };
 }
 
-export { AnalysisBoard, AnalysisBoardCore, AnalysisBoardCoreView, AnalysisBoardLayout, AnalysisChessboardView, AnalysisEngineProvider, AnalysisErrorBoundary, AnalysisPosition, BOARD_THEMES, BOARD_THEME_IDS, CORRECT_MOVE_FEEDBACK_MS, ChessboardDnDProvider, ChessboardThemeContext, CorrectMoveCheckBadge, DEFAULT_ANALYSIS_LAYOUT, DEFAULT_BOARD_THEME, DEFAULT_STOCKFISH_SCRIPT_URL, DefaultAnalysisContainer, DefaultAnalysisSidebar, DefaultPlyNavigation, EngineEvaluationPanel, HighlightChessboard, MISS_MOVE_ANIMATION_MS, MISS_REFUTATION_MAX_WAIT_MS, MISS_REFUTATION_PAUSE_MS, MISS_WRONG_PAUSE_MS, PlyNavigation, REFUTATION_EVAL_GAP_CP, REFUTATION_EVAL_GAP_PAWNS, StockfishBrowserEngine, ThemeProvider, analysisBoardHighlightColors, analysisSidebarColors, applyUciMove, boardSquareHighlightColors, boardThemeFromLegacyUiTheme, createExpectedMoveDropHandler, createSidebarRowBandCounters, defaultRenderPlyNavigation, emptyEngineEvaluation, evaluateExpectedMoveDrop, fenAfterUci, formatEvaluation, formatPvPreview, getAnalysisModalStyles, getBoardThemeStyles, getCheckSquareFromChess, getLastMoveSquareStyles, getMissDisplay, getSidebarRowBackground, getStylesForTheme, isAnalyzableFen, isBoardThemeId, isEditableKeyboardTarget, lineEvalCpForGap, matchesExpectedUci, navButtonStyle, navRowStyle, normalizeEvalForWhite, normalizePvMoves, normalizeSubscriberOptions, parseUciInfoLine, parseUciMove, plyLabelStyle, palette as plyNavigationPalette, refutationEngineOptions, refutationEvalGapCp, refutationFromEvaluation, resolveStockfishScriptUrl, resolveStockfishWasmUrl, resolveStockfishWorkerUrl, scrubberInputStyle, splitWorkerLines, uciFromDrop, uciPvToSan, useAnalysisBoardModel, useAnalysisEngine, useAnalysisEngineContext, useBoardRevision, useChessboardTheme, useCorrectMoveFeedback, useMissBoard, useMissRefutation, useMissSequence, usePositionKeyboardNav, useTheme };
+export { AnalysisBoard, AnalysisBoardCore, AnalysisBoardCoreView, AnalysisBoardLayout, AnalysisChessboardView, AnalysisEngineProvider, AnalysisErrorBoundary, AnalysisPosition, BOARD_THEMES, BOARD_THEME_IDS, CORRECT_MOVE_FEEDBACK_MS, ChessboardDnDProvider, ChessboardThemeContext, CorrectMoveCheckBadge, DEFAULT_ANALYSIS_LAYOUT, DEFAULT_BOARD_THEME, DEFAULT_LAST_MOVE_ARROW_COLOR, DEFAULT_STOCKFISH_SCRIPT_URL, DefaultAnalysisContainer, DefaultAnalysisSidebar, DefaultPlyNavigation, EngineEvaluationPanel, HighlightChessboard, MISS_MOVE_ANIMATION_MS, MISS_REFUTATION_MAX_WAIT_MS, MISS_REFUTATION_PAUSE_MS, MISS_WRONG_PAUSE_MS, PlyNavigation, REFUTATION_EVAL_GAP_CP, REFUTATION_EVAL_GAP_PAWNS, StockfishBrowserEngine, ThemeProvider, analysisBoardHighlightColors, analysisSidebarColors, applyUciMove, boardSquareHighlightColors, boardThemeFromLegacyUiTheme, createExpectedMoveDropHandler, createSidebarRowBandCounters, defaultRenderPlyNavigation, emptyEngineEvaluation, evaluateExpectedMoveDrop, fenAfterUci, formatEvaluation, formatPvPreview, getAnalysisModalStyles, getBoardThemeStyles, getCheckSquareFromChess, getLastMoveSquareStyles, getMissDisplay, getSidebarRowBackground, getStylesForTheme, isAnalyzableFen, isBoardThemeId, isEditableKeyboardTarget, lastMoveArrowFromUci, lastMoveUciAtPly, lineEvalCpForGap, matchesExpectedUci, mergeCustomArrowsWithLastMove, navButtonStyle, navRowStyle, normalizeEvalForWhite, normalizePvMoves, normalizeSubscriberOptions, parseUciInfoLine, parseUciMove, plyLabelStyle, palette as plyNavigationPalette, refutationEngineOptions, refutationEvalGapCp, refutationFromEvaluation, resolveStockfishScriptUrl, resolveStockfishWasmUrl, resolveStockfishWorkerUrl, scrubberInputStyle, splitWorkerLines, uciFromDrop, uciPvToSan, uciToArrow, useAnalysisBoardModel, useAnalysisEngine, useAnalysisEngineContext, useBoardRevision, useChessboardTheme, useCorrectMoveFeedback, useMissBoard, useMissRefutation, useMissSequence, usePositionKeyboardNav, useTheme };

package/dist/index.js

@@ -1783,6 +1783,31 @@ function createFeedbackSquareRenderer(correctMoveSquare) {
     };
 }
 
+/** Subtle green arrow visible on light and dark boards (Lichess-style). */
+const DEFAULT_LAST_MOVE_ARROW_COLOR = 'rgba(155, 199, 0, 0.85)';
+const uciToArrow = (uci, color = DEFAULT_LAST_MOVE_ARROW_COLOR) => [uci.slice(0, 2), uci.slice(2, 4), color];
+const lastMoveArrowFromUci = (uci, color = DEFAULT_LAST_MOVE_ARROW_COLOR) => {
+    if (!uci || uci.length < 4) {
+        return [];
+    }
+    return [uciToArrow(uci, color)];
+};
+/** UCI of the move that produced the position at {@link plyIndex}. */
+const lastMoveUciAtPly = (movesUci, plyIndex) => {
+    var _a;
+    if (plyIndex <= 0) {
+        return null;
+    }
+    return (_a = movesUci[plyIndex - 1]) !== null && _a !== void 0 ? _a : null;
+};
+const mergeCustomArrowsWithLastMove = (customArrows, lastMoveUci, lastMoveArrowColor) => {
+    const lastMove = lastMoveArrowFromUci(lastMoveUci, lastMoveArrowColor);
+    if (!lastMove.length) {
+        return customArrows !== null && customArrows !== void 0 ? customArrows : [];
+    }
+    return [...lastMove, ...(customArrows !== null && customArrows !== void 0 ? customArrows : [])];
+};
+
 function defaultPromotionCheck(sourceSquare, targetSquare, piece) {
     return (((piece === 'wP' && sourceSquare[1] === '7' && targetSquare[1] === '8') ||
         (piece === 'bP' && sourceSquare[1] === '2' && targetSquare[1] === '1')) &&
@@ -1955,7 +1980,7 @@ const getFeedbackHighlighting = (hintSquare, incorrectMoveSquare) => {
     return styles;
 };
 const HighlightChessboard = (_a) => {
-    var { checkSquare, hintSquare, incorrectMoveSquare, correctMoveSquare = null, clickToMove, customSquareStyles: extraSquareStyles, customBoardStyle, onPieceDrop, position, arePiecesDraggable, autoPromoteToQueen, isDraggablePiece, onPromotionCheck, onSquareClick, onPromotionPieceSelect, onPieceDragBegin, showPromotionDialog: showPromotionDialogProp, promotionToSquare: promotionToSquareProp } = _a, props = __rest(_a, ["checkSquare", "hintSquare", "incorrectMoveSquare", "correctMoveSquare", "clickToMove", "customSquareStyles", "customBoardStyle", "onPieceDrop", "position", "arePiecesDraggable", "autoPromoteToQueen", "isDraggablePiece", "onPromotionCheck", "onSquareClick", "onPromotionPieceSelect", "onPieceDragBegin", "showPromotionDialog", "promotionToSquare"]);
+    var { checkSquare, hintSquare, incorrectMoveSquare, correctMoveSquare = null, lastMoveUci = null, lastMoveArrowColor, clickToMove, customSquareStyles: extraSquareStyles, customArrows, customBoardStyle, onPieceDrop, position, arePiecesDraggable, autoPromoteToQueen, isDraggablePiece, onPromotionCheck, onSquareClick, onPromotionPieceSelect, onPieceDragBegin, showPromotionDialog: showPromotionDialogProp, promotionToSquare: promotionToSquareProp } = _a, props = __rest(_a, ["checkSquare", "hintSquare", "incorrectMoveSquare", "correctMoveSquare", "lastMoveUci", "lastMoveArrowColor", "clickToMove", "customSquareStyles", "customArrows", "customBoardStyle", "onPieceDrop", "position", "arePiecesDraggable", "autoPromoteToQueen", "isDraggablePiece", "onPromotionCheck", "onSquareClick", "onPromotionPieceSelect", "onPieceDragBegin", "showPromotionDialog", "promotionToSquare"]);
     const { customDarkSquareStyle, customLightSquareStyle } = useChessboardTheme();
     const clickToMoveEnabled = clickToMove !== false && typeof onPieceDrop === 'function';
     const { clickSquareStyles, handleSquareClick, handlePromotionPieceSelect, handlePieceDragBegin, showPromotionDialog: clickPromotionDialog, promotionToSquare: clickPromotionToSquare, } = useClickToMove({
@@ -1976,6 +2001,7 @@ const HighlightChessboard = (_a) => {
     const customSquare = react.useMemo(() => correctMoveSquare
         ? createFeedbackSquareRenderer(correctMoveSquare)
         : undefined, [correctMoveSquare]);
+    const mergedCustomArrows = react.useMemo(() => mergeCustomArrowsWithLastMove(customArrows, lastMoveUci, lastMoveArrowColor), [customArrows, lastMoveArrowColor, lastMoveUci]);
     const promotionControlProps = clickPromotionDialog
         ? {
             showPromotionDialog: true,
@@ -1988,7 +2014,7 @@ const HighlightChessboard = (_a) => {
                 promotionToSquare: promotionToSquareProp,
             }
             : {};
-    return (jsxRuntime.jsx(reactChessboard.Chessboard, Object.assign({ customDarkSquareStyle: customDarkSquareStyle, customLightSquareStyle: customLightSquareStyle, customSquareStyles: customSquareStyles, customSquare: customSquare, customBoardStyle: Object.assign(Object.assign({}, nonSelectableBoardStyle), customBoardStyle), position: position, arePiecesDraggable: arePiecesDraggable, autoPromoteToQueen: autoPromoteToQueen, isDraggablePiece: isDraggablePiece, onPromotionCheck: onPromotionCheck, onPieceDrop: onPieceDrop, onSquareClick: clickToMoveEnabled ? handleSquareClick : onSquareClick, onPromotionPieceSelect: clickToMoveEnabled ? handlePromotionPieceSelect : onPromotionPieceSelect, onPieceDragBegin: clickToMoveEnabled ? handlePieceDragBegin : onPieceDragBegin }, promotionControlProps, props)));
+    return (jsxRuntime.jsx(reactChessboard.Chessboard, Object.assign({ customDarkSquareStyle: customDarkSquareStyle, customLightSquareStyle: customLightSquareStyle, customSquareStyles: customSquareStyles, customSquare: customSquare, customBoardStyle: Object.assign(Object.assign({}, nonSelectableBoardStyle), customBoardStyle), position: position, arePiecesDraggable: arePiecesDraggable, autoPromoteToQueen: autoPromoteToQueen, isDraggablePiece: isDraggablePiece, onPromotionCheck: onPromotionCheck, onPieceDrop: onPieceDrop, onSquareClick: clickToMoveEnabled ? handleSquareClick : onSquareClick, onPromotionPieceSelect: clickToMoveEnabled ? handlePromotionPieceSelect : onPromotionPieceSelect, onPieceDragBegin: clickToMoveEnabled ? handlePieceDragBegin : onPieceDragBegin, customArrows: mergedCustomArrows }, promotionControlProps, props)));
 };
 
 const emptyEngineEvaluation = () => ({
@@ -2916,9 +2942,7 @@ const PlyNavigation = ({ plyIndex, totalPly, canPrev, canNext, onGoFirst, onGoPr
 /** Draggable analysis board (no surrounding layout chrome). */
 const AnalysisChessboardView = ({ model }) => {
     var _a;
-    return (jsxRuntime.jsx(ChessboardDnDProvider, { children: jsxRuntime.jsx(HighlightChessboard, { checkSquare: (_a = model.checkSquare) !== null && _a !== void 0 ? _a : '', hintSquare: null, incorrectMoveSquare: null, position: model.fen, boardOrientation: model.boardOrientation, boardWidth: model.boardWidth, arePiecesDraggable: true, onPieceDrop: model.onPieceDrop, promotionDialogVariant: "modal", customSquareStyles: model.lastMove
-                ? getLastMoveSquareStyles(model.lastMove.from, model.lastMove.to, model.theme)
-                : {} }) }));
+    return (jsxRuntime.jsx(ChessboardDnDProvider, { children: jsxRuntime.jsx(HighlightChessboard, { checkSquare: (_a = model.checkSquare) !== null && _a !== void 0 ? _a : '', hintSquare: null, incorrectMoveSquare: null, position: model.fen, boardOrientation: model.boardOrientation, boardWidth: model.boardWidth, arePiecesDraggable: true, onPieceDrop: model.onPieceDrop, promotionDialogVariant: "modal", lastMoveUci: model.lastMoveUci }) }));
 };
 
 class AnalysisPosition {
@@ -3174,22 +3198,26 @@ class AnalysisPosition {
         return true;
     }
     getLastMoveSquares() {
-        const navPly = this.getNavPly();
-        if (navPly === 0) {
+        const uci = this.getLastMoveUci();
+        if (!uci) {
             return null;
         }
-        let uci;
-        if (this.variation && this.variationCursor > 0) {
-            uci = this.variation.moves[this.variationCursor - 1];
-        }
-        else {
-            uci = this.solutionMoves[this.mainPly - 1];
-        }
         return {
             from: uci.slice(0, 2),
             to: uci.slice(2, 4),
         };
     }
+    getLastMoveUci() {
+        var _a;
+        const navPly = this.getNavPly();
+        if (navPly === 0) {
+            return null;
+        }
+        if (this.variation && this.variationCursor > 0) {
+            return this.variation.moves[this.variationCursor - 1];
+        }
+        return (_a = this.solutionMoves[this.mainPly - 1]) !== null && _a !== void 0 ? _a : null;
+    }
     fen() {
         return this.chess.fen();
     }
@@ -3199,7 +3227,7 @@ class AnalysisPosition {
 }
 
 const useAnalysisBoardModel = ({ analysisContext, onClose, theme, boardWidth, engine, }) => {
-    var _a, _b, _c, _d;
+    var _a;
     const skipBackdropCloseRef = react.useRef(true);
     const analysisPosition = react.useMemo(() => new AnalysisPosition(analysisContext), [analysisContext]);
     const [navRevision, setNavRevision] = react.useState(0);
@@ -3215,12 +3243,7 @@ const useAnalysisBoardModel = ({ analysisContext, onClose, theme, boardWidth, en
     }, [analysisContext, analysisPosition]);
     const fen = analysisPosition.fen();
     const engineEnabled = (_a = engine === null || engine === void 0 ? void 0 : engine.enabled) !== null && _a !== void 0 ? _a : true;
-    const engineEvaluation = useAnalysisEngine(fen, {
-        enabled: engineEnabled,
-        depth: (_b = engine === null || engine === void 0 ? void 0 : engine.depth) !== null && _b !== void 0 ? _b : 16,
-        multiPv: (_c = engine === null || engine === void 0 ? void 0 : engine.multiPv) !== null && _c !== void 0 ? _c : 2,
-        scriptUrl: (_d = engine === null || engine === void 0 ? void 0 : engine.scriptUrl) !== null && _d !== void 0 ? _d : DEFAULT_STOCKFISH_SCRIPT_URL,
-    });
+    const engineEvaluation = useAnalysisEngine(fen, Object.assign(Object.assign({ depth: 16, multiPv: 2, scriptUrl: DEFAULT_STOCKFISH_SCRIPT_URL }, engine), { enabled: engineEnabled }));
     return {
         theme,
         boardWidth,
@@ -3234,6 +3257,7 @@ const useAnalysisBoardModel = ({ analysisContext, onClose, theme, boardWidth, en
         engineEvaluation,
         engineEnabled,
         lastMove: analysisPosition.getLastMoveSquares(),
+        lastMoveUci: analysisPosition.getLastMoveUci(),
         checkSquare: analysisPosition.getCheckSquare(),
         onSelectPly: (ply) => {
             analysisPosition.goToNavPly(ply);
@@ -3848,6 +3872,7 @@ function getMissDisplay(sequence, expectedUci, refutationUci, answerArrowColor)
         return {
             fen: null,
             arrows: [],
+            lastMoveUci: null,
             animating: false,
         };
     }
@@ -3858,6 +3883,7 @@ function getMissDisplay(sequence, expectedUci, refutationUci, answerArrowColor)
             return {
                 fen: fenAfterWrong !== null && fenAfterWrong !== void 0 ? fenAfterWrong : setupFen,
                 arrows: [],
+                lastMoveUci: attemptedUci,
                 animating: false,
             };
         case 'refutation': {
@@ -3867,6 +3893,7 @@ function getMissDisplay(sequence, expectedUci, refutationUci, answerArrowColor)
             return {
                 fen: (_a = fenAfterRefutation !== null && fenAfterRefutation !== void 0 ? fenAfterRefutation : fenAfterWrong) !== null && _a !== void 0 ? _a : setupFen,
                 arrows: [],
+                lastMoveUci: refutationUci,
                 animating: Boolean(fenAfterRefutation),
             };
         }
@@ -3874,18 +3901,21 @@ function getMissDisplay(sequence, expectedUci, refutationUci, answerArrowColor)
             return {
                 fen: setupFen,
                 arrows: [],
+                lastMoveUci: null,
                 animating: false,
             };
         case 'answer':
             return {
                 fen: setupFen,
                 arrows: expectedMoveArrow(expectedUci, answerArrowColor),
+                lastMoveUci: null,
                 animating: false,
             };
         default:
             return {
                 fen: setupFen,
                 arrows: [],
+                lastMoveUci: null,
                 animating: false,
             };
     }
@@ -4058,6 +4088,7 @@ function useMissBoard({ feedback, expectedUci, positionFen, answerArrowColor, au
         customArrows,
         boardPosition,
         boardAnimating: missSequence.display.animating,
+        lastMoveUci: missSequence.display.lastMoveUci,
         wrapDropHandler,
     };
 }
@@ -4078,6 +4109,7 @@ exports.ChessboardThemeContext = ChessboardThemeContext;
 exports.CorrectMoveCheckBadge = CorrectMoveCheckBadge;
 exports.DEFAULT_ANALYSIS_LAYOUT = DEFAULT_ANALYSIS_LAYOUT;
 exports.DEFAULT_BOARD_THEME = DEFAULT_BOARD_THEME;
+exports.DEFAULT_LAST_MOVE_ARROW_COLOR = DEFAULT_LAST_MOVE_ARROW_COLOR;
 exports.DEFAULT_STOCKFISH_SCRIPT_URL = DEFAULT_STOCKFISH_SCRIPT_URL;
 exports.DefaultAnalysisContainer = DefaultAnalysisContainer;
 exports.DefaultAnalysisSidebar = DefaultAnalysisSidebar;
@@ -4116,8 +4148,11 @@ exports.getStylesForTheme = getStylesForTheme;
 exports.isAnalyzableFen = isAnalyzableFen;
 exports.isBoardThemeId = isBoardThemeId;
 exports.isEditableKeyboardTarget = isEditableKeyboardTarget;
+exports.lastMoveArrowFromUci = lastMoveArrowFromUci;
+exports.lastMoveUciAtPly = lastMoveUciAtPly;
 exports.lineEvalCpForGap = lineEvalCpForGap;
 exports.matchesExpectedUci = matchesExpectedUci;
+exports.mergeCustomArrowsWithLastMove = mergeCustomArrowsWithLastMove;
 exports.navButtonStyle = navButtonStyle;
 exports.navRowStyle = navRowStyle;
 exports.normalizeEvalForWhite = normalizeEvalForWhite;
@@ -4137,6 +4172,7 @@ exports.scrubberInputStyle = scrubberInputStyle;
 exports.splitWorkerLines = splitWorkerLines;
 exports.uciFromDrop = uciFromDrop;
 exports.uciPvToSan = uciPvToSan;
+exports.uciToArrow = uciToArrow;
 exports.useAnalysisBoardModel = useAnalysisBoardModel;
 exports.useAnalysisEngine = useAnalysisEngine;
 exports.useAnalysisEngineContext = useAnalysisEngineContext;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-chess-core",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Shared React chessboard theme, highlights, browser Stockfish, and analysis board",
   "license": "MIT",
   "author": "Robert Blackwell",