Skip to content

# Fix: Make Undo Button Clickable #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WilsonNet merged 1 commit into from
Dec 1, 2025
Merged

# Fix: Make Undo Button Clickable #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 37 additions & 12 deletions components/GameArea.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,12 +229,14 @@ const ChordButtons: React.FC<{
const SubmitSection: React.FC<{
selectedSlots: (string | null)[];
onSubmit: () => void;
}> = ({ selectedSlots, onSubmit }) => {
onUndo: () => void;
}> = ({ selectedSlots, onSubmit, onUndo }) => {
const { t } = useTranslation();

const isFull = (slots: (string | null)[]): slots is string[] => {
return slots.every((s) => s !== null);
};
const canUndo = selectedSlots.some((slot) => slot !== null);

return (
<div className="relative flex justify-center">
Expand All @@ -252,10 +254,16 @@ const SubmitSection: React.FC<{
/>
)}
</Button>
<div className="-right-4 -translate-y-1/2 absolute top-1/2 hidden font-mono text-slate-500 text-xs lg:block">
<button
type="button"
onClick={onUndo}
disabled={!canUndo}
title={t('game.undo')}
className="-right-4 -translate-y-1/2 absolute top-1/2 hidden items-center gap-2 font-mono text-slate-500 text-xs transition-opacity disabled:cursor-not-allowed disabled:opacity-40 lg:flex"
>
<span className="rounded border border-slate-700 bg-slate-800 px-1.5 py-0.5">U</span>{' '}
{t('game.undo')}
</div>
</button>
</div>
);
};
Expand Down Expand Up @@ -571,6 +579,17 @@ export const GameArea: React.FC<Props> = ({ gameState, setGameState, onBack, onN
[gameState.status, selectedSlots]
);

const handleUndo = useCallback((): void => {
Copy link
Owner

@WilsonNet WilsonNet Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we have react compiler here but I guess it does not hurt

if (gameState.status === 'FEEDBACK') return;
const lastFilledIndex = selectedSlots.reduce((lastIndex, slot, idx) => {
return slot !== null ? idx : lastIndex;
}, -1);

if (lastFilledIndex !== -1) {
handleClearSlot(lastFilledIndex);
}
}, [gameState.status, selectedSlots, handleClearSlot]);

const handleSubmit = useCallback(async (): Promise<void> => {
if (!isFull(selectedSlots)) return;

Expand Down Expand Up @@ -708,13 +727,7 @@ export const GameArea: React.FC<Props> = ({ gameState, setGameState, onBack, onN

if (key === 'u' || key === 'backspace') {
e.preventDefault();
const lastFilledIndex = selectedSlots.reduce((lastIndex, slot, idx) => {
return slot !== null ? idx : lastIndex;
}, -1);

if (lastFilledIndex !== -1) {
handleClearSlot(lastFilledIndex);
}
handleUndo();
return true;
}

Expand All @@ -732,7 +745,15 @@ export const GameArea: React.FC<Props> = ({ gameState, setGameState, onBack, onN

return false;
},
[selectedSlots, gameState.level, handlePlay, handleSubmit, handleClearSlot, handleSelectChord]
[
selectedSlots,
gameState.level,
handlePlay,
handleSubmit,
handleClearSlot,
handleSelectChord,
handleUndo,
]
);

// Keyboard Shortcuts Logic
Expand Down Expand Up @@ -788,7 +809,11 @@ export const GameArea: React.FC<Props> = ({ gameState, setGameState, onBack, onN
onSelectChord={handleSelectChord}
/>

<SubmitSection selectedSlots={selectedSlots} onSubmit={handleSubmit} />
<SubmitSection
selectedSlots={selectedSlots}
onSubmit={handleSubmit}
onUndo={handleUndo}
/>
</div>
) : (
<FeedbackView
Expand Down
Loading