waveform-analysis 0.1.27 → 0.1.29

package/dist/types/components/core/layout.d.ts

@@ -1,7 +1,7 @@
 import type { WaveformOverlayMode } from '../../types';
 import type { DisplaySeries, DisplayTrack, TrackLayout } from './types';
 import { type WaveformYDomain } from './yDomain';
-export { MAX_MULTI_Y_AXIS_COUNT, Y_AXIS_EXPONENT_GAP } from './constants';
+export { MAX_MULTI_Y_AXIS_COUNT } from './constants';
 export interface YAxisSeriesGroup {
     index: number;
     side: 'left' | 'right';
@@ -11,9 +11,7 @@ export interface YAxisSeriesGroup {
 }
 export declare function buildYAxisSeriesGroups(track: DisplayTrack, overlayMode: WaveformOverlayMode): YAxisSeriesGroup[];
 export declare function resolveYAxisSeriesGroups(track: DisplayTrack, overlayMode: WaveformOverlayMode, yDomain?: WaveformYDomain, yDomains?: Record<string, WaveformYDomain>): YAxisSeriesGroup[];
-export declare function axisTextMetrics(domain: [number, number], nice?: boolean): {
-    exponentLabel: string | null;
-    exponentWidth: number;
+export declare function axisTextMetrics(domain: [number, number], nice?: boolean, tickValues?: number[]): {
     tickTextWidth: number;
 };
 export declare function measureYAxisGroupClearance(group: YAxisSeriesGroup): number;

package/dist/types/components/core/trackLayoutBuilder.d.ts

@@ -1,6 +1,6 @@
 import { type ZoomTransform } from 'd3';
 import { type ResolvedWaveformRenderingOptions } from '../../core/rendering';
-import type { WaveformDisplayMode, WaveformOverlayMode } from '../../types';
+import type { WaveformDisplayMode, WaveformOverlayMode, WaveformXAxisLabelFormatter } from '../../types';
 import { type GridCellGeometry, type NormalizedWaveformGridOptions } from './grid';
 import type { DisplayTrack, TrackLayout } from './types';
 interface SeriesGridCell extends GridCellGeometry {
@@ -19,6 +19,7 @@ export interface BuildTrackLayoutsOptions {
     fixedYDomains?: Record<string, [number, number]>;
     yDomains?: Record<string, [number, number]>;
     timeUnit: 's' | 'ms';
+    xAxisLabelFormatter?: WaveformXAxisLabelFormatter;
     rendering: ResolvedWaveformRenderingOptions;
     hideSecondaryLabels: boolean;
     yAxisLabelX: number;

package/dist/types/components/core/types.d.ts

@@ -41,8 +41,6 @@ export interface WaveformYAxisLayout {
     side: 'left' | 'right';
     x: number;
     labelX: number;
-    exponentX: number;
-    exponentLabel: string | null;
     scale: ScaleLinear<number, number>;
     majorTicks: number[];
     minorTicks: number[];
@@ -102,7 +100,6 @@ export interface TrackLayout {
         start: string;
         end: string;
     };
-    xAxisExponent: string | null;
     path: string | null;
     seriesPaths: TrackSeriesPath[];
     showXAxis: boolean;

package/dist/types/demo/types.d.ts

@@ -1,4 +1,5 @@
 import type { WaveformAnnotation, WaveformAxesOptions, WaveformData, WaveformDisplayMode, WaveformFrameStyle, WaveformGridTrackLines, WaveformInteractionMode, WaveformLegendOrientation, WaveformLegendPosition, WaveformLineStyle, WaveformOverlayMode, WaveformTitleOptions, WaveformZeroLineOptions, WaveformZoomEndPayload } from '../components';
+import type { DemoXAxisLabelFormat, DemoXAxisLabelTimeZone } from './useDemoXAxisLabelControls';
 interface SelectOption<T> {
     label: string;
     value: T;
@@ -27,6 +28,14 @@ export interface DemoControlPanelModel {
     verticalGridColor: string;
     xAxisLineVisible: boolean;
     yAxisLineVisible: boolean;
+    xAxisLabelFormatterEnabled: boolean;
+    xAxisLabelFormat: DemoXAxisLabelFormat;
+    xAxisLabelFormatOptions: Array<SelectOption<DemoXAxisLabelFormat>>;
+    xAxisLabelMultiplier: number;
+    xAxisLabelFractionDigits: number;
+    xAxisLabelTimeZone: DemoXAxisLabelTimeZone;
+    xAxisLabelTimeZoneOptions: Array<SelectOption<DemoXAxisLabelTimeZone>>;
+    xAxisLabelShowMilliseconds: boolean;
     frameBorderColor: string;
     frameBackgroundColor: string;
     frameBorderWidth: number;

package/dist/types/demo/useDemoXAxisLabelControls.d.ts

@@ -0,0 +1,32 @@
+import type { WaveformXAxisLabelFormatter } from '../types';
+export type DemoXAxisLabelFormat = 'number' | 'datetime';
+export type DemoXAxisLabelTimeZone = 'local' | 'Asia/Shanghai' | 'UTC';
+export declare function formatDemoTimestamp(value: number, timeZone: DemoXAxisLabelTimeZone, showMilliseconds: boolean): string;
+export declare function useDemoXAxisLabelControls(): {
+    controlModel: {
+        xAxisLabelFormatterEnabled: import("vue").Ref<boolean, boolean>;
+        xAxisLabelFormat: import("vue").Ref<DemoXAxisLabelFormat, DemoXAxisLabelFormat>;
+        xAxisLabelFormatOptions: ({
+            label: string;
+            value: "number";
+        } | {
+            label: string;
+            value: "datetime";
+        })[];
+        xAxisLabelMultiplier: import("vue").Ref<number, number>;
+        xAxisLabelFractionDigits: import("vue").Ref<number, number>;
+        xAxisLabelTimeZone: import("vue").Ref<DemoXAxisLabelTimeZone, DemoXAxisLabelTimeZone>;
+        xAxisLabelTimeZoneOptions: ({
+            label: string;
+            value: "Asia/Shanghai";
+        } | {
+            label: string;
+            value: "local";
+        } | {
+            label: string;
+            value: "UTC";
+        })[];
+        xAxisLabelShowMilliseconds: import("vue").Ref<boolean, boolean>;
+    };
+    xAxisLabelFormatter: import("vue").ComputedRef<WaveformXAxisLabelFormatter | undefined>;
+};

package/dist/types/index.d.ts

@@ -3,7 +3,7 @@
  * @packageDocumentation
  */
 export { default as WaveformChart } from './components/WaveformChart.vue';
-export type { WaveformPoint, WaveformDisplayMode, WaveformOverlayMode, WaveformInteractionMode, WaveformZoomEndPayload, WaveformAnnotationStyle, WaveformAnnotation, WaveformRenderingOptions, WaveformTitleTextStyle, WaveformTitleOptions, WaveformLegendPosition, WaveformLegendOrientation, WaveformLegendOptions, WaveformFrameStyle, WaveformAxesOptions, WaveformZeroLineOptions, SingleWaveformData, WaveformLineType, WaveformLineStyle, WaveformPointType, WaveformErrorBarOptions, ResolvedWaveformErrorBarOptions, WaveformSeries, WaveformData, NormalizedWaveformSeries, } from './types';
+export type { WaveformPoint, WaveformDisplayMode, WaveformOverlayMode, WaveformInteractionMode, WaveformZoomEndPayload, WaveformAnnotationStyle, WaveformAnnotation, WaveformRenderingOptions, WaveformTitleTextStyle, WaveformTitleOptions, WaveformLegendPosition, WaveformLegendOrientation, WaveformLegendOptions, WaveformFrameStyle, WaveformXAxisLabelKind, WaveformXAxisLabelFormatterContext, WaveformXAxisLabelFormatter, WaveformAxesOptions, WaveformZeroLineOptions, SingleWaveformData, WaveformLineType, WaveformLineStyle, WaveformPointType, WaveformErrorBarOptions, ResolvedWaveformErrorBarOptions, WaveformSeries, WaveformData, NormalizedWaveformSeries, } from './types';
 export type { WaveformGridOptions, WaveformGridLineOptions, WaveformGridTrackLines, } from './components/core/grid';
 export { normalizeWaveformData, normalizeWaveformSeries } from './core';
 export { paddedDomain, buildMinorTicks, displayTime, formatEndpointTime, formatAxisTime, formatTooltipTime, resolveTrackGeometry, clamp, type TimeUnit, type TrackGeometry, } from './utils';

package/dist/types/types/chart.d.ts

@@ -106,10 +106,25 @@ export interface WaveformFrameStyle {
     borderStyle?: 'solid' | 'dashed' | 'dotted';
     backgroundColor?: string;
 }
+export type WaveformXAxisLabelKind = 'tick' | 'start' | 'end';
+/** Context passed to custom X-axis label formatters. */
+export interface WaveformXAxisLabelFormatterContext {
+    kind: WaveformXAxisLabelKind;
+    /** X coordinate in the source data, before time-unit conversion. */
+    rawValue: number;
+    timeUnit: 's' | 'ms';
+    /** Current visible X domain in source coordinates. */
+    domain: [number, number];
+    /** Current visible X domain converted to the selected display unit. */
+    displayDomain: [number, number];
+}
+export type WaveformXAxisLabelFormatter = (value: number, context: WaveformXAxisLabelFormatterContext) => string;
 /** Controls axis baseline visibility while preserving tick marks and axis text. */
 export interface WaveformAxesOptions {
     x?: {
         lineVisible?: boolean;
+        /** Formats display-unit X values for ticks and visible-range endpoints. */
+        labelFormatter?: WaveformXAxisLabelFormatter;
     };
     y?: {
         lineVisible?: boolean;

package/dist/types/types/index.d.ts

@@ -1,5 +1,5 @@
 /**
  * 类型定义统一导出
  */
-export type { WaveformPoint, WaveformDisplayMode, WaveformOverlayMode, WaveformInteractionMode, WaveformZoomEndPayload, WaveformAnnotationStyle, WaveformAnnotation, WaveformRenderingOptions, WaveformTitleTextStyle, WaveformTitleOptions, WaveformLegendPosition, WaveformLegendOrientation, WaveformLegendOptions, WaveformFrameStyle, WaveformAxesOptions, WaveformZeroLineOptions, } from './chart';
+export type { WaveformPoint, WaveformDisplayMode, WaveformOverlayMode, WaveformInteractionMode, WaveformZoomEndPayload, WaveformAnnotationStyle, WaveformAnnotation, WaveformRenderingOptions, WaveformTitleTextStyle, WaveformTitleOptions, WaveformLegendPosition, WaveformLegendOrientation, WaveformLegendOptions, WaveformFrameStyle, WaveformXAxisLabelKind, WaveformXAxisLabelFormatterContext, WaveformXAxisLabelFormatter, WaveformAxesOptions, WaveformZeroLineOptions, } from './chart';
 export type { SingleWaveformData, WaveformLineType, WaveformLineStyle, WaveformPointType, WaveformErrorBarOptions, ResolvedWaveformErrorBarOptions, WaveformSeries, WaveformData, NormalizedWaveformSeries, } from './data';

package/dist/types/utils/formatters.d.ts

@@ -1,16 +1,17 @@
+import type { WaveformXAxisLabelFormatter, WaveformXAxisLabelKind } from '../types';
 /**
  * 时间单位类型
  */
 export type TimeUnit = 'ms' | 's';
 export interface ScientificAxisLabelOptions {
+    /** @deprecated Y-axis labels always use five significant digits before localization. */
     precision?: number;
     axisMin?: number;
     axisMax?: number;
+    topTickValue?: number;
 }
 /** @deprecated Use ScientificAxisLabelOptions. */
-export type ScientificYAxisLabelOptions = ScientificAxisLabelOptions & {
-    topTickValue?: number;
-};
+export type ScientificYAxisLabelOptions = ScientificAxisLabelOptions;
 /** Whether an axis magnitude should use one shared scientific exponent. */
 export declare function shouldUseScientificAxisLabel(maxAbsoluteValue: number): boolean;
 export declare function resolveScientificAxisExponent(axisMin?: number, axisMax?: number): number | null;
@@ -33,6 +34,8 @@ export declare function formatPlainNumber(value: number): string;
  * @returns 转换后的显示值
  */
 export declare function displayTime(value: number, timeUnit: TimeUnit): number;
+/** Format an X-axis value without changing its source coordinate. */
+export declare function formatXAxisLabel(rawValue: number, domain: [number, number], timeUnit: TimeUnit, kind: WaveformXAxisLabelKind, formatter?: WaveformXAxisLabelFormatter): string;
 /**
  * 计算端点标签的小数位数
  * @param domain 数据域 [最小值, 最大值]
@@ -41,22 +44,21 @@ export declare function displayTime(value: number, timeUnit: TimeUnit): number;
  */
 export declare function endpointFractionDigits(domain: [number, number], timeUnit: TimeUnit): number;
 /**
- * 按完整 X 轴显示域格式化端点时间
+ * 将 X 轴端点时间格式化为当前显示单位下的普通十进制文本
  * @param value 时间值（秒）
- * @param domain 数据域
+ * @param _domain 数据域（为保持现有调用签名而保留）
  * @param timeUnit 时间单位
  * @returns 格式化的时间字符串
  */
-export declare function formatEndpointTime(value: number, domain: [number, number], timeUnit: TimeUnit): string;
+export declare function formatEndpointTime(value: number, _domain: [number, number], timeUnit: TimeUnit): string;
 /**
- * 按完整 X 轴显示域格式化时间刻度
+ * 将 X 轴时间刻度格式化为当前显示单位下的普通十进制文本
  * @param value 时间值（秒）
  * @param timeUnit 时间单位
+ * @param _domain 数据域（为保持现有调用签名而保留）
  * @returns 格式化的时间字符串
  */
-export declare function formatAxisTime(value: number, timeUnit: TimeUnit, domain?: [number, number]): string;
-/** Return the shared multiplier for an X-axis domain in its selected display unit. */
-export declare function formatAxisTimeExponent(domain: [number, number], timeUnit: TimeUnit): string | null;
+export declare function formatAxisTime(value: number, timeUnit: TimeUnit, _domain?: [number, number]): string;
 /**
  * 格式化悬浮提示时间（4 位小数，本地化格式）
  * @param value 时间值（秒）

package/dist/types/utils/index.d.ts

@@ -2,6 +2,6 @@
  * 工具函数模块统一导出
  */
 export { paddedDomain, buildMinorTicks } from './domain';
-export { displayTime, endpointFractionDigits, formatEndpointTime, formatAxisTime, formatAxisTimeExponent, formatTooltipTime, formatAnnotationTime, formatPlainNumber, formatScientificAxisLabel, formatScientificAxisExponent, formatScientificYAxisLabel, formatTooltipNumber, resolveScientificAxisExponent, shouldUseScientificAxisLabel, shouldUseScientificYAxisLabel, type ScientificAxisLabelOptions, type ScientificYAxisLabelOptions, type TimeUnit, } from './formatters';
+export { displayTime, endpointFractionDigits, formatEndpointTime, formatAxisTime, formatXAxisLabel, formatTooltipTime, formatAnnotationTime, formatPlainNumber, formatScientificAxisLabel, formatScientificAxisExponent, formatScientificYAxisLabel, formatTooltipNumber, resolveScientificAxisExponent, shouldUseScientificAxisLabel, shouldUseScientificYAxisLabel, type ScientificAxisLabelOptions, type ScientificYAxisLabelOptions, type TimeUnit, } from './formatters';
 export { resolveTrackGeometry, clamp, type TrackGeometry } from './geometry';
 export { downsampleLTTB, downsampleMinMax, adaptiveSampling, calculateSamplingThreshold, } from './sampling';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "waveform-analysis",
-  "version": "0.1.27",
+  "version": "0.1.29",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
   "types": "./dist/types/index.d.ts",

package/src/App.vue

@@ -23,6 +23,7 @@ import { createSimulatedWaveformData } from './data/simulatedWaveforms'
 import DemoChartHost from './demo/DemoChartHost.vue'
 import DemoControlPanel from './demo/DemoControlPanel.vue'
 import type { DemoChartModel, DemoControlPanelModel } from './demo/types'
+import { useDemoXAxisLabelControls } from './demo/useDemoXAxisLabelControls'
 
 const fullChartData = createSimulatedWaveformData()
 const displayMode = ref<WaveformDisplayMode>('independent')
@@ -40,6 +41,7 @@ const verticalGridVisible = ref(true)
 const verticalGridColor = ref('#dfe5ef')
 const xAxisLineVisible = ref(false)
 const yAxisLineVisible = ref(false)
+const { controlModel: xAxisLabelControlModel, xAxisLabelFormatter } = useDemoXAxisLabelControls()
 const annotations = ref<WaveformAnnotation[]>([])
 const annotationsVisible = ref(true)
 const cleanView = ref(false)
@@ -112,7 +114,10 @@ const frameStyle = computed<WaveformFrameStyle>(() => ({
   backgroundColor: frameBackgroundColor.value,
 }))
 const axes = computed<WaveformAxesOptions>(() => ({
-  x: { lineVisible: xAxisLineVisible.value },
+  x: {
+    lineVisible: xAxisLineVisible.value,
+    ...(xAxisLabelFormatter.value ? { labelFormatter: xAxisLabelFormatter.value } : {}),
+  },
   y: { lineVisible: yAxisLineVisible.value },
 }))
 const zeroLine = computed<WaveformZeroLineOptions>(() => ({
@@ -308,6 +313,7 @@ const controlPanelModel = reactive({
   verticalGridColor,
   xAxisLineVisible,
   yAxisLineVisible,
+  ...xAxisLabelControlModel,
   frameBorderColor,
   frameBackgroundColor,
   frameBorderWidth,

package/src/components/core/layout.test.ts

@@ -192,7 +192,7 @@ describe('multi-value Y-axis grouping', () => {
     ])
   })
 
-  it('places left and right scientific exponents eight pixels outside their tick labels', () => {
+  it('reserves label clearance for exponent-prefixed ticks on both axis sides', () => {
     const layout = buildTrackLayouts({
       cells: [
         {
@@ -206,7 +206,7 @@ describe('multi-value Y-axis grouping', () => {
           plotHeight: 300,
           cellHeight: 330,
           xAxisBand: 30,
-          series: track([series('left', 0, 254), series('right', 0, 254)]),
+          series: track([series('left', 1000, 3000), series('right', 1000, 3000)]),
         },
       ],
       grid: { rowCount: 1, columnCount: 1, showPagination: false, trackLines: {} },
@@ -222,14 +222,13 @@ describe('multi-value Y-axis grouping', () => {
     })[0]
 
     expect(
-      layout?.yAxes.map(({ side, x, exponentX, exponentLabel }) => ({
+      layout?.yAxes.map(({ side, x, labelX }) => ({
         side,
-        offset: Math.abs(exponentX - x),
-        exponentLabel,
+        labelOffset: Math.abs(labelX - x),
       })),
     ).toEqual([
-      { side: 'left', offset: 43, exponentLabel: 'E+02' },
-      { side: 'right', offset: 43, exponentLabel: 'E+02' },
+      { side: 'left', labelOffset: 67 },
+      { side: 'right', labelOffset: 67 },
     ])
   })
 
@@ -237,7 +236,7 @@ describe('multi-value Y-axis grouping', () => {
     const [group] = buildYAxisSeriesGroups(track([series('long', -1e120, 1e120)]), 'multi-axis')
 
     expect(group).toBeDefined()
-    expect(measureYAxisGroupClearance(group!)).toBe(119)
+    expect(measureYAxisGroupClearance(group!)).toBe(90)
   })
 })
 

package/src/components/core/layout.ts

@@ -1,9 +1,9 @@
 import { scaleLinear } from 'd3'
 
 import type { WaveformOverlayMode } from '../../types'
-import { formatScientificAxisExponent, formatScientificAxisLabel, paddedDomain } from '../../utils'
+import { formatScientificAxisLabel, paddedDomain } from '../../utils'
 import type { DisplaySeries, DisplayTrack, TrackLayout } from './types'
-import { MAX_MULTI_Y_AXIS_COUNT, Y_AXIS_EXPONENT_GAP } from './constants'
+import { MAX_MULTI_Y_AXIS_COUNT } from './constants'
 import {
   mergeYDomains,
   resolveSeriesFixedYDomain,
@@ -12,7 +12,7 @@ import {
 } from './yDomain'
 
 // 导出常量供外部使用
-export { MAX_MULTI_Y_AXIS_COUNT, Y_AXIS_EXPONENT_GAP } from './constants'
+export { MAX_MULTI_Y_AXIS_COUNT } from './constants'
 
 const Y_AXIS_CHARACTER_WIDTH = 7
 const Y_AXIS_TICK_PADDING = 7
@@ -102,36 +102,27 @@ export function resolveYAxisSeriesGroups(
 export function axisTextMetrics(
   domain: [number, number],
   nice = true,
-): {
-  exponentLabel: string | null
-  exponentWidth: number
-  tickTextWidth: number
-} {
+  tickValues?: number[],
+): { tickTextWidth: number } {
   const scale = scaleLinear(domain, [1, 0])
   if (nice) scale.nice()
   const [axisMin, axisMax] = scale.domain()
-  const values = scale.ticks(10)
+  const values = tickValues ?? Array.from(new Set([axisMin, ...scale.ticks(10), axisMax]))
+  const topTickValue = Math.max(...values)
   const maximumTickCharacters = Math.max(
     1,
-    ...values.map((value) => formatScientificAxisLabel(value, { axisMin, axisMax }).length),
+    ...values.map(
+      (value) => formatScientificAxisLabel(value, { axisMin, axisMax, topTickValue }).length,
+    ),
   )
-  const exponentLabel = formatScientificAxisExponent(axisMin, axisMax)
   return {
-    exponentLabel,
-    exponentWidth: exponentLabel ? exponentLabel.length * Y_AXIS_CHARACTER_WIDTH : 0,
     tickTextWidth: maximumTickCharacters * Y_AXIS_CHARACTER_WIDTH,
   }
 }
 
-function axisExponentClearance(domain: [number, number], nice: boolean): number {
-  const { exponentLabel, exponentWidth } = axisTextMetrics(domain, nice)
-  return exponentLabel ? exponentWidth + Y_AXIS_EXPONENT_GAP : 0
-}
-
 export function measureYAxisGroupClearance(group: YAxisSeriesGroup): number {
   return (
     axisTextMetrics(group.domain, !group.fixed).tickTextWidth +
-    axisExponentClearance(group.domain, !group.fixed) +
     Y_AXIS_TICK_PADDING +
     Y_AXIS_LABEL_GAP +
     Y_AXIS_LABEL_BAND_WIDTH +
@@ -142,7 +133,6 @@ export function measureYAxisGroupClearance(group: YAxisSeriesGroup): number {
 function measureYAxisGroupTickClearance(group: YAxisSeriesGroup): number {
   return (
     axisTextMetrics(group.domain, !group.fixed).tickTextWidth +
-    axisExponentClearance(group.domain, !group.fixed) +
     Y_AXIS_TICK_PADDING +
     Y_AXIS_OUTER_PADDING
   )

package/src/components/core/trackLayoutBuilder.ts

@@ -12,8 +12,13 @@ import {
   selectSeriesRenderPoints,
   type ResolvedWaveformRenderingOptions,
 } from '../../core/rendering'
-import type { WaveformDisplayMode, WaveformOverlayMode, WaveformPoint } from '../../types'
-import { buildMinorTicks, formatAxisTimeExponent, formatEndpointTime } from '../../utils'
+import type {
+  WaveformDisplayMode,
+  WaveformOverlayMode,
+  WaveformPoint,
+  WaveformXAxisLabelFormatter,
+} from '../../types'
+import { buildMinorTicks, formatXAxisLabel } from '../../utils'
 import {
   getBottomRowCellIndexes,
   type GridCellGeometry,
@@ -21,7 +26,6 @@ import {
 } from './grid'
 import { axisTextMetrics, resolveYAxisSeriesGroups } from './layout'
 import type { DisplaySeries, DisplayTrack, TrackLayout, WaveformYAxisLayout } from './types'
-import { Y_AXIS_EXPONENT_GAP } from './constants'
 import {
   Y_AXIS_LABEL_BAND_WIDTH,
   Y_AXIS_LABEL_GAP,
@@ -46,6 +50,7 @@ export interface BuildTrackLayoutsOptions {
   fixedYDomains?: Record<string, [number, number]>
   yDomains?: Record<string, [number, number]>
   timeUnit: 's' | 'ms'
+  xAxisLabelFormatter?: WaveformXAxisLabelFormatter
   rendering: ResolvedWaveformRenderingOptions
   hideSecondaryLabels: boolean
   yAxisLabelX: number
@@ -118,31 +123,16 @@ export function buildTrackLayouts(options: BuildTrackLayoutsOptions): TrackLayou
       const tickValues = Array.from(
         new Set([axisStart, ...visibleMajorTicks, ...(showAxisEnd ? [axisEnd] : [])]),
       )
-      const { exponentLabel, exponentWidth, tickTextWidth } = axisTextMetrics(
-        group.domain,
-        !group.fixed,
-      )
-      const exponentClearance = exponentLabel ? exponentWidth + Y_AXIS_EXPONENT_GAP : 0
+      const { tickTextWidth } = axisTextMetrics(group.domain, !group.fixed, tickValues)
       const clearance =
         tickTextWidth +
         Y_AXIS_TICK_PADDING +
-        exponentClearance +
         Y_AXIS_LABEL_GAP +
         Y_AXIS_LABEL_BAND_WIDTH +
         Y_AXIS_OUTER_PADDING
       const x = group.side === 'left' ? -sideOffsets.left : cell.width + sideOffsets.right
-      const exponentX =
-        x +
-        (group.side === 'left'
-          ? -(Y_AXIS_TICK_PADDING + tickTextWidth + Y_AXIS_EXPONENT_GAP)
-          : Y_AXIS_TICK_PADDING + tickTextWidth + Y_AXIS_EXPONENT_GAP)
       const labelDistance =
-        tickTextWidth +
-        Y_AXIS_TICK_PADDING +
-        exponentClearance +
-        exponentWidth +
-        Y_AXIS_LABEL_GAP +
-        Y_AXIS_LABEL_BAND_WIDTH / 2
+        tickTextWidth + Y_AXIS_TICK_PADDING + Y_AXIS_LABEL_GAP + Y_AXIS_LABEL_BAND_WIDTH / 2
       const labelX = x + (group.side === 'left' ? -labelDistance : labelDistance)
       sideOffsets[group.side] += clearance
       return {
@@ -150,8 +140,6 @@ export function buildTrackLayouts(options: BuildTrackLayoutsOptions): TrackLayou
         side: group.side,
         x,
         labelX,
-        exponentX,
-        exponentLabel,
         scale,
         majorTicks,
         minorTicks: buildMinorTicks(majorTicks),
@@ -165,10 +153,21 @@ export function buildTrackLayouts(options: BuildTrackLayoutsOptions): TrackLayou
     const yAxisTickValues = yAxes[0]?.tickValues ?? []
     const domain = xScale.domain() as [number, number]
     const endpointLabels = {
-      start: formatEndpointTime(domain[0], domain, options.timeUnit),
-      end: formatEndpointTime(domain[1], domain, options.timeUnit),
+      start: formatXAxisLabel(
+        domain[0],
+        domain,
+        options.timeUnit,
+        'start',
+        options.xAxisLabelFormatter,
+      ),
+      end: formatXAxisLabel(
+        domain[1],
+        domain,
+        options.timeUnit,
+        'end',
+        options.xAxisLabelFormatter,
+      ),
     }
-    const xAxisExponent = formatAxisTimeExponent(domain, options.timeUnit)
     const leftClearance = endpointLabels.start.length * 7 + 10
     const rightClearance = endpointLabels.end.length * 7 + 10
     const xAxisTickValues = xMajorTicks.filter((tick) => {
@@ -235,7 +234,6 @@ export function buildTrackLayouts(options: BuildTrackLayoutsOptions): TrackLayou
       yAxisTickValues,
       xAxisTickValues,
       endpointLabels,
-      xAxisExponent,
       path: seriesPaths[0]?.path ?? null,
       seriesPaths,
       gridLines: options.grid.trackLines[displayTrack.id] ?? {

package/src/components/core/types.ts

@@ -51,8 +51,6 @@ export interface WaveformYAxisLayout {
   side: 'left' | 'right'
   x: number
   labelX: number
-  exponentX: number
-  exponentLabel: string | null
   scale: ScaleLinear<number, number>
   majorTicks: number[]
   minorTicks: number[]
@@ -109,7 +107,6 @@ export interface TrackLayout {
   yAxisTickValues: number[]
   xAxisTickValues: number[]
   endpointLabels: { start: string; end: string }
-  xAxisExponent: string | null
   path: string | null
   seriesPaths: TrackSeriesPath[]
   showXAxis: boolean

package/src/components/core/useWaveformLayout.ts

@@ -2,7 +2,7 @@ import { scaleLinear, type ZoomTransform } from 'd3'
 import { computed, type ComputedRef, type Ref, type ShallowRef } from 'vue'
 
 import { resolveWaveformRenderingOptions } from '../../core'
-import { formatScientificAxisExponent, formatScientificAxisLabel, paddedDomain } from '../../utils'
+import { paddedDomain } from '../../utils'
 import {
   layoutAnnotations,
   type AnnotationSeriesInfo,
@@ -28,9 +28,9 @@ import {
 } from './grid'
 import {
   buildTrackLayouts,
+  axisTextMetrics,
   measureTrackYAxisClearance,
   resolveYAxisSeriesGroups,
-  Y_AXIS_EXPONENT_GAP,
 } from './layout'
 import type { DisplaySeries, DisplayTrack, TrackLayout } from './types'
 import type { PreparedWaveformSeries } from './useWaveformData'
@@ -112,40 +112,18 @@ export function useWaveformLayout(context: LayoutContext) {
       .flatMap((track) =>
         resolveYAxisSeriesGroups(track, props.overlayMode, props.yDomain, props.yDomains),
       )
-      .map((group) => {
-        const scale = scaleLinear(group.domain, [1, 0])
-        if (!group.fixed) scale.nice()
-        const [axisMin, axisMax] = scale.domain()
-        return {
-          exponentLabel: formatScientificAxisExponent(axisMin, axisMax),
-          tickLabels: scale
-            .ticks(10)
-            .map((value) => formatScientificAxisLabel(value, { axisMin, axisMax })),
-        }
-      })
-    const maximumCharacters = Math.max(
-      1,
-      ...axisText.flatMap(({ tickLabels }) => tickLabels).map((label) => label.length),
-    )
-    const tickTextWidth = maximumCharacters * Y_AXIS_CHARACTER_WIDTH
-    const maximumExponentWidth = Math.max(
-      0,
-      ...axisText.map(({ exponentLabel }) => (exponentLabel?.length ?? 0) * Y_AXIS_CHARACTER_WIDTH),
-    )
-    const exponentClearance = maximumExponentWidth ? maximumExponentWidth + Y_AXIS_EXPONENT_GAP : 0
-    const tickClearance =
-      tickTextWidth + Y_AXIS_TICK_PADDING + exponentClearance + Y_AXIS_OUTER_PADDING
+      .map((group) => axisTextMetrics(group.domain, !group.fixed).tickTextWidth)
+    const tickTextWidth = Math.max(Y_AXIS_CHARACTER_WIDTH, ...axisText)
+    const tickClearance = tickTextWidth + Y_AXIS_TICK_PADDING + Y_AXIS_OUTER_PADDING
     const labelCenterX = -(
       Y_AXIS_TICK_PADDING +
       tickTextWidth +
-      exponentClearance +
       Y_AXIS_LABEL_GAP +
       Y_AXIS_LABEL_BAND_WIDTH / 2
     )
     const fullClearance =
       tickTextWidth +
       Y_AXIS_TICK_PADDING +
-      exponentClearance +
       Y_AXIS_LABEL_GAP +
       Y_AXIS_LABEL_BAND_WIDTH +
       Y_AXIS_OUTER_PADDING
@@ -307,6 +285,7 @@ export function useWaveformLayout(context: LayoutContext) {
             )
           : sharedYDomains.value,
       timeUnit: props.timeUnit,
+      xAxisLabelFormatter: props.axes?.x?.labelFormatter,
       rendering: renderingOptions.value,
       hideSecondaryLabels: isCleanView.value || yAxisLayout.value.hideSecondaryLabels,
       yAxisLabelX: yAxisMetrics.value.labelCenterX,

package/src/components/interaction/WaveformTooltip.test.ts

@@ -91,6 +91,22 @@ describe('WaveformTooltip', () => {
     expect(wrapper.get('.waveform-tooltip__value').text()).toBe('-1,405.4932 A')
   })
 
+  it('formats tooltip time with at most four decimal places', () => {
+    const wrapper = mount(WaveformTooltip, {
+      props: {
+        visible: true,
+        position: { x: 10, y: 10 },
+        timeUnit: 's',
+        hoveredPoint: { x: 1.234567, y: 12 },
+        seriesPoints: [],
+        containerWidth: 400,
+        containerHeight: 300,
+      },
+    })
+
+    expect(wrapper.get('.waveform-tooltip__time').text()).toBe('s: 1.2346')
+  })
+
   it('omits the error label when both resolved errors are zero', () => {
     const point = { x: 1, y: 12 }
     const wrapper = mount(WaveformTooltip, {