@363045841yyt/klinechart-core 0.9.0-alpha.2 → 0.9.0-alpha.4

package/src/engine/data/scrollCompensator.ts

@@ -1,17 +1,10 @@
-import type { ChartDom, Viewport } from '../chartTypes'
 import { getPhysicalKLineConfig } from '../utils/klineConfig'
+import type { ViewportStateModule } from '../state/viewportState'
 
 export interface ScrollDeps {
   getOption: () => { kWidth: number; kGap: number }
-  getEffectiveDpr: () => number
-  getCachedScrollLeft: () => number
-  setScrollLeft: (v: number) => void
-  getDom: () => ChartDom
-  getObservedSize: () => { width: number; height: number }
-  getViewport: () => Viewport | null
-  /** 几何 SSOT：由 kernel viewport.readonly 注入 */
-  getLeftLoadBufferWidth: () => number
-  getContentWidth: () => number
+  /** scroll / dpr / 几何 SSOT */
+  viewport: ViewportStateModule
 }
 
 export const SCROLL_TRAILING_SLOTS = 30
@@ -20,53 +13,52 @@ export class ScrollCompensator {
   constructor(private deps: ScrollDeps) {}
 
   compensatePrepend(count: number): void {
-    const dpr = this.deps.getEffectiveDpr()
+    const dpr = this.deps.viewport.readonly.dpr.peek()
     const opt = this.deps.getOption()
     const { unitPx } = getPhysicalKLineConfig(opt.kWidth, opt.kGap, dpr)
     const compensation = (count * unitPx) / dpr
-    const nextScrollLeft = this.deps.getCachedScrollLeft() + compensation
-    this.deps.setScrollLeft(nextScrollLeft)
+    const nextScrollLeft = this.deps.viewport.readonly.scrollLeft.peek() + compensation
+    this.deps.viewport.actions.scrollTo(nextScrollLeft)
   }
 
   adjustScrollAfterDataChange(dataLength: number): void {
-    const scrollLeft = this.deps.getCachedScrollLeft()
+    const scrollLeft = this.deps.viewport.readonly.scrollLeft.peek()
     if (scrollLeft < 0) return
 
     if (scrollLeft <= 0) {
-      this.deps.setScrollLeft(this.deps.getLeftLoadBufferWidth())
+      this.deps.viewport.actions.scrollTo(this.deps.viewport.readonly.leftLoadBufferWidth.peek())
       return
     }
 
-    const dpr = this.deps.getEffectiveDpr()
+    const dpr = this.deps.viewport.readonly.dpr.peek()
     const opt = this.deps.getOption()
     const { unitPx, startXPx } = getPhysicalKLineConfig(opt.kWidth, opt.kGap, dpr)
     const totalDataWidth = (startXPx + dataLength * unitPx) / dpr
-    const leftBuffer = this.deps.getLeftLoadBufferWidth()
+    const leftBuffer = this.deps.viewport.readonly.leftLoadBufferWidth.peek()
     if (scrollLeft >= leftBuffer + totalDataWidth) {
-      this.deps.setScrollLeft(leftBuffer)
+      this.deps.viewport.actions.scrollTo(leftBuffer)
     }
   }
 
   scrollToRight(dataLength: number): void {
     if (dataLength === 0) return
-    const dpr = this.deps.getEffectiveDpr()
+    const dpr = this.deps.viewport.readonly.dpr.peek()
     const opt = this.deps.getOption()
     const { unitPx, startXPx } = getPhysicalKLineConfig(opt.kWidth, opt.kGap, dpr)
     const lastKLineEndPx = (startXPx + dataLength * unitPx) / dpr
-    const viewport = this.deps.getViewport()
-    const clientWidth = viewport?.viewWidth ?? 0
+    const clientWidth = this.deps.viewport.readonly.viewWidth.peek()
     if (clientWidth <= 0) return
 
-    const leftBuffer = this.deps.getLeftLoadBufferWidth()
+    const leftBuffer = this.deps.viewport.readonly.leftLoadBufferWidth.peek()
     let target: number
     if (lastKLineEndPx <= clientWidth) {
       target = leftBuffer - (clientWidth - lastKLineEndPx)
     } else {
       target = leftBuffer + (lastKLineEndPx - clientWidth)
     }
-    const contentWidth = this.deps.getContentWidth()
+    const contentWidth = this.deps.viewport.readonly.contentWidth.peek()
     const maxScroll = Math.max(0, contentWidth - clientWidth)
     const scrollLeft = Math.round(Math.max(0, Math.min(target, maxScroll)) * dpr) / dpr
-    this.deps.setScrollLeft(scrollLeft)
+    this.deps.viewport.actions.scrollTo(scrollLeft)
   }
 }

package/src/engine/indicators/__tests__/chartIndicatorManager.test.ts

@@ -52,7 +52,7 @@ function createMockDeps() {
     upsertPane: vi.fn(),
     removePaneDefinition: vi.fn(),
     getPaneSpecs: vi.fn(() => []),
-    getPaneRatiosSignal: () => paneRatiosSignal,
+    paneRatios$: paneRatiosSignal,
     paneSpecs$: paneSpecsSignal,
     getInternalPaneRatios: vi.fn(() => new Map()),
     setInternalPaneRatio: vi.fn(),
@@ -68,30 +68,22 @@ function createMockDeps() {
     removeLayer: vi.fn(() => false),
     getLayer: vi.fn(() => null),
     setLayerVisibility: vi.fn(),
-    mainIndicators$: indicatorState.readonly.mainIndicators,
-    upsertMainIndicator: (id, p) => indicatorState.actions.upsert(id, p),
-    removeMainIndicator: (id) => indicatorState.actions.remove(id),
-    setMainIndicatorParams: (id, p) => indicatorState.actions.setParams(id, p),
-    replaceMainIndicators: (entries) => indicatorState.actions.replaceAll(entries),
-    clearMainIndicators: () => indicatorState.actions.clear(),
-    subPanes$: subPaneState.readonly.entries,
-    createSubPaneState: vi.fn((paneId, indicatorId, params) =>
-      subPaneState.actions.upsert({ paneId, indicatorId, params }),
-    ),
-    removeSubPaneState: vi.fn((paneId) => subPaneState.actions.remove(paneId)),
-    replaceSubPaneState: vi.fn((paneId, indicatorId, params) =>
-      subPaneState.actions.replace({ paneId, indicatorId, params }),
-    ),
-    updateSubPaneStateParams: vi.fn((paneId, params) =>
-      subPaneState.actions.setParams(paneId, params),
-    ),
-    clearSubPaneState: vi.fn(() => subPaneState.actions.clear()),
+    indicator: indicatorState,
+    subPaneOps: {
+      entries: subPaneState.readonly.entries,
+      create: vi.fn((paneId, indicatorId, params) =>
+        subPaneState.actions.upsert({ paneId, indicatorId, params }),
+      ),
+      remove: vi.fn((paneId) => subPaneState.actions.remove(paneId)),
+      replace: vi.fn((paneId, indicatorId, params) =>
+        subPaneState.actions.replace({ paneId, indicatorId, params }),
+      ),
+      setParams: vi.fn((paneId, params) => subPaneState.actions.setParams(paneId, params)),
+      clear: vi.fn(() => subPaneState.actions.clear()),
+    },
     projectPaneLayout: vi.fn(),
     runRendererTransaction: (run) => run(),
     getIndicatorScheduler: vi.fn(),
-    getRightAxisWidth: () => 60,
-    getPriceLabelWidth: () => 60,
-    getYPaddingPx: () => 4,
   } as IndicatorDependencies & { rendererMap: Map<string, any> }
 }
 
@@ -169,9 +161,9 @@ describe('ChartIndicatorManager', () => {
     it('creates sub-pane business state before projecting runtime resources', () => {
       expect(manager.createSubPane('RSI_0', 'RSI', { period1: 6 })).toBe(true)
 
-      expect(deps.createSubPaneState).toHaveBeenCalledTimes(1)
+      expect(deps.subPaneOps.create).toHaveBeenCalledTimes(1)
       expect(deps.useRenderer).toHaveBeenCalled()
-      expect(deps.createSubPaneState.mock.invocationCallOrder[0]).toBeLessThan(
+      expect(deps.subPaneOps.create.mock.invocationCallOrder[0]).toBeLessThan(
         deps.useRenderer.mock.invocationCallOrder[0]!,
       )
       expect(manager.getSubPaneEntry('RSI_0')?.params).toEqual({ period1: 6 })
@@ -183,7 +175,7 @@ describe('ChartIndicatorManager', () => {
 
       expect(manager.createSubPane('RSI_0', 'MACD', { fast: 5 })).toBe(true)
 
-      expect(deps.replaceSubPaneState).not.toHaveBeenCalled()
+      expect(deps.subPaneOps.replace).not.toHaveBeenCalled()
       expect(manager.getSubPaneEntry('RSI_0')?.indicatorId).toBe('RSI')
       expect(manager.getSubPaneEntry('RSI_0')?.params).toEqual({ period1: 6 })
     })
@@ -213,7 +205,7 @@ describe('ChartIndicatorManager', () => {
       manager.destroy()
       vi.clearAllMocks()
 
-      deps.upsertMainIndicator('MA', { ma5: true })
+      deps.indicator.actions.upsert('MA', { ma5: true })
 
       expect(deps.useRenderer).not.toHaveBeenCalled()
       expect(deps.scheduleDraw).not.toHaveBeenCalled()

package/src/engine/indicators/chartIndicatorManager.ts

@@ -11,7 +11,7 @@ import {
   type ReadonlySignal,
   type Computed,
 } from '../../foundation/reactivity/signal'
-import type { MainIndicatorEntry } from '../state/indicatorState'
+import type { IndicatorStateModule, MainIndicatorEntry } from '../state/indicatorState'
 import type { SubPaneSpec } from '../state/subPaneState'
 import type { Layer } from '../../rendering/scene/types'
 import type { KLineData } from '../../foundation/types/price'
@@ -47,6 +47,24 @@ function mainIndicatorProjectionKey(
     .join('|')
 }
 
+/** 副图业务操作：create/remove/clear 会联动 pane 布局，不能只写 subPane 模块 */
+export interface SubPaneOps {
+  readonly entries: ReadonlySignal<ReadonlyArray<SubPaneSpec>>
+  create: (
+    paneId: string,
+    indicatorId: string,
+    params: Readonly<Record<string, unknown>>,
+  ) => void
+  remove: (paneId: string) => void
+  replace: (
+    paneId: string,
+    indicatorId: string,
+    params: Readonly<Record<string, unknown>>,
+  ) => void
+  setParams: (paneId: string, params: Readonly<Record<string, unknown>>) => void
+  clear: () => void
+}
+
 export interface IndicatorDependencies {
   getOption: () => ResolvedChartOptions
   getPluginHost: () => PluginHostImpl
@@ -58,7 +76,8 @@ export interface IndicatorDependencies {
   removeRenderer: (name: string) => void
   updateRendererConfig: (name: string, config: Record<string, unknown>) => void
   setRendererEnabled: (name: string, enabled: boolean) => void
-  getPaneRatiosSignal: () => ReadonlySignal<Readonly<Record<string, number>>>
+  /** pane ratios SSOT */
+  paneRatios$: ReadonlySignal<Readonly<Record<string, number>>>
   paneSpecs$: ReadonlySignal<ReadonlyArray<PaneSpec>>
   projectPaneLayout: (
     specs: ReadonlyArray<PaneSpec>,
@@ -74,29 +93,10 @@ export interface IndicatorDependencies {
   removeLayer: (id: string) => boolean
   getLayer: (id: string) => Layer | null
   setLayerVisibility: (id: string, visible: boolean) => void
-  getRightAxisWidth: () => number
-  getPriceLabelWidth: () => number
-  getYPaddingPx: () => number
-  mainIndicators$: ReadonlySignal<ReadonlyMap<string, MainIndicatorEntry>>
-  upsertMainIndicator: (id: string, params: Record<string, number | boolean | string>) => void
-  removeMainIndicator: (id: string) => void
-  setMainIndicatorParams: (id: string, params: Record<string, number | boolean | string>) => void
-  replaceMainIndicators: (entries: ReadonlyMap<string, MainIndicatorEntry>) => void
-  clearMainIndicators: () => void
-  subPanes$: ReadonlySignal<ReadonlyArray<SubPaneSpec>>
-  createSubPaneState: (
-    paneId: string,
-    indicatorId: string,
-    params: Readonly<Record<string, unknown>>,
-  ) => void
-  removeSubPaneState: (paneId: string) => void
-  replaceSubPaneState: (
-    paneId: string,
-    indicatorId: string,
-    params: Readonly<Record<string, unknown>>,
-  ) => void
-  updateSubPaneStateParams: (paneId: string, params: Readonly<Record<string, unknown>>) => void
-  clearSubPaneState: () => void
+  /** 主图指标状态模块 */
+  indicator: IndicatorStateModule
+  /** 副图状态 + 联动 pane 布局的复合操作 */
+  subPaneOps: SubPaneOps
   runRendererTransaction: (run: () => void) => void
 }
 
@@ -169,12 +169,12 @@ export class ChartIndicatorManager {
 
     // 注册副图活跃列表提供者
     this.indicatorScheduler.setActiveSubPaneProvider(() =>
-      this.deps.subPanes$.peek().map((entry) => entry.paneId),
+      this.deps.subPaneOps.entries.peek().map((entry) => entry.paneId),
     )
 
     // 派生信号
     this._indicatorsComputed = computed<ReadonlyArray<IndicatorInstance>>(() => {
-      const mainIndicators: IndicatorInstance[] = [...this.deps.mainIndicators$().entries()].map(
+      const mainIndicators: IndicatorInstance[] = [...this.deps.indicator.readonly.mainIndicators().entries()].map(
         ([id, entry]) => ({
           id,
           definitionId: id,
@@ -185,7 +185,7 @@ export class ChartIndicatorManager {
         }),
       )
 
-      const subIndicators: IndicatorInstance[] = this.deps.subPanes$().map((entry) => ({
+      const subIndicators: IndicatorInstance[] = this.deps.subPaneOps.entries().map((entry) => ({
         id: entry.paneId,
         definitionId: entry.indicatorId,
         label: entry.indicatorId,
@@ -198,8 +198,8 @@ export class ChartIndicatorManager {
       return [...mainIndicators, ...subIndicators]
     })
     this._subPanesComputed = computed<ReadonlyArray<SubPaneInfo>>(() => {
-      const ratios = deps.getPaneRatiosSignal()()
-      return this.deps.subPanes$().map((entry) => ({
+      const ratios = deps.paneRatios$()
+      return this.deps.subPaneOps.entries().map((entry) => ({
         paneId: entry.paneId,
         indicatorId: entry.indicatorId,
         params: { ...entry.params },
@@ -220,12 +220,12 @@ export class ChartIndicatorManager {
     }
 
     this.projectedPaneSpecs = this.deps.paneSpecs$.peek()
-    this.projectedPaneRatios = this.deps.getPaneRatiosSignal().peek()
+    this.projectedPaneRatios = this.deps.paneRatios$.peek()
     this.disposeProjection = effect(() => {
       const paneSpecs = this.deps.paneSpecs$()
-      const paneRatios = this.deps.getPaneRatiosSignal()()
-      const mainIndicators = this.deps.mainIndicators$()
-      const subPanes = this.deps.subPanes$()
+      const paneRatios = this.deps.paneRatios$()
+      const mainIndicators = this.deps.indicator.readonly.mainIndicators()
+      const subPanes = this.deps.subPaneOps.entries()
       this.deps.runRendererTransaction(() => {
         let paneChanged = false
         if (paneSpecs !== this.projectedPaneSpecs || paneRatios !== this.projectedPaneRatios) {
@@ -250,7 +250,7 @@ export class ChartIndicatorManager {
   }
 
   get mainIndicatorsSignalPeek(): ReadonlyMap<string, MainIndicatorEntry> {
-    return this.deps.mainIndicators$.peek()
+    return this.deps.indicator.readonly.mainIndicators.peek()
   }
 
   get indicatorsComputed(): Computed<ReadonlyArray<IndicatorInstance>> {
@@ -273,26 +273,26 @@ export class ChartIndicatorManager {
       return false
     }
 
-    const existing = this.deps.mainIndicators$.peek().get(id)
+    const existing = this.deps.indicator.readonly.mainIndicators.peek().get(id)
 
     if (existing) {
       if (params) {
-        this.deps.upsertMainIndicator(id, params)
+        this.deps.indicator.actions.upsert(id, params)
       }
       return true
     }
 
     const defaults = ChartIndicatorManager.DEFAULT_MAIN_PARAMS[id] ?? {}
     const merged = params ? { ...defaults, ...params } : defaults
-    this.deps.upsertMainIndicator(id, merged)
+    this.deps.indicator.actions.upsert(id, merged)
     return true
   }
 
   disableMainIndicator(indicatorId: string): boolean {
     const id = indicatorId.toUpperCase()
-    if (!this.deps.mainIndicators$.peek().has(id)) return false
+    if (!this.deps.indicator.readonly.mainIndicators.peek().has(id)) return false
 
-    this.deps.removeMainIndicator(id)
+    this.deps.indicator.actions.remove(id)
     return true
   }
 
@@ -305,11 +305,11 @@ export class ChartIndicatorManager {
   }
 
   getActiveMainIndicators(): string[] {
-    return [...this.deps.mainIndicators$.peek().keys()]
+    return [...this.deps.indicator.readonly.mainIndicators.peek().keys()]
   }
 
   isMainIndicatorActive(indicatorId: string): boolean {
-    return this.deps.mainIndicators$.peek().has(indicatorId.toUpperCase())
+    return this.deps.indicator.readonly.mainIndicators.peek().has(indicatorId.toUpperCase())
   }
 
   updateMainIndicatorParams(
@@ -317,18 +317,18 @@ export class ChartIndicatorManager {
     params: Record<string, number | boolean | string>,
   ): void {
     const id = indicatorId.toUpperCase()
-    if (!this.deps.mainIndicators$.peek().has(id)) return
+    if (!this.deps.indicator.readonly.mainIndicators.peek().has(id)) return
 
-    this.deps.setMainIndicatorParams(id, params)
+    this.deps.indicator.actions.setParams(id, params)
   }
 
   getMainIndicatorParams(indicatorId: string): Record<string, number | boolean | string> | null {
-    const params = this.deps.mainIndicators$.peek().get(indicatorId.toUpperCase())?.params
+    const params = this.deps.indicator.readonly.mainIndicators.peek().get(indicatorId.toUpperCase())?.params
     return params ? { ...params } : null
   }
 
   clearMainIndicators(): void {
-    this.deps.clearMainIndicators()
+    this.deps.indicator.actions.clear()
   }
 
   private reconcileMainIndicators(desired: ReadonlyMap<string, MainIndicatorEntry>): boolean {
@@ -397,7 +397,7 @@ export class ChartIndicatorManager {
   }
 
   private updateIndicatorSchedulerConfig(indicatorId: string): void {
-    const entry = this.deps.mainIndicators$.peek().get(indicatorId)
+    const entry = this.deps.indicator.readonly.mainIndicators.peek().get(indicatorId)
     const isActive = entry !== undefined
     const params = entry?.params ?? {}
 
@@ -419,7 +419,7 @@ export class ChartIndicatorManager {
     const newIds = indicators
       .map((i) => i.toUpperCase())
       .filter((id) => ChartIndicatorManager.ENABLE_MAIN_INDICATORS.includes(id))
-    const prev = this.deps.mainIndicators$.peek()
+    const prev = this.deps.indicator.readonly.mainIndicators.peek()
 
     const next = new Map<string, MainIndicatorEntry>()
     for (const id of newIds) {
@@ -432,7 +432,7 @@ export class ChartIndicatorManager {
         })
       }
     }
-    this.deps.replaceMainIndicators(next)
+    this.deps.indicator.actions.replaceAll(next)
   }
 
   // ========== 副图管理 API ==========
@@ -446,7 +446,7 @@ export class ChartIndicatorManager {
     if (!definition) {
       throw new KLineChartError('NOT_REGISTERED', `[Chart] Unknown indicator: ${indicatorId}`)
     }
-    this.deps.createSubPaneState(
+    this.deps.subPaneOps.create(
       paneId,
       indicatorId,
       params ?? this.getDefaultSubPaneParams(indicatorId),
@@ -458,13 +458,13 @@ export class ChartIndicatorManager {
     indicatorId: SubIndicatorType,
     params?: Record<string, number | boolean | string>,
   ): boolean {
-    const existing = this.deps.subPanes$.peek().find((entry) => entry.paneId === paneId)
+    const existing = this.deps.subPaneOps.entries.peek().find((entry) => entry.paneId === paneId)
     if (existing) {
       if (
         existing.indicatorId === indicatorId &&
         !this.subPaneManager.getMountedResources(paneId)
       ) {
-        this.deps.replaceSubPaneState(
+        this.deps.subPaneOps.replace(
           paneId,
           existing.indicatorId,
           existing.params,
@@ -475,7 +475,7 @@ export class ChartIndicatorManager {
     if (!this.indicatorScheduler.getIndicatorMetadata(indicatorId)) {
       throw new KLineChartError('NOT_REGISTERED', `[Chart] Unknown indicator: ${indicatorId}`)
     }
-    this.deps.createSubPaneState(
+    this.deps.subPaneOps.create(
       paneId,
       indicatorId,
       params ?? this.getDefaultSubPaneParams(indicatorId),
@@ -484,7 +484,7 @@ export class ChartIndicatorManager {
   }
 
   removeSubPane(paneId: string): void {
-    this.deps.removeSubPaneState(paneId)
+    this.deps.subPaneOps.remove(paneId)
   }
 
   replaceSubPaneIndicator(
@@ -495,7 +495,7 @@ export class ChartIndicatorManager {
     if (!this.indicatorScheduler.getIndicatorMetadata(newIndicatorId)) {
       throw new KLineChartError('NOT_REGISTERED', `[Chart] Unknown indicator: ${newIndicatorId}`)
     }
-    this.deps.replaceSubPaneState(
+    this.deps.subPaneOps.replace(
       paneId,
       newIndicatorId,
       params ?? this.getDefaultSubPaneParams(newIndicatorId),
@@ -503,22 +503,22 @@ export class ChartIndicatorManager {
   }
 
   updateSubPaneParams(paneId: string, params: Record<string, unknown>): void {
-    this.deps.updateSubPaneStateParams(paneId, params)
+    this.deps.subPaneOps.setParams(paneId, params)
   }
 
   clearSubPanes(): void {
-    this.deps.clearSubPaneState()
+    this.deps.subPaneOps.clear()
   }
 
   /**
    * @deprecated 使用 getSubPaneEntries 获取完整信息
    */
   getSubPaneIndicators(): SubIndicatorType[] {
-    return this.deps.subPanes$.peek().map((entry) => entry.indicatorId)
+    return this.deps.subPaneOps.entries.peek().map((entry) => entry.indicatorId)
   }
 
   getSubPaneEntries(): SubPaneEntry[] {
-    return this.deps.subPanes$.peek().map((entry) => ({
+    return this.deps.subPaneOps.entries.peek().map((entry) => ({
       ...entry,
       params: { ...entry.params },
       ...this.subPaneManager.getMountedResources(entry.paneId),
@@ -526,7 +526,7 @@ export class ChartIndicatorManager {
   }
 
   getSubPaneEntry(paneId: string): SubPaneEntry | undefined {
-    const entry = this.deps.subPanes$.peek().find((candidate) => candidate.paneId === paneId)
+    const entry = this.deps.subPaneOps.entries.peek().find((candidate) => candidate.paneId === paneId)
     if (!entry) return undefined
     return {
       ...entry,
@@ -569,7 +569,7 @@ export class ChartIndicatorManager {
   removeIndicator(instanceId: string): boolean {
     const id = instanceId.toUpperCase()
 
-    if (this.deps.mainIndicators$.peek().has(id)) {
+    if (this.deps.indicator.readonly.mainIndicators.peek().has(id)) {
       return this.disableMainIndicator(instanceId)
     }
 
@@ -585,7 +585,7 @@ export class ChartIndicatorManager {
   updateIndicatorParams(instanceId: string, params: Record<string, unknown>): boolean {
     const id = instanceId.toUpperCase()
 
-    if (this.deps.mainIndicators$.peek().has(id)) {
+    if (this.deps.indicator.readonly.mainIndicators.peek().has(id)) {
       this.updateMainIndicatorParams(
         instanceId,
         params as Record<string, number | boolean | string>,