Skip to content

Refactor PomodoroPanel rendering logic to comply with React Hooks rules #35

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
jermzblake merged 1 commit into from
Apr 6, 2026
Merged

Refactor PomodoroPanel rendering logic to comply with React Hooks rules #35

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: 9 additions & 9 deletions src/client/components/pomodoro-panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,6 @@ export function PomodoroPanel() {
// Flowtime uses a per-interval stopwatch; total elapsed work is displayed separately below.
const stopwatchSeconds = state.flowtimeWorkSeconds

// Don't render when no session is active
if (state.status === 'idle' && state.taskId === null) return null

const isFlowtime = state.mode === 'flowtime'
const isFlowtimeWork = isFlowtime && state.phase === 'work'
const showFlowtimeRestSelector = isFlowtimeWork && state.status === 'paused'
const showModeChangeResetHint =
state.status === 'paused' && modeAtPauseStart !== null && state.mode !== modeAtPauseStart

useEffect(() => {
if (state.status !== 'paused') {
setModeAtPauseStart(null)
Expand All @@ -76,6 +67,15 @@ export function PomodoroPanel() {
setModeAtPauseStart((prev) => prev ?? state.mode)
}, [state.mode, state.status])

// Don't render when no session is active
if (state.status === 'idle' && state.taskId === null) return null

const isFlowtime = state.mode === 'flowtime'
const isFlowtimeWork = isFlowtime && state.phase === 'work'
const showFlowtimeRestSelector = isFlowtimeWork && state.status === 'paused'
const showModeChangeResetHint =
state.status === 'paused' && modeAtPauseStart !== null && state.mode !== modeAtPauseStart

const timeDisplay = isFlowtimeWork
? formatSeconds(stopwatchSeconds) // Stopwatch counts up
: state.secondsRemaining !== null
Expand Down
Loading