waveform-analysis 0.1.57 → 0.1.58

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

@@ -9,6 +9,8 @@ export interface WaveformGridOptions {
     fillIncompleteLastRow?: boolean;
     /** Stable grid slots. Empty IDs remain as empty chart frames and keep their page position. */
     trackOrder?: string[];
+    /** Omits ordered tracks without waveform series from layout and pagination. */
+    hideEmptyTracks?: boolean;
     trackLines?: WaveformGridTrackLines;
 }
 export interface WaveformGridLineOptions {
@@ -32,6 +34,7 @@ export interface NormalizedWaveformGridOptions {
     showPagination: boolean;
     fillIncompleteLastRow: boolean;
     trackOrder?: string[];
+    hideEmptyTracks?: boolean;
     trackLines: Record<string, NormalizedWaveformGridLineOptions>;
 }
 export interface GridCellGeometry {

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

@@ -0,0 +1,4 @@
+import type { DisplayTrack } from './types';
+export declare const resolvePageableTracks: (tracks: DisplayTrack[], hideEmptyTracks?: boolean) => DisplayTrack[];
+export declare const resolveTrackFrameNumber: (frameNumber: string | number | undefined, frameNumbers: Record<string, string | number> | undefined, trackCount: number, trackIndex: number, trackId: string) => string | number | undefined;
+export declare const createFrameNumberResolver: (getFrameNumber: () => string | number | undefined, getFrameNumbers: () => Record<string, string | number> | undefined, getTracks: () => DisplayTrack[]) => (trackId: string) => string | number | undefined;

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

@@ -246,6 +246,7 @@ export declare function useWaveformChartController(props: ResolvedWaveformChartP
     confirmAnnotation: (annotation: import("..").WaveformAnnotation) => void;
     chartSeries: import("./types").DisplaySeries[];
     chartTracks: import("./types").DisplayTrack[];
+    pageableTracks: import("./types").DisplayTrack[];
     renderingOptions: import("../..").ResolvedWaveformRenderingOptions;
     gridOptions: import("./grid").NormalizedWaveformGridOptions;
     pageCount: number;
@@ -281,7 +282,7 @@ export declare function useWaveformChartController(props: ResolvedWaveformChartP
     annotationTrackLayouts: import("../annotation").AnnotationTrackLayout[];
     renderedAnnotations: import("../annotation").RenderedAnnotation[];
     editorSeries: import("../annotation").AnnotationSeriesInfo | undefined;
-    resolveFrameNumber: (trackIndex: number) => string | number | undefined;
+    resolveFrameNumber: (trackId: string) => string | number | undefined;
     fixedWidth: number | undefined;
     fixedHeight: number | undefined;
     chartWidth: number;
@@ -341,6 +342,7 @@ export declare function useWaveformChartController(props: ResolvedWaveformChartP
     yDomains?: Record<string, [number, number]> | undefined;
     timeUnit: "s" | "ms";
     frameNumber?: string | number | undefined;
+    frameNumbers?: Record<string, string | number> | undefined;
     frameStyle?: import("..").WaveformFrameStyle | undefined;
     axes?: import("..").WaveformAxesOptions | undefined;
     annotations: import("..").WaveformAnnotation[];

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

@@ -23,6 +23,7 @@ interface LayoutContext {
 export declare function useWaveformLayout(context: LayoutContext): {
     chartSeries: ComputedRef<DisplaySeries[]>;
     chartTracks: ComputedRef<DisplayTrack[]>;
+    pageableTracks: ComputedRef<DisplayTrack[]>;
     renderingOptions: ComputedRef<import("../..").ResolvedWaveformRenderingOptions>;
     gridOptions: ComputedRef<import("./grid").NormalizedWaveformGridOptions>;
     pageCount: ComputedRef<number>;
@@ -58,6 +59,6 @@ export declare function useWaveformLayout(context: LayoutContext): {
     annotationTrackLayouts: ComputedRef<AnnotationTrackLayout[]>;
     renderedAnnotations: ComputedRef<import("../annotation").RenderedAnnotation[]>;
     editorSeries: ComputedRef<AnnotationSeriesInfo | undefined>;
-    resolveFrameNumber: (trackIndex: number) => string | number | undefined;
+    resolveFrameNumber: (trackId: string) => string | number | undefined;
 };
 export {};

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

@@ -22,6 +22,8 @@ export interface WaveformChartProps {
     yDomains?: Record<string, [number, number]>;
     timeUnit?: 's' | 'ms';
     frameNumber?: string | number;
+    /** Per-track frame watermark overrides, keyed by stable trackId. */
+    frameNumbers?: Record<string, string | number>;
     frameStyle?: WaveformFrameStyle;
     axes?: WaveformAxesOptions;
     annotations?: WaveformAnnotation[];

package/package.json

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

package/src/components/WaveformChartView.vue

@@ -80,7 +80,7 @@ const {
   pageCount,
   currentPage,
   getPageSize,
-  chartTracks,
+  pageableTracks,
   goToPage,
   annotationInteraction,
   editorDraft,
@@ -230,7 +230,7 @@ function handleChartPointerLeave() {
           :interactive="!isPresentationMode"
           :display-mode="displayMode"
           :interaction-mode="activeInteractionMode"
-          :frame-number="resolveFrameNumber(track.index)"
+          :frame-number="resolveFrameNumber(track.id)"
           :frame-style="frameStyle"
           :axes="axes"
           :clean-view="isCleanView"
@@ -326,7 +326,7 @@ function handleChartPointerLeave() {
       aria-label="波形分页"
       :current="currentPage"
       :page-size="getPageSize(gridOptions)"
-      :total="chartTracks.length"
+      :total="pageableTracks.length"
       :show-size-changer="false"
       :show-quick-jumper="false"
       @change="goToPage"

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

@@ -17,6 +17,7 @@ describe('waveform grid helpers', () => {
       showPagination: true,
       fillIncompleteLastRow: false,
       trackOrder: [],
+      hideEmptyTracks: false,
       trackLines: {},
     })
     expect(normalizeGridOptions({ rowCount: 0, columnCount: 99 })).toEqual({
@@ -25,8 +26,10 @@ describe('waveform grid helpers', () => {
       showPagination: true,
       fillIncompleteLastRow: false,
       trackOrder: [],
+      hideEmptyTracks: false,
       trackLines: {},
     })
+    expect(normalizeGridOptions({ hideEmptyTracks: true }).hideEmptyTracks).toBe(true)
   })
 
   it('normalizes track order by trimming, dropping blanks, and removing duplicates', () => {

package/src/components/core/grid.ts

@@ -11,6 +11,8 @@ export interface WaveformGridOptions {
   fillIncompleteLastRow?: boolean
   /** Stable grid slots. Empty IDs remain as empty chart frames and keep their page position. */
   trackOrder?: string[]
+  /** Omits ordered tracks without waveform series from layout and pagination. */
+  hideEmptyTracks?: boolean
   trackLines?: WaveformGridTrackLines
 }
 
@@ -38,6 +40,7 @@ export interface NormalizedWaveformGridOptions {
   showPagination: boolean
   fillIncompleteLastRow: boolean
   trackOrder?: string[]
+  hideEmptyTracks?: boolean
   trackLines: Record<string, NormalizedWaveformGridLineOptions>
 }
 
@@ -95,6 +98,7 @@ export function normalizeGridOptions(options?: WaveformGridOptions): NormalizedW
     showPagination: options?.showPagination ?? true,
     fillIncompleteLastRow: options?.fillIncompleteLastRow ?? false,
     trackOrder: normalizeTrackOrder(options?.trackOrder),
+    hideEmptyTracks: options?.hideEmptyTracks ?? false,
     trackLines,
   }
 }

package/src/components/core/trackPagination.ts

@@ -0,0 +1,40 @@
+import type { DisplayTrack } from './types'
+
+export const resolvePageableTracks = (
+  tracks: DisplayTrack[],
+  hideEmptyTracks?: boolean,
+): DisplayTrack[] => (hideEmptyTracks ? tracks.filter((track) => track.series.length > 0) : tracks)
+
+export const resolveTrackFrameNumber = (
+  frameNumber: string | number | undefined,
+  frameNumbers: Record<string, string | number> | undefined,
+  trackCount: number,
+  trackIndex: number,
+  trackId: string,
+): string | number | undefined => {
+  const mappedFrameNumber = frameNumbers?.[trackId]
+  if (mappedFrameNumber !== undefined) return mappedFrameNumber
+  if (frameNumber === undefined) return undefined
+  if (trackCount === 1) return frameNumber
+  return typeof frameNumber === 'number'
+    ? frameNumber + trackIndex
+    : `${frameNumber}-${trackIndex + 1}`
+}
+
+export const createFrameNumberResolver =
+  (
+    getFrameNumber: () => string | number | undefined,
+    getFrameNumbers: () => Record<string, string | number> | undefined,
+    getTracks: () => DisplayTrack[],
+  ) =>
+  (trackId: string): string | number | undefined => {
+    const tracks = getTracks()
+    const trackIndex = tracks.findIndex((track) => track.id === trackId)
+    return resolveTrackFrameNumber(
+      getFrameNumber(),
+      getFrameNumbers(),
+      tracks.length,
+      trackIndex >= 0 ? trackIndex : 0,
+      trackId,
+    )
+  }

package/src/components/core/useWaveformLayout.ts

@@ -31,6 +31,7 @@ import {
   resolveYAxisSeriesGroups,
 } from './layout'
 import type { DisplaySeries, DisplayTrack, TrackLayout } from './types'
+import { createFrameNumberResolver, resolvePageableTracks } from './trackPagination'
 import type { PreparedWaveformSeries } from './useWaveformData'
 import type { ResolvedWaveformChartProps } from './waveformChartTypes'
 import { applyXDomainStrategy } from './xDomain'
@@ -107,9 +108,12 @@ export function useWaveformLayout(context: LayoutContext) {
     })
   })
   const renderingOptions = computed(() => resolveWaveformRenderingOptions(props.rendering))
-  const pageCount = computed(() => getPageCount(chartTracks.value.length, gridOptions.value))
+  const pageableTracks = computed(() =>
+    resolvePageableTracks(chartTracks.value, gridOptions.value.hideEmptyTracks),
+  )
+  const pageCount = computed(() => getPageCount(pageableTracks.value.length, gridOptions.value))
   const pagedTracks = computed(() =>
-    paginateSeries(chartTracks.value, currentPage.value, gridOptions.value),
+    paginateSeries(pageableTracks.value, currentPage.value, gridOptions.value),
   )
   const layoutTracks = computed(() => {
     const tracksWithSeries = pagedTracks.value.filter((track) => track.series.length > 0)
@@ -357,16 +361,15 @@ export function useWaveformLayout(context: LayoutContext) {
         }
       : undefined
   })
-  const resolveFrameNumber = (trackIndex: number): string | number | undefined => {
-    if (props.frameNumber === undefined || props.frameNumber === null) return undefined
-    if (chartTracks.value.length === 1) return props.frameNumber
-    return typeof props.frameNumber === 'number'
-      ? props.frameNumber + trackIndex
-      : `${props.frameNumber}-${trackIndex + 1}`
-  }
+  const resolveFrameNumber = createFrameNumberResolver(
+    () => props.frameNumber,
+    () => props.frameNumbers,
+    () => chartTracks.value,
+  )
   return {
     chartSeries,
     chartTracks,
+    pageableTracks,
     renderingOptions,
     gridOptions,
     pageCount,

package/src/components/core/waveformChartTypes.ts

@@ -43,6 +43,8 @@ export interface WaveformChartProps {
   yDomains?: Record<string, [number, number]>
   timeUnit?: 's' | 'ms'
   frameNumber?: string | number
+  /** Per-track frame watermark overrides, keyed by stable trackId. */
+  frameNumbers?: Record<string, string | number>
   frameStyle?: WaveformFrameStyle
   axes?: WaveformAxesOptions
   annotations?: WaveformAnnotation[]

package/src/components/waveformChartCases/trackOrder.test.ts

@@ -104,6 +104,68 @@ describe('WaveformChart track order', () => {
     expect(wrapper.findAll('.waveform-chart__crosshair line')).toHaveLength(2)
   })
 
+  it('keeps incremental watermarks stable when empty ordered tracks are hidden', async () => {
+    const wrapper = await mountSizedChart(mergedFourTrackSeries(), {
+      frameNumber: 1,
+      grid: {
+        rowCount: 2,
+        columnCount: 1,
+        hideEmptyTracks: true,
+        trackOrder: ['frame-1', 'frame-2', 'frame-3', 'frame-4'],
+      },
+    })
+
+    expect(
+      wrapper.findAll('.waveform-chart__track').map((track) => track.attributes('data-track-id')),
+    ).toEqual(['frame-1', 'frame-3'])
+    expect(
+      wrapper.findAll('.waveform-chart__watermark').map((watermark) => watermark.text()),
+    ).toEqual(['1', '3'])
+
+    await wrapper.get('.ant-pagination-next button').trigger('click')
+
+    expect(
+      wrapper.findAll('.waveform-chart__track').map((track) => track.attributes('data-track-id')),
+    ).toEqual(['frame-4'])
+    expect(
+      wrapper.findAll('.waveform-chart__watermark').map((watermark) => watermark.text()),
+    ).toEqual(['4'])
+  })
+
+  it('uses stable track IDs for explicit frame watermark overrides', async () => {
+    const wrapper = await mountSizedChart(mergedFourTrackSeries(), {
+      frameNumber: 1,
+      frameNumbers: { 'frame-1': 'A', 'frame-3': 'C', 'frame-4': 'D' },
+      grid: {
+        rowCount: 2,
+        columnCount: 1,
+        hideEmptyTracks: true,
+        trackOrder: ['frame-1', 'frame-2', 'frame-3', 'frame-4'],
+      },
+    })
+
+    expect(
+      wrapper.findAll('.waveform-chart__watermark').map((watermark) => watermark.text()),
+    ).toEqual(['A', 'C'])
+
+    await wrapper.get('.ant-pagination-next button').trigger('click')
+
+    expect(
+      wrapper.findAll('.waveform-chart__watermark').map((watermark) => watermark.text()),
+    ).toEqual(['D'])
+  })
+
+  it('keeps the existing incremental watermark fallback when frame mappings are absent', async () => {
+    const wrapper = await mountSizedChart(orderedSeries(['frame-1', 'frame-2']), {
+      frameNumber: 7,
+      grid: { rowCount: 2, columnCount: 1 },
+    })
+
+    expect(
+      wrapper.findAll('.waveform-chart__watermark').map((watermark) => watermark.text()),
+    ).toEqual(['7', '8'])
+  })
+
   it('appends data tracks absent from trackOrder in input order', async () => {
     const wrapper = await mountSizedChart(
       {