@363045841yyt/klinechart-core 0.8.12 → 0.8.13-alpha.0

package/src/engine/controller/markerInteraction.ts

@@ -82,7 +82,10 @@ export class MarkerInteractionState {
     }
   }
 
-  private enterCustomMarkerHover(hitCustomMarker: CustomMarkerEntity, markerManager: MarkerManager): true {
+  private enterCustomMarkerHover(
+    hitCustomMarker: CustomMarkerEntity,
+    markerManager: MarkerManager,
+  ): true {
     if (this.hoveredCustomMarker?.id !== hitCustomMarker.id) {
       this.hoveredCustomMarker = hitCustomMarker
       this.onCustomMarkerHoverCallback?.(hitCustomMarker)

package/src/engine/data/chartDataManager.ts

@@ -1,5 +1,5 @@
 import type { KLineData, TimeShareData } from '../../types/price'
-import type { SymbolSpec, DataFetcher, CustomDataSource } from '../../controllers/types'
+import type { SymbolSpec, SymbolInfo, DataFetcher, CustomDataSource } from '../../controllers/types'
 import { createSignal, type Signal } from '../../reactivity/signal'
 import { DataBuffer } from '../../data-fetchers/dataBuffer'
 import { getPeriodDays } from '../../data-fetchers/dataBuffer.effects'
@@ -53,9 +53,11 @@ export class ChartDataManager {
   private _activeBufferKey: string | null = null
   private _activeBufferUnsub: (() => void) | null = null
 
-private _dataSignal = createSignal<ReadonlyArray<unknown>>([])
-private _loadingSignal = createSignal<boolean>(false)
-private _symbolsSignal = createSignal<ReadonlyArray<SymbolSpec>>([])
+  private _dataSignal = createSignal<ReadonlyArray<unknown>>([])
+  private _loadingSignal = createSignal<boolean>(false)
+  private _symbolsSignal = createSignal<ReadonlyArray<SymbolSpec>>([])
+  /** Available symbol catalog — consumed by UI pickers (e.g. TopToolbar) */
+  private _symbolCatalog = createSignal<ReadonlyArray<SymbolInfo>>([])
 
   private _currentSpec: SymbolSpec | null = null
 
@@ -101,11 +103,11 @@ private _symbolsSignal = createSignal<ReadonlyArray<SymbolSpec>>([])
     this._activeBufferKey = key
     const buf = this._buffers.get(key) as DataBufferLike | undefined
     if (buf) {
-      this._dataSignal.set([...buf.data.peek() as unknown[]])
+      this._dataSignal.set([...(buf.data.peek() as unknown[])])
       this._loadingSignal.set(buf.loading.peek())
       const unsubData = buf.data.subscribe(() => {
         const prevDataLength = this._dataSignal.peek().length
-        this._dataSignal.set([...buf.data.peek() as unknown[]])
+        this._dataSignal.set([...(buf.data.peek() as unknown[])])
         this.onBufferDataChanged(key, prevDataLength)
       })
       const unsubLoading = buf.loading.subscribe(() => {
@@ -206,10 +208,15 @@ private _symbolsSignal = createSignal<ReadonlyArray<SymbolSpec>>([])
 
     this.deps.resetInteraction()
 
-    if (this.lastVisibleRange.start === 0 && this.lastVisibleRange.end === 0 && bufferData.length > 0) {
-      const plotWidth = this.deps.getObservedSize().width > 0
-        ? this.deps.getObservedSize().width
-        : Math.max(1, Math.round(this.deps.getDom().container?.clientWidth ?? 800))
+    if (
+      this.lastVisibleRange.start === 0 &&
+      this.lastVisibleRange.end === 0 &&
+      bufferData.length > 0
+    ) {
+      const plotWidth =
+        this.deps.getObservedSize().width > 0
+          ? this.deps.getObservedSize().width
+          : Math.max(1, Math.round(this.deps.getDom().container?.clientWidth ?? 800))
       const dpr = this.deps.getEffectiveDpr()
       const opt = this.deps.getOption()
       const { start, end } = getVisibleRange(
@@ -256,9 +263,10 @@ private _symbolsSignal = createSignal<ReadonlyArray<SymbolSpec>>([])
     const buf = this.getActiveDataBuffer()
     const dataLength = buf ? buf.getRawData().length : 0
     if (dataLength === 0) return 0
-    const plotWidth = this.deps.getViewport()?.plotWidth
-      ?? (this.deps.getObservedSize().width > 0 ? this.deps.getObservedSize().width : undefined)
-      ?? Math.round(this.deps.getDom().container?.clientWidth ?? 0)
+    const plotWidth =
+      this.deps.getViewport()?.plotWidth ??
+      (this.deps.getObservedSize().width > 0 ? this.deps.getObservedSize().width : undefined) ??
+      Math.round(this.deps.getDom().container?.clientWidth ?? 0)
     return Math.max(0, plotWidth)
   }
 
@@ -274,22 +282,13 @@ private _symbolsSignal = createSignal<ReadonlyArray<SymbolSpec>>([])
     const vp = this.deps.getViewport()
     if (!vp) return null
     const opt = this.deps.getOption()
-    return getVisibleRange(
-      vp.scrollLeft,
-      vp.plotWidth,
-      opt.kWidth,
-      opt.kGap,
-      dataLength,
-      vp.dpr,
-    )
+    return getVisibleRange(vp.scrollLeft, vp.plotWidth, opt.kWidth, opt.kGap, dataLength, vp.dpr)
   }
 
   private getTrailingSlotCount(): number {
     return 24
   }
 
-
-
   private clearIncrementalLoadHintTimer(): void {
     if (this.incrementalLoadHintTimer !== null) {
       window.clearTimeout(this.incrementalLoadHintTimer)
@@ -370,6 +369,28 @@ private _symbolsSignal = createSignal<ReadonlyArray<SymbolSpec>>([])
     return this._symbolsSignal
   }
 
+  get symbolCatalog(): Signal<ReadonlyArray<SymbolInfo>> {
+    return this._symbolCatalog
+  }
+
+  /**
+   * Register symbols into the available catalog.
+   * Deduplicates by symbol code: newer entries replace older ones.
+   */
+  registerSymbols(infos: ReadonlyArray<SymbolInfo>): void {
+    const current = new Map(this._symbolCatalog.peek().map((s) => [s.code, s]))
+    for (const info of infos) current.set(info.code, info)
+    this._symbolCatalog.set(Array.from(current.values()))
+  }
+
+  /** Remove a symbol from the catalog by code. */
+  unregisterSymbol(code: string): void {
+    const next = this._symbolCatalog.peek().filter((s) => s.code !== code)
+    if (next.length < this._symbolCatalog.peek().length) {
+      this._symbolCatalog.set(next)
+    }
+  }
+
   get currentPeriod(): string {
     return this._currentSpec?.period ?? 'daily'
   }
@@ -377,7 +398,9 @@ private _symbolsSignal = createSignal<ReadonlyArray<SymbolSpec>>([])
   /** Internal KLine data for indicator scheduler (empty in timeshare mode) */
   getInternalData(): KLineData[] {
     const buf = this.getActiveDataBuffer()
-    return buf ? buf.getRawData() : []
+    if (buf) return buf.getRawData()
+    const peek = this._dataSignal.peek()
+    return peek.length > 0 ? (peek as KLineData[]) : []
   }
 
   getRenderData(): unknown[] {
@@ -399,7 +422,9 @@ private _symbolsSignal = createSignal<ReadonlyArray<SymbolSpec>>([])
 
   getTimeShareSignal(): Signal<ReadonlyArray<TimeShareData>> {
     const buf = this.getActiveTimeShareBuffer()
-    return (buf?.data ?? createSignal<ReadonlyArray<TimeShareData>>([])) as Signal<ReadonlyArray<TimeShareData>>
+    return (buf?.data ?? createSignal<ReadonlyArray<TimeShareData>>([])) as Signal<
+      ReadonlyArray<TimeShareData>
+    >
   }
 
   getTimeShareLoadingSignal(): Signal<boolean> {
@@ -664,7 +689,9 @@ private _symbolsSignal = createSignal<ReadonlyArray<SymbolSpec>>([])
 
     this._comparisonSpecs.push(spec)
 
-    const color = COMPARISON_PALETTE[this._comparisonColors.size % COMPARISON_PALETTE.length] ?? DEFAULT_COMPARISON_COLOR
+    const color =
+      COMPARISON_PALETTE[this._comparisonColors.size % COMPARISON_PALETTE.length] ??
+      DEFAULT_COMPARISON_COLOR
     this._comparisonColors.set(symbol, color)
     this._comparisonColorsSignal.set(new Map(this._comparisonColors))
 
@@ -716,7 +743,9 @@ private _symbolsSignal = createSignal<ReadonlyArray<SymbolSpec>>([])
       const spec: SymbolSpec = { symbol, period }
       this._comparisonSpecs.push(spec)
       const mainSpec = this._symbolsSignal.peek()[0]
-      this._symbolsSignal.set(mainSpec ? [mainSpec, ...this._comparisonSpecs] : [...this._comparisonSpecs])
+      this._symbolsSignal.set(
+        mainSpec ? [mainSpec, ...this._comparisonSpecs] : [...this._comparisonSpecs],
+      )
 
       buffer.setInlineData(data)
       return
@@ -786,16 +815,24 @@ private _symbolsSignal = createSignal<ReadonlyArray<SymbolSpec>>([])
   }
 
   applyCustomData(source: CustomDataSource): void {
-    if (source.symbol) this.setCurrentSymbol(source.symbol)
-    if (source.period) this.setCurrentPeriod(source.period)
-
-    const specs = this._symbolsSignal.peek()
-    if (specs.length === 0 && source.symbol) {
-      const mainSpec: SymbolSpec = {
-        symbol: source.symbol,
-        period: source.period ?? 'daily',
-      }
-      this._symbolsSignal.set([mainSpec])
+    const spec: SymbolSpec = {
+      symbol: source.symbol ?? this._currentSpec?.symbol ?? '',
+      period: source.period ?? this._currentSpec?.period ?? 'daily',
+      incremental: false,
+    }
+    this.setSymbols([spec, ...this._comparisonSpecs])
+
+    // Auto-register the custom symbol into the available catalog so it appears in UI pickers.
+    const symbolCode = spec.symbol
+    if (symbolCode) {
+      this.registerSymbols([
+        {
+          code: symbolCode,
+          description: source.description ?? symbolCode,
+          exchange: source.exchange ?? '',
+          source: source.source ?? 'custom',
+        },
+      ])
     }
 
     const plainData = source.data.map((d) => ({ ...d }))
@@ -805,7 +842,10 @@ private _symbolsSignal = createSignal<ReadonlyArray<SymbolSpec>>([])
         if (!source.comparisons[key]) this.removeComparisonSymbol(key)
       }
       for (const [symbol, data] of Object.entries(source.comparisons)) {
-        this.setComparisonData(symbol, data.map((d) => ({ ...d })))
+        this.setComparisonData(
+          symbol,
+          data.map((d) => ({ ...d })),
+        )
       }
     }
   }
@@ -869,10 +909,27 @@ private _symbolsSignal = createSignal<ReadonlyArray<SymbolSpec>>([])
   private loadKLineSymbols(specs: ReadonlyArray<SymbolSpec>): void {
     const spec = specs[0]!
     this.syncComparisonBuffers(specs.slice(1))
-    if (!this._dataFetcher) return
 
     const buf = this.getPrimaryDataBuffer(spec.symbol, spec.period!)
     this.activateBuffer(bufKey(BUF_PRIMARY, spec.symbol, spec.period!))
+    if (!this._dataFetcher) {
+      buf.setCurrentSpec(spec)
+      return
+    }
+
+    // Buffer already has data (e.g. from a previous applyCustomData setInlineData call)
+    // → just update the spec metadata, skip fetch to avoid clearing inline data.
+    // Preserve the buffer's existing incremental flag so inline data sources
+    // (which use incremental:false) remain non-fetching even after a symbol switch.
+    if (buf.getRawData().length > 0) {
+      buf.setCurrentSpec({
+        ...spec,
+        incremental: spec.incremental ?? buf.currentSpec?.incremental ?? true,
+      })
+      this.deps.resetInteraction()
+      this.scrollToRight()
+      return
+    }
 
     buf.onPrepend = (count: number) => {
       this.pendingPrependedCount = count
@@ -916,9 +973,10 @@ private _symbolsSignal = createSignal<ReadonlyArray<SymbolSpec>>([])
     const { unitPx, startXPx } = getPhysicalKLineConfig(opt.kWidth, opt.kGap, dpr)
     const lastKLineEndPx = (startXPx + dataLength * unitPx) / dpr
     const viewport = this.deps.getViewport()
-    const clientWidth = viewport?.viewWidth
-      ?? (this.deps.getObservedSize().width > 0 ? this.deps.getObservedSize().width : undefined)
-      ?? Math.round(this.deps.getDom().container?.clientWidth ?? 0)
+    const clientWidth =
+      viewport?.viewWidth ??
+      (this.deps.getObservedSize().width > 0 ? this.deps.getObservedSize().width : undefined) ??
+      Math.round(this.deps.getDom().container?.clientWidth ?? 0)
     if (clientWidth <= 0) return
     const leftBuffer = this.getLeftLoadBufferWidth()
     let target: number
@@ -1038,14 +1096,20 @@ private _symbolsSignal = createSignal<ReadonlyArray<SymbolSpec>>([])
   }
 }
 
-function findComparisonBaselineByDate(data: ReadonlyArray<KLineData>, date: string): KLineData | null {
+function findComparisonBaselineByDate(
+  data: ReadonlyArray<KLineData>,
+  date: string,
+): KLineData | null {
   for (const item of data) {
     if (item.date && item.date >= date) return item
   }
   return null
 }
 
-function findComparisonBaselineByTimestamp(data: ReadonlyArray<KLineData>, timestamp: number): KLineData | null {
+function findComparisonBaselineByTimestamp(
+  data: ReadonlyArray<KLineData>,
+  timestamp: number,
+): KLineData | null {
   for (const item of data) {
     if (item.timestamp >= timestamp) return item
   }
@@ -1058,4 +1122,4 @@ function batchFormatDate(ts: number): string {
   const m = String(d.getMonth() + 1).padStart(2, '0')
   const day = String(d.getDate()).padStart(2, '0')
   return `${y}-${m}-${day}`
-}
+}

package/src/engine/draw/__tests__/pixelAlign.spec.ts

@@ -174,4 +174,4 @@ describe('createHorizontalLineRect', () => {
     expect(result?.y).toBe(10) // 10.2 * 1 = 10.2 -> round(10.2) = 10 -> 10/1 = 10 (对齐到物理像素)
     expect(result?.height).toBe(1)
   })
-})
+})