@363045841yyt/klinechart-core 0.7.3 → 0.7.5-alpha.2

package/src/engine/controller/markerInteraction.ts

@@ -1,130 +1,130 @@
-import type { MarkerEntity, CustomMarkerEntity, MarkerManager } from '../marker/registry'
-
-/** Marker交互状态，管理标记 hover/click 状态和回调，与 InteractionController 正交。 */
-export class MarkerInteractionState {
-  hoveredMarkerId: string | null = null
-  clickedMarkerId: string | null = null
-  hoveredMarkerData: MarkerEntity | null = null
-  clickedMarkerData: MarkerEntity | null = null
-  hoveredCustomMarker: CustomMarkerEntity | null = null
-
-  private onMarkerHoverCallback?: (marker: MarkerEntity | null) => void
-  private onMarkerClickCallback?: (marker: MarkerEntity) => void
-  private onCustomMarkerHoverCallback?: (marker: CustomMarkerEntity | null) => void
-  private onCustomMarkerClickCallback?: (marker: CustomMarkerEntity) => void
-
-  setOnMarkerHover(callback: (marker: MarkerEntity | null) => void) {
-    this.onMarkerHoverCallback = callback
-  }
-
-  setOnMarkerClick(callback: (marker: MarkerEntity) => void) {
-    this.onMarkerClickCallback = callback
-  }
-
-  setOnCustomMarkerHover(callback: (marker: CustomMarkerEntity | null) => void) {
-    this.onCustomMarkerHoverCallback = callback
-  }
-
-  setOnCustomMarkerClick(callback: (marker: CustomMarkerEntity) => void) {
-    this.onCustomMarkerClickCallback = callback
-  }
-
-  handleClick(hitMarker: MarkerEntity): void {
-    this.clickedMarkerId = hitMarker.id
-    this.clickedMarkerData = hitMarker
-    this.onMarkerClickCallback?.(hitMarker)
-  }
-
-  /** 从坐标更新 hover 状态。返回 true 表示命中 marker/custom-marker，调用方应跳过后续 hover 逻辑。 */
-  updateHoverFromPoint(
-    worldX: number,
-    mouseX: number,
-    mouseY: number,
-    markerManager: MarkerManager,
-  ): boolean {
-    const hitMarker = markerManager.hitTest(worldX, mouseY, 3)
-    if (hitMarker) {
-      return this.enterMarkerHover(hitMarker, markerManager)
-    }
-    this.leaveMarkerHover(markerManager)
-
-    const hitCustomMarker = markerManager.hitTestCustomMarker(mouseX, mouseY)
-    if (hitCustomMarker) {
-      return this.enterCustomMarkerHover(hitCustomMarker, markerManager)
-    }
-    this.leaveCustomMarkerHover()
-
-    return false
-  }
-
-  private enterMarkerHover(hitMarker: MarkerEntity, markerManager: MarkerManager): true {
-    if (this.hoveredMarkerId !== hitMarker.id) {
-      this.hoveredMarkerId = hitMarker.id
-      this.hoveredMarkerData = hitMarker
-      markerManager.setHover(hitMarker.id)
-      this.onMarkerHoverCallback?.(hitMarker)
-    }
-    if (this.hoveredCustomMarker !== null) {
-      this.hoveredCustomMarker = null
-      this.onCustomMarkerHoverCallback?.(null)
-    }
-    return true
-  }
-
-  private leaveMarkerHover(markerManager: MarkerManager): void {
-    if (this.hoveredMarkerId !== null) {
-      this.hoveredMarkerId = null
-      this.hoveredMarkerData = null
-      markerManager.setHover(null)
-      this.onMarkerHoverCallback?.(null)
-    } else {
-      this.hoveredMarkerData = null
-    }
-  }
-
-  private enterCustomMarkerHover(hitCustomMarker: CustomMarkerEntity, markerManager: MarkerManager): true {
-    if (this.hoveredCustomMarker?.id !== hitCustomMarker.id) {
-      this.hoveredCustomMarker = hitCustomMarker
-      this.onCustomMarkerHoverCallback?.(hitCustomMarker)
-    }
-    if (this.hoveredMarkerId !== null) {
-      this.hoveredMarkerId = null
-      this.hoveredMarkerData = null
-      markerManager.setHover(null)
-      this.onMarkerHoverCallback?.(null)
-    }
-    return true
-  }
-
-  private leaveCustomMarkerHover(): void {
-    if (this.hoveredCustomMarker !== null) {
-      this.hoveredCustomMarker = null
-      this.onCustomMarkerHoverCallback?.(null)
-    }
-  }
-
-  /** 清空 hover 状态并触发回调（拖拽/离开时调用）。需要 markerManager 以便同步清除 Native hover。 */
-  clearAll(markerManager: MarkerManager): void {
-    if (this.hoveredMarkerId !== null) {
-      this.hoveredMarkerId = null
-      this.hoveredMarkerData = null
-      markerManager.setHover(null)
-      this.onMarkerHoverCallback?.(null)
-    } else {
-      this.hoveredMarkerData = null
-    }
-    if (this.hoveredCustomMarker !== null) {
-      this.hoveredCustomMarker = null
-      this.onCustomMarkerHoverCallback?.(null)
-    }
-  }
-
-  /** 全量重置（数据更新时调用，不触发热点回调） */
-  reset(): void {
-    this.hoveredMarkerId = null
-    this.clickedMarkerId = null
-    this.hoveredMarkerData = null
-    this.clickedMarkerData = null
-    this.hoveredCustomMarker = null
-  }
-}
+import type { MarkerEntity, CustomMarkerEntity, MarkerManager } from '../marker/registry'
+
+/** Marker交互状态，管理标记 hover/click 状态和回调，与 InteractionController 正交。 */
+export class MarkerInteractionState {
+  hoveredMarkerId: string | null = null
+  clickedMarkerId: string | null = null
+  hoveredMarkerData: MarkerEntity | null = null
+  clickedMarkerData: MarkerEntity | null = null
+  hoveredCustomMarker: CustomMarkerEntity | null = null
+
+  private onMarkerHoverCallback?: (marker: MarkerEntity | null) => void
+  private onMarkerClickCallback?: (marker: MarkerEntity) => void
+  private onCustomMarkerHoverCallback?: (marker: CustomMarkerEntity | null) => void
+  private onCustomMarkerClickCallback?: (marker: CustomMarkerEntity) => void
+
+  setOnMarkerHover(callback: (marker: MarkerEntity | null) => void) {
+    this.onMarkerHoverCallback = callback
+  }
+
+  setOnMarkerClick(callback: (marker: MarkerEntity) => void) {
+    this.onMarkerClickCallback = callback
+  }
+
+  setOnCustomMarkerHover(callback: (marker: CustomMarkerEntity | null) => void) {
+    this.onCustomMarkerHoverCallback = callback
+  }
+
+  setOnCustomMarkerClick(callback: (marker: CustomMarkerEntity) => void) {
+    this.onCustomMarkerClickCallback = callback
+  }
+
+  handleClick(hitMarker: MarkerEntity): void {
+    this.clickedMarkerId = hitMarker.id
+    this.clickedMarkerData = hitMarker
+    this.onMarkerClickCallback?.(hitMarker)
+  }
+
+  /** 从坐标更新 hover 状态。返回 true 表示命中 marker/custom-marker，调用方应跳过后续 hover 逻辑。 */
+  updateHoverFromPoint(
+    worldX: number,
+    mouseX: number,
+    mouseY: number,
+    markerManager: MarkerManager,
+  ): boolean {
+    const hitMarker = markerManager.hitTest(worldX, mouseY, 3)
+    if (hitMarker) {
+      return this.enterMarkerHover(hitMarker, markerManager)
+    }
+    this.leaveMarkerHover(markerManager)
+
+    const hitCustomMarker = markerManager.hitTestCustomMarker(mouseX, mouseY)
+    if (hitCustomMarker) {
+      return this.enterCustomMarkerHover(hitCustomMarker, markerManager)
+    }
+    this.leaveCustomMarkerHover()
+
+    return false
+  }
+
+  private enterMarkerHover(hitMarker: MarkerEntity, markerManager: MarkerManager): true {
+    if (this.hoveredMarkerId !== hitMarker.id) {
+      this.hoveredMarkerId = hitMarker.id
+      this.hoveredMarkerData = hitMarker
+      markerManager.setHover(hitMarker.id)
+      this.onMarkerHoverCallback?.(hitMarker)
+    }
+    if (this.hoveredCustomMarker !== null) {
+      this.hoveredCustomMarker = null
+      this.onCustomMarkerHoverCallback?.(null)
+    }
+    return true
+  }
+
+  private leaveMarkerHover(markerManager: MarkerManager): void {
+    if (this.hoveredMarkerId !== null) {
+      this.hoveredMarkerId = null
+      this.hoveredMarkerData = null
+      markerManager.setHover(null)
+      this.onMarkerHoverCallback?.(null)
+    } else {
+      this.hoveredMarkerData = null
+    }
+  }
+
+  private enterCustomMarkerHover(hitCustomMarker: CustomMarkerEntity, markerManager: MarkerManager): true {
+    if (this.hoveredCustomMarker?.id !== hitCustomMarker.id) {
+      this.hoveredCustomMarker = hitCustomMarker
+      this.onCustomMarkerHoverCallback?.(hitCustomMarker)
+    }
+    if (this.hoveredMarkerId !== null) {
+      this.hoveredMarkerId = null
+      this.hoveredMarkerData = null
+      markerManager.setHover(null)
+      this.onMarkerHoverCallback?.(null)
+    }
+    return true
+  }
+
+  private leaveCustomMarkerHover(): void {
+    if (this.hoveredCustomMarker !== null) {
+      this.hoveredCustomMarker = null
+      this.onCustomMarkerHoverCallback?.(null)
+    }
+  }
+
+  /** 清空 hover 状态并触发回调（拖拽/离开时调用）。需要 markerManager 以便同步清除 Native hover。 */
+  clearAll(markerManager: MarkerManager): void {
+    if (this.hoveredMarkerId !== null) {
+      this.hoveredMarkerId = null
+      this.hoveredMarkerData = null
+      markerManager.setHover(null)
+      this.onMarkerHoverCallback?.(null)
+    } else {
+      this.hoveredMarkerData = null
+    }
+    if (this.hoveredCustomMarker !== null) {
+      this.hoveredCustomMarker = null
+      this.onCustomMarkerHoverCallback?.(null)
+    }
+  }
+
+  /** 全量重置（数据更新时调用，不触发热点回调） */
+  reset(): void {
+    this.hoveredMarkerId = null
+    this.clickedMarkerId = null
+    this.hoveredMarkerData = null
+    this.clickedMarkerData = null
+    this.hoveredCustomMarker = null
+  }
+}

package/src/engine/controller/pinchTracker.ts

@@ -1,82 +1,82 @@
-/** 触屏双指捏合跟踪，与 InteractionController 正交。 */
-export class PinchTracker {
-  private activePointers = new Map<number, { x: number; y: number }>()
-  private lastPinchDistance = 0
-  private pinchCenter = { x: 0, y: 0 }
-  private isPinching = false
-  private onPinchZoomCallback?: (delta: number, centerX: number) => void
-
-  setOnPinchZoom(callback: (delta: number, centerX: number) => void) {
-    this.onPinchZoomCallback = callback
-  }
-
-  getIsPinching(): boolean {
-    return this.isPinching
-  }
-
-  getPointerCount(): number {
-    return this.activePointers.size
-  }
-
-  /** Returns true if pinch started (caller should early-return, not process drag). */
-  handlePointerDown(e: PointerEvent, isTouchSession: boolean): boolean {
-    this.activePointers.set(e.pointerId, { x: e.clientX, y: e.clientY })
-
-    if (this.activePointers.size === 2 && isTouchSession) {
-      this.isPinching = true
-      const pointers = Array.from(this.activePointers.values())
-      const p1 = pointers[0]!
-      const p2 = pointers[1]!
-      this.lastPinchDistance = Math.hypot(p2.x - p1.x, p2.y - p1.y)
-      this.pinchCenter = { x: (p1.x + p2.x) / 2, y: (p1.y + p2.y) / 2 }
-      return true
-    }
-    return false
-  }
-
-  handlePointerUp(e: PointerEvent): void {
-    this.activePointers.delete(e.pointerId)
-    if (this.isPinching && this.activePointers.size < 2) {
-      this.isPinching = false
-      this.lastPinchDistance = 0
-    }
-  }
-
-  handlePointerLeave(e: PointerEvent): void {
-    this.activePointers.delete(e.pointerId)
-    if (this.activePointers.size < 2) {
-      this.isPinching = false
-      this.lastPinchDistance = 0
-    }
-  }
-
-  /** Returns true if pinch zoom was processed (caller should skip further pointer-move handling). */
-  handlePointerMove(e: PointerEvent): boolean {
-    if (this.activePointers.has(e.pointerId)) {
-      this.activePointers.set(e.pointerId, { x: e.clientX, y: e.clientY })
-    }
-
-    if (this.isPinching && this.activePointers.size === 2) {
-      const pointers = Array.from(this.activePointers.values())
-      const p1 = pointers[0]!
-      const p2 = pointers[1]!
-      const distance = Math.hypot(p2.x - p1.x, p2.y - p1.y)
-      const deltaDistance = distance - this.lastPinchDistance
-
-      if (Math.abs(deltaDistance) > 10) {
-        const pinchDelta = deltaDistance > 0 ? 1 : -1
-        const centerX = (p1.x + p2.x) / 2
-        this.onPinchZoomCallback?.(pinchDelta, centerX)
-        this.lastPinchDistance = distance
-      }
-      return true
-    }
-    return false
-  }
-
-  reset(): void {
-    this.activePointers.clear()
-    this.isPinching = false
-    this.lastPinchDistance = 0
-  }
-}
+/** 触屏双指捏合跟踪，与 InteractionController 正交。 */
+export class PinchTracker {
+  private activePointers = new Map<number, { x: number; y: number }>()
+  private lastPinchDistance = 0
+  private pinchCenter = { x: 0, y: 0 }
+  private isPinching = false
+  private onPinchZoomCallback?: (delta: number, centerX: number) => void
+
+  setOnPinchZoom(callback: (delta: number, centerX: number) => void) {
+    this.onPinchZoomCallback = callback
+  }
+
+  getIsPinching(): boolean {
+    return this.isPinching
+  }
+
+  getPointerCount(): number {
+    return this.activePointers.size
+  }
+
+  /** Returns true if pinch started (caller should early-return, not process drag). */
+  handlePointerDown(e: PointerEvent, isTouchSession: boolean): boolean {
+    this.activePointers.set(e.pointerId, { x: e.clientX, y: e.clientY })
+
+    if (this.activePointers.size === 2 && isTouchSession) {
+      this.isPinching = true
+      const pointers = Array.from(this.activePointers.values())
+      const p1 = pointers[0]!
+      const p2 = pointers[1]!
+      this.lastPinchDistance = Math.hypot(p2.x - p1.x, p2.y - p1.y)
+      this.pinchCenter = { x: (p1.x + p2.x) / 2, y: (p1.y + p2.y) / 2 }
+      return true
+    }
+    return false
+  }
+
+  handlePointerUp(e: PointerEvent): void {
+    this.activePointers.delete(e.pointerId)
+    if (this.isPinching && this.activePointers.size < 2) {
+      this.isPinching = false
+      this.lastPinchDistance = 0
+    }
+  }
+
+  handlePointerLeave(e: PointerEvent): void {
+    this.activePointers.delete(e.pointerId)
+    if (this.activePointers.size < 2) {
+      this.isPinching = false
+      this.lastPinchDistance = 0
+    }
+  }
+
+  /** Returns true if pinch zoom was processed (caller should skip further pointer-move handling). */
+  handlePointerMove(e: PointerEvent): boolean {
+    if (this.activePointers.has(e.pointerId)) {
+      this.activePointers.set(e.pointerId, { x: e.clientX, y: e.clientY })
+    }
+
+    if (this.isPinching && this.activePointers.size === 2) {
+      const pointers = Array.from(this.activePointers.values())
+      const p1 = pointers[0]!
+      const p2 = pointers[1]!
+      const distance = Math.hypot(p2.x - p1.x, p2.y - p1.y)
+      const deltaDistance = distance - this.lastPinchDistance
+
+      if (Math.abs(deltaDistance) > 10) {
+        const pinchDelta = deltaDistance > 0 ? 1 : -1
+        const centerX = (p1.x + p2.x) / 2
+        this.onPinchZoomCallback?.(pinchDelta, centerX)
+        this.lastPinchDistance = distance
+      }
+      return true
+    }
+    return false
+  }
+
+  reset(): void {
+    this.activePointers.clear()
+    this.isPinching = false
+    this.lastPinchDistance = 0
+  }
+}

package/src/engine/controller/tooltipPosition.ts

@@ -1,48 +1,48 @@
-export interface TooltipPositionInput {
-  mouseX: number
-  mouseY: number
-  viewWidth: number
-  viewHeight: number
-  plotWidth: number
-  plotHeight: number
-  tooltipSize: { width: number; height: number }
-  useAnchorPositioning: boolean
-}
-
-export interface TooltipPositionOutput {
-  pos: { x: number; y: number }
-  anchorPlacement?: 'right-bottom' | 'left-bottom'
-}
-
-export function computeTooltipPosition(input: TooltipPositionInput): TooltipPositionOutput {
-  const padding = 12
-  const preferGap = 14
-
-  if (input.useAnchorPositioning) {
-    const tooltipW = input.tooltipSize.width
-    const rightCandidateX = input.mouseX + preferGap
-    const rightWouldOverflow = rightCandidateX + tooltipW + padding > input.plotWidth
-    return {
-      anchorPlacement: rightWouldOverflow ? 'left-bottom' : 'right-bottom',
-      pos: {
-        x: Math.min(Math.max(input.mouseX, padding), Math.max(padding, input.plotWidth - padding)),
-        y: Math.min(Math.max(input.mouseY, padding), Math.max(padding, input.plotHeight - padding)),
-      },
-    }
-  }
-
-  const tooltipW = input.tooltipSize.width
-  const tooltipH = input.tooltipSize.height
-  const rightX = input.mouseX + preferGap
-  const leftX = input.mouseX - preferGap - tooltipW
-  const desiredX = rightX + tooltipW + padding <= input.viewWidth ? rightX : leftX
-  const desiredY = input.mouseY + preferGap
-  const maxX = Math.max(padding, input.viewWidth - tooltipW - padding)
-  const maxY = Math.max(padding, input.viewHeight - tooltipH - padding)
-  return {
-    pos: {
-      x: Math.min(Math.max(desiredX, padding), maxX),
-      y: Math.min(Math.max(desiredY, padding), maxY),
-    },
-  }
-}
+export interface TooltipPositionInput {
+  mouseX: number
+  mouseY: number
+  viewWidth: number
+  viewHeight: number
+  plotWidth: number
+  plotHeight: number
+  tooltipSize: { width: number; height: number }
+  useAnchorPositioning: boolean
+}
+
+export interface TooltipPositionOutput {
+  pos: { x: number; y: number }
+  anchorPlacement?: 'right-bottom' | 'left-bottom'
+}
+
+export function computeTooltipPosition(input: TooltipPositionInput): TooltipPositionOutput {
+  const padding = 12
+  const preferGap = 14
+
+  if (input.useAnchorPositioning) {
+    const tooltipW = input.tooltipSize.width
+    const rightCandidateX = input.mouseX + preferGap
+    const rightWouldOverflow = rightCandidateX + tooltipW + padding > input.plotWidth
+    return {
+      anchorPlacement: rightWouldOverflow ? 'left-bottom' : 'right-bottom',
+      pos: {
+        x: Math.min(Math.max(input.mouseX, padding), Math.max(padding, input.plotWidth - padding)),
+        y: Math.min(Math.max(input.mouseY, padding), Math.max(padding, input.plotHeight - padding)),
+      },
+    }
+  }
+
+  const tooltipW = input.tooltipSize.width
+  const tooltipH = input.tooltipSize.height
+  const rightX = input.mouseX + preferGap
+  const leftX = input.mouseX - preferGap - tooltipW
+  const desiredX = rightX + tooltipW + padding <= input.viewWidth ? rightX : leftX
+  const desiredY = input.mouseY + preferGap
+  const maxX = Math.max(padding, input.viewWidth - tooltipW - padding)
+  const maxY = Math.max(padding, input.viewHeight - tooltipH - padding)
+  return {
+    pos: {
+      x: Math.min(Math.max(desiredX, padding), maxX),
+      y: Math.min(Math.max(desiredY, padding), maxY),
+    },
+  }
+}