diff --git a/frontend/src/pages/HealthPage.jsx b/frontend/src/pages/HealthPage.jsx index cc037ac..ac94ac5 100644 --- a/frontend/src/pages/HealthPage.jsx +++ b/frontend/src/pages/HealthPage.jsx @@ -1,4 +1,4 @@ -import { useState, useMemo } from 'react' +import { useState, useMemo, useRef } from 'react' import { useQuery, keepPreviousData } from '@tanstack/react-query' import { AreaChart, Area, ComposedChart, Line, BarChart, Bar, ReferenceLine, ReferenceArea, @@ -293,18 +293,22 @@ function BodyBatteryChart({ bb, hiresValues, sleepStart, sleepEnd, activities }) // Proper sleep hypnogram: 4 horizontal lanes (Awake/REM/Light/Deep), time on X axis const SLEEP_LANE_ORDER = [1, 4, 2, 3] // top→bottom: awake, rem, light, deep -const SLEEP_STAGE_COLOR = { 0: '#6b7280', 1: '#eab308', 2: '#a78bfa', 3: '#6366f1', 4: '#8b5cf6' } +const SLEEP_STAGE_COLOR = { 0: '#6b7280', 1: '#eab308', 2: '#a78bfa', 3: '#6366f1', 4: '#7c3aed' } const SLEEP_STAGE_LABEL = { 1: 'Awake', 2: 'Light', 3: 'Deep', 4: 'REM' } const LANE_H = 15 +const fmtClock = (ms) => new Date(ms).toLocaleTimeString('en-GB', { hour: '2-digit', minute: '2-digit' }) + function SleepHypnogram({ sleepStart, sleepEnd, stages }) { + const wrapRef = useRef(null) + const [tip, setTip] = useState(null) if (!sleepStart || !sleepEnd || !stages?.length) return null const startMs = new Date(sleepStart).getTime() const endMs = new Date(sleepEnd).getTime() const windowMs = endMs - startMs if (windowMs <= 0) return null - // Build segments per lane + // Build segments per lane (keep each segment's real start/end for the tooltip) const segsByLane = {} SLEEP_LANE_ORDER.forEach(lv => { segsByLane[lv] = [] }) stages.forEach(([tsMs, level], i) => { @@ -313,9 +317,21 @@ function SleepHypnogram({ sleepStart, sleepEnd, stages }) { const left = Math.max(0, (tsMs - startMs) / windowMs * 100) const right = Math.min(100, (nextTs - startMs) / windowMs * 100) const w = right - left - if (w > 0) segsByLane[level].push({ left, w }) + if (w > 0) segsByLane[level].push({ left, w, level, startMs: tsMs, endMs: nextTs }) }) + const showTip = (seg, e) => { + const rect = wrapRef.current?.getBoundingClientRect() + if (!rect) return + setTip({ + x: e.clientX - rect.left, + y: e.clientY - rect.top, + level: seg.level, + range: `${fmtClock(seg.startMs)}–${fmtClock(seg.endMs)}`, + mins: Math.max(1, Math.round((seg.endMs - seg.startMs) / 60000)), + }) + } + // Hour ticks const sh = new Date(startMs); sh.setMinutes(0, 0, 0); sh.setHours(sh.getHours() + 1) const ticks = [] @@ -327,25 +343,38 @@ function SleepHypnogram({ sleepStart, sleepEnd, stages }) { return (