@fundar/data-chart-telling 0.0.32 → 0.0.33

package/dist/plots/line/Plot.svelte

@@ -107,18 +107,6 @@
     }),
   );
 
-  // Last *real* data point per series (skipping any trailing gap row), with
-  // its palette index for colour.
-  const lastPoints = $derived(
-    resolvedSeries
-      .map((s, idx) => {
-        const sy = resolveAccessor(s.y);
-        const lastRow = [...s.data].reverse().find((d) => !isGapValue(sy(d)));
-        return { series: s, lastRow, seriesIndex: idx };
-      })
-      .filter((p): p is { series: Series<TData>; lastRow: TData; seriesIndex: number } => p.lastRow !== undefined),
-  );
-
   const hover = $derived({
     active: tooltip != null || hasHoverMarker(markers),
     points: hoverPoints,
@@ -153,6 +141,21 @@
     }),
   );
 
+  const lastPoints = $derived(
+    resolvedSeries
+      .map((s, idx) => {
+        const sy = resolveAccessor(s.y);
+        const lastRow = [...s.data].reverse().find((d) => !isGapValue(sy(d)));
+        if (lastRow === undefined) return undefined;
+        const group = scopedGroups.find((g) => g.name === s.name);
+        const matchedSeg = group?.segments.find((seg) => seg.match(lastRow));
+        const color =
+          matchedSeg?.color ?? group?.segments[0]?.color ?? group?.color ?? paletteColor(idx, cfg.palette);
+        return { series: s, lastRow, color };
+      })
+      .filter((p): p is { series: Series<TData>; lastRow: TData; color: string } => p !== undefined),
+  );
+
   // End-of-line labels can grow past the plot's own content box, into its
   // margin — reserving real space there (rather than padding the domain,
   // which would falsely imply data exists past the last real point) is

package/dist/plots/line/ValueLabels.svelte

@@ -3,7 +3,6 @@
   import { Text, usePlot } from 'svelteplot';
   import { resolveAccessor } from '../utils/accessors';
   import { getConfiguration } from '../../configuration/config.svelte';
-  import { paletteColor } from '../../utils/color';
   import { declutter1D, laneAssignment } from '../utils/declutter';
   import { disabledFillOverride, disabledStrokeOverride } from '../utils/legendDisabled';
   import { watchLabelOverflow } from '../utils/labelOverflow.svelte';
@@ -32,7 +31,7 @@
     onHoverSeries,
     onHoverEnd,
   }: {
-    lastPoints: { series: Series<TData>; lastRow: TData; seriesIndex: number }[];
+    lastPoints: { series: Series<TData>; lastRow: TData; color: string }[];
     values: ValuesStyle | undefined;
     /** The plot's own pixel size — together with `numericMargins`, the ground truth for its content box (see `bounds()` below for why `usePlot()`'s own scale range can't be trusted for this). */
     width: number;
@@ -183,10 +182,9 @@
 </script>
 
 <g bind:this={groupEl}>
-{#each lastPoints as { series: s, lastRow, seriesIndex } (s.name)}
+{#each lastPoints as { series: s, lastRow, color: seriesColor } (s.name)}
   {@const xFn = resolveAccessor(s.x)}
   {@const yFn = resolveAccessor(s.y)}
-  {@const seriesColor = paletteColor(seriesIndex, cfg.palette)}
   {@const offset = declutteredOffsets.get(s.name)}
   {@const extraDy = offset?.inGroup ? offset.extraDy : 0}
   {@const baseDx = font?.dx ?? defaultDx}

package/dist/plots/line/ValueLabels.svelte.d.ts

@@ -7,7 +7,7 @@ declare function $$render<TData extends Record<string, unknown>>(): {
         lastPoints: {
             series: Series<TData>;
             lastRow: TData;
-            seriesIndex: number;
+            color: string;
         }[];
         values: ValuesStyle | undefined;
         /** The plot's own pixel size — together with `numericMargins`, the ground truth for its content box (see `bounds()` below for why `usePlot()`'s own scale range can't be trusted for this). */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fundar/data-chart-telling",
-  "version": "0.0.32",
+  "version": "0.0.33",
   "type": "module",
   "files": [
     "dist"