matterviz 0.3.1 → 0.3.3

package/dist/plot/Histogram.svelte

@@ -1,567 +1,1024 @@
-<script lang="ts">import { format_value } from '../labels';
-import { FullscreenToggle, set_fullscreen_bg } from '../layout';
-import { compute_element_placement, HistogramControls, InteractiveAxisLabel, PlotLegend, ReferenceLine, } from './';
-import { AXIS_LABEL_CONTAINER, create_axis_change_handler, } from './axis-utils';
-import { extract_series_color, prepare_legend_data } from './data-transform';
-import { AXIS_DEFAULTS } from './defaults';
-import { create_dimension_tracker, create_hover_lock, } from './hover-lock.svelte';
-import { get_relative_coords, pan_range, PINCH_ZOOM_THRESHOLD, pixels_to_data_delta, } from './interactions';
-import { calc_auto_padding, constrain_tooltip_position, filter_padding, LABEL_GAP_DEFAULT, measure_text_width, } from './layout';
-import { group_ref_lines_by_z, index_ref_lines } from './reference-line';
-import { create_scale, generate_ticks, get_nice_data_range, get_tick_label, } from './scales';
-import { get_scale_type_name } from './types';
-import { DEFAULTS } from '../settings';
-import { bin, max } from 'd3-array';
-import { untrack } from 'svelte';
-import { Tween } from 'svelte/motion';
-import PlotTooltip from './PlotTooltip.svelte';
-import { bar_path } from './svg';
-let { series = $bindable([]), x_axis: x_axis_init = {}, y_axis: y_axis_init = {}, y2_axis: y2_axis_init = {}, display: display_init = DEFAULTS.histogram.display, x_range = [null, null], y_range = [null, null], y2_range = [null, null], range_padding = 0.05, padding = { t: 20, b: 60, l: 60, r: 20 }, bins = $bindable(100), show_legend = $bindable(true), legend = {}, bar: bar_init = {}, selected_property = $bindable(``), mode = $bindable(`single`), tooltip, hovered = $bindable(false), change = () => { }, on_bar_click, on_bar_hover, ref_lines = $bindable([]), on_ref_line_click, on_ref_line_hover, show_controls = $bindable(true), controls_open = $bindable(false), on_series_toggle = () => { }, controls_toggle_props, controls_pane_props, fullscreen = $bindable(false), fullscreen_toggle = true, children, header_controls, controls_extra, data_loader, on_axis_change, on_error, pan = {}, ...rest } = $props();
-// Local state for controls (initialized from props, owned by this component)
-// Include key AXIS_DEFAULTS props (range, ticks, scale_type) that PlotControls needs
-// Using $state because these have bindings in HistogramControls/PlotControls
-// untrack() explicitly captures initial prop values (intentional - props provide initial config)
-const { format: _, ...axis_state_defaults } = AXIS_DEFAULTS; // Exclude format (has component-specific default)
-let bar = $state(untrack(() => ({ ...DEFAULTS.histogram.bar, ...bar_init })));
-let x_axis = $state(untrack(() => ({ ...axis_state_defaults, ...x_axis_init })));
-let y_axis = $state(untrack(() => ({ ...axis_state_defaults, ...y_axis_init })));
-// y2-axis needs different default label_shift for right-side positioning
-let y2_axis = $state(untrack(() => ({
+<script lang="ts">
+  import { format_value } from '../labels'
+  import { FullscreenToggle, set_fullscreen_bg } from '../layout'
+  import type {
+    AxisLoadError,
+    BarStyle,
+    DataLoaderFn,
+    HistogramHandlerProps,
+    PanConfig,
+    RefLine,
+    RefLineEvent,
+  } from './'
+  import {
+    AxisLabel,
+    compute_element_placement,
+    HistogramControls,
+    PlotLegend,
+    ReferenceLine,
+  } from './'
+  import type { AxisChangeState } from './axis-utils'
+  import { create_axis_change_handler } from './axis-utils'
+  import { extract_series_color, prepare_legend_data } from './data-transform'
+  import { AXIS_DEFAULTS } from './defaults'
+  import {
+    create_dimension_tracker,
+    create_hover_lock,
+  } from './hover-lock.svelte'
+  import {
+    get_relative_coords,
+    pan_range,
+    PINCH_ZOOM_THRESHOLD,
+    pixels_to_data_delta,
+  } from './interactions'
+  import {
+    calc_auto_padding,
+    constrain_tooltip_position,
+    filter_padding,
+    LABEL_GAP_DEFAULT,
+    measure_max_tick_width,
+  } from './layout'
+  import type { IndexedRefLine } from './reference-line'
+  import { group_ref_lines_by_z, index_ref_lines } from './reference-line'
+  import {
+    create_scale,
+    generate_ticks,
+    get_nice_data_range,
+    get_tick_label,
+  } from './scales'
+  import type {
+    BasePlotProps,
+    DataSeries,
+    InitialRanges,
+    LegendConfig,
+    PlotConfig,
+    ScaleType,
+  } from './types'
+  import { get_scale_type_name } from './types'
+  import ZeroLines from './ZeroLines.svelte'
+  import ZoomRect from './ZoomRect.svelte'
+  import { DEFAULTS } from '../settings'
+  import { bin, max } from 'd3-array'
+  import type { Snippet } from 'svelte'
+  import { untrack } from 'svelte'
+  import type { HTMLAttributes } from 'svelte/elements'
+  import { Tween } from 'svelte/motion'
+  import type { Vec2 } from '../math'
+  import PlotTooltip from './PlotTooltip.svelte'
+  import { bar_path } from './svg'
+
+  let {
+    series = $bindable([]),
+    x_axis: x_axis_init = {},
+    x2_axis: x2_axis_init = {},
+    y_axis: y_axis_init = {},
+    y2_axis: y2_axis_init = {},
+    display: display_init = DEFAULTS.histogram.display,
+    x_range = [null, null],
+    x2_range = [null, null],
+    y_range = [null, null],
+    y2_range = [null, null],
+    range_padding = 0.05,
+    padding = { t: 20, b: 60, l: 60, r: 20 },
+    bins = $bindable(100),
+    show_legend = $bindable(true),
+    legend = {},
+    bar: bar_init = {},
+    selected_property = $bindable(``),
+    mode = $bindable(`single`),
+    tooltip,
+    hovered = $bindable(false),
+    change = () => {},
+    on_bar_click,
+    on_bar_hover,
+    ref_lines = $bindable([]),
+    on_ref_line_click,
+    on_ref_line_hover,
+    show_controls = $bindable(true),
+    controls_open = $bindable(false),
+    on_series_toggle = () => {},
+    controls_toggle_props,
+    controls_pane_props,
+    fullscreen = $bindable(false),
+    fullscreen_toggle = true,
+    children,
+    header_controls,
+    controls_extra,
+    data_loader,
+    on_axis_change,
+    on_error,
+    pan = {},
+    ...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: {
+        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()
+
+  // Local state for controls (initialized from props, owned by this component)
+  // Include key AXIS_DEFAULTS props (range, ticks, scale_type) that PlotControls needs
+  // Using $state because these have bindings in HistogramControls/PlotControls
+  // untrack() explicitly captures initial prop values (intentional - props provide initial config)
+  const { format: _, ...axis_state_defaults } = AXIS_DEFAULTS // Exclude format (has component-specific default)
+  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 y_axis = $state(untrack(() => ({ ...axis_state_defaults, ...y_axis_init })))
+  // y2-axis needs different default label_shift for right-side positioning
+  let y2_axis = $state(untrack(() => ({
     ...axis_state_defaults,
     label_shift: { x: 0, y: 60 },
     ...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_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 });
-// Core state
-let [width, height] = $state([0, 0]);
-let wrapper = $state();
-let svg_element = $state(null);
-let clip_path_id = `histogram-clip-${crypto?.randomUUID?.()}`;
-let hover_info = $state(null);
-// Reference line hover state
-let hovered_ref_line_idx = $state(null);
-// Interactive axis loading state
-let axis_loading = $state(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 tooltip_el = $state();
-let drag_state = $state({ start: null, current: null, bounds: null });
-// Pan state
-let is_focused = $state(false);
-let shift_held = $state(false);
-let pan_drag_state = $state(null);
-let touch_state = $state(null);
-// Legend placement stability state
-let legend_element = $state();
-const legend_hover = create_hover_lock();
-const dim_tracker = create_dimension_tracker();
-let has_initial_legend_placement = $state(false);
-// Clear pending hover lock timeout on unmount
-$effect(() => () => legend_hover.cleanup());
-// Derived data
-let selected_series = $derived(mode === `single` && selected_property
-    ? series.filter((srs) => (srs.visible ?? true) && srs.label === selected_property)
-    : series.filter((srs) => srs.visible ?? true));
-// Separate series by y-axis
-let y1_series = $derived(selected_series.filter((srs) => (srs.y_axis ?? `y1`) === `y1`));
-let y2_series = $derived(selected_series.filter((srs) => srs.y_axis === `y2`));
-let auto_ranges = $derived.by(() => {
-    const all_values = selected_series.flatMap((srs) => srs.y);
-    const auto_x = get_nice_data_range(all_values.map((val) => ({ x: val, y: 0 })), ({ x }) => x, x_range, final_x_axis.scale_type ?? `linear`, range_padding, false);
+  })))
+  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 })
+  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 })
+
+  // Core state
+  let [width, height] = $state([0, 0])
+  let wrapper: HTMLDivElement | undefined = $state()
+  let svg_element: SVGElement | null = $state(null)
+  let clip_path_id = `histogram-clip-${crypto?.randomUUID?.()}`
+  let hover_info = $state<HistogramHandlerProps | null>(null)
+
+  // Reference line hover state
+  let hovered_ref_line_idx = $state<number | null>(null)
+
+  // Interactive axis loading state
+  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 tooltip_el = $state<HTMLDivElement | undefined>()
+  let drag_state = $state<{
+    start: { x: number; y: number } | null
+    current: { x: number; y: number } | null
+    bounds: DOMRect | null
+  }>({ start: null, current: null, bounds: null })
+
+  // Pan state
+  let is_focused = $state(false)
+  let shift_held = $state(false)
+  let pan_drag_state = $state<
+    InitialRanges & { start: { x: number; y: number } } | null
+  >(null)
+  let touch_state = $state<
+    InitialRanges & { start_touches: { x: number; y: number }[] } | null
+  >(null)
+
+  // Legend placement stability state
+  let legend_element = $state<HTMLDivElement | undefined>()
+  const legend_hover = create_hover_lock()
+  const dim_tracker = create_dimension_tracker()
+  let has_initial_legend_placement = $state(false)
+
+  // Clear pending hover lock timeout on unmount
+  $effect(() => () => legend_hover.cleanup())
+
+  // Derived data
+  let selected_series = $derived(
+    mode === `single` && selected_property
+      ? series.filter((srs: DataSeries) =>
+        (srs.visible ?? true) && srs.label === selected_property
+      )
+      : series.filter((srs: DataSeries) => srs.visible ?? true),
+  )
+
+  // 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 auto_ranges = $derived.by(() => {
+    const all_values = selected_series.flatMap((srs: DataSeries) => srs.y)
+    const auto_x = get_nice_data_range(
+      all_values.map((val) => ({ x: val, y: 0 })),
+      ({ x }) => x,
+      x_range,
+      final_x_axis.scale_type ?? `linear`,
+      range_padding,
+      false,
+    )
+
+    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,
+        x2_range,
+        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, y_limit, scale_type) => {
-        const type_name = get_scale_type_name(scale_type);
-        if (!series_list.length) {
-            const fallback = type_name === `log` ? 1 : 0;
-            return [fallback, 1];
-        }
-        const hist = bin().domain([auto_x[0], auto_x[1]]).thresholds(bins);
-        const max_count = Math.max(0, ...series_list.map((srs) => 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, y_range, final_y_axis.scale_type ?? `linear`);
-    const y2_auto_range = calc_y_range(y2_series, y2_range, final_y2_axis.scale_type ?? `linear`);
-    return { x: auto_x, y: y1_range, y2: y2_auto_range };
-});
-// Initialize ranges
-let ranges = $state({
+    const calc_y_range = (
+      series_list: typeof selected_series,
+      y_limit: typeof y_range,
+      scale_type: ScaleType,
+    ): Vec2 => {
+      const type_name = get_scale_type_name(scale_type)
+      if (!series_list.length) {
+        const fallback = type_name === `log` ? 1 : 0
+        return [fallback, 1]
+      }
+      const hist = bin().domain([auto_x[0], auto_x[1]]).thresholds(bins)
+      const max_count = Math.max(
+        0,
+        ...series_list.map((srs: DataSeries) =>
+          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,
+      y_range,
+      final_y_axis.scale_type ?? `linear`,
+    )
+    const y2_auto_range = calc_y_range(
+      y2_series,
+      y2_range,
+      final_y2_axis.scale_type ?? `linear`,
+    )
+
+    return { x: auto_x, x2: auto_x2, y: y1_range, y2: y2_auto_range }
+  })
+
+  // Initialize ranges
+  let ranges = $state({
     initial: {
-        x: [0, 1],
-        y: [0, 1],
-        y2: [0, 1],
+      x: [0, 1] as Vec2,
+      x2: [0, 1] as Vec2,
+      y: [0, 1] as Vec2,
+      y2: [0, 1] as Vec2,
     },
     current: {
-        x: [0, 1],
-        y: [0, 1],
-        y2: [0, 1],
+      x: [0, 1] as Vec2,
+      x2: [0, 1] as Vec2,
+      y: [0, 1] as Vec2,
+      y2: [0, 1] as Vec2,
     },
-});
-$effect(() => {
+  })
+
+  $effect(() => {
     // Support one-sided range pinning: merge user range with auto range for null values
-    const new_x = final_x_axis.range
-        ? [
-            final_x_axis.range[0] ?? auto_ranges.x[0],
-            final_x_axis.range[1] ?? auto_ranges.x[1],
-        ]
-        : auto_ranges.x;
-    const new_y = final_y_axis.range
-        ? [
-            final_y_axis.range[0] ?? auto_ranges.y[0],
-            final_y_axis.range[1] ?? auto_ranges.y[1],
-        ]
-        : auto_ranges.y;
-    const new_y2 = final_y2_axis.range
-        ? [
-            final_y2_axis.range[0] ?? auto_ranges.y2[0],
-            final_y2_axis.range[1] ?? auto_ranges.y2[1],
-        ]
-        : auto_ranges.y2;
+    const new_x: [number, number] = final_x_axis.range
+      ? [
+        final_x_axis.range[0] ?? auto_ranges.x[0],
+        final_x_axis.range[1] ?? auto_ranges.x[1],
+      ]
+      : auto_ranges.x
+    const new_x2: [number, number] = final_x2_axis.range
+      ? [
+        final_x2_axis.range[0] ?? auto_ranges.x2[0],
+        final_x2_axis.range[1] ?? auto_ranges.x2[1],
+      ]
+      : auto_ranges.x2
+    const new_y: [number, number] = final_y_axis.range
+      ? [
+        final_y_axis.range[0] ?? auto_ranges.y[0],
+        final_y_axis.range[1] ?? auto_ranges.y[1],
+      ]
+      : auto_ranges.y
+    const new_y2: [number, number] = final_y2_axis.range
+      ? [
+        final_y2_axis.range[0] ?? auto_ranges.y2[0],
+        final_y2_axis.range[1] ?? auto_ranges.y2[1],
+      ]
+      : auto_ranges.y2
+
     // Only update if the initial (data-driven) ranges changed, not when user pans
     // Comparing against initial preserves user's pan/zoom state
     const x_changed = new_x[0] !== ranges.initial.x[0] ||
-        new_x[1] !== ranges.initial.x[1];
+      new_x[1] !== ranges.initial.x[1]
+    const x2_changed = new_x2[0] !== ranges.initial.x2[0] ||
+      new_x2[1] !== ranges.initial.x2[1]
     const y_changed = new_y[0] !== ranges.initial.y[0] ||
-        new_y[1] !== ranges.initial.y[1];
+      new_y[1] !== ranges.initial.y[1]
     const y2_changed = new_y2[0] !== ranges.initial.y2[0] ||
-        new_y2[1] !== ranges.initial.y2[1];
-    if (x_changed)
-        [ranges.initial.x, ranges.current.x] = [new_x, new_x];
-    if (y_changed)
-        [ranges.initial.y, ranges.current.y] = [new_y, new_y];
-    if (y2_changed)
-        [ranges.initial.y2, ranges.current.y2] = [new_y2, new_y2];
-});
-// Layout: dynamic padding based on tick label widths
-const default_padding = { t: 20, b: 60, l: 60, r: 20 };
-let pad = $derived(filter_padding(padding, default_padding));
-// Update padding based on tick label widths (untrack breaks circular dependency)
-$effect(() => {
-    const current_ticks_y = untrack(() => ticks.y);
-    const current_ticks_y2 = untrack(() => ticks.y2);
+      new_y2[1] !== ranges.initial.y2[1]
+
+    if (x_changed) [ranges.initial.x, ranges.current.x] = [new_x, new_x]
+    if (x2_changed) [ranges.initial.x2, ranges.current.x2] = [new_x2, new_x2]
+    if (y_changed) [ranges.initial.y, ranges.current.y] = [new_y, new_y]
+    if (y2_changed) [ranges.initial.y2, ranges.current.y2] = [new_y2, new_y2]
+  })
+
+  // Layout: dynamic padding based on tick label widths
+  const default_padding = { t: 20, b: 60, l: 60, r: 20 }
+  let pad = $derived(filter_padding(padding, default_padding))
+
+  // Update padding based on tick label widths (untrack breaks circular dependency)
+  $effect(() => {
+    const current_ticks_x2 = untrack(() => ticks.x2)
+    const current_ticks_y = untrack(() => ticks.y)
+    const current_ticks_y2 = untrack(() => ticks.y2)
+
     const new_pad = width && height && current_ticks_y.length
-        ? calc_auto_padding({
-            padding,
-            default_padding,
-            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);
+      ? 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)
+
     // Add y2 axis label space (calc_auto_padding only accounts for tick labels)
-    if (width && height && y2_series.length && current_ticks_y2.length &&
-        final_y2_axis.label) {
-        const y2_tick_width = Math.max(0, ...current_ticks_y2.map((tick) => measure_text_width(format_value(tick, final_y2_axis.format), `12px sans-serif`)));
-        const inside = final_y2_axis.tick?.label?.inside ?? false;
-        // When ticks are inside, they don't contribute to padding
-        const tick_shift = inside ? 0 : (final_y2_axis.tick?.label?.shift?.x ?? 0) + 8;
-        const tick_width_contribution = inside ? 0 : y2_tick_width;
-        const label_thickness = Math.round(12 * 1.2);
-        new_pad.r = Math.max(new_pad.r, tick_width_contribution + LABEL_GAP_DEFAULT + tick_shift + label_thickness);
+    if (
+      width && height && y2_series.length && current_ticks_y2.length &&
+      final_y2_axis.label
+    ) {
+      const inside = final_y2_axis.tick?.label?.inside ?? false
+      // When ticks are inside, they don't contribute to padding
+      const tick_shift = inside ? 0 : (final_y2_axis.tick?.label?.shift?.x ?? 0) + 8
+      const tick_width_contribution = inside ? 0 : tick_label_widths.y2_max
+      const label_thickness = Math.round(12 * 1.2)
+      new_pad.r = Math.max(
+        new_pad.r,
+        tick_width_contribution + LABEL_GAP_DEFAULT + tick_shift + label_thickness,
+      )
+    }
+
+    // Add x2 axis label space (mirroring y2 logic for top padding)
+    if (
+      width && height && x2_series.length && current_ticks_x2.length &&
+      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 label_thickness = Math.round(12 * 1.2)
+      new_pad.t = Math.max(
+        new_pad.t,
+        tick_shift + LABEL_GAP_DEFAULT + label_thickness,
+      )
     }
+
     // Only update if padding actually changed
-    if (pad.t !== new_pad.t || pad.b !== new_pad.b || pad.l !== new_pad.l ||
-        pad.r !== new_pad.r)
-        pad = new_pad;
-});
-// Scales and data
-let scales = $derived({
-    x: create_scale(final_x_axis.scale_type ?? `linear`, ranges.current.x, [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]),
-});
-let histogram_data = $derived.by(() => {
-    if (!selected_series.length || !width || !height)
-        return [];
+    if (
+      pad.t !== new_pad.t || pad.b !== new_pad.b || pad.l !== new_pad.l ||
+      pad.r !== new_pad.r
+    ) pad = new_pad
+  })
+
+  // 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],
+    ),
+  })
+
+  let histogram_data = $derived.by(() => {
+    if (!selected_series.length || !width || !height) return []
     const hist_generator = bin()
-        .domain([ranges.current.x[0], ranges.current.x[1]])
-        .thresholds(bins);
+      .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.map((series_data, series_idx) => {
-        const bins_arr = hist_generator(series_data.y);
-        const use_y2 = series_data.y_axis === `y2`;
-        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,
-            y_axis: series_data.y_axis,
-            y_scale: use_y2 ? scales.y2 : scales.y,
-        };
-    });
-});
-let ticks = $derived({
+      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)
+      const use_y2 = series_data.y_axis === `y2`
+      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,
+        x_scale: use_x2 ? scales.x2 : scales.x,
+        y_scale: use_y2 ? scales.y2 : scales.y,
+      }
+    })
+  })
+
+  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 })
-        : [],
+      ? 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 })
-        : [],
+      ? 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 legend_data = $derived(prepare_legend_data(series));
-// Collect histogram bar positions for legend placement
-let hist_points_for_placement = $derived.by(() => {
-    if (!width || !height || !histogram_data.length)
-        return [];
-    const points = [];
-    for (const { bins, y_scale } of histogram_data) {
-        for (const bin of bins) {
-            if (bin.length > 0) {
-                const bar_x = scales.x((bin.x0 + bin.x1) / 2);
-                const bar_y = y_scale(bin.length);
-                if (isFinite(bar_x) && isFinite(bar_y)) {
-                    // Add multiple points for taller bars to increase their weight
-                    // Cap to prevent O(N·count/10) blow-ups for large counts
-                    const weight = Math.min(20, Math.ceil(bin.length / 10));
-                    for (let idx = 0; idx < weight; idx++)
-                        points.push({ x: bar_x, y: bar_y });
-                }
-            }
+      ? generate_ticks(
+        ranges.current.y2,
+        final_y2_axis.scale_type ?? `linear`,
+        final_y2_axis.ticks,
+        scales.y2,
+        { default_count: 6 },
+      )
+      : [],
+  })
+
+  // Cache measured tick-label widths so expensive text measurement only runs
+  // when tick values/format change, not on every template rerender.
+  let tick_label_widths = $derived({
+    x2_max: measure_max_tick_width(ticks.x2, final_x2_axis.format ?? ``),
+    y_max: measure_max_tick_width(ticks.y, final_y_axis.format ?? ``),
+    y2_max: measure_max_tick_width(ticks.y2, final_y2_axis.format ?? ``),
+  })
+
+  let legend_data = $derived(prepare_legend_data(series))
+
+  // Collect histogram bar positions for legend placement
+  let hist_points_for_placement = $derived.by(() => {
+    if (!width || !height || !histogram_data.length) return []
+
+    const points: { x: number; y: number }[] = []
+
+    for (const { bins, x_scale, y_scale } of histogram_data) {
+      for (const bin of bins) {
+        if (bin.length > 0) {
+          const bar_x = x_scale(((bin.x0 ?? 0) + (bin.x1 ?? 0)) / 2)
+          const bar_y = y_scale(bin.length)
+          if (isFinite(bar_x) && isFinite(bar_y)) {
+            // Add multiple points for taller bars to increase their weight
+            // Cap to prevent O(N·count/10) blow-ups for large counts
+            const weight = Math.min(20, Math.ceil(bin.length / 10))
+            for (let idx = 0; idx < weight; idx++) points.push({ x: bar_x, y: bar_y })
+          }
         }
+      }
     }
-    return points;
-});
-// Calculate best legend placement using continuous grid sampling
-let legend_placement = $derived.by(() => {
-    const should_place = show_legend && legend != null && series.length > 1;
-    if (!should_place || !width || !height)
-        return null;
-    const plot_width = width - pad.l - pad.r;
-    const plot_height = height - pad.t - pad.b;
+    return points
+  })
+
+  // Calculate best legend placement using continuous grid sampling
+  let legend_placement = $derived.by(() => {
+    const should_place = show_legend && legend != null && series.length > 1
+    if (!should_place || !width || !height) return null
+
+    const plot_width = width - pad.l - pad.r
+    const plot_height = height - pad.t - pad.b
+
     // Use measured size if available, otherwise estimate
     const legend_size = legend_element
-        ? { width: legend_element.offsetWidth, height: legend_element.offsetHeight }
-        : { width: 120, height: 60 };
+      ? { width: legend_element.offsetWidth, height: legend_element.offsetHeight }
+      : { width: 120, height: 60 }
+
     const result = compute_element_placement({
-        plot_bounds: { x: pad.l, y: pad.t, width: plot_width, height: plot_height },
-        element_size: legend_size,
-        axis_clearance: legend?.axis_clearance,
-        exclude_rects: [],
-        points: hist_points_for_placement,
-    });
-    return result;
-});
-// Tweened legend coordinates for smooth animation - create once, update target via effect
-// untrack() explicitly captures initial tween config (intentional - config set once at mount)
-const tweened_legend_coords = new Tween({ x: 0, y: 0 }, untrack(() => ({ duration: 400, ...(legend?.tween ?? {}) })));
-// Update legend position with stability checks
-$effect(() => {
-    if (!width || !height || !legend_placement)
-        return;
+      plot_bounds: { x: pad.l, y: pad.t, width: plot_width, height: plot_height },
+      element_size: legend_size,
+      axis_clearance: legend?.axis_clearance,
+      exclude_rects: [],
+      points: hist_points_for_placement,
+    })
+
+    return result
+  })
+
+  // Tweened legend coordinates for smooth animation - create once, update target via effect
+  // untrack() explicitly captures initial tween config (intentional - config set once at mount)
+  const tweened_legend_coords = new Tween(
+    { x: 0, y: 0 },
+    untrack(() => ({ duration: 400, ...(legend?.tween ?? {}) })),
+  )
+
+  // Update legend position with stability checks
+  $effect(() => {
+    if (!width || !height || !legend_placement) return
+
     // Track dimensions for resize detection
-    const dims_changed = dim_tracker.has_changed(width, height);
-    if (dims_changed)
-        dim_tracker.update(width, height);
+    const dims_changed = dim_tracker.has_changed(width, height)
+    if (dims_changed) dim_tracker.update(width, height)
+
     // Only update if: resize occurred, OR (not hover-locked AND (responsive OR not yet initially placed))
-    const is_responsive = legend?.responsive ?? false;
+    const is_responsive = legend?.responsive ?? false
     const should_update = dims_changed || (!legend_hover.is_locked.current &&
-        (is_responsive || !has_initial_legend_placement));
+      (is_responsive || !has_initial_legend_placement))
+
     if (should_update) {
-        tweened_legend_coords.set({ x: legend_placement.x, y: legend_placement.y }, 
+      tweened_legend_coords.set(
+        { x: legend_placement.x, y: legend_placement.y },
         // Skip animation on initial placement to avoid jump from (0, 0)
-        has_initial_legend_placement ? undefined : { duration: 0 });
-        // Only lock position after we have actual measured size
-        if (legend_element) {
-            has_initial_legend_placement = true;
-        }
+        has_initial_legend_placement ? undefined : { duration: 0 },
+      )
+      // Only lock position after we have actual measured size
+      if (legend_element) {
+        has_initial_legend_placement = true
+      }
     }
-});
-// Event handlers
-const handle_zoom = () => {
-    if (!drag_state.start || !drag_state.current)
-        return;
-    const start_x = scales.x.invert(drag_state.start.x);
-    const end_x = scales.x.invert(drag_state.current.x);
-    const start_y = scales.y.invert(drag_state.start.y);
-    const end_y = scales.y.invert(drag_state.current.y);
-    const start_y2 = scales.y2.invert(drag_state.start.y);
-    const end_y2 = scales.y2.invert(drag_state.current.y);
+  })
+
+  // Event handlers
+  const handle_zoom = () => {
+    if (!drag_state.start || !drag_state.current) return
+    const start_x = scales.x.invert(drag_state.start.x)
+    const end_x = scales.x.invert(drag_state.current.x)
+    const start_x2 = scales.x2.invert(drag_state.start.x)
+    const end_x2 = scales.x2.invert(drag_state.current.x)
+    const start_y = scales.y.invert(drag_state.start.y)
+    const end_y = scales.y.invert(drag_state.current.y)
+    const start_y2 = scales.y2.invert(drag_state.start.y)
+    const end_y2 = scales.y2.invert(drag_state.current.y)
+
     if (typeof start_x === `number` && typeof end_x === `number`) {
-        const dx = Math.abs(drag_state.start.x - drag_state.current.x);
-        const dy = Math.abs(drag_state.start.y - drag_state.current.y);
-        if (dx > 5 && dy > 5) {
-            // Update axis ranges to trigger reactivity and prevent effect from overriding
-            x_axis = {
-                ...x_axis,
-                range: [Math.min(start_x, end_x), Math.max(start_x, end_x)],
-            };
-            y_axis = {
-                ...y_axis,
-                range: [Math.min(start_y, end_y), Math.max(start_y, end_y)],
-            };
-            y2_axis = {
-                ...y2_axis,
-                range: [Math.min(start_y2, end_y2), Math.max(start_y2, end_y2)],
-            };
+      const dx = Math.abs(drag_state.start.x - drag_state.current.x)
+      const dy = Math.abs(drag_state.start.y - drag_state.current.y)
+      if (dx > 5 && dy > 5) {
+        // Update axis ranges to trigger reactivity and prevent effect from overriding
+        x_axis = {
+          ...x_axis,
+          range: [Math.min(start_x, end_x), Math.max(start_x, end_x)],
         }
+        if (x2_series.length > 0) {
+          x2_axis = {
+            ...x2_axis,
+            range: [Math.min(start_x2, end_x2), Math.max(start_x2, end_x2)],
+          }
+        }
+        y_axis = {
+          ...y_axis,
+          range: [Math.min(start_y, end_y), Math.max(start_y, end_y)],
+        }
+        y2_axis = {
+          ...y2_axis,
+          range: [Math.min(start_y2, end_y2), Math.max(start_y2, end_y2)],
+        }
+      }
     }
-};
-const on_window_mouse_move = (evt) => {
-    if (!drag_state.start || !drag_state.bounds)
-        return;
+  }
+
+  const on_window_mouse_move = (evt: MouseEvent) => {
+    if (!drag_state.start || !drag_state.bounds) return
     drag_state.current = {
-        x: evt.clientX - drag_state.bounds.left,
-        y: evt.clientY - drag_state.bounds.top,
-    };
-};
-const on_window_mouse_up = () => {
-    handle_zoom();
-    drag_state = { start: null, current: null, bounds: null };
-    window.removeEventListener(`mousemove`, on_window_mouse_move);
-    window.removeEventListener(`mouseup`, on_window_mouse_up);
-    document.body.style.cursor = `default`;
-};
-// Pan drag handlers
-const on_pan_move = (evt) => {
-    if (!pan_drag_state)
-        return;
-    const dx = evt.clientX - pan_drag_state.start.x;
-    const dy = evt.clientY - pan_drag_state.start.y;
+      x: evt.clientX - drag_state.bounds.left,
+      y: evt.clientY - drag_state.bounds.top,
+    }
+  }
+
+  const on_window_mouse_up = () => {
+    handle_zoom()
+    drag_state = { start: null, current: null, bounds: null }
+    window.removeEventListener(`mousemove`, on_window_mouse_move)
+    window.removeEventListener(`mouseup`, on_window_mouse_up)
+    document.body.style.cursor = `default`
+  }
+
+  // Pan drag handlers
+  const on_pan_move = (evt: MouseEvent) => {
+    if (!pan_drag_state) return
+    const dx = evt.clientX - pan_drag_state.start.x
+    const dy = evt.clientY - pan_drag_state.start.y
+
     // Convert pixel delta to data delta (note: drag direction is inverted for natural pan feel)
-    const plot_width = width - pad.l - pad.r;
-    const plot_height = height - pad.t - pad.b;
-    const sensitivity = pan?.drag_sensitivity ?? 1;
-    const x_delta = pixels_to_data_delta(-dx * sensitivity, pan_drag_state.initial_x_range, plot_width);
-    const y_delta = pixels_to_data_delta(dy * sensitivity, pan_drag_state.initial_y_range, plot_height);
-    const y2_delta = pixels_to_data_delta(dy * sensitivity, pan_drag_state.initial_y2_range, plot_height);
-    ranges.current.x = pan_range(pan_drag_state.initial_x_range, x_delta);
-    ranges.current.y = pan_range(pan_drag_state.initial_y_range, y_delta);
-    ranges.current.y2 = pan_range(pan_drag_state.initial_y2_range, y2_delta);
-};
-const on_pan_end = () => {
-    pan_drag_state = null;
-    document.body.style.cursor = ``;
-    window.removeEventListener(`mousemove`, on_pan_move);
-    window.removeEventListener(`mouseup`, on_pan_end);
-};
-function handle_mouse_down(evt) {
-    const coords = get_relative_coords(evt);
-    if (!coords || !svg_element)
-        return;
+    const plot_width = width - pad.l - pad.r
+    const plot_height = height - pad.t - pad.b
+    const sensitivity = pan?.drag_sensitivity ?? 1
+
+    const x_delta = pixels_to_data_delta(
+      -dx * sensitivity,
+      pan_drag_state.initial_x_range,
+      plot_width,
+    )
+    const x2_delta = pixels_to_data_delta(
+      -dx * sensitivity,
+      pan_drag_state.initial_x2_range,
+      plot_width,
+    )
+    const y_delta = pixels_to_data_delta(
+      dy * sensitivity,
+      pan_drag_state.initial_y_range,
+      plot_height,
+    )
+    const y2_delta = pixels_to_data_delta(
+      dy * sensitivity,
+      pan_drag_state.initial_y2_range,
+      plot_height,
+    )
+
+    ranges.current.x = pan_range(pan_drag_state.initial_x_range, x_delta)
+    ranges.current.x2 = pan_range(pan_drag_state.initial_x2_range, x2_delta)
+    ranges.current.y = pan_range(pan_drag_state.initial_y_range, y_delta)
+    ranges.current.y2 = pan_range(pan_drag_state.initial_y2_range, y2_delta)
+  }
+
+  const on_pan_end = () => {
+    pan_drag_state = null
+    document.body.style.cursor = ``
+    window.removeEventListener(`mousemove`, on_pan_move)
+    window.removeEventListener(`mouseup`, on_pan_end)
+  }
+
+  function handle_mouse_down(evt: MouseEvent) {
+    const coords = get_relative_coords(evt)
+    if (!coords || !svg_element) return
+
     // Check if pan is enabled and shift is held for pan mode
-    const pan_enabled = pan?.enabled !== false;
+    const pan_enabled = pan?.enabled !== false
     if (pan_enabled && evt.shiftKey) {
-        evt.preventDefault();
-        pan_drag_state = {
-            start: { x: evt.clientX, y: evt.clientY },
-            initial_x_range: [...ranges.current.x],
-            initial_y_range: [...ranges.current.y],
-            initial_y2_range: [...ranges.current.y2],
-        };
-        document.body.style.cursor = `grabbing`;
-        window.addEventListener(`mousemove`, on_pan_move);
-        window.addEventListener(`mouseup`, on_pan_end);
-        return;
+      evt.preventDefault()
+      pan_drag_state = {
+        start: { x: evt.clientX, y: evt.clientY },
+        initial_x_range: [...ranges.current.x] as [number, number],
+        initial_x2_range: [...ranges.current.x2] as [number, number],
+        initial_y_range: [...ranges.current.y] as [number, number],
+        initial_y2_range: [...ranges.current.y2] as [number, number],
+      }
+      document.body.style.cursor = `grabbing`
+      window.addEventListener(`mousemove`, on_pan_move)
+      window.addEventListener(`mouseup`, on_pan_end)
+      return
     }
+
     drag_state = {
-        start: coords,
-        current: coords,
-        bounds: svg_element.getBoundingClientRect(),
-    };
-    window.addEventListener(`mousemove`, on_window_mouse_move);
-    window.addEventListener(`mouseup`, on_window_mouse_up);
-    evt.preventDefault();
-}
-// Wheel handler for pan (requires focus and shift)
-function handle_wheel(evt) {
-    const pan_enabled = pan?.enabled !== false;
+      start: coords,
+      current: coords,
+      bounds: svg_element.getBoundingClientRect(),
+    }
+    window.addEventListener(`mousemove`, on_window_mouse_move)
+    window.addEventListener(`mouseup`, on_window_mouse_up)
+    evt.preventDefault()
+  }
+
+  // Wheel handler for pan (requires focus and shift)
+  function handle_wheel(evt: WheelEvent) {
+    const pan_enabled = pan?.enabled !== false
     // Only capture wheel when focused AND Shift is held
     // Use shift_held state (tracked via keydown/keyup) for compatibility with synthetic events
-    if (!pan_enabled || !is_focused || !shift_held)
-        return;
-    evt.preventDefault();
+    if (!pan_enabled || !is_focused || !shift_held) return
+
+    evt.preventDefault()
+
     // Clamp to at least 1 to avoid Infinity deltas when padding equals container size
-    const plot_width = Math.max(1, width - pad.l - pad.r);
-    const plot_height = Math.max(1, height - pad.t - pad.b);
-    const sensitivity = pan?.wheel_sensitivity ?? 1;
+    const plot_width = Math.max(1, width - pad.l - pad.r)
+    const plot_height = Math.max(1, height - pad.t - pad.b)
+    const sensitivity = pan?.wheel_sensitivity ?? 1
+
     // Determine pan direction based on wheel delta
-    const x_delta = pixels_to_data_delta(evt.deltaX * sensitivity, ranges.current.x, plot_width);
-    const y_delta = pixels_to_data_delta(evt.deltaY * sensitivity, ranges.current.y, plot_height);
-    const y2_delta = pixels_to_data_delta(evt.deltaY * sensitivity, ranges.current.y2, plot_height);
+    const x_delta = pixels_to_data_delta(
+      evt.deltaX * sensitivity,
+      ranges.current.x,
+      plot_width,
+    )
+    const x2_delta = pixels_to_data_delta(
+      evt.deltaX * sensitivity,
+      ranges.current.x2,
+      plot_width,
+    )
+    const y_delta = pixels_to_data_delta(
+      evt.deltaY * sensitivity,
+      ranges.current.y,
+      plot_height,
+    )
+    const y2_delta = pixels_to_data_delta(
+      evt.deltaY * sensitivity,
+      ranges.current.y2,
+      plot_height,
+    )
+
     if (Math.abs(evt.deltaX) > Math.abs(evt.deltaY)) {
-        ranges.current.x = pan_range(ranges.current.x, x_delta);
+      ranges.current.x = pan_range(ranges.current.x, x_delta)
+      ranges.current.x2 = pan_range(ranges.current.x2, x2_delta)
+    } else {
+      ranges.current.y = pan_range(ranges.current.y, y_delta)
+      ranges.current.y2 = pan_range(ranges.current.y2, y2_delta)
     }
-    else {
-        ranges.current.y = pan_range(ranges.current.y, y_delta);
-        ranges.current.y2 = pan_range(ranges.current.y2, y2_delta);
-    }
-}
-// Touch handlers for pinch-zoom and two-finger pan
-function handle_touch_start(evt) {
-    const touch_enabled = pan?.enabled !== false && pan?.touch_enabled !== false;
-    if (!touch_enabled || evt.touches.length !== 2)
-        return;
-    evt.preventDefault();
-    const touches = Array.from(evt.touches);
+  }
+
+  // Touch handlers for pinch-zoom and two-finger pan
+  function handle_touch_start(evt: TouchEvent) {
+    const touch_enabled = pan?.enabled !== false && pan?.touch_enabled !== false
+    if (!touch_enabled || evt.touches.length !== 2) return
+
+    evt.preventDefault()
+    const touches = Array.from(evt.touches)
     touch_state = {
-        start_touches: touches.map((touch) => ({ x: touch.clientX, y: touch.clientY })),
-        initial_x_range: [...ranges.current.x],
-        initial_y_range: [...ranges.current.y],
-        initial_y2_range: [...ranges.current.y2],
-    };
-}
-function handle_touch_move(evt) {
-    if (!touch_state || evt.touches.length !== 2)
-        return;
-    evt.preventDefault();
-    const [t1, t2] = Array.from(evt.touches);
-    const [s1, s2] = touch_state.start_touches;
+      start_touches: touches.map((touch) => ({ x: touch.clientX, y: touch.clientY })),
+      initial_x_range: [...ranges.current.x] as [number, number],
+      initial_x2_range: [...ranges.current.x2] as [number, number],
+      initial_y_range: [...ranges.current.y] as [number, number],
+      initial_y2_range: [...ranges.current.y2] as [number, number],
+    }
+  }
+
+  function handle_touch_move(evt: TouchEvent) {
+    if (!touch_state || evt.touches.length !== 2) return
+    evt.preventDefault()
+
+    const [t1, t2] = Array.from(evt.touches)
+    const [s1, s2] = touch_state.start_touches
+
     // Calculate center movement for pan
-    const start_center = { x: (s1.x + s2.x) / 2, y: (s1.y + s2.y) / 2 };
+    const start_center = { x: (s1.x + s2.x) / 2, y: (s1.y + s2.y) / 2 }
     const curr_center = {
-        x: (t1.clientX + t2.clientX) / 2,
-        y: (t1.clientY + t2.clientY) / 2,
-    };
-    const dx = curr_center.x - start_center.x;
-    const dy = curr_center.y - start_center.y;
+      x: (t1.clientX + t2.clientX) / 2,
+      y: (t1.clientY + t2.clientY) / 2,
+    }
+    const dx = curr_center.x - start_center.x
+    const dy = curr_center.y - start_center.y
+
     // Calculate pinch scale (curr/start so spread = zoom out, pinch = zoom in)
-    const start_dist = Math.hypot(s2.x - s1.x, s2.y - s1.y);
+    const start_dist = Math.hypot(s2.x - s1.x, s2.y - s1.y)
     // Guard against zero-distance pinch to avoid Infinity scale
-    if (start_dist < Number.EPSILON)
-        return;
-    const curr_dist = Math.hypot(t2.clientX - t1.clientX, t2.clientY - t1.clientY);
-    const scale = curr_dist / start_dist;
+    if (start_dist < Number.EPSILON) return
+    const curr_dist = Math.hypot(t2.clientX - t1.clientX, t2.clientY - t1.clientY)
+    const scale = curr_dist / start_dist
+
     // Clamp to at least 1 to avoid Infinity deltas when padding equals container size
-    const plot_width = Math.max(1, width - pad.l - pad.r);
-    const plot_height = Math.max(1, height - pad.t - pad.b);
+    const plot_width = Math.max(1, width - pad.l - pad.r)
+    const plot_height = Math.max(1, height - pad.t - pad.b)
+
     // If scale changed significantly, treat as pinch-zoom
     // Also guard against scale being too small to avoid division by zero
     if (Math.abs(scale - 1) > PINCH_ZOOM_THRESHOLD && scale > Number.EPSILON) {
-        // Pinch zoom centered on gesture center
-        // Divide by scale so spread (scale > 1) = smaller span (zoom in)
-        const x_span = touch_state.initial_x_range[1] - touch_state.initial_x_range[0];
-        const y_span = touch_state.initial_y_range[1] - touch_state.initial_y_range[0];
-        const y2_span = touch_state.initial_y2_range[1] -
-            touch_state.initial_y2_range[0];
-        const x_center = (touch_state.initial_x_range[0] + touch_state.initial_x_range[1]) / 2;
-        const y_center = (touch_state.initial_y_range[0] + touch_state.initial_y_range[1]) / 2;
-        const y2_center = (touch_state.initial_y2_range[0] + touch_state.initial_y2_range[1]) / 2;
-        ranges.current.x = [
-            x_center - x_span / scale / 2,
-            x_center + x_span / scale / 2,
-        ];
-        ranges.current.y = [
-            y_center - y_span / scale / 2,
-            y_center + y_span / scale / 2,
-        ];
-        ranges.current.y2 = [
-            y2_center - y2_span / scale / 2,
-            y2_center + y2_span / scale / 2,
-        ];
-    }
-    else {
-        // Pan
-        const x_delta = pixels_to_data_delta(-dx, touch_state.initial_x_range, plot_width);
-        const y_delta = pixels_to_data_delta(dy, touch_state.initial_y_range, plot_height);
-        const y2_delta = pixels_to_data_delta(dy, touch_state.initial_y2_range, plot_height);
-        ranges.current.x = pan_range(touch_state.initial_x_range, x_delta);
-        ranges.current.y = pan_range(touch_state.initial_y_range, y_delta);
-        ranges.current.y2 = pan_range(touch_state.initial_y2_range, y2_delta);
+      // Pinch zoom centered on gesture center
+      // Divide by scale so spread (scale > 1) = smaller span (zoom in)
+      const x_span = touch_state.initial_x_range[1] - touch_state.initial_x_range[0]
+      const x2_span = touch_state.initial_x2_range[1] -
+        touch_state.initial_x2_range[0]
+      const y_span = touch_state.initial_y_range[1] - touch_state.initial_y_range[0]
+      const y2_span = touch_state.initial_y2_range[1] -
+        touch_state.initial_y2_range[0]
+      const x_center =
+        (touch_state.initial_x_range[0] + touch_state.initial_x_range[1]) / 2
+      const x2_center =
+        (touch_state.initial_x2_range[0] + touch_state.initial_x2_range[1]) / 2
+      const y_center =
+        (touch_state.initial_y_range[0] + touch_state.initial_y_range[1]) / 2
+      const y2_center =
+        (touch_state.initial_y2_range[0] + touch_state.initial_y2_range[1]) / 2
+
+      ranges.current.x = [
+        x_center - x_span / scale / 2,
+        x_center + x_span / scale / 2,
+      ]
+      ranges.current.x2 = [
+        x2_center - x2_span / scale / 2,
+        x2_center + x2_span / scale / 2,
+      ]
+      ranges.current.y = [
+        y_center - y_span / scale / 2,
+        y_center + y_span / scale / 2,
+      ]
+      ranges.current.y2 = [
+        y2_center - y2_span / scale / 2,
+        y2_center + y2_span / scale / 2,
+      ]
+    } else {
+      // Pan
+      const x_delta = pixels_to_data_delta(
+        -dx,
+        touch_state.initial_x_range,
+        plot_width,
+      )
+      const x2_delta = pixels_to_data_delta(
+        -dx,
+        touch_state.initial_x2_range,
+        plot_width,
+      )
+      const y_delta = pixels_to_data_delta(
+        dy,
+        touch_state.initial_y_range,
+        plot_height,
+      )
+      const y2_delta = pixels_to_data_delta(
+        dy,
+        touch_state.initial_y2_range,
+        plot_height,
+      )
+      ranges.current.x = pan_range(touch_state.initial_x_range, x_delta)
+      ranges.current.x2 = pan_range(touch_state.initial_x2_range, x2_delta)
+      ranges.current.y = pan_range(touch_state.initial_y_range, y_delta)
+      ranges.current.y2 = pan_range(touch_state.initial_y2_range, y2_delta)
     }
-}
-function handle_touch_end() {
-    touch_state = null;
-}
-function handle_double_click() {
+  }
+
+  function handle_touch_end() {
+    touch_state = null
+  }
+
+  function handle_double_click() {
     // Reset zoom to initial ranges (undo any pan/zoom)
-    ranges.current.x = [...ranges.initial.x];
-    ranges.current.y = [...ranges.initial.y];
-    ranges.current.y2 = [...ranges.initial.y2];
+    ranges.current.x = [...ranges.initial.x] as [number, number]
+    ranges.current.x2 = [...ranges.initial.x2] as [number, number]
+    ranges.current.y = [...ranges.initial.y] as [number, number]
+    ranges.current.y2 = [...ranges.initial.y2] as [number, number]
     // Also reset axis props so future data changes recalculate auto ranges
-    x_axis = { ...x_axis, range: [null, null] };
-    y_axis = { ...y_axis, range: [null, null] };
-    y2_axis = { ...y2_axis, range: [null, null] };
-}
-function handle_mouse_move(evt, value, count, property, active_y_axis = `y1`, series_idx = 0) {
-    hovered = true;
+    x_axis = { ...x_axis, range: [null, null] }
+    x2_axis = { ...x2_axis, range: [null, null] }
+    y_axis = { ...y_axis, range: [null, null] }
+    y2_axis = { ...y2_axis, range: [null, null] }
+  }
+
+  function handle_mouse_move(
+    evt: MouseEvent,
+    value: number,
+    count: number,
+    property: string,
+    active_y_axis: `y1` | `y2` = `y1`,
+    series_idx: number = 0,
+    active_x_axis: `x1` | `x2` = `x1`,
+  ) {
+    hovered = true
     hover_info = {
-        value,
-        count,
-        property,
-        active_y_axis,
-        x: value,
-        y: count,
-        series_idx,
-        metadata: null,
-        label: property,
-        x_axis,
-        y_axis: active_y_axis === `y2` ? y2_axis : y_axis,
-        y2_axis,
-    };
-    change({ value, count, property });
-    on_bar_hover?.({ value, count, property, event: evt });
-}
-function toggle_series_visibility(series_idx) {
+      value,
+      count,
+      property,
+      active_y_axis,
+      active_x_axis,
+      x: value,
+      y: count,
+      series_idx,
+      metadata: null,
+      label: property,
+      x_axis: active_x_axis === `x2` ? x2_axis : x_axis,
+      x2_axis,
+      y_axis: active_y_axis === `y2` ? y2_axis : y_axis,
+      y2_axis,
+    }
+    change({ value, count, property })
+    on_bar_hover?.({ value, count, property, event: evt })
+  }
+
+  function toggle_series_visibility(series_idx: number) {
     if (series_idx >= 0 && series_idx < series.length) {
-        // Toggle series visibility
-        series = series.map((srs, idx) => {
-            if (idx === series_idx)
-                return { ...srs, visible: !(srs.visible ?? true) };
-            return srs;
-        });
-        (legend?.on_toggle || on_series_toggle)(series_idx);
+      // Toggle series visibility
+      series = series.map((srs: DataSeries, idx: number) => {
+        if (idx === series_idx) return { ...srs, visible: !(srs.visible ?? true) }
+        return srs
+      })
+      ;(legend?.on_toggle || on_series_toggle)(series_idx)
     }
-}
-// Set theme-aware background when entering fullscreen
-$effect(() => {
-    set_fullscreen_bg(wrapper, fullscreen, `--histogram-fullscreen-bg`);
-});
-// State accessors for shared axis change handler
-const axis_state = {
-    get_axis: (axis) => (axis === `x` ? x_axis : axis === `y` ? y_axis : y2_axis),
+  }
+
+  // Set theme-aware background when entering fullscreen
+  $effect(() => {
+    set_fullscreen_bg(wrapper, fullscreen, `--histogram-fullscreen-bg`)
+  })
+
+  // State accessors for shared axis change handler
+  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
+    },
     set_axis: (axis, config) => {
-        // Spread into existing state to preserve merged type structure
-        if (axis === `x`)
-            x_axis = { ...x_axis, ...config };
-        else if (axis === `y`)
-            y_axis = { ...y_axis, ...config };
-        else
-            y2_axis = { ...y2_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),
-};
-// Create shared handler bound to this component's state
-// Using $derived so handler updates when callback props change
-const handle_axis_change = $derived(create_axis_change_handler(axis_state, data_loader, on_axis_change, on_error));
-let auto_load_attempted = false; // prevent infinite retries on failure
-// Auto-load data if series is empty but options exist (runs once)
-$effect(() => {
+  }
+
+  // Create shared handler bound to this component's state
+  // Using $derived so handler updates when callback props change
+  const handle_axis_change = $derived(create_axis_change_handler(
+    axis_state,
+    data_loader,
+    on_axis_change,
+    on_error,
+  ))
+
+  let auto_load_attempted = false // prevent infinite retries on failure
+
+  // Auto-load data if series is empty but options exist (runs once)
+  $effect(() => {
     if (series.length === 0 && data_loader && !auto_load_attempted) {
-        // Check x-axis first, then y-axis
-        if (x_axis.options?.length) {
-            auto_load_attempted = true;
-            const first_key = x_axis.selected_key ?? x_axis.options[0].key;
-            handle_axis_change(`x`, first_key).catch(() => { });
-        }
-        else if (y_axis.options?.length) {
-            auto_load_attempted = true;
-            const first_key = y_axis.selected_key ?? y_axis.options[0].key;
-            handle_axis_change(`y`, first_key).catch(() => { });
-        }
+      // Check x-axis first, then y-axis
+      if (x_axis.options?.length) {
+        auto_load_attempted = true
+        const first_key = x_axis.selected_key ?? x_axis.options[0].key
+        handle_axis_change(`x`, first_key).catch(() => {})
+      } else if (y_axis.options?.length) {
+        auto_load_attempted = true
+        const first_key = y_axis.selected_key ?? y_axis.options[0].key
+        handle_axis_change(`y`, first_key).catch(() => {})
+      }
     }
-});
+  })
 </script>
 
 {#snippet ref_lines_layer(lines: IndexedRefLine[])}
@@ -569,11 +1026,12 @@ $effect(() => {
     <ReferenceLine
       ref_line={line}
       line_idx={line.idx}
-      x_min={ranges.current.x[0]}
-      x_max={ranges.current.x[1]}
+      x_min={line.x_axis === `x2` ? ranges.current.x2[0] : ranges.current.x[0]}
+      x_max={line.x_axis === `x2` ? ranges.current.x2[1] : ranges.current.x[1]}
       y_min={line.y_axis === `y2` ? ranges.current.y2[0] : ranges.current.y[0]}
       y_max={line.y_axis === `y2` ? ranges.current.y2[1] : ranges.current.y[1]}
       x_scale={scales.x}
+      x2_scale={scales.x2}
       y_scale={scales.y}
       y2_scale={scales.y2}
       {clip_path_id}
@@ -625,6 +1083,9 @@ $effect(() => {
   <svg
     bind:this={svg_element}
     role="application"
+    aria-label={rest[`aria-label`] ??
+    ([final_x_axis.label, final_y_axis.label].filter(Boolean).join(` vs `) ||
+      `Histogram`)}
     tabindex="0"
     onfocusin={() => (is_focused = true)}
     onfocusout={() => (is_focused = false)}
@@ -670,79 +1131,33 @@ $effect(() => {
     <!-- Reference lines: below grid (must render first to appear behind grid) -->
     {@render ref_lines_layer(ref_lines_by_z.below_grid)}
 
-    <!-- Zoom Selection Rectangle -->
-    {#if drag_state.start && drag_state.current && isFinite(drag_state.start.x) &&
-        isFinite(drag_state.start.y) && isFinite(drag_state.current.x) &&
-        isFinite(drag_state.current.y)}
-      {@const x = Math.min(drag_state.start.x, drag_state.current.x)}
-      {@const y = Math.min(drag_state.start.y, drag_state.current.y)}
-      {@const rect_width = Math.abs(drag_state.start.x - drag_state.current.x)}
-      {@const rect_height = Math.abs(drag_state.start.y - drag_state.current.y)}
-      <rect class="zoom-rect" {x} {y} width={rect_width} height={rect_height} />
-    {/if}
+    <ZoomRect start={drag_state.start} current={drag_state.current} />
+
+    <ZeroLines
+      {display}
+      x_scale_fn={scales.x}
+      x2_scale_fn={scales.x2}
+      y_scale_fn={scales.y}
+      y2_scale_fn={scales.y2}
+      x_range={ranges.current.x}
+      x2_range={ranges.current.x2}
+      y_range={ranges.current.y}
+      y2_range={ranges.current.y2}
+      x_scale_type={final_x_axis.scale_type}
+      x2_scale_type={final_x2_axis.scale_type}
+      y_scale_type={final_y_axis.scale_type}
+      y2_scale_type={final_y2_axis.scale_type}
+      has_x2={x2_series.length > 0}
+      has_y2={y2_series.length > 0}
+      {width}
+      {height}
+      {pad}
+    />
 
     <!-- Reference lines: below lines -->
     {@render ref_lines_layer(ref_lines_by_z.below_lines)}
 
-    <!-- Histogram bars (rendered before axes so tick labels appear on top) -->
-    {#each histogram_data as
-      { id, bins, color, label, y_scale, y_axis },
-      series_idx
-      (id ?? series_idx)
-    }
-      <g class="histogram-series" data-series-idx={series_idx}>
-        {#each bins as bin, bin_idx (bin_idx)}
-          {@const bar_x = scales.x(bin.x0!)}
-          {@const bar_width = Math.max(1, Math.abs(scales.x(bin.x1!) - bar_x))}
-          {@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}
-            <path
-              d={bar_path(
-                bar_x,
-                bar_y,
-                bar_width,
-                bar_height,
-                Math.min(final_bar.border_radius ?? 0, bar_width / 2, bar_height / 2),
-              )}
-              fill={color}
-              opacity={final_bar.opacity}
-              stroke={final_bar.stroke_color}
-              stroke-opacity={final_bar.stroke_opacity}
-              stroke-width={final_bar.stroke_width}
-              role="button"
-              tabindex="0"
-              onmousemove={(evt) =>
-              handle_mouse_move(
-                evt,
-                value,
-                bin.length,
-                label,
-                (y_axis ?? `y1`) as `y1` | `y2`,
-                series_idx,
-              )}
-              onmouseleave={() => {
-                hover_info = null
-                change(null)
-                on_bar_hover?.(null)
-              }}
-              onclick={(event) =>
-              on_bar_click?.({ value, count: bin.length, property: label, event })}
-              onkeydown={(event: KeyboardEvent) => {
-                if ([`Enter`, ` `].includes(event.key)) {
-                  event.preventDefault()
-                  on_bar_click?.({ value, count: bin.length, property: label, event })
-                }
-              }}
-              style:cursor={on_bar_click ? `pointer` : undefined}
-            />
-          {/if}
-        {/each}
-      </g>
-    {/each}
-
-    <!-- Reference lines: below points (after bars, before axes/labels) -->
+    <!-- Reference lines: below points -->
     {@render ref_lines_layer(ref_lines_by_z.below_points)}
 
     <!-- X-axis -->
@@ -761,7 +1176,7 @@ $effect(() => {
         {@const inside = final_x_axis.tick?.label?.inside ?? false}
         {@const shift_x = final_x_axis.tick?.label?.shift?.x ?? 0}
         {@const shift_y = final_x_axis.tick?.label?.shift?.y ?? 0}
-        {@const base_y = inside ? -8 : 18}
+        {@const base_y = inside ? -8 : 8}
         {@const text_y = base_y + shift_y}
         {@const dominant_baseline = inside ? `auto` : `hanging`}
         <g class="tick" transform="translate({tick_x}, {height - pad.b})">
@@ -793,31 +1208,87 @@ $effect(() => {
         </g>
       {/each}
       {#if final_x_axis.label || x_axis.options?.length}
-        <foreignObject
-          x={(pad.l + width - pad.r) / 2 + (final_x_axis.label_shift?.x ?? 0) -
-          AXIS_LABEL_CONTAINER.x_offset}
-          y={height - 10 + (final_x_axis.label_shift?.y ?? 0) -
-          AXIS_LABEL_CONTAINER.y_offset}
-          width={AXIS_LABEL_CONTAINER.width}
-          height={AXIS_LABEL_CONTAINER.height}
-          style="overflow: visible; pointer-events: none"
-        >
-          <div xmlns="http://www.w3.org/1999/xhtml" style="pointer-events: auto">
-            <InteractiveAxisLabel
-              label={final_x_axis.label ?? ``}
-              options={x_axis.options}
-              selected_key={x_axis.selected_key}
-              loading={axis_loading === `x`}
-              axis_type="x"
-              color={final_x_axis.color}
-              on_select={(key) => handle_axis_change(`x`, key)}
-              class="axis-label x-label"
-            />
-          </div>
-        </foreignObject>
+        {@const { label_shift, label = ``, options, selected_key, color } = final_x_axis}
+        <AxisLabel
+          x={(pad.l + width - pad.r) / 2 + (label_shift?.x ?? 0)}
+          y={height - 10 + (label_shift?.y ?? 0)}
+          {label}
+          {options}
+          {selected_key}
+          loading={axis_loading === `x`}
+          axis_type="x"
+          {color}
+          on_select={(key) => handle_axis_change(`x`, key)}
+        />
       {/if}
     </g>
 
+    <!-- X2-axis (Top) -->
+    {#if x2_series.length > 0}
+      <g class="x2-axis">
+        <line
+          x1={pad.l}
+          x2={width - pad.r}
+          y1={pad.t}
+          y2={pad.t}
+          stroke={final_x2_axis.color || `var(--border-color, gray)`}
+          stroke-width="1"
+        />
+        {#each ticks.x2 as tick (tick)}
+          {@const tick_x = scales.x2(tick as number)}
+          {@const custom_label = get_tick_label(tick as number, final_x2_axis.ticks)}
+          {@const inside = final_x2_axis.tick?.label?.inside ?? false}
+          {@const shift_x = final_x2_axis.tick?.label?.shift?.x ?? 0}
+          {@const shift_y = final_x2_axis.tick?.label?.shift?.y ?? 0}
+          {@const base_y = inside ? 8 : -20}
+          {@const text_y = base_y + shift_y}
+          {@const dominant_baseline = inside ? `hanging` : `auto`}
+          <g class="tick" transform="translate({tick_x}, {pad.t})">
+            {#if display.x2_grid}
+              <line
+                y1="0"
+                y2={height - pad.b - pad.t}
+                stroke="var(--border-color, gray)"
+                stroke-dasharray="4"
+                stroke-width="1"
+                {...final_x2_axis.grid_style ?? {}}
+              />
+            {/if}
+            <line
+              y1={inside ? 0 : -5}
+              y2={inside ? 5 : 0}
+              stroke={final_x2_axis.color || `var(--border-color, gray)`}
+              stroke-width="1"
+            />
+            <text
+              x={shift_x}
+              y={text_y}
+              text-anchor="middle"
+              dominant-baseline={dominant_baseline}
+              fill={final_x2_axis.color || `var(--text-color)`}
+            >
+              {custom_label ?? format_value(tick, final_x2_axis.format)}
+            </text>
+          </g>
+        {/each}
+        {#if final_x2_axis.label || x2_axis.options?.length}
+          {@const { label_shift, label = ``, options, selected_key, color } =
+          final_x2_axis}
+          <AxisLabel
+            x={(pad.l + width - pad.r) / 2 + (label_shift?.x ?? 0)}
+            y={Math.max(12, pad.t - (label_shift?.y ?? 40))}
+            {label}
+            {options}
+            {selected_key}
+            loading={axis_loading === `x2`}
+            axis_type="x2"
+            {color}
+            on_select={(key) => handle_axis_change(`x2`, key)}
+          />
+        {/if}
+      </g>
+    {/if}
+
     <!-- Y-axis -->
     <g class="y-axis">
       <line
@@ -866,41 +1337,25 @@ $effect(() => {
         </g>
       {/each}
       {#if final_y_axis.label || y_axis.options?.length}
-        {@const max_y_tick_width = Math.max(
-          0,
-          ...ticks.y.map((tick) =>
-            measure_text_width(
-              format_value(tick, final_y_axis.format),
-              `12px sans-serif`,
-            )
-          ),
-        )}
-        {@const shift_x = final_y_axis.label_shift?.x ?? 0}
-        {@const shift_y = final_y_axis.label_shift?.y ?? 0}
-        {@const y_label_x = Math.max(12, pad.l - max_y_tick_width - LABEL_GAP_DEFAULT) +
-          shift_x}
-        {@const y_label_y = pad.t + (height - pad.t - pad.b) / 2 + shift_y}
-        <foreignObject
-          x={y_label_x - AXIS_LABEL_CONTAINER.x_offset}
-          y={y_label_y - AXIS_LABEL_CONTAINER.y_offset}
-          width={AXIS_LABEL_CONTAINER.width}
-          height={AXIS_LABEL_CONTAINER.height}
-          style="overflow: visible; pointer-events: none"
-          transform="rotate(-90, {y_label_x}, {y_label_y})"
-        >
-          <div xmlns="http://www.w3.org/1999/xhtml" style="pointer-events: auto">
-            <InteractiveAxisLabel
-              label={final_y_axis.label ?? ``}
-              options={y_axis.options}
-              selected_key={y_axis.selected_key}
-              loading={axis_loading === `y`}
-              axis_type="y"
-              color={final_y_axis.color}
-              on_select={(key) => handle_axis_change(`y`, key)}
-              class="axis-label y-label"
-            />
-          </div>
-        </foreignObject>
+        {@const { label_shift, label = ``, options, selected_key, color, tick } =
+          final_y_axis}
+        {@const y_inside = tick?.label?.inside ?? false}
+        <AxisLabel
+          x={Math.max(
+            12,
+            pad.l - (y_inside ? 0 : tick_label_widths.y_max) - LABEL_GAP_DEFAULT,
+          ) +
+            (label_shift?.x ?? 0)}
+          y={pad.t + (height - pad.t - pad.b) / 2 + (label_shift?.y ?? 0)}
+          rotate
+          {label}
+          {options}
+          {selected_key}
+          loading={axis_loading === `y`}
+          axis_type="y"
+          {color}
+          on_select={(key) => handle_axis_change(`y`, key)}
+        />
       {/if}
     </g>
 
@@ -952,80 +1407,86 @@ $effect(() => {
           </g>
         {/each}
         {#if final_y2_axis.label || y2_axis.options?.length}
-          {@const max_y2_tick_width = Math.max(
-          0,
-          ...ticks.y2.map((tick) =>
-            measure_text_width(
-              format_value(tick, final_y2_axis.format),
-              `12px sans-serif`,
-            )
-          ),
-        )}
-          {@const shift_x = final_y2_axis.label_shift?.x ?? 0}
-          {@const shift_y = final_y2_axis.label_shift?.y ?? 0}
-          {@const inside = final_y2_axis.tick?.label?.inside ?? false}
-          {@const tick_shift = inside ? 0 : (final_y2_axis.tick?.label?.shift?.x ?? 0) + 8}
-          {@const tick_width_contribution = inside ? 0 : max_y2_tick_width}
-          {@const y2_label_x = width - pad.r + tick_shift + tick_width_contribution +
-          LABEL_GAP_DEFAULT +
-          shift_x}
-          {@const y2_label_y = pad.t + (height - pad.t - pad.b) / 2 + shift_y}
-          <foreignObject
-            x={y2_label_x - AXIS_LABEL_CONTAINER.x_offset}
-            y={y2_label_y - AXIS_LABEL_CONTAINER.y_offset}
-            width={AXIS_LABEL_CONTAINER.width}
-            height={AXIS_LABEL_CONTAINER.height}
-            style="overflow: visible; pointer-events: none"
-            transform="rotate(-90, {y2_label_x}, {y2_label_y})"
-          >
-            <div xmlns="http://www.w3.org/1999/xhtml" style="pointer-events: auto">
-              <InteractiveAxisLabel
-                label={final_y2_axis.label ?? ``}
-                options={y2_axis.options}
-                selected_key={y2_axis.selected_key}
-                loading={axis_loading === `y2`}
-                axis_type="y2"
-                color={final_y2_axis.color}
-                on_select={(key) => handle_axis_change(`y2`, key)}
-                class="axis-label y2-label"
-              />
-            </div>
-          </foreignObject>
+          {@const { label_shift, label = ``, options, selected_key, color, tick } =
+          final_y2_axis}
+          {@const inside = tick?.label?.inside ?? false}
+          {@const tick_shift = inside ? 0 : (tick?.label?.shift?.x ?? 0) + 8}
+          {@const tick_width_contribution = inside ? 0 : tick_label_widths.y2_max}
+          <AxisLabel
+            x={width - pad.r + tick_shift + tick_width_contribution +
+            LABEL_GAP_DEFAULT + (label_shift?.x ?? 0)}
+            y={pad.t + (height - pad.t - pad.b) / 2 + (label_shift?.y ?? 0)}
+            rotate
+            {label}
+            {options}
+            {selected_key}
+            loading={axis_loading === `y2`}
+            axis_type="y2"
+            {color}
+            on_select={(key) => handle_axis_change(`y2`, key)}
+          />
         {/if}
       </g>
     {/if}
 
-    <!-- Zero lines (shown for linear and arcsinh scales, not log) -->
-    {#if display.x_zero_line &&
-        get_scale_type_name(final_x_axis.scale_type) !== `log` &&
-        ranges.current.x[0] <= 0 && ranges.current.x[1] >= 0}
-      {@const x0 = scales.x(0)}
-      {#if isFinite(x0)}
-        <line class="zero-line" x1={x0} x2={x0} y1={pad.t} y2={height - pad.b} />
-      {/if}
-    {/if}
-    {#if display.y_zero_line &&
-        get_scale_type_name(final_y_axis.scale_type) !== `log` &&
-        ranges.current.y[0] <= 0 && ranges.current.y[1] >= 0}
-      {@const zero_y = scales.y(0)}
-      {#if isFinite(zero_y)}
-        <line class="zero-line" x1={pad.l} x2={width - pad.r} y1={zero_y} y2={zero_y} />
-      {/if}
-    {/if}
-    {#if display.y_zero_line && y2_series.length > 0 &&
-        get_scale_type_name(final_y2_axis.scale_type) !== `log` &&
-        ranges.current.y2[0] <= 0 && ranges.current.y2[1] >= 0}
-      {@const zero_y2 = scales.y2(0)}
-      {#if isFinite(zero_y2)}
-        <line
-          class="zero-line"
-          x1={pad.l}
-          x2={width - pad.r}
-          y1={zero_y2}
-          y2={zero_y2}
-        />
-      {/if}
-    {/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
+      (id ?? series_idx)
+    }
+      <g class="histogram-series" data-series-idx={series_idx}>
+        {#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_y = y_scale(bin.length)}
+          {@const value = (bin.x0! + bin.x1!) / 2}
+          {#if bar_height > 0}
+            <path
+              d={bar_path(
+                bar_x,
+                bar_y,
+                bar_width,
+                bar_height,
+                Math.min(final_bar.border_radius ?? 0, bar_width / 2, bar_height / 2),
+              )}
+              fill={color}
+              opacity={final_bar.opacity}
+              stroke={final_bar.stroke_color}
+              stroke-opacity={final_bar.stroke_opacity}
+              stroke-width={final_bar.stroke_width}
+              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`,
+              )}
+              onmouseleave={() => {
+                hover_info = null
+                change(null)
+                on_bar_hover?.(null)
+              }}
+              onclick={(event) =>
+              on_bar_click?.({ value, count: bin.length, property: label, event })}
+              onkeydown={(event: KeyboardEvent) => {
+                if ([`Enter`, ` `].includes(event.key)) {
+                  event.preventDefault()
+                  on_bar_click?.({ value, count: bin.length, property: label, event })
+                }
+              }}
+              style:cursor={on_bar_click ? `pointer` : undefined}
+            />
+          {/if}
+        {/each}
+      </g>
+    {/each}
 
     <!-- Reference lines: above all -->
     {@render ref_lines_layer(ref_lines_by_z.above_all)}
@@ -1033,8 +1494,8 @@ $effect(() => {
 
   <!-- Tooltip (outside SVG for proper HTML rendering) -->
   {#if hover_info}
-    {@const { value, count, property, active_y_axis } = hover_info}
-    {@const tooltip_x = scales.x(value)}
+    {@const { value, count, property, active_y_axis, active_x_axis } = hover_info}
+    {@const tooltip_x = (active_x_axis === `x2` ? scales.x2 : scales.x)(value)}
     {@const tooltip_y = (active_y_axis === `y2` ? scales.y2 : scales.y)(count)}
     {@const tooltip_pos = constrain_tooltip_position(
       tooltip_x,
@@ -1045,7 +1506,6 @@ $effect(() => {
       height,
       { offset_x: 5, offset_y: -10 },
     )}
-    {@const active_y_config = active_y_axis === `y2` ? final_y2_axis : final_y_axis}
     <PlotTooltip
       x={tooltip_pos.x}
       y={tooltip_pos.y}
@@ -1055,8 +1515,8 @@ $effect(() => {
       {#if tooltip}
         {@render tooltip({ ...hover_info, fullscreen })}
       {:else}
-        <div>Value: {format_value(value, final_x_axis.format || `.3~s`)}</div>
-        <div>Count: {format_value(count, active_y_config.format || `.3~s`)}</div>
+        <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>
         {#if mode === `overlay`}<div>{property}</div>{/if}
       {/if}
     </PlotTooltip>
@@ -1066,7 +1526,7 @@ $effect(() => {
     <HistogramControls
       toggle_props={{
         ...controls_toggle_props,
-        style: `--ctrl-btn-right: var(--fullscreen-btn-offset, 36px); top: 4px; ${
+        style: `--ctrl-btn-right: var(--fullscreen-btn-offset, 30px); ${
           controls_toggle_props?.style ?? ``
         }`,
       }}
@@ -1080,12 +1540,16 @@ $effect(() => {
       bind:display
       bind:bar
       bind:x_axis
+      bind:x2_axis
       bind:y_axis
       bind:y2_axis
       auto_x_range={auto_ranges.x}
+      auto_x2_range={auto_ranges.x2}
       auto_y_range={auto_ranges.y}
       auto_y2_range={auto_ranges.y2}
       {series}
+      has_x2_points={x2_series.length > 0}
+      has_y2_points={y2_series.length > 0}
       children={controls_extra}
     />
   {/if}
@@ -1178,7 +1642,7 @@ $effect(() => {
     font-weight: var(--histogram-font-weight);
     font-size: var(--histogram-font-size);
   }
-  g:is(.x-axis, .y-axis, .y2-axis) .tick text {
+  g:is(.x-axis, .x2-axis, .y-axis, .y2-axis) .tick text {
     font-size: var(--tick-font-size, 0.8em); /* shrink tick labels */
   }
   .histogram-series path {
@@ -1187,15 +1651,4 @@ $effect(() => {
   .histogram-series path:hover {
     opacity: 1 !important;
   }
-  .zoom-rect {
-    fill: var(--histogram-zoom-rect-fill, rgba(100, 100, 255, 0.2));
-    stroke: var(--histogram-zoom-rect-stroke, rgba(100, 100, 255, 0.8));
-    stroke-width: var(--histogram-zoom-rect-stroke-width, 1);
-    pointer-events: none;
-  }
-  .zero-line {
-    stroke: var(--histogram-zero-line-color, light-dark(black, white));
-    stroke-width: var(--histogram-zero-line-width, 1);
-    opacity: var(--histogram-zero-line-opacity);
-  }
 </style>