matterviz 0.4.1 → 0.4.2

package/dist/plot/histogram/Histogram.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { format_value } from '../../labels'
+  import { format_value_or_num } from '../../labels'
   import { FullscreenToggle, set_fullscreen_bg } from '../../layout'
   import type {
     AxisLoadError,
@@ -15,10 +15,22 @@
     HistogramControls,
     PlotAxis,
     PlotLegend,
+    PlotMarginals,
     ReferenceLine,
   } from '..'
-  import type { AxisChangeState } from '../core/axis-utils'
-  import { AXIS_DEFAULTS, create_axis_loader } from '../core/axis-utils'
+  import type { MarginalSeriesInput, MarginalsProp } from '../core/marginals'
+  import {
+    add_sides,
+    marginal_axis,
+    marginal_axis_presence,
+    normalize_marginals,
+    reserve_marginal_pad,
+  } from '../core/marginals'
+  import {
+    AXIS_DEFAULTS,
+    type AxisChangeState,
+    create_axis_loader,
+  } from '../core/axis-utils'
   import { extract_series_color, prepare_legend_data } from '../core/data-transform'
   import { create_placed_tween } from '../core/placed-tween.svelte'
   import { create_pan_zoom } from '../core/pan-zoom.svelte'
@@ -29,7 +41,9 @@
     vec2_equal,
   } from '../core/interactions'
   import {
+    AXIS_TITLE_OFFSET,
     calc_auto_padding,
+    DEFAULT_PLOT_PADDING,
     filter_padding,
     LABEL_GAP_DEFAULT,
     y2_axis_label_x,
@@ -46,7 +60,7 @@
   import type { IndexedRefLine } from '../core/reference-line'
   import { group_ref_lines_by_z, index_ref_lines } from '../core/reference-line'
   import {
-    create_scale,
+    create_axis_scales,
     generate_ticks,
     get_nice_data_range,
     get_tick_label,
@@ -56,13 +70,15 @@
     DataSeries,
     LegendConfig,
     PlotConfig,
-    ScaleType,
   } from '../core/types'
-  import { get_scale_type_name } from '../core/types'
+  import {
+    compute_count_range,
+    compute_histogram_bins,
+    log_safe_range,
+  } from './histogram'
   import ZeroLines from '../core/components/ZeroLines.svelte'
   import ZoomRect from '../core/components/ZoomRect.svelte'
   import { DEFAULTS } from '../../settings'
-  import { bin, max } from 'd3-array'
   import type { Snippet } from 'svelte'
   import { onDestroy, untrack } from 'svelte'
   import type { HTMLAttributes } from 'svelte/elements'
@@ -78,8 +94,8 @@
     y_axis: y_axis_init = {},
     y2_axis: y2_axis_init = {},
     display: display_init = DEFAULTS.histogram.display,
-    range_padding = 0.05,
-    padding = { t: 20, b: 60, l: 60, r: 20 },
+    range_padding = 0,
+    padding = DEFAULT_PLOT_PADDING,
     bins = $bindable(100),
     show_legend = $bindable(true),
     legend = {},
@@ -108,49 +124,47 @@
     on_axis_change,
     on_error,
     pan = {},
+    marginals = false,
     ...rest
-  }: HTMLAttributes<HTMLDivElement> & BasePlotProps & PlotConfig & {
-    series: DataSeries[]
-    // Component-specific props
-    bins?: number
-    show_legend?: boolean
-    legend?: LegendConfig | null
-    bar?: BarStyle
-    selected_property?: string
-    mode?: `single` | `overlay`
-    tooltip?: Snippet<[HistogramHandlerProps]>
-    header_controls?: Snippet<
-      [{ height: number; width: number; fullscreen: boolean }]
-    >
-    controls_extra?: Snippet<[Required<PlotConfig>]>
-    change?: (data: { value: number; count: number; property: string } | null) => void
-    on_bar_click?: (
-      data: {
+  }: HTMLAttributes<HTMLDivElement> &
+    BasePlotProps &
+    PlotConfig & {
+      series: DataSeries[]
+      // Component-specific props
+      bins?: number
+      show_legend?: boolean
+      legend?: LegendConfig | null
+      bar?: BarStyle
+      selected_property?: string
+      mode?: `single` | `overlay`
+      tooltip?: Snippet<[HistogramHandlerProps]>
+      header_controls?: Snippet<[{ height: number; width: number; fullscreen: boolean }]>
+      controls_extra?: Snippet<[Required<PlotConfig>]>
+      change?: (data: { value: number; count: number; property: string } | null) => void
+      on_bar_click?: (data: {
         value: number
         count: number
         property: string
         event: MouseEvent | KeyboardEvent
-      },
-    ) => void
-    on_bar_hover?: (
-      data:
-        | { value: number; count: number; property: string; event: MouseEvent }
-        | null,
-    ) => void
-    ref_lines?: RefLine[]
-    on_ref_line_click?: (event: RefLineEvent) => void
-    on_ref_line_hover?: (event: RefLineEvent | null) => void
-    on_series_toggle?: (series_idx: number) => void
-    // Interactive axis props
-    data_loader?: DataLoaderFn
-    on_axis_change?: (
-      axis: `x` | `x2` | `y` | `y2`,
-      key: string,
-      new_series: DataSeries[],
-    ) => void
-    on_error?: (error: AxisLoadError) => void
-    pan?: PanConfig
-  } = $props()
+      }) => void
+      on_bar_hover?: (
+        data: { value: number; count: number; property: string; event: MouseEvent } | null,
+      ) => void
+      ref_lines?: RefLine[]
+      on_ref_line_click?: (event: RefLineEvent) => void
+      on_ref_line_hover?: (event: RefLineEvent | null) => void
+      on_series_toggle?: (series_idx: number) => void
+      // Interactive axis props
+      data_loader?: DataLoaderFn
+      on_axis_change?: (
+        axis: `x` | `x2` | `y` | `y2`,
+        key: string,
+        new_series: DataSeries[],
+      ) => void
+      on_error?: (error: AxisLoadError) => void
+      pan?: PanConfig
+      marginals?: MarginalsProp
+    } = $props()
 
   // Local state for controls (initialized from props, owned by this component)
   // Include key AXIS_DEFAULTS props (range, ticks, scale_type) that PlotControls needs
@@ -160,25 +174,29 @@
   let bar = $state(untrack(() => ({ ...DEFAULTS.histogram.bar, ...bar_init })))
   let x_axis = $state(untrack(() => ({ ...axis_state_defaults, ...x_axis_init })))
   // x2-axis needs different default label_shift for top-side positioning
-  let x2_axis = $state(untrack(() => ({
-    ...axis_state_defaults,
-    label_shift: { x: 0, y: 40 },
-    ...x2_axis_init,
-  })))
+  let x2_axis = $state(
+    untrack(() => ({
+      ...axis_state_defaults,
+      label_shift: { x: 0, y: AXIS_TITLE_OFFSET },
+      ...x2_axis_init,
+    })),
+  )
   let y_axis = $state(untrack(() => ({ ...axis_state_defaults, ...y_axis_init })))
   // y2 title stays vertically centered; its x position is computed by y2_axis_label_x
-  let y2_axis = $state(untrack(() => ({
-    ...axis_state_defaults,
-    label_shift: { x: 0, y: 0 },
-    ...y2_axis_init,
-  })))
-  let display = $state(
-    untrack(() => ({ ...DEFAULTS.histogram.display, ...display_init })),
+  let y2_axis = $state(
+    untrack(() => ({
+      ...axis_state_defaults,
+      label_shift: { x: 0, y: 0 },
+      ...y2_axis_init,
+    })),
   )
+  let display = $state(untrack(() => ({ ...DEFAULTS.histogram.display, ...display_init })))
 
   // Merge component-specific defaults with local state (format comes from here, not AXIS_DEFAULTS)
-  const final_x_axis = $derived({ label: `Value`, format: `.2~s`, ...x_axis })
-  const final_x2_axis = $derived({ label: `Value`, format: `.2~s`, ...x2_axis })
+  // No default tick format: PlotAxis falls back to format_num, which uses SI
+  // prefixes above 1 but plain decimals below (0.2 must not render as 200m)
+  const final_x_axis = $derived({ label: `Value`, ...x_axis })
+  const final_x2_axis = $derived({ label: `Value`, ...x2_axis })
   const final_y_axis = $derived({ label: `Count`, format: `d`, ...y_axis })
   const final_bar = $derived({ ...DEFAULTS.histogram.bar, ...bar })
   const final_y2_axis = $derived({ label: `Count`, format: `d`, ...y2_axis })
@@ -197,8 +215,7 @@
   let axis_loading = $state<`x` | `x2` | `y` | `y2` | null>(null)
 
   // Compute ref_lines with index and group by z-index (using shared utilities)
-  let indexed_ref_lines = $derived(index_ref_lines(ref_lines))
-  let ref_lines_by_z = $derived(group_ref_lines_by_z(indexed_ref_lines))
+  let ref_lines_by_z = $derived(group_ref_lines_by_z(index_ref_lines(ref_lines)))
 
   // Legend placement stability state
   let legend_element = $state<HTMLDivElement | undefined>()
@@ -220,29 +237,24 @@
   let selected_series_entries = $derived<IndexedSeries[]>(
     series
       .map((series_data: DataSeries, series_idx: number) => ({ series_data, series_idx }))
-      .filter(({ series_data }) =>
-        (series_data.visible ?? true) &&
-        (mode !== `single` || !selected_property || series_data.label === selected_property)
+      .filter(
+        ({ series_data }) =>
+          (series_data.visible ?? true) &&
+          (mode !== `single` || !selected_property || series_data.label === selected_property),
       ),
   )
-  let selected_series = $derived(
-    selected_series_entries.map(({ series_data }) => series_data),
-  )
+  let selected_series = $derived(selected_series_entries.map(({ series_data }) => series_data))
 
   // Separate series by y-axis
   let y1_series = $derived(
     selected_series.filter((srs: DataSeries) => (srs.y_axis ?? `y1`) === `y1`),
   )
-  let y2_series = $derived(
-    selected_series.filter((srs: DataSeries) => srs.y_axis === `y2`),
-  )
-  let x2_series = $derived(
-    selected_series.filter((srs: DataSeries) => srs.x_axis === `x2`),
-  )
+  let y2_series = $derived(selected_series.filter((srs: DataSeries) => srs.y_axis === `y2`))
+  let x2_series = $derived(selected_series.filter((srs: DataSeries) => srs.x_axis === `x2`))
 
   let auto_ranges = $derived.by(() => {
     // Only x1 series contribute to the x1 auto-range (x2 series get their own domain below)
-    const x1_values = selected_series.flatMap((srs) => srs.x_axis === `x2` ? [] : srs.y)
+    const x1_values = selected_series.flatMap((srs) => (srs.x_axis === `x2` ? [] : srs.y))
     const auto_x = get_nice_data_range(
       x1_values.map((val) => ({ x: val, y: 0 })),
       ({ x }) => x,
@@ -253,68 +265,29 @@
     )
 
     const x2_values = x2_series.flatMap((srs: DataSeries) => srs.y)
-    const auto_x2 = x2_values.length > 0
-      ? get_nice_data_range(
-        x2_values.map((val) => ({ x: val, y: 0 })),
-        ({ x }) => x,
-        final_x2_axis.range ?? [null, null],
-        final_x2_axis.scale_type ?? `linear`,
-        range_padding,
-        false,
-      )
-      : [0, 1] as Vec2
-
-    // Calculate y-range for a specific set of series
-    const calc_y_range = (
-      series_list: typeof selected_series,
-      y_limit: [number | null, number | null],
-      scale_type: ScaleType,
-    ): Vec2 => {
-      const type_name = get_scale_type_name(scale_type)
-      if (series_list.length === 0) {
-        const fallback = type_name === `log` ? 1 : 0
-        return [fallback, 1]
-      }
-      // Bin each series over the domain of the x-axis it renders on (d3 bin() drops
-      // out-of-domain values, so binning x2 series over the x1 domain skews max_count)
-      const max_count = Math.max(
-        0,
-        ...series_list.map((srs: DataSeries) => {
-          const hist = bin().domain(srs.x_axis === `x2` ? auto_x2 : auto_x).thresholds(bins)
-          return max(hist(srs.y), (data) => data.length) || 0
-        }),
-      )
-
-      // If there's effectively no data, avoid log-range issues (counts can't be <= 0 on log)
-      if (max_count <= 0) {
-        const fallback = type_name === `log` ? 1 : 0
-        return [fallback, 1]
-      }
-
-      const [y0, y1] = get_nice_data_range(
-        [{ x: 0, y: 0 }, { x: max_count, y: 0 }],
-        ({ x }) => x,
-        y_limit,
-        scale_type,
-        range_padding,
-        false,
-      )
-      // For log scale, minimum must be >= 1 (count can't be 0 on log)
-      // For linear/arcsinh, start from 0
-      const y_min = type_name === `log` ? Math.max(1, y0) : Math.max(0, y0)
-      return [y_min, y1]
-    }
-
-    const y1_range = calc_y_range(
-      y1_series,
-      final_y_axis.range ?? [null, null],
-      final_y_axis.scale_type ?? `linear`,
-    )
-    const y2_auto_range = calc_y_range(
-      y2_series,
-      final_y2_axis.range ?? [null, null],
-      final_y2_axis.scale_type ?? `linear`,
-    )
+    const auto_x2 =
+      x2_values.length > 0
+        ? get_nice_data_range(
+            x2_values.map((val) => ({ x: val, y: 0 })),
+            ({ x }) => x,
+            final_x2_axis.range ?? [null, null],
+            final_x2_axis.scale_type ?? `linear`,
+            range_padding,
+            false,
+          )
+        : ([0, 1] as Vec2)
+
+    const count_cfg = { x_domain: auto_x, x2_domain: auto_x2, bin_count: bins, range_padding }
+    const y1_range = compute_count_range(y1_series, {
+      ...count_cfg,
+      scale_type: final_y_axis.scale_type ?? `linear`,
+      y_limit: log_safe_range(final_y_axis),
+    })
+    const y2_auto_range = compute_count_range(y2_series, {
+      ...count_cfg,
+      scale_type: final_y2_axis.scale_type ?? `linear`,
+      y_limit: log_safe_range(final_y2_axis),
+    })
 
     return { x: auto_x, x2: auto_x2, y: y1_range, y2: y2_auto_range }
   })
@@ -336,10 +309,16 @@
   })
 
   $effect(() => {
-    // Supports one-sided range pinning (null bounds fall back to auto); returns null
-    // for transient non-finite bounds (skip: writing NaN breaks scales and loops here)
+    // Supports one-sided range pinning (null bounds fall back to auto); returns null for transient
+    // non-finite bounds (skip: writing NaN breaks scales and loops here). y/y2 ranges are
+    // log-sanitized so an invalid (<= 0) log lower falls back to the auto count minimum.
     const next = resolve_axis_ranges(
-      { x: final_x_axis, x2: final_x2_axis, y: final_y_axis, y2: final_y2_axis },
+      {
+        x: final_x_axis,
+        x2: final_x2_axis,
+        y: { range: log_safe_range(final_y_axis) },
+        y2: { range: log_safe_range(final_y2_axis) },
+      },
       auto_ranges,
     )
     if (!next) return
@@ -348,15 +327,16 @@
     // (reading + writing the same state otherwise causes effect_update_depth_exceeded).
     const init = untrack(() => ranges.initial)
     if (!vec2_equal(init.x, next.x)) [ranges.initial.x, ranges.current.x] = [next.x, next.x]
-    if (!vec2_equal(init.x2, next.x2)) [ranges.initial.x2, ranges.current.x2] = [next.x2, next.x2]
+    if (!vec2_equal(init.x2, next.x2))
+      [ranges.initial.x2, ranges.current.x2] = [next.x2, next.x2]
     if (!vec2_equal(init.y, next.y)) [ranges.initial.y, ranges.current.y] = [next.y, next.y]
-    if (!vec2_equal(init.y2, next.y2)) [ranges.initial.y2, ranges.current.y2] = [next.y2, next.y2]
+    if (!vec2_equal(init.y2, next.y2))
+      [ranges.initial.y2, ranges.current.y2] = [next.y2, next.y2]
   })
 
   // Layout: dynamic padding based on tick label widths
-  const default_padding = { t: 20, b: 60, l: 60, r: 20 }
   // base_pad reserves space for tick labels/axis titles; pad (below) adds decoration reservations
-  let base_pad = $derived(filter_padding(padding, default_padding))
+  let base_pad = $derived(filter_padding(padding, DEFAULT_PLOT_PADDING))
 
   // Update padding based on tick label widths (untrack breaks circular dependency)
   $effect(() => {
@@ -364,19 +344,23 @@
     const current_ticks_y = untrack(() => ticks.y)
     const current_ticks_y2 = untrack(() => ticks.y2)
 
-    const new_pad = width && height && current_ticks_y.length > 0
-      ? calc_auto_padding({
-        padding,
-        default_padding,
-        x2_axis: { ...final_x2_axis, tick_values: current_ticks_x2 },
-        y_axis: { ...final_y_axis, tick_values: current_ticks_y },
-        y2_axis: { ...final_y2_axis, tick_values: current_ticks_y2 },
-      })
-      : filter_padding(padding, default_padding)
+    const new_pad =
+      width && height && current_ticks_y.length > 0
+        ? calc_auto_padding({
+            padding,
+            default_padding: DEFAULT_PLOT_PADDING,
+            x2_axis: { ...final_x2_axis, tick_values: current_ticks_x2 },
+            y_axis: { ...final_y_axis, tick_values: current_ticks_y },
+            y2_axis: { ...final_y2_axis, tick_values: current_ticks_y2 },
+          })
+        : filter_padding(padding, DEFAULT_PLOT_PADDING)
 
     // Add y2 axis label space (calc_auto_padding only accounts for tick labels)
     if (
-      width && height && y2_series.length > 0 && current_ticks_y2.length > 0 &&
+      width &&
+      height &&
+      y2_series.length > 0 &&
+      current_ticks_y2.length > 0 &&
       final_y2_axis.label
     ) {
       const inside = final_y2_axis.tick?.label?.inside ?? false
@@ -392,28 +376,31 @@
 
     // Add x2 axis label space (mirroring y2 logic for top padding)
     if (
-      width && height && x2_series.length > 0 && current_ticks_x2.length > 0 &&
+      width &&
+      height &&
+      x2_series.length > 0 &&
+      current_ticks_x2.length > 0 &&
       final_x2_axis.label
     ) {
       const inside = final_x2_axis.tick?.label?.inside ?? false
-      const tick_shift = inside
-        ? 0
-        : Math.abs(final_x2_axis.tick?.label?.shift?.y ?? 0) + 8
+      const tick_shift = inside ? 0 : Math.abs(final_x2_axis.tick?.label?.shift?.y ?? 0) + 8
       const label_thickness = Math.round(12 * 1.2)
-      new_pad.t = Math.max(
-        new_pad.t,
-        tick_shift + LABEL_GAP_DEFAULT + label_thickness,
-      )
+      new_pad.t = Math.max(new_pad.t, tick_shift + LABEL_GAP_DEFAULT + label_thickness)
     }
 
     // Only update if padding actually changed
     if (
-      base_pad.t !== new_pad.t || base_pad.b !== new_pad.b ||
-      base_pad.l !== new_pad.l || base_pad.r !== new_pad.r
-    ) base_pad = new_pad
+      base_pad.t !== new_pad.t ||
+      base_pad.b !== new_pad.b ||
+      base_pad.l !== new_pad.l ||
+      base_pad.r !== new_pad.r
+    )
+      base_pad = new_pad
   })
 
-  const legend_footprint = $derived(measured_footprint(legend_element, { width: 120, height: 60 }))
+  const legend_footprint = $derived(
+    measured_footprint(legend_element, { width: 120, height: 60 }),
+  )
   const legend_has_explicit_pos = $derived(has_explicit_position(legend?.style))
 
   // Obstacle field in normalized [0,1] plot coords (y=0 at top). Each filled bar is modeled as a
@@ -451,66 +438,64 @@
       height,
       obstacles_norm,
       // gate on legend_element (the render signal) not legend_data, whose entries can read pad
-      legend: show_legend && legend != null && series.length > 1 &&
-          legend_element != null && !legend_has_explicit_pos
-        ? { footprint: legend_footprint, clearance: legend?.axis_clearance }
-        : null,
-    })
+      legend:
+        show_legend &&
+        legend != null &&
+        series.length > 1 &&
+        legend_element != null &&
+        !legend_has_explicit_pos
+          ? { footprint: legend_footprint, clearance: legend?.axis_clearance }
+          : null,
+    }),
+  )
+  // Resolve marginals (default: CDF strip on top) and reserve outer-band padding. Pass the
+  // histogram's `bins` as the marginal's histogram bin count (NOT `size`/thickness) so a
+  // `histogram` marginal inherits the main binning via normalize_marginals' merge; `cdf`
+  // ignores `bins`. Samples lie along x and equal series.y, so the adapter maps y -> x.
+  const resolved_marginals = $derived(
+    normalize_marginals(marginals, { top: { type: `cdf`, bins } }),
+  )
+  const pad = $derived(add_sides(decor.pad, reserve_marginal_pad(resolved_marginals)))
+  // a lone series uses the configured bar color; with multiple, each gets its own
+  const series_color = (series_data: DataSeries) =>
+    selected_series.length === 1 ? final_bar.color : extract_series_color(series_data)
+  const marginal_series = $derived<MarginalSeriesInput[]>(
+    selected_series_entries.map(({ series_data }) => ({
+      x: series_data.y ?? [],
+      color: series_color(series_data),
+      label: series_data.label,
+      visible: true,
+      x_axis: series_data.x_axis,
+      y_axis: series_data.y_axis,
+    })),
+  )
+  const marginal_has_axis = $derived(
+    marginal_axis_presence(x2_series.length > 0, y2_series.length > 0),
   )
-  const pad = $derived(decor.pad)
   const legend_auto_outside = $derived(decor.legend_outside)
   const legend_outside_x = $derived(decor.legend_pos.x)
   const legend_outside_y = $derived(decor.legend_pos.y)
 
-  // Scales and data
-  let scales = $derived({
-    x: create_scale(
-      final_x_axis.scale_type ?? `linear`,
-      ranges.current.x,
-      [pad.l, width - pad.r],
-    ),
-    x2: create_scale(
-      final_x2_axis.scale_type ?? `linear`,
-      ranges.current.x2,
-      [pad.l, width - pad.r],
-    ),
-    y: create_scale(
-      final_y_axis.scale_type ?? `linear`,
-      ranges.current.y,
-      [height - pad.b, pad.t],
-    ),
-    y2: create_scale(
-      final_y2_axis.scale_type ?? `linear`,
-      ranges.current.y2,
-      [height - pad.b, pad.t],
+  // Scales and data (x/x2 share the horizontal pixel span, y/y2 the inverted vertical one)
+  let scales = $derived(
+    create_axis_scales(
+      { x: final_x_axis, x2: final_x2_axis, y: final_y_axis, y2: final_y2_axis },
+      ranges.current,
+      pad,
+      width,
+      height,
     ),
-  })
+  )
 
   // Pad-independent binning (no pixel scales) so the auto-place obstacle field can reuse it
   let histogram_bins = $derived.by(() => {
     if (selected_series.length === 0 || !width || !height) return []
-    const hist_generator = bin()
-      .domain([ranges.current.x[0], ranges.current.x[1]])
-      .thresholds(bins)
-    const x2_hist_generator = x2_series.length > 0
-      ? bin().domain([ranges.current.x2[0], ranges.current.x2[1]]).thresholds(bins)
-      : null
-    return selected_series_entries.map(({ series_data, series_idx }) => {
-      const use_x2 = series_data.x_axis === `x2`
-      const active_hist = use_x2 && x2_hist_generator ? x2_hist_generator : hist_generator
-      const bins_arr = active_hist(series_data.y)
-      return {
-        id: series_data.id ?? series_idx,
-        series_idx,
-        label: series_data.label || `Series ${series_idx + 1}`,
-        color: selected_series.length === 1
-          ? final_bar.color
-          : extract_series_color(series_data),
-        bins: bins_arr,
-        max_count: max(bins_arr, (data) => data.length) || 0,
-        x_axis: series_data.x_axis,
-        y_axis: series_data.y_axis,
-      }
+    return compute_histogram_bins(selected_series_entries, {
+      x_domain: ranges.current.x,
+      x2_domain: ranges.current.x2,
+      has_x2: x2_series.length > 0,
+      bin_count: bins,
+      series_color,
     })
   })
   // Render-time data adds the pixel scales (pad-dependent)
@@ -522,43 +507,25 @@
     })),
   )
 
-  let ticks = $derived({
-    x: width && height
-      ? generate_ticks(
-        ranges.current.x,
-        final_x_axis.scale_type ?? `linear`,
-        final_x_axis.ticks,
-        scales.x,
-        { default_count: 8 },
-      )
-      : [],
-    x2: width && height && x2_series.length > 0
-      ? generate_ticks(
-        ranges.current.x2,
-        final_x2_axis.scale_type ?? `linear`,
-        final_x2_axis.ticks,
-        scales.x2,
-        { default_count: 8 },
-      )
-      : [],
-    y: width && height
-      ? generate_ticks(
-        ranges.current.y,
-        final_y_axis.scale_type ?? `linear`,
-        final_y_axis.ticks,
-        scales.y,
-        { default_count: 6 },
-      )
-      : [],
-    y2: width && height && y2_series.length > 0
-      ? generate_ticks(
-        ranges.current.y2,
-        final_y2_axis.scale_type ?? `linear`,
-        final_y2_axis.ticks,
-        scales.y2,
-        { default_count: 6 },
-      )
-      : [],
+  let ticks = $derived.by(() => {
+    // x/y always render; x2/y2 only when their series exist (else their scale is a [0,1] sentinel)
+    const axis_ticks = (
+      axis: typeof final_x_axis,
+      range: Vec2,
+      scale: typeof scales.x,
+      default_count: number,
+      show = true,
+    ) =>
+      width && height && show
+        ? generate_ticks(range, axis.scale_type ?? `linear`, axis.ticks, scale, {
+            default_count,
+          })
+        : []
+    const x = axis_ticks(final_x_axis, ranges.current.x, scales.x, 8)
+    const x2 = axis_ticks(final_x2_axis, ranges.current.x2, scales.x2, 8, x2_series.length > 0)
+    const y = axis_ticks(final_y_axis, ranges.current.y, scales.y, 6)
+    const y2 = axis_ticks(final_y2_axis, ranges.current.y2, scales.y2, 6, y2_series.length > 0)
+    return { x, x2, y, y2 }
   })
 
   // Cache measured tick-label widths so expensive text measurement only runs
@@ -644,11 +611,13 @@
       x_axis = { ...x_axis, range: next_x }
       // gate x2/y2 on series presence: their scales are [0, 1] sentinels otherwise,
       // so inverting would store a phantom range in the bindable prop
-      const next_x2 = x2_series.length > 0 ? invert_rect_range(scales.x2, start.x, current.x) : null
+      const next_x2 =
+        x2_series.length > 0 ? invert_rect_range(scales.x2, start.x, current.x) : null
       if (next_x2) x2_axis = { ...x2_axis, range: next_x2 }
       const next_y = invert_rect_range(scales.y, start.y, current.y)
       if (next_y) y_axis = { ...y_axis, range: next_y }
-      const next_y2 = y2_series.length > 0 ? invert_rect_range(scales.y2, start.y, current.y) : null
+      const next_y2 =
+        y2_series.length > 0 ? invert_rect_range(scales.y2, start.y, current.y) : null
       if (next_y2) y2_axis = { ...y2_axis, range: next_y2 }
     },
     on_reset: () => {
@@ -698,7 +667,10 @@
     on_bar_hover?.({ value, count, property, event: evt })
   }
 
-  const legend_vis = create_legend_visibility(() => series, (next) => (series = next))
+  const legend_vis = create_legend_visibility(
+    () => series,
+    (next) => (series = next),
+  )
 
   // Set theme-aware background when entering fullscreen
   $effect(() => {
@@ -706,31 +678,24 @@
   })
 
   // State accessors for shared axis change handler
+  // Spread into existing state in each setter to preserve merged type structure
   const axis_state: AxisChangeState<DataSeries> = {
-    get_axis: (axis) => {
-      if (axis === `x`) return x_axis
-      if (axis === `x2`) return x2_axis
-      if (axis === `y`) return y_axis
-      return y2_axis
+    axes: {
+      x: { get: () => x_axis, set: (config) => (x_axis = { ...x_axis, ...config }) },
+      x2: { get: () => x2_axis, set: (config) => (x2_axis = { ...x2_axis, ...config }) },
+      y: { get: () => y_axis, set: (config) => (y_axis = { ...y_axis, ...config }) },
+      y2: { get: () => y2_axis, set: (config) => (y2_axis = { ...y2_axis, ...config }) },
     },
-    set_axis: (axis, config) => {
-      // Spread into existing state to preserve merged type structure
-      if (axis === `x`) x_axis = { ...x_axis, ...config }
-      else if (axis === `x2`) x2_axis = { ...x2_axis, ...config }
-      else if (axis === `y`) y_axis = { ...y_axis, ...config }
-      else y2_axis = { ...y2_axis, ...config }
-    },
-    get_series: () => series,
-    set_series: (new_series) => (series = new_series),
-    get_loading: () => axis_loading,
-    set_loading: (axis) => (axis_loading = axis),
+    series: { get: () => series, set: (next) => (series = next) },
+    loading: { get: () => axis_loading, set: (axis) => (axis_loading = axis) },
   }
 
   // Shared handler + one-shot auto-load bound to this component's state
-  const { handle_axis_change, try_auto_load } = create_axis_loader(
-    axis_state,
-    () => ({ data_loader, on_axis_change, on_error }),
-  )
+  const { handle_axis_change, try_auto_load } = create_axis_loader(axis_state, () => ({
+    data_loader,
+    on_axis_change,
+    on_error,
+  }))
   $effect(try_auto_load)
 </script>
 
@@ -795,8 +760,7 @@
     bind:this={svg_element}
     role="application"
     aria-label={rest[`aria-label`] ??
-    ([final_x_axis.label, final_y_axis.label].filter(Boolean).join(` vs `) ||
-      `Histogram`)}
+      ([final_x_axis.label, final_y_axis.label].filter(Boolean).join(` vs `) || `Histogram`)}
     tabindex="0"
     onfocusin={() => pan_zoom.set_focused(true)}
     onfocusout={() => pan_zoom.set_focused(false)}
@@ -863,17 +827,17 @@
     <!-- X-axis -->
     <PlotAxis
       side="x"
-      ticks={ticks.x as number[]}
+      ticks={ticks.x}
       place={scales.x}
       axis={final_x_axis}
-      domain={ranges.current.x as Vec2}
+      domain={ranges.current.x}
       {pad}
       {width}
       {height}
       show_grid={display.x_grid}
       tick_label={(tick) => get_tick_label(tick, final_x_axis.ticks)}
       label_x={(pad.l + width - pad.r) / 2 + (final_x_axis.label_shift?.x ?? 0)}
-      label_y={height - 10 + (final_x_axis.label_shift?.y ?? 0)}
+      label_y={height - pad.b + AXIS_TITLE_OFFSET + (final_x_axis.label_shift?.y ?? 0)}
       axis_loading={axis_loading === `x`}
       on_axis_change={(key) => handle_axis_change(`x`, key)}
     />
@@ -882,17 +846,17 @@
     {#if x2_series.length > 0}
       <PlotAxis
         side="x2"
-        ticks={ticks.x2 as number[]}
+        ticks={ticks.x2}
         place={scales.x2}
         axis={final_x2_axis}
-        domain={ranges.current.x2 as Vec2}
+        domain={ranges.current.x2}
         {pad}
         {width}
         {height}
         show_grid={display.x2_grid}
         tick_label={(tick) => get_tick_label(tick, final_x2_axis.ticks)}
         label_x={(pad.l + width - pad.r) / 2 + (final_x2_axis.label_shift?.x ?? 0)}
-        label_y={Math.max(12, pad.t - (final_x2_axis.label_shift?.y ?? 40))}
+        label_y={Math.max(12, pad.t - (final_x2_axis.label_shift?.y ?? AXIS_TITLE_OFFSET))}
         axis_loading={axis_loading === `x2`}
         on_axis_change={(key) => handle_axis_change(`x2`, key)}
       />
@@ -901,10 +865,10 @@
     <!-- Y-axis -->
     <PlotAxis
       side="y"
-      ticks={ticks.y as number[]}
+      ticks={ticks.y}
       place={scales.y}
       axis={final_y_axis}
-      domain={ranges.current.y as Vec2}
+      domain={ranges.current.y}
       {pad}
       {width}
       {height}
@@ -912,7 +876,8 @@
       tick_label={(tick) => get_tick_label(tick, final_y_axis.ticks)}
       label_x={Math.max(
         12,
-        pad.l - (final_y_axis.tick?.label?.inside ? 0 : tick_label_widths.y_max) -
+        pad.l -
+          (final_y_axis.tick?.label?.inside ? 0 : tick_label_widths.y_max) -
           LABEL_GAP_DEFAULT,
       ) + (final_y_axis.label_shift?.x ?? 0)}
       label_y={pad.t + (height - pad.t - pad.b) / 2 + (final_y_axis.label_shift?.y ?? 0)}
@@ -924,10 +889,10 @@
     {#if y2_series.length > 0}
       <PlotAxis
         side="y2"
-        ticks={ticks.y2 as number[]}
+        ticks={ticks.y2}
         place={scales.y2}
         axis={final_y2_axis}
-        domain={ranges.current.y2 as Vec2}
+        domain={ranges.current.y2}
         {pad}
         {width}
         {height}
@@ -941,24 +906,19 @@
     {/if}
 
     <!-- Histogram bars (rendered after axes so bars appear above grid lines) -->
-    {#each histogram_data as
-      { id, bins, color, label, x_scale, y_scale, x_axis: srs_x_axis, y_axis, series_idx },
-      idx
-      (id ?? idx)
-    }
+    {#each histogram_data as { id, bins, color, label, x_scale, y_scale, x_axis: srs_x_axis, y_axis, series_idx }, idx (id ?? idx)}
       <g
         class="histogram-series"
         data-series-idx={series_idx}
         clip-path="url(#{clip_path_id})"
-        opacity={hovered_legend_series_idx !== null &&
-            hovered_legend_series_idx !== series_idx
+        opacity={hovered_legend_series_idx !== null && hovered_legend_series_idx !== series_idx
           ? 0.25
           : 1}
       >
         {#each bins as bin, bin_idx (bin_idx)}
           {@const bar_x = x_scale(bin.x0!)}
           {@const bar_width = Math.max(1, Math.abs(x_scale(bin.x1!) - bar_x))}
-          {@const bar_height = Math.max(0, (height - pad.b) - y_scale(bin.length))}
+          {@const bar_height = Math.max(0, height - pad.b - y_scale(bin.length))}
           {@const bar_y = y_scale(bin.length)}
           {@const value = (bin.x0! + bin.x1!) / 2}
           {#if bar_height > 0}
@@ -978,22 +938,22 @@
               role="button"
               tabindex="0"
               onmousemove={(evt) =>
-              handle_mouse_move(
-                evt,
-                value,
-                bin.length,
-                label,
-                (y_axis ?? `y1`) as `y1` | `y2`,
-                series_idx,
-                (srs_x_axis ?? `x1`) as `x1` | `x2`,
-              )}
+                handle_mouse_move(
+                  evt,
+                  value,
+                  bin.length,
+                  label,
+                  (y_axis ?? `y1`) as `y1` | `y2`,
+                  series_idx,
+                  (srs_x_axis ?? `x1`) as `x1` | `x2`,
+                )}
               onmouseleave={() => {
                 hover_info = null
                 change(null)
                 on_bar_hover?.(null)
               }}
               onclick={(event) =>
-              on_bar_click?.({ value, count: bin.length, property: label, event })}
+                on_bar_click?.({ value, count: bin.length, property: label, event })}
               onkeydown={(event: KeyboardEvent) => {
                 if ([`Enter`, ` `].includes(event.key)) {
                   event.preventDefault()
@@ -1009,6 +969,23 @@
 
     <!-- Reference lines: above all -->
     {@render ref_lines_layer(ref_lines_by_z.above_all)}
+
+    <!-- Marginal distribution strips -->
+    <PlotMarginals
+      marginals={resolved_marginals}
+      series={marginal_series}
+      {width}
+      {height}
+      {pad}
+      has_axis={marginal_has_axis}
+      axes={{
+        x1: marginal_axis(scales.x, ranges.current.x, final_x_axis),
+        x2: marginal_axis(scales.x2, ranges.current.x2, final_x2_axis),
+        y1: marginal_axis(scales.y, ranges.current.y, final_y_axis),
+        y2: marginal_axis(scales.y2, ranges.current.y2, final_y2_axis),
+      }}
+      id={clip_path_id}
+    />
   </svg>
 
   <!-- Tooltip (outside SVG for proper HTML rendering) -->
@@ -1026,8 +1003,8 @@
       {#if tooltip}
         {@render tooltip({ ...hover_info, fullscreen })}
       {:else}
-        <div>Value: {format_value(value, hover_info.x_axis.format || `.3~s`)}</div>
-        <div>Count: {format_value(count, hover_info.y_axis.format || `.3~s`)}</div>
+        <div>Value: {format_value_or_num(value, hover_info.x_axis.format)}</div>
+        <div>Count: {format_value_or_num(count, hover_info.y_axis.format)}</div>
         {#if mode === `overlay`}<div>{property}</div>{/if}
       {/if}
     </PlotTooltip>
@@ -1067,27 +1044,27 @@
 
   {#if show_legend && legend != null && series.length > 1}
     {@const legend_pos = placed_coords(
-    legend_auto_outside,
-    { x: legend_outside_x, y: legend_outside_y },
-    legend_placement,
-    legend_tween.coords.current,
-    { x: pad.l + 10, y: pad.t + 10 },
-  )}
+      legend_auto_outside,
+      { x: legend_outside_x, y: legend_outside_y },
+      legend_placement,
+      legend_tween.coords.current,
+      { x: pad.l + 10, y: pad.t + 10 },
+    )}
     <PlotLegend
       bind:root_element={legend_element}
       {...legend}
       series_data={legend_data}
-      on_toggle={legend?.on_toggle ?? ((series_idx: number) => {
-        if (series_idx < 0 || series_idx >= series.length) return
-        legend_vis.on_toggle(series_idx)
-        on_series_toggle(series_idx)
-      })}
+      on_toggle={legend?.on_toggle ??
+        ((series_idx: number) => {
+          if (series_idx < 0 || series_idx >= series.length) return
+          legend_vis.on_toggle(series_idx)
+          on_series_toggle(series_idx)
+        })}
       on_double_click={legend?.on_double_click ?? legend_vis.on_double_click}
       on_hover_change={legend_tween.set_locked}
       on_item_hover={(item) =>
-        (hovered_legend_series_idx = item != null && item.series_idx >= 0
-          ? item.series_idx
-          : null)}
+        (hovered_legend_series_idx =
+          item != null && item.series_idx >= 0 ? item.series_idx : null)}
       active_series_idx={hover_info?.series_idx ?? hovered_legend_series_idx}
       style={`
         position: absolute;
@@ -1153,7 +1130,9 @@
   .histogram :global(.pane-toggle),
   .histogram .header-controls {
     opacity: 0;
-    transition: opacity 0.2s, background-color 0.2s;
+    transition:
+      opacity 0.2s,
+      background-color 0.2s;
   }
   .histogram:hover :global(.pane-toggle),
   .histogram:hover .header-controls,