@spider-analyzer/timeline 5.0.4 → 5.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spider-analyzer/timeline",
-  "version": "5.0.4",
+  "version": "5.0.6",
   "description": "React graphical component to display metric over time with a time selection feature.",
   "author": "Thibaut Raballand <spider.analyzer@gmail.com> (https://spider-analyzer.io)",
   "license": "MIT",

package/src/TimeLine.tsx

@@ -189,15 +189,31 @@ const TimeLineInner = forwardRef<TimeLineHandle, any>(function TimeLine(props, r
         xAxis.clamp(true);
         xAxisRef.current = xAxis;
 
-        const ticks = xAxis.ticks(_floor(histoWidth / p.xAxis.spaceBetweenTicks));
+        const tickCount = _floor(histoWidth / p.xAxis.spaceBetweenTicks);
+        const ticks = xAxis.ticks(tickCount);
+        // intervalMs should be domainSpan/(visibleTickCount*barsBetweenTicks).
+        // Use ticks[1]-ticks[0] when d3 gives us >= 2 "nice" ticks (preserves
+        // the original intent of snapping to minute/hour-aligned intervals);
+        // otherwise fall back to domainSpan/tickCount so we never regress to
+        // smallestResolution on the very first render (when tick generation
+        // can be momentarily sparse).
+        const tickIntervalMs = ticks.length >= 2
+            ? ticks[1].getTime() - ticks[0].getTime()
+            : (+domain.max - +domain.min) / Math.max(tickCount, 1);
         const intervalMs = _max([
-            _round(moment(ticks[1]).diff(moment(ticks[0])) / p.xAxis.barsBetweenTicks),
+            _round(tickIntervalMs / p.xAxis.barsBetweenTicks),
             propsRef.current.smallestResolution.asMilliseconds(),
         ]) as number;
 
         patchState({ histoWidth, isActive: true, ticks });
 
-        if (shouldReload && intervalMs) {
+        // Gate the fetch on a usable histoWidth. Before the first valid
+        // width is measured (React mount, ResizeObserver, consumer layout)
+        // histoWidth can be <= 0 — in that case we'd otherwise hit the
+        // domainSpan/1 fallback and ask the backend for smallestResolution
+        // / tickCount=1 granularity over the whole domain. Wait for the
+        // width-change effect to re-run getItems with a real width.
+        if (shouldReload && intervalMs && histoWidth > 0) {
             widthOfLastUpdateRef.current = p.width;
             patchState({ waitForLoad: true });
             p.onLoadHisto(intervalMs, domain.min, domain.max);
@@ -237,14 +253,19 @@ const TimeLineInner = forwardRef<TimeLineHandle, any>(function TimeLine(props, r
             return;
         }
         const s = stateRef.current;
-        if (s.isActive) {
+        patchState(computeMarginAndWidth(props));
+        // Re-run getItems whenever width/margin changes AND we have a
+        // domain. Was previously guarded on s.isActive which meant the
+        // first getItems call (with an as-yet unknown width) locked us
+        // into a bad intervalMs: it set isActive=true but skipped the
+        // fetch (histoWidth <= 0 gate), and this effect wouldn't re-fetch
+        // because isActive was now true but big=false.
+        if (s.domain) {
             const big =
                 widthOfLastUpdateRef.current !== null
                 && Math.abs((props.width ?? 0) - (widthOfLastUpdateRef.current ?? 0)) > 30;
-            getItems(props, s.domain, big);
-            patchState(computeMarginAndWidth(props));
-        } else {
-            patchState(computeMarginAndWidth(props));
+            const shouldReload = !s.isActive || big || widthOfLastUpdateRef.current === null;
+            getItems(props, s.domain, shouldReload);
         }
 
         if (stateRef.current.domain) {