@fundar/data-chart-telling 0.0.63 → 1.0.0

package/dist/layout/geometry/GeometryLayout.svelte

@@ -1,233 +1,296 @@
-<script lang="ts" generics="TData extends Record<string, unknown>, TSeries extends Record<string, unknown> = TData">
-  import type { Snippet } from 'svelte';
-  import { SvelteMap } from 'svelte/reactivity';
-  import BarMarker from '../../markers/BarMarker.svelte';
-  import LineMarker from '../../markers/LineMarker.svelte';
-  import CellMarker from '../../markers/CellMarker.svelte';
-  import DotMarker from '../../markers/DotMarker.svelte';
-  import TextMarker from '../../markers/TextMarker.svelte';
-  import RuleMarker from '../../markers/RuleMarker.svelte';
-  import HoverMarker from '../../markers/HoverMarker.svelte';
-  import GeoHoverMarker from '../../markers/GeoHoverMarker.svelte';
-  import DeltaMarker from '../../markers/DeltaMarker.svelte';
-  import GeoFeaturesMarker from '../../markers/GeoFeaturesMarker.svelte';
-  import GraticuleMarker from '../../markers/GraticuleMarker.svelte';
-  import SphereMarker from '../../markers/SphereMarker.svelte';
-  import VectorMarker from '../../markers/VectorMarker.svelte';
-  import LinkMarker from '../../markers/LinkMarker.svelte';
-  import ContourMarker from '../../markers/ContourMarker.svelte';
-  import ContourClipMarker from '../../markers/ContourClipMarker.svelte';
-  import InsetMarker from '../../markers/inset/InsetMarker.svelte';
-  import { getConfiguration } from '../../configuration/config.svelte';
-  import { resolveAccessor } from '../../plots/utils/accessors';
-  import type { Series } from '../../types/plots/data/common';
-  import type { HoverMarkerConfig, CustomComponentMarkerConfig } from '../../types/markers/common';
-  import type { MarkerConfig } from '../../types/markers/all';
-  import type { TooltipAnchorX, TooltipAnchorY } from '../../types/layout/tooltip';
-  import type { HoverController } from '../tooltip/controller.svelte';
-  import type { ScopedMarkerGroup } from '../../types/layout/geometry';
-  import type { GeoFeature } from '../../types/plots/data/geo';
+<script
+	lang="ts"
+	generics="TData extends Record<string, unknown>, TSeries extends Record<string, unknown> = TData"
+>
+	import BarMarker from '../../markers/bar/BarMarker.svelte';
+	import LineMarker from '../../markers/line/LineMarker.svelte';
+	import CellMarker from '../../markers/cell/CellMarker.svelte';
+	import RectMarker from '../../markers/rect/RectMarker.svelte';
+	import RegressionMarker from '../../markers/regression/RegressionMarker.svelte';
+	import BollingerMarker from '../../markers/bollinger/BollingerMarker.svelte';
+	import AreaMarker from '../../markers/area/AreaMarker.svelte';
+	import DensityMarker from '../../markers/density/DensityMarker.svelte';
+	import BoxMarker from '../../markers/box/BoxMarker.svelte';
+	import HullMarker from '../../markers/hull/HullMarker.svelte';
+	import DifferenceMarker from '../../markers/difference/DifferenceMarker.svelte';
+	import ArrowMarker from '../../markers/arrow/ArrowMarker.svelte';
+	import BrushMarker from '../../markers/brush/BrushMarker.svelte';
+	import DelaunayLinkMarker from '../../markers/delaunay/DelaunayLinkMarker.svelte';
+	import DelaunayMeshMarker from '../../markers/delaunay/DelaunayMeshMarker.svelte';
+	import VoronoiMarker from '../../markers/voronoi/VoronoiMarker.svelte';
+	import VoronoiMeshMarker from '../../markers/voronoi/VoronoiMeshMarker.svelte';
+	import ImageMarker from '../../markers/image/ImageMarker.svelte';
+	import RasterMarker from '../../markers/raster/RasterMarker.svelte';
+	import TickMarker from '../../markers/tick/TickMarker.svelte';
+	import TrailMarker from '../../markers/trail/TrailMarker.svelte';
+	import WaffleMarker from '../../markers/waffle/WaffleMarker.svelte';
+	import DotMarker from '../../markers/dot/DotMarker.svelte';
+	import TextMarker from '../../markers/text/TextMarker.svelte';
+	import RuleMarker from '../../markers/rule/RuleMarker.svelte';
+	import HoverMarker from '../../markers/hover/HoverMarker.svelte';
+	import GeoHoverMarker from '../../markers/geo/GeoHoverMarker.svelte';
+	import DeltaMarker from '../../markers/delta/DeltaMarker.svelte';
+	import GeoFeaturesMarker from '../../markers/geo/GeoFeaturesMarker.svelte';
+	import GraticuleMarker from '../../markers/geo/GraticuleMarker.svelte';
+	import SphereMarker from '../../markers/geo/SphereMarker.svelte';
+	import VectorMarker from '../../markers/vector/VectorMarker.svelte';
+	import LinkMarker from '../../markers/link/LinkMarker.svelte';
+	import ContourMarker from '../../markers/contour/ContourMarker.svelte';
+	import ContourClipMarker from '../../markers/contour/ContourClipMarker.svelte';
+	import InsetMarker from '../../markers/inset/InsetMarker.svelte';
+	import FrameClip from './FrameClip.svelte';
+	import { getConfiguration } from '../../configuration/config.svelte';
+	import { usePlot } from '../plot/usePlot';
+	import { PlotMargins } from '../margins/PlotMargins.svelte';
+	import type { Series } from '../../types/plots/data/common';
+	import type { MarkerConfig } from '../../types/markers/all';
+	import type { TooltipAnchorX, TooltipAnchorY } from '../../types/layout/tooltip';
+	import type { PlotHover } from '../hover/PlotHover.svelte';
+	import type { ScopedMarkerGroup } from '../../types/layout/geometry';
+	import type { GeoFeature } from '../../types/plots/data/geo';
+	import type { ChannelScalesConfig } from '../../types/layout/scales';
+	import { MarkerGrouping } from '../../phases/statistics/MarkerGrouping';
+	import { FrameClipping } from './FrameClipping';
 
-  /**
-   * Renders every marker in `markers`, in array order, each delegated to the
-   * component that draws it. Owns only routing, plus the few extra props a
-   * marker kind needs beyond its own config (hover-controller state for
-   * `hover`; per-series data/color for a `series`-scoped `hover`/`component`).
-   * `children` (value labels) renders last, on top of everything here.
-   *
-   * A marker scoped to one `series` renders once per matching entry in
-   * `scopedGroups` instead of the plain loop, since it needs that series'
-   * own data/color and resolved segments. `width`/`height`/`numericMargins`/
-   * `geoAllFeatures` are `GeoPlot`-only context an `inset` marker needs
-   * beyond its own config; `data` is `BasePlotLayout`'s own rows, forwarded
-   * for `contour`'s clip and unscoped `geo-component`'s fallback data —
-   * both reachable only through `GeoMarkersConfig`, so `data` is always
-   * `GeoFeature`-shaped there despite the generic `TData` bound.
-   */
-  let {
-    width,
-    height,
-    markers = [],
-    seriesData = [],
-    scopedGroups = [],
-    ctrl,
-    numericMargins,
-    data = [],
-    geoAllFeatures = [],
-    tooltipAnchorX,
-    tooltipAnchorY,
-    children,
-  }: {
-    /** The plot's own outer width/height — `inset` marker only, to size its content box. */
-    width?: number;
-    height?: number;
-    markers?: MarkerConfig[];
-    /** All resolved series, forwarded to unscoped `component`/`delta` markers. Independently generic over `TSeries` (defaults to `TData`). */
-    seriesData?: Series<TSeries>[];
-    /** One entry per series that can own a `series`-scoped marker. Same `TSeries` as `seriesData`. */
-    scopedGroups?: ScopedMarkerGroup<TSeries>[];
-    /** `BasePlotLayout`'s own hover controller. */
-    ctrl: HoverController<TData>;
-    /** The plot's own resolved margins — `inset` marker only, to place its content box. */
-    numericMargins?: { top: number; right: number; bottom: number; left: number };
-    /** `BasePlotLayout`'s own rows — `contour` (clip) and unscoped `geo-component` fallback data. */
-    data?: TData[];
-    /** `GeoPlot`'s own untouched, tagged features — `inset` marker only (shows a part the main map may exclude). */
-    geoAllFeatures?: (GeoFeature<Record<string, unknown>> & { __id: string })[];
-    /** The plot's own top-level `tooltip.anchorX`/`anchorY` — `inset` marker only, as the fallback its own tooltip inherits when unset. */
-    tooltipAnchorX?: TooltipAnchorX;
-    tooltipAnchorY?: TooltipAnchorY;
-    /** Rendered last, on top of every marker — typically value labels. Optional; a plot kind may have nothing extra to add. */
-    children?: Snippet;
-  } = $props();
+	/**
+	 * Renders every marker in `markers`, in array order, each delegated to the
+	 * component that draws it. Owns only routing, plus the few extra props a
+	 * marker kind needs beyond its own config (hover-controller state for
+	 * `hover`; per-series data/color for a `series`-scoped `hover`/`component`).
+	 *
+	 * A marker scoped to one `series` renders against its entry in
+	 * `scopedGroups`, since it needs that series' own data/color and resolved
+	 * segments; one whose series has no entry renders nothing. `width`/`height`/`numericMargins`/
+	 * `geoAllFeatures` are `GeoPlot`-only context an `inset` marker needs
+	 * beyond its own config; `data` is `BasePlotLayout`'s own rows, forwarded
+	 * as the fallback every `CommonMarkerConfig`-based marker's own (optional)
+	 * `data` falls back to when unset, plus `contour`'s clip and unscoped
+	 * `geo-component`'s fallback data - the latter two reachable only through
+	 * `GeoMarkersConfig`, so `data` is always `GeoFeature`-shaped there
+	 * despite the generic `TData` bound.
+	 */
+	let {
+		width,
+		height,
+		markers = [],
+		seriesData = [],
+		scopedGroups = [],
+		channelScales = undefined,
+		ctrl,
+		numericMargins,
+		data = [],
+		geoAllFeatures = [],
+		tooltipAnchorX,
+		tooltipAnchorY
+	}: {
+		/** The plot's own outer width/height - sizes the content box an `inset` marker needs. */
+		width?: number;
+		height?: number;
+		markers?: MarkerConfig[];
+		/** All resolved series, forwarded to unscoped `component`/`delta` markers. Independently generic over `TSeries` (defaults to `TData`). */
+		seriesData?: Series<TSeries>[];
+		/** One entry per series that can own a `series`-scoped marker. Same `TSeries` as `seriesData`. */
+		scopedGroups?: ScopedMarkerGroup<TSeries>[];
+		/** This plot kind's own `color`/`grouping` channel config - the fallback a marker's own `scales` inherits when it sets none of its own. */
+		channelScales?: ChannelScalesConfig;
+		/** `BasePlotLayout`'s own hover controller. */
+		ctrl: PlotHover<TData>;
+		/** The plot's own resolved margins - places the content box an `inset` marker needs. */
+		numericMargins?: { top: number; right: number; bottom: number; left: number };
+		/** `BasePlotLayout`'s own rows - `contour` (clip) and unscoped `geo-component` fallback data. */
+		data?: TData[];
+		/** `GeoPlot`'s own untouched, tagged features - `inset` marker only (shows a part the main map may exclude). */
+		geoAllFeatures?: (GeoFeature<Record<string, unknown>> & { __id: string })[];
+		/** The plot's own top-level `tooltip.anchorX`/`anchorY` - `inset` marker only, as the fallback its own tooltip inherits when unset. */
+		tooltipAnchorX?: TooltipAnchorX;
+		tooltipAnchorY?: TooltipAnchorY;
+	} = $props();
 
-  const cfg = $derived(getConfiguration());
+	const cfg = $derived(getConfiguration());
 
-  const geometryMarkers = $derived(
-    markers.filter(
-      (marker) => !((marker.type === 'hover' || marker.type === 'component') && 'series' in marker && marker.series),
-    ),
-  );
+	// Mounted inside svelteplot's `<Plot>`, the one place the margins it settles on can be read.
+	PlotMargins.current()?.follow(usePlot().svelteplot);
 
-  const scopedMarkersByName = $derived.by(() => {
-    const map = new SvelteMap<string, (HoverMarkerConfig | CustomComponentMarkerConfig)[]>();
-    for (const marker of markers) {
-      if ((marker.type === 'hover' || marker.type === 'component') && 'series' in marker && marker.series) {
-        if (!map.has(marker.series)) map.set(marker.series, []);
-        map.get(marker.series)!.push(marker);
-      }
-    }
-    return map;
-  });
+	const scopedSeriesOf = (marker: MarkerConfig): string | undefined =>
+		'series' in marker && typeof marker.series === 'string' && marker.series
+			? marker.series
+			: undefined;
 
-  function markerKey(marker: MarkerConfig, i: number): string {
-    if (marker.type === 'rule') return `rule-${marker.axis}-${marker.value}`;
-    if (marker.type === 'bar') return `bar-${marker.role}-${i}`;
-    return `${marker.type}-${i}`;
-  }
+	const groupByName = $derived(new Map(scopedGroups.map((group) => [group.name, group])));
+
+	function markerKey(marker: MarkerConfig, i: number): string {
+		const scope = scopedSeriesOf(marker);
+		if (scope) return `${scope}-${marker.type}-${i}`;
+		if (marker.type === 'rule') {
+			const v = typeof marker.value === 'function' ? i : marker.value;
+			return `rule-${marker.axis}-${v}`;
+		}
+		if (marker.type === 'bar') return `bar-${marker.role}-${i}`;
+		return `${marker.type}-${i}`;
+	}
 </script>
 
-{#each geometryMarkers as marker, i (markerKey(marker, i))}
-  {#if marker.type === 'bar'}
-    <BarMarker {marker} />
-  {:else if marker.type === 'line'}
-    <LineMarker {marker} />
-  {:else if marker.type === 'cell'}
-    <CellMarker {marker} />
-  {:else if marker.type === 'dot'}
-    <DotMarker
-      data={marker.data}
-      x={resolveAccessor(marker.x)}
-      y={resolveAccessor(marker.y)}
-      r={typeof marker.r === 'number' || marker.r == null ? marker.r : resolveAccessor(marker.r)}
-      fill={marker.fill}
-      value={marker.value ? resolveAccessor(marker.value) : undefined}
-      style={marker.style}
-    />
-  {:else if marker.type === 'text'}
-    <TextMarker
-      data={marker.data}
-      x={resolveAccessor(marker.x)}
-      y={resolveAccessor(marker.y)}
-      text={marker.text}
-      style={marker.style}
-    />
-  {:else if marker.type === 'rule'}
-    <RuleMarker axis={marker.axis} value={marker.value} style={marker.style} />
-  {:else if marker.type === 'geo'}
-    <GeoFeaturesMarker {marker} />
-  {:else if marker.type === 'graticule'}
-    <GraticuleMarker {marker} />
-  {:else if marker.type === 'sphere'}
-    <SphereMarker {marker} />
-  {:else if marker.type === 'vector'}
-    <VectorMarker {marker} />
-  {:else if marker.type === 'link'}
-    <LinkMarker {marker} />
-  {:else if marker.type === 'contour'}
-    <!-- 'contour' only exists in GeoMarkersConfig, so `data` is always GeoFeature-shaped here despite the generic TData bound. -->
-    <ContourClipMarker mode={marker.clip} features={data as unknown as GeoFeature<Record<string, unknown>>[]}>
-      <ContourMarker {marker} />
-    </ContourClipMarker>
-  {:else if marker.type === 'inset'}
-    <InsetMarker
-      {marker}
-      features={geoAllFeatures}
-      width={Math.max(0, (width ?? 0) - (numericMargins?.left ?? 0) - (numericMargins?.right ?? 0))}
-      height={Math.max(0, (height ?? 0) - (numericMargins?.top ?? 0) - (numericMargins?.bottom ?? 0))}
-      left={numericMargins?.left ?? 0}
-      top={numericMargins?.top ?? 0}
-      defaultFill={cfg.palette[0]}
-      {tooltipAnchorX}
-      {tooltipAnchorY}
-    />
-  {:else if marker.type === 'component'}
-    <marker.component {...marker.props} data={marker.data ?? seriesData} />
-  {:else if marker.type === 'geo-component'}
-    <marker.component {...marker.props} data={marker.data ?? data} />
-  {:else if marker.type === 'hover'}
-    <HoverMarker
-      {marker}
-      data={ctrl.points}
-      activePoint={ctrl.activePoint}
-      impliesCrosshairX={ctrl.impliesCrosshairX}
-      impliesCrosshairY={ctrl.impliesCrosshairY}
-      onActivePointPixel={ctrl.reportActivePointPixel}
-    />
-  {:else if marker.type === 'geo-hover'}
-    <GeoHoverMarker {marker} data={ctrl.points} />
-  {:else if marker.type === 'delta'}
-    <DeltaMarker {marker} data={seriesData} />
-  {/if}
-{/each}
+{#snippet renderMarker(marker: MarkerConfig, rows: TData[] | TSeries[])}
+	{#if marker.type === 'bar'}
+		<BarMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'line'}
+		<LineMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'cell'}
+		<CellMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'rect'}
+		<RectMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'regression'}
+		<RegressionMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'bollinger'}
+		<BollingerMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'area'}
+		<AreaMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'density'}
+		<DensityMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'box'}
+		<BoxMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'hull'}
+		<HullMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'difference'}
+		<DifferenceMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'arrow'}
+		<ArrowMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'brush'}
+		<BrushMarker {marker} />
+	{:else if marker.type === 'delaunayLink'}
+		<DelaunayLinkMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'delaunayMesh'}
+		<DelaunayMeshMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'voronoi'}
+		<VoronoiMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'voronoiMesh'}
+		<VoronoiMeshMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'image'}
+		<ImageMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'raster'}
+		<RasterMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'tick'}
+		<TickMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'trail'}
+		<TrailMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'waffle'}
+		<WaffleMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'dot'}
+		<DotMarker
+			marker={{ ...marker, data: marker.data ?? rows, scales: marker.scales ?? channelScales }}
+		/>
+	{:else if marker.type === 'text'}
+		<TextMarker marker={{ ...marker, data: marker.data ?? rows }} />
+	{:else if marker.type === 'rule'}
+		<RuleMarker {marker} />
+	{:else if marker.type === 'geo'}
+		<GeoFeaturesMarker {marker} />
+	{:else if marker.type === 'graticule'}
+		<GraticuleMarker {marker} />
+	{:else if marker.type === 'sphere'}
+		<SphereMarker {marker} />
+	{:else if marker.type === 'vector'}
+		<VectorMarker {marker} />
+	{:else if marker.type === 'link'}
+		<LinkMarker {marker} />
+	{:else if marker.type === 'contour'}
+		<!-- 'contour' only exists in GeoMarkersConfig, so `data` is always GeoFeature-shaped here despite the generic TData bound. -->
+		<ContourClipMarker
+			mode={marker.clip}
+			features={data as unknown as GeoFeature<Record<string, unknown>>[]}
+		>
+			<ContourMarker {marker} />
+		</ContourClipMarker>
+	{:else if marker.type === 'inset'}
+		<InsetMarker
+			{marker}
+			features={geoAllFeatures}
+			width={Math.max(0, (width ?? 0) - (numericMargins?.left ?? 0) - (numericMargins?.right ?? 0))}
+			height={Math.max(
+				0,
+				(height ?? 0) - (numericMargins?.top ?? 0) - (numericMargins?.bottom ?? 0)
+			)}
+			left={numericMargins?.left ?? 0}
+			top={numericMargins?.top ?? 0}
+			defaultFill={cfg.palette[0]}
+			{tooltipAnchorX}
+			{tooltipAnchorY}
+		/>
+	{:else if marker.type === 'component'}
+		<marker.component {...marker.props} data={marker.data ?? seriesData} />
+	{:else if marker.type === 'geo-component'}
+		<marker.component {...marker.props} data={marker.data ?? rows} />
+	{:else if marker.type === 'hover'}
+		<HoverMarker
+			{marker}
+			data={ctrl.points}
+			activePoint={ctrl.activePoint}
+			impliesCrosshairX={ctrl.impliesCrosshairX}
+			impliesCrosshairY={ctrl.impliesCrosshairY}
+			onActivePointPixel={ctrl.reportActivePointPixel}
+		/>
+	{:else if marker.type === 'geo-hover'}
+		<GeoHoverMarker {marker} data={ctrl.points} />
+	{:else if marker.type === 'delta'}
+		<DeltaMarker {marker} data={seriesData} />
+	{/if}
+{/snippet}
 
-{#each scopedGroups as group (group.name)}
-  {#each scopedMarkersByName.get(group.name) ?? [] as marker, i (`${group.name}-${marker.type}-${i}`)}
-    {#if marker.type === 'hover'}
-      {@const seriesPoints = ctrl.points.filter((p) => p.series === group.name)}
-      {#if marker.scope === 'segment'}
-        {#each group.segments as seg, segIdx (`${group.name}-hover-segment-${segIdx}`)}
-          <!-- p.row (TData) is always a superset of TSeries in practice, not provable across two independent generics. -->
-          {@const segPoints = seriesPoints.filter((p) => seg.match(p.row as unknown as TSeries))}
-          {#if segPoints.length > 0}
-            <HoverMarker
-              {marker}
-              data={segPoints}
-              activePoint={segPoints[0] ?? null}
-              impliesCrosshairX={ctrl.impliesCrosshairX}
-              impliesCrosshairY={ctrl.impliesCrosshairY}
-              seriesColor={seg.color}
-            />
-          {/if}
-        {/each}
-      {:else}
-        <HoverMarker
-          {marker}
-          data={seriesPoints}
-          activePoint={seriesPoints[0] ?? null}
-          impliesCrosshairX={ctrl.impliesCrosshairX}
-          impliesCrosshairY={ctrl.impliesCrosshairY}
-          seriesColor={group.segments[0]?.color ?? group.color}
-        />
-      {/if}
-    {:else if marker.type === 'component'}
-      {#if marker.scope === 'segment'}
-        {#each group.segments as seg, segIdx (`${group.name}-component-segment-${segIdx}`)}
-          {@const segmentData = group.data.filter((row) => seg.match(row))}
-          {#if segmentData.length > 0}
-            <marker.component {...marker.props} series={group.name} data={segmentData} seriesColor={seg.color} />
-          {/if}
-        {/each}
-      {:else}
-        <marker.component
-          {...marker.props}
-          series={group.name}
-          data={group.data}
-          seriesColor={group.segments[0]?.color ?? group.color}
-        />
-      {/if}
-    {/if}
-  {/each}
-{/each}
+{#snippet renderScoped(marker: MarkerConfig, group: ScopedMarkerGroup<TSeries>)}
+	{#if marker.type === 'hover'}
+		{@const seriesPoints = ctrl.points.filter((p) => p.series === group.name)}
+		{#if marker.scope === 'segment'}
+			{#each group.segments as seg, segIdx (`${group.name}-hover-segment-${segIdx}`)}
+				<!-- p.row (TData) is always a superset of TSeries in practice, not provable across two independent generics. -->
+				{@const segPoints = seriesPoints.filter((p) => seg.match(p.row as unknown as TSeries))}
+				{#if segPoints.length > 0}
+					<HoverMarker
+						marker={MarkerGrouping.withHoverSeriesColor(marker, seg.color)}
+						data={segPoints}
+						activePoint={segPoints[0] ?? null}
+						impliesCrosshairX={ctrl.impliesCrosshairX}
+						impliesCrosshairY={ctrl.impliesCrosshairY}
+					/>
+				{/if}
+			{/each}
+		{:else}
+			<HoverMarker
+				marker={MarkerGrouping.withHoverSeriesColor(
+					marker,
+					group.segments[0]?.color ?? group.color
+				)}
+				data={seriesPoints}
+				activePoint={seriesPoints[0] ?? null}
+				impliesCrosshairX={ctrl.impliesCrosshairX}
+				impliesCrosshairY={ctrl.impliesCrosshairY}
+			/>
+		{/if}
+	{:else if marker.type === 'component'}
+		{#if marker.scope === 'segment'}
+			{#each group.segments as seg, segIdx (`${group.name}-component-segment-${segIdx}`)}
+				{@const segmentData = group.data.filter((row) => seg.match(row))}
+				{#if segmentData.length > 0}
+					<marker.component {...marker.props} series={group.name} data={segmentData} />
+				{/if}
+			{/each}
+		{:else}
+			<marker.component {...marker.props} series={group.name} data={group.data} />
+		{/if}
+	{:else}
+		<FrameClip clip={FrameClipping.isClipped(marker)}>
+			{@render renderMarker(MarkerGrouping.withSeriesColor(marker, group.color), group.data)}
+		</FrameClip>
+	{/if}
+{/snippet}
 
-{@render children?.()}
+<!-- Every marker in array order, so a later one always draws on top. -->
+{#each markers as marker, i (markerKey(marker, i))}
+	{@const scope = scopedSeriesOf(marker)}
+	{#if scope === undefined}
+		<FrameClip clip={FrameClipping.isClipped(marker)}>
+			{@render renderMarker(marker, data)}
+		</FrameClip>
+	{:else if groupByName.has(scope)}
+		{@render renderScoped(marker, groupByName.get(scope)!)}
+	{/if}
+{/each}

package/dist/layout/geometry/GeometryLayout.svelte.d.ts

@@ -1,13 +1,13 @@
-import type { Snippet } from 'svelte';
 import type { Series } from '../../types/plots/data/common';
 import type { MarkerConfig } from '../../types/markers/all';
 import type { TooltipAnchorX, TooltipAnchorY } from '../../types/layout/tooltip';
-import type { HoverController } from '../tooltip/controller.svelte';
+import type { PlotHover } from '../hover/PlotHover.svelte';
 import type { ScopedMarkerGroup } from '../../types/layout/geometry';
 import type { GeoFeature } from '../../types/plots/data/geo';
+import type { ChannelScalesConfig } from '../../types/layout/scales';
 declare function $$render<TData extends Record<string, unknown>, TSeries extends Record<string, unknown> = TData>(): {
     props: {
-        /** The plot's own outer width/height — `inset` marker only, to size its content box. */
+        /** The plot's own outer width/height - sizes the content box an `inset` marker needs. */
         width?: number;
         height?: number;
         markers?: MarkerConfig[];
@@ -15,26 +15,26 @@ declare function $$render<TData extends Record<string, unknown>, TSeries extends
         seriesData?: Series<TSeries>[];
         /** One entry per series that can own a `series`-scoped marker. Same `TSeries` as `seriesData`. */
         scopedGroups?: ScopedMarkerGroup<TSeries>[];
+        /** This plot kind's own `color`/`grouping` channel config - the fallback a marker's own `scales` inherits when it sets none of its own. */
+        channelScales?: ChannelScalesConfig;
         /** `BasePlotLayout`'s own hover controller. */
-        ctrl: HoverController<TData>;
-        /** The plot's own resolved margins — `inset` marker only, to place its content box. */
+        ctrl: PlotHover<TData>;
+        /** The plot's own resolved margins - places the content box an `inset` marker needs. */
         numericMargins?: {
             top: number;
             right: number;
             bottom: number;
             left: number;
         };
-        /** `BasePlotLayout`'s own rows — `contour` (clip) and unscoped `geo-component` fallback data. */
+        /** `BasePlotLayout`'s own rows - `contour` (clip) and unscoped `geo-component` fallback data. */
         data?: TData[];
-        /** `GeoPlot`'s own untouched, tagged features — `inset` marker only (shows a part the main map may exclude). */
+        /** `GeoPlot`'s own untouched, tagged features - `inset` marker only (shows a part the main map may exclude). */
         geoAllFeatures?: (GeoFeature<Record<string, unknown>> & {
             __id: string;
         })[];
-        /** The plot's own top-level `tooltip.anchorX`/`anchorY` — `inset` marker only, as the fallback its own tooltip inherits when unset. */
+        /** The plot's own top-level `tooltip.anchorX`/`anchorY` - `inset` marker only, as the fallback its own tooltip inherits when unset. */
         tooltipAnchorX?: TooltipAnchorX;
         tooltipAnchorY?: TooltipAnchorY;
-        /** Rendered last, on top of every marker — typically value labels. Optional; a plot kind may have nothing extra to add. */
-        children?: Snippet;
     };
     exports: {};
     bindings: "";