Skip to content

Fix dice intermittently not animating on rollAll #112

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
AdamTyler merged 1 commit into from
Jun 23, 2026
Merged

Fix dice intermittently not animating on rollAll #112

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
18 changes: 11 additions & 7 deletions lib/Die.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ const Die = forwardRef<DieRef, DieProps>(
}: DieProps,
ref
): JSX.Element => {
const dieRef = useRef<HTMLDivElement>(null)
const timeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null)

useEffect(() => {
Expand All @@ -60,6 +59,11 @@ const Die = forwardRef<DieRef, DieProps>(
const clampedDefault = Math.min(Math.max(defaultRoll || 6, 1), 6)
const [dieValue, setDieValue] = useState(clampedDefault)
const [hasRolled, setHasRolled] = useState(false)
// Bumped on every roll so React remounts the animated element, which
// restarts the CSS keyframe animation reliably (replaces the old
// className-reset + forced-reflow hack that could fail to restart on
// rapid/overlapping rolls).
const [rollKey, setRollKey] = useState(0)

// Only d6 faces are rendered; clamp to 1-6 regardless of sides prop
const getRandomInt = () => {
Expand All @@ -68,15 +72,15 @@ const Die = forwardRef<DieRef, DieProps>(
}

const rollDie = (value?: number) => {
dieRef.current && (dieRef.current.className = `die`)
void dieRef.current?.offsetWidth
const rawRoll = disableRandom ? dieValue : value || getRandomInt()
const roll = Math.min(Math.max(rawRoll, 1), 6)
dieRef.current?.classList.add(`roll${roll}`)
// Drive the roll through state and remount the animated node (rollKey)
// so the CSS animation always restarts, even on rapid/overlapping rolls.
setDieValue(roll)
setHasRolled(true)
setRollKey((k) => k + 1)
if (timeoutRef.current !== null) clearTimeout(timeoutRef.current)
timeoutRef.current = setTimeout(() => {
setHasRolled(true)
setDieValue(roll)
onRollDone(roll)
timeoutRef.current = null
}, rollTime * 1000)
Expand Down Expand Up @@ -172,8 +176,8 @@ const Die = forwardRef<DieRef, DieProps>(
style={containerStyle}
>
<div
key={rollKey}
className={`die ${hasRolled ? 'roll' : 'init-roll'}${dieValue}`}
ref={dieRef}
style={rollStyle}
>
<div className='face six' style={Object.assign({}, faceStyle, f6Style)}>
Expand Down
Loading