@spider-analyzer/timeline 5.0.3 → 5.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spider-analyzer/timeline",
-  "version": "5.0.3",
+  "version": "5.0.5",
   "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

@@ -3,6 +3,7 @@ import {
     useCallback,
     useEffect,
     useImperativeHandle,
+    useMemo,
     useRef,
     useState,
 } from 'react';
@@ -188,9 +189,19 @@ 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;
 
@@ -887,27 +898,66 @@ const TimeLine = forwardRef<TimeLineHandle, any>(function TimeLineWrapper(props,
         else if (ret) apply(ret);
     }, [props.onLoadDefaultDomain, props.onDomainChange, zone]);
 
-    // Build the moment-typed props the inner expects. Apply the same
-    // defaults the inner destructures locally so that ref-path accesses
-    // (propsRef.current.xAxis.spaceBetweenTicks etc.) never trip on an
-    // undefined consumer prop.
+    // Normalize incoming props into moment-typed values the inner expects.
+    // MEMOIZE on the raw consumer reference so that a parent re-render
+    // with an unchanged `histo` (etc.) doesn't hand the inner a fresh
+    // object — otherwise the inner's `histo !== prev` effect fires every
+    // render → setState → re-render → infinite loop (observed in
+    // Network-View: x-axis never stabilizes, loader never clears).
+    const timeSpanMoments = useMemo(
+        () => (props.timeSpan ? timeSpanToMoments(props.timeSpan, zone) : undefined),
+        [props.timeSpan, zone],
+    );
+    const maxDomainMoments = useMemo(
+        () => (props.maxDomain ? domainToMoments(props.maxDomain, zone) : undefined),
+        [props.maxDomain, zone],
+    );
+    const histoMoments = useMemo(
+        () => (props.histo?.items
+            ? { ...props.histo, items: props.histo.items.map((it: any) => ({ ...it, time: toMoment(it.time, zone) })) }
+            : props.histo),
+        [props.histo, zone],
+    );
+    const qualityMoments = useMemo(
+        () => (props.quality?.items
+            ? { ...props.quality, items: props.quality.items.map((it: any) => ({ ...it, time: toMoment(it.time, zone) })) }
+            : props.quality),
+        [props.quality, zone],
+    );
+    const biggestVisibleDomainDur = useMemo(
+        () => (props.biggestVisibleDomain != null ? toDuration(props.biggestVisibleDomain) : undefined),
+        [props.biggestVisibleDomain],
+    );
+    const biggestTimeSpanDur = useMemo(
+        () => (props.biggestTimeSpan != null ? toDuration(props.biggestTimeSpan) : undefined),
+        [props.biggestTimeSpan],
+    );
+    const smallestResolutionDur = useMemo(
+        () => (props.smallestResolution != null ? toDuration(props.smallestResolution) : undefined),
+        [props.smallestResolution],
+    );
+    const xAxisMerged = useMemo(
+        () => ({ ...xAxisDefault, ...(props.xAxis ?? {}) }),
+        [props.xAxis],
+    );
+    const marginMerged = useMemo(
+        () => ({ ...marginDefault, ...(props.margin ?? {}) }),
+        [props.margin],
+    );
+
     const innerProps: any = {
         ...props,
-        xAxis: { ...xAxisDefault, ...(props.xAxis ?? {}) },
+        xAxis: xAxisMerged,
         yAxis: props.yAxis ?? {},
-        margin: { ...marginDefault, ...(props.margin ?? {}) },
+        margin: marginMerged,
         domains: stack,
-        timeSpan: props.timeSpan ? timeSpanToMoments(props.timeSpan, zone) : undefined,
-        maxDomain: props.maxDomain ? domainToMoments(props.maxDomain, zone) : undefined,
-        histo: props.histo?.items
-            ? { ...props.histo, items: props.histo.items.map((it: any) => ({ ...it, time: toMoment(it.time, zone) })) }
-            : props.histo,
-        quality: props.quality?.items
-            ? { ...props.quality, items: props.quality.items.map((it: any) => ({ ...it, time: toMoment(it.time, zone) })) }
-            : props.quality,
-        biggestVisibleDomain: props.biggestVisibleDomain != null ? toDuration(props.biggestVisibleDomain) : undefined,
-        biggestTimeSpan: props.biggestTimeSpan != null ? toDuration(props.biggestTimeSpan) : undefined,
-        smallestResolution: props.smallestResolution != null ? toDuration(props.smallestResolution) : undefined,
+        timeSpan: timeSpanMoments,
+        maxDomain: maxDomainMoments,
+        histo: histoMoments,
+        quality: qualityMoments,
+        biggestVisibleDomain: biggestVisibleDomainDur,
+        biggestTimeSpan: biggestTimeSpanDur,
+        smallestResolution: smallestResolutionDur,
         onUpdateDomains: handleUpdateDomains,
         onLoadDefaultDomain: handleLoadDefault,
         // onLoadHisto: object shape + Date instants