@stfrigerio/sito-template 0.1.81 → 0.1.82

package/dist/index.js

@@ -4429,6 +4429,53 @@ const HabitTimeOfDayChart = ({ events, width = 800, height = 400, startDate, end
         const active = new Set(activeHabits);
         return parsed.filter(e => active.has(e.habitKey));
     }, [parsed, activeHabits]);
+    // Group events that land on the same minute (same habit) into a single
+    // cluster so overlapping dots become one sized/counted dot. Then, for any
+    // (date, minute) coord with multiple habits, fan them out horizontally so
+    // different-colored dots stop masking each other.
+    const clusters = React.useMemo(() => {
+        const byKey = new Map();
+        filtered.forEach(e => {
+            const bucketFraction = Math.round(e.hourFraction * 60) / 60;
+            const bucketMinute = Math.round(bucketFraction * 60) % 60;
+            const bucketHour = Math.floor(bucketFraction);
+            const key = `${e.date}|${e.habitKey}|${bucketFraction}`;
+            const existing = byKey.get(key);
+            if (existing) {
+                existing.count += 1;
+            }
+            else {
+                byKey.set(key, {
+                    habitKey: e.habitKey,
+                    date: e.date,
+                    hour: bucketHour,
+                    minute: bucketMinute,
+                    hourFraction: bucketFraction,
+                    count: 1,
+                    xOffsetPx: 0,
+                });
+            }
+        });
+        const coordGroups = new Map();
+        byKey.forEach(c => {
+            const coordKey = `${c.date}|${c.hourFraction}`;
+            const arr = coordGroups.get(coordKey);
+            if (arr)
+                arr.push(c);
+            else
+                coordGroups.set(coordKey, [c]);
+        });
+        const out = [];
+        const spacing = 10;
+        coordGroups.forEach(group => {
+            group.sort((a, b) => a.habitKey.localeCompare(b.habitKey));
+            const mid = (group.length - 1) / 2;
+            group.forEach((c, i) => {
+                out.push({ ...c, xOffsetPx: (i - mid) * spacing });
+            });
+        });
+        return out;
+    }, [filtered]);
     const hourlyTotals = React.useMemo(() => {
         const totals = Array.from({ length: 24 }, (_, hour) => ({
             hour,
@@ -4482,15 +4529,16 @@ const HabitTimeOfDayChart = ({ events, width = 800, height = 400, startDate, end
                 .attr('y2', chartHeight);
             // Dots
             const rowHeight = yScale.bandwidth();
-            const radius = Math.min(5, Math.max(2, rowHeight / 2));
+            const baseRadius = Math.min(5, Math.max(2, rowHeight / 2));
+            const maxRadius = baseRadius * 2.2;
             g.selectAll('circle.dot')
-                .data(filtered)
+                .data(clusters)
                 .enter()
                 .append('circle')
                 .attr('class', styles$7.dot)
-                .attr('cx', d => xScale(d.hourFraction))
+                .attr('cx', d => xScale(d.hourFraction) + d.xOffsetPx)
                 .attr('cy', d => (yScale(d.date) ?? 0) + rowHeight / 2)
-                .attr('r', radius)
+                .attr('r', d => Math.min(maxRadius, baseRadius * Math.sqrt(d.count)))
                 .attr('fill', d => getColor(d.habitKey))
                 .attr('opacity', d => hoveredHabit && hoveredHabit !== d.habitKey ? 0.15 : 0.8)
                 .style('cursor', 'pointer')
@@ -4499,13 +4547,13 @@ const HabitTimeOfDayChart = ({ events, width = 800, height = 400, startDate, end
                 if (!rect)
                     return;
                 setTooltipData({
-                    x: xScale(d.hourFraction) + margin.left + rect.left,
+                    x: xScale(d.hourFraction) + d.xOffsetPx + margin.left + rect.left,
                     y: (yScale(d.date) ?? 0) + margin.top + rect.top,
                     habit: d.habitKey,
                     hour: d.hour,
                     minute: d.minute,
                     date: d.date,
-                    count: 1,
+                    count: d.count,
                 });
             })
                 .on('mouseleave', () => setTooltipData(null));
@@ -4601,6 +4649,7 @@ const HabitTimeOfDayChart = ({ events, width = 800, height = 400, startDate, end
     }, [
         view,
         filtered,
+        clusters,
         hourlyTotals,
         dateRange,
         maxHourTotal,
@@ -4624,9 +4673,9 @@ const HabitTimeOfDayChart = ({ events, width = 800, height = 400, startDate, end
             day: 'numeric',
         });
     };
-    return (jsxRuntime.jsxs("div", { className: styles$7.container, children: [!hideControls && (jsxRuntime.jsx("div", { className: styles$7.controls, children: jsxRuntime.jsx("div", { className: styles$7.viewToggle, children: ['scatter', 'totals'].map(type => (jsxRuntime.jsxs("button", { className: `${styles$7.viewButton} ${view === type ? styles$7.active : ''}`, onClick: () => setView(type), title: viewConfig[type].label, children: [jsxRuntime.jsx("span", { className: styles$7.viewIcon, children: viewConfig[type].icon }), jsxRuntime.jsx("span", { className: styles$7.viewLabel, children: viewConfig[type].label })] }, type))) }) })), habits.length > 0 && (jsxRuntime.jsx("div", { className: `${styles$7.legend}${compactLegend ? ` ${styles$7.compactLegend}` : ''}`, children: habits.map(habit => (jsxRuntime.jsxs("button", { className: `${styles$7.legendItem} ${!activeHabits.includes(habit) ? styles$7.inactive : ''}`, onClick: () => toggleHabit(habit), onMouseEnter: () => setHoveredHabit(habit), onMouseLeave: () => setHoveredHabit(null), children: [jsxRuntime.jsx("span", { className: styles$7.legendEmoji, children: customHabitEmojis[habit] || '📊' }), jsxRuntime.jsx("span", { className: styles$7.legendColor, style: { backgroundColor: getColor(habit) } }), jsxRuntime.jsx("span", { className: styles$7.legendLabel, children: habit })] }, habit))) })), jsxRuntime.jsx("svg", { ref: svgRef, viewBox: `0 0 ${width} ${height}`, preserveAspectRatio: "xMidYMid meet", className: styles$7.chart }), tooltipData && (jsxRuntime.jsx("div", { className: `${styles$7.tooltip} ${styles$7.visible}`, style: { left: `${tooltipData.x}px`, top: `${tooltipData.y - 70}px` }, children: tooltipData.habit ? (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("div", { className: styles$7.tooltipHeader, children: [jsxRuntime.jsx("span", { className: styles$7.tooltipDot, style: { backgroundColor: getColor(tooltipData.habit) } }), jsxRuntime.jsxs("span", { children: [customHabitEmojis[tooltipData.habit] || '', " ", tooltipData.habit] })] }), jsxRuntime.jsx("div", { className: styles$7.tooltipInfo, children: jsxRuntime.jsxs("div", { className: styles$7.tooltipDate, children: [tooltipData.date ? formatTooltipDate(tooltipData.date) : '', tooltipData.minute !== undefined
-                                        ? ` · ${formatTime$1(tooltipData.hour, tooltipData.minute)}`
-                                        : ''] }) })] })) : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx("div", { className: styles$7.tooltipHeader, children: jsxRuntime.jsx("span", { children: formatHour(tooltipData.hour) }) }), jsxRuntime.jsxs("div", { className: styles$7.tooltipInfo, children: [jsxRuntime.jsxs("div", { className: styles$7.tooltipValue, children: [jsxRuntime.jsx("strong", { children: tooltipData.count }), jsxRuntime.jsxs("span", { className: styles$7.tooltipUnits, children: ["event", tooltipData.count === 1 ? '' : 's'] })] }), tooltipData.breakdown && tooltipData.breakdown.length > 1 && (jsxRuntime.jsx("div", { className: styles$7.tooltipBreakdown, children: tooltipData.breakdown.map(({ habit, count }) => (jsxRuntime.jsxs("div", { className: styles$7.tooltipBreakdownRow, children: [jsxRuntime.jsx("span", { className: styles$7.tooltipDot, style: { backgroundColor: getColor(habit) } }), jsxRuntime.jsxs("span", { children: [customHabitEmojis[habit] || '', " ", habit] }), jsxRuntime.jsx("span", { className: styles$7.tooltipCount, children: count })] }, habit))) }))] })] })) }))] }));
+    return (jsxRuntime.jsxs("div", { className: styles$7.container, children: [!hideControls && (jsxRuntime.jsx("div", { className: styles$7.controls, children: jsxRuntime.jsx("div", { className: styles$7.viewToggle, children: ['scatter', 'totals'].map(type => (jsxRuntime.jsxs("button", { className: `${styles$7.viewButton} ${view === type ? styles$7.active : ''}`, onClick: () => setView(type), title: viewConfig[type].label, children: [jsxRuntime.jsx("span", { className: styles$7.viewIcon, children: viewConfig[type].icon }), jsxRuntime.jsx("span", { className: styles$7.viewLabel, children: viewConfig[type].label })] }, type))) }) })), habits.length > 0 && (jsxRuntime.jsx("div", { className: `${styles$7.legend}${compactLegend ? ` ${styles$7.compactLegend}` : ''}`, children: habits.map(habit => (jsxRuntime.jsxs("button", { className: `${styles$7.legendItem} ${!activeHabits.includes(habit) ? styles$7.inactive : ''}`, onClick: () => toggleHabit(habit), onMouseEnter: () => setHoveredHabit(habit), onMouseLeave: () => setHoveredHabit(null), children: [jsxRuntime.jsx("span", { className: styles$7.legendEmoji, children: customHabitEmojis[habit] || '📊' }), jsxRuntime.jsx("span", { className: styles$7.legendColor, style: { backgroundColor: getColor(habit) } }), jsxRuntime.jsx("span", { className: styles$7.legendLabel, children: habit })] }, habit))) })), jsxRuntime.jsx("svg", { ref: svgRef, viewBox: `0 0 ${width} ${height}`, preserveAspectRatio: "xMidYMid meet", className: styles$7.chart }), tooltipData && (jsxRuntime.jsx("div", { className: `${styles$7.tooltip} ${styles$7.visible}`, style: { left: `${tooltipData.x}px`, top: `${tooltipData.y - 70}px` }, children: tooltipData.habit ? (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("div", { className: styles$7.tooltipHeader, children: [jsxRuntime.jsx("span", { className: styles$7.tooltipDot, style: { backgroundColor: getColor(tooltipData.habit) } }), jsxRuntime.jsxs("span", { children: [customHabitEmojis[tooltipData.habit] || '', " ", tooltipData.habit] })] }), jsxRuntime.jsxs("div", { className: styles$7.tooltipInfo, children: [jsxRuntime.jsxs("div", { className: styles$7.tooltipDate, children: [tooltipData.date ? formatTooltipDate(tooltipData.date) : '', tooltipData.minute !== undefined
+                                            ? ` · ${formatTime$1(tooltipData.hour, tooltipData.minute)}`
+                                            : ''] }), tooltipData.count > 1 && (jsxRuntime.jsxs("div", { className: styles$7.tooltipValue, children: [jsxRuntime.jsx("strong", { children: tooltipData.count }), jsxRuntime.jsx("span", { className: styles$7.tooltipUnits, children: "events" })] }))] })] })) : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx("div", { className: styles$7.tooltipHeader, children: jsxRuntime.jsx("span", { children: formatHour(tooltipData.hour) }) }), jsxRuntime.jsxs("div", { className: styles$7.tooltipInfo, children: [jsxRuntime.jsxs("div", { className: styles$7.tooltipValue, children: [jsxRuntime.jsx("strong", { children: tooltipData.count }), jsxRuntime.jsxs("span", { className: styles$7.tooltipUnits, children: ["event", tooltipData.count === 1 ? '' : 's'] })] }), tooltipData.breakdown && tooltipData.breakdown.length > 1 && (jsxRuntime.jsx("div", { className: styles$7.tooltipBreakdown, children: tooltipData.breakdown.map(({ habit, count }) => (jsxRuntime.jsxs("div", { className: styles$7.tooltipBreakdownRow, children: [jsxRuntime.jsx("span", { className: styles$7.tooltipDot, style: { backgroundColor: getColor(habit) } }), jsxRuntime.jsxs("span", { children: [customHabitEmojis[habit] || '', " ", habit] }), jsxRuntime.jsx("span", { className: styles$7.tooltipCount, children: count })] }, habit))) }))] })] })) }))] }));
 };
 
 var styles$6 = {"container":"SleepChart-module_container__RjHVU","header":"SleepChart-module_header__bcoWe","title":"SleepChart-module_title__6-QII","legend":"SleepChart-module_legend__VsqQj","legendItem":"SleepChart-module_legendItem__2c1nd","sleepDot":"SleepChart-module_sleepDot__qCY6O","wakeDot":"SleepChart-module_wakeDot__-RcrT","chart":"SleepChart-module_chart__jC1nL","gridLine":"SleepChart-module_gridLine__hi715","sleepBar":"SleepChart-module_sleepBar__Hk76f","xAxis":"SleepChart-module_xAxis__xzXyM","yAxis":"SleepChart-module_yAxis__7N-LA","tooltip":"SleepChart-module_tooltip__jQBv1","visible":"SleepChart-module_visible__wy0ck","tooltipHeader":"SleepChart-module_tooltipHeader__5BdPL","tooltipEmoji":"SleepChart-module_tooltipEmoji__c5vtz","tooltipInfo":"SleepChart-module_tooltipInfo__9Yrno","tooltipRow":"SleepChart-module_tooltipRow__CuDaE","tooltipLabel":"SleepChart-module_tooltipLabel__7SNzQ","tooltipValue":"SleepChart-module_tooltipValue__FoAVy","tooltipDuration":"SleepChart-module_tooltipDuration__d2wBW"};