@363045841yyt/klinechart-core 0.7.6 → 0.7.7

package/src/engine/renderers/Indicator/structure.ts

@@ -1,4 +1,4 @@
-import { getColors } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 import type { RendererPluginWithHost, RenderContext, PluginHost } from '../../../plugin'
 import { RENDERER_PRIORITY } from '../../../plugin'
 import type { StructureRenderState } from '../../indicators/structureState'
@@ -41,7 +41,7 @@ export function createStructureRendererPlugin(options: { paneId?: string } = {})
         getDeclaredNamespaces() { const key = resolveKey(); return key ? [key] : [] },
         draw(context: RenderContext) {
             const { ctx, pane, range, scrollLeft, kLineCenters } = context
-            const colors = getColors(context.theme)
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
             const stateKey = resolveKey()
             if (!stateKey) return
             const state = pluginHost?.getSharedState<StructureRenderState>(stateKey)
@@ -64,7 +64,7 @@ export function createStructureRendererPlugin(options: { paneId?: string } = {})
                     const centerX = kLineCenters[s.index - range.start]
                     if (centerX === undefined) continue
                     const y = toY(s.price)
-                    ctx.fillStyle = s.label === 'HH' ? colors.STRUCTURE.HH : s.label === 'HL' ? colors.STRUCTURE.HL : s.label === 'LH' ? colors.STRUCTURE.LH : colors.STRUCTURE.LL
+                    ctx.fillStyle = s.label === 'HH' ? colors.structure.hh : s.label === 'HL' ? colors.structure.hl : s.label === 'LH' ? colors.structure.lh : colors.structure.ll
                     const labelY = s.kind === 'high' ? y - 8 : y + 16
                     ctx.fillText(s.label, centerX, labelY)
                     // Dot
@@ -86,12 +86,12 @@ export function createStructureRendererPlugin(options: { paneId?: string } = {})
                     const x2 = kLineCenters[ev.index - range.start]
                     if (x1 === undefined || x2 === undefined) continue
                     const y = toY(ev.brokenLevel)
-                    ctx.strokeStyle = ev.kind === 'BOS' ? colors.STRUCTURE.BOS : colors.STRUCTURE.CHOCH
+                    ctx.strokeStyle = ev.kind === 'BOS' ? colors.structure.bos : colors.structure.choch
                     ctx.beginPath()
                     ctx.moveTo(x1, y)
                     ctx.lineTo(x2, y)
                     ctx.stroke()
-                    ctx.fillStyle = ev.kind === 'BOS' ? colors.STRUCTURE.BOS : colors.STRUCTURE.CHOCH
+                    ctx.fillStyle = ev.kind === 'BOS' ? colors.structure.bos : colors.structure.choch
                     ctx.fillText(ev.kind, (x1 + x2) / 2, y - 4)
                 }
                 ctx.setLineDash([])

package/src/engine/renderers/Indicator/wmsr.ts

@@ -1,6 +1,6 @@
 import type { RendererPluginWithHost, RenderContext, PluginHost } from '../../../plugin'
 import { RENDERER_PRIORITY } from '../../../plugin'
-import { getColors, type ChartTheme } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 import { alignToPhysicalPixelCenter } from '../../draw/pixelAlign'
 import type { WMSRRenderState } from '../../indicators/wmsrState'
 import { createWMSRStateKey } from '../../indicators/wmsrState'
@@ -82,7 +82,7 @@ export function createWMSRRendererPlugin(options: WMSRRendererOptions = {}): Ren
         displayMin: number,
         displayMax: number,
         dpr: number,
-        colors: { WMSR: { OVERBOUGHT: string; OVERSOLD: string }; WMSR_GRID: string }
+        colors: { wmsr: { overbought: string; oversold: string }; wmsrGrid: string }
     ): void {
         const displayValueRange = displayMax - displayMin || 1
         const y20 = alignToPhysicalPixelCenter(paneHeight - (-20 - displayMin) / displayValueRange * paneHeight, dpr)
@@ -95,19 +95,19 @@ export function createWMSRRendererPlugin(options: WMSRRendererOptions = {}): Ren
         ctx.lineWidth = 1
         ctx.setLineDash([4, 4])
 
-        ctx.strokeStyle = colors.WMSR.OVERBOUGHT
+        ctx.strokeStyle = colors.wmsr.overbought
         ctx.beginPath()
         ctx.moveTo(0, y20)
         ctx.lineTo(paneWidth, y20)
         ctx.stroke()
 
-        ctx.strokeStyle = colors.WMSR.OVERSOLD
+        ctx.strokeStyle = colors.wmsr.oversold
         ctx.beginPath()
         ctx.moveTo(0, y80)
         ctx.lineTo(paneWidth, y80)
         ctx.stroke()
 
-        ctx.strokeStyle = colors.WMSR_GRID
+        ctx.strokeStyle = colors.wmsrGrid
         ctx.beginPath()
         ctx.moveTo(0, y50)
         ctx.lineTo(paneWidth, y50)
@@ -160,7 +160,7 @@ export function createWMSRRendererPlugin(options: WMSRRendererOptions = {}): Ren
 
         draw(context: RenderContext) {
 const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = context
-            const colors = getColors(context.theme)
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
 
             const stateKey = resolveKey()
             if (!stateKey) return
@@ -230,7 +230,7 @@ const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = co
             if (enableWebGL && lineWebGLSurface?.isAvailable()) {
                 if (params.showWMSR && cachedWMSRPoints.length >= 2) {
                     const ok = lineWebGLSurface.drawLineStrips(
-                        [{ points: cachedWMSRPoints, width: 1, color: colors.WMSR.WMSR }],
+                        [{ points: cachedWMSRPoints, width: 1, color: colors.wmsr.wmsr }],
                         scrollLeft
                     )
                     if (ok) {
@@ -266,13 +266,13 @@ function drawWMSRLineWithCanvas2D(
     scrollLeft: number,
     wmsrPoints: LinePoint[],
     params: { showWMSR: boolean },
-    colors: { WMSR: { WMSR: string } }
+    colors: { wmsr: { wmsr: string } }
 ): void {
     if (!params.showWMSR || wmsrPoints.length < 2) return
 
     ctx.save()
     ctx.translate(-scrollLeft, 0)
-    ctx.strokeStyle = colors.WMSR.WMSR
+    ctx.strokeStyle = colors.wmsr.wmsr
     ctx.lineWidth = 1
     ctx.lineJoin = 'round'
     ctx.lineCap = 'round'
@@ -294,9 +294,10 @@ export function getWMSRTitleInfo(
     period: number,
     pluginHost: PluginHost,
     paneId: string = 'sub_WMSR',
-    theme: ChartTheme = 'light'
+    theme: 'light' | 'dark' = 'light',
+    isAsiaMarket?: boolean
 ): { name: string; params: number[]; values: Array<{ label: string; value: number; color: string }> } | null {
-    const colors = getColors(theme)
+    const colors = resolveThemeColors(theme, isAsiaMarket)
     const state = pluginHost.getSharedState<WMSRRenderState>(createWMSRStateKey(paneId))
     if (!state) return null
 
@@ -307,7 +308,7 @@ export function getWMSRTitleInfo(
         name: 'WMSR',
         params: [period],
         values: [
-            { label: 'WMSR', value: wmsr, color: colors.WMSR.WMSR },
+            { label: 'WMSR', value: wmsr, color: colors.wmsr.wmsr },
         ],
     }
 }

package/src/engine/renderers/Indicator/zones.ts

@@ -1,4 +1,4 @@
-import { getColors } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 import type { RendererPluginWithHost, RenderContext, PluginHost } from '../../../plugin'
 import { RENDERER_PRIORITY } from '../../../plugin'
 import type { ZonesRenderState } from '../../indicators/zonesState'
@@ -39,7 +39,7 @@ export function createZonesRendererPlugin(options: { paneId?: string } = {}): Re
         getDeclaredNamespaces() { const key = resolveKey(); return key ? [key] : [] },
         draw(context: RenderContext) {
             const { ctx, pane, range, scrollLeft, kLineCenters } = context
-            const colors = getColors(context.theme)
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
             const stateKey = resolveKey()
             if (!stateKey) return
             const state = pluginHost?.getSharedState<ZonesRenderState>(stateKey)
@@ -69,10 +69,10 @@ export function createZonesRendererPlugin(options: { paneId?: string } = {}): Re
 
                 const yHigh = toY(zone.high)
                 const yLow = toY(zone.low)
-                const fill = zone.kind === 'FVG_BULL' ? colors.ZONES.FVG_BULL_FILL
-                    : zone.kind === 'FVG_BEAR' ? colors.ZONES.FVG_BEAR_FILL
-                    : zone.kind === 'OB_BULL' ? colors.ZONES.OB_BULL_FILL
-                    : colors.ZONES.OB_BEAR_FILL
+                const fill = zone.kind === 'FVG_BULL' ? colors.zones.fvgBullFill
+                    : zone.kind === 'FVG_BEAR' ? colors.zones.fvgBearFill
+                    : zone.kind === 'OB_BULL' ? colors.zones.obBullFill
+                    : colors.zones.obBearFill
                 ctx.fillStyle = fill
                 ctx.fillRect(startX, yHigh, endX - startX, yLow - yHigh)
             }
@@ -102,4 +102,4 @@ export function createZonesRendererPlugin(options: { paneId?: string } = {}): Re
 })
 class ZonesDefinition {
     static rendererFactory = createZonesRendererPlugin
-}
+}

package/src/engine/renderers/candle.ts

@@ -3,7 +3,7 @@ import { RENDERER_PRIORITY } from '../../plugin'
 import type { KLineData } from '../../types/price'
 import { getKLineTrend, type kLineTrend } from '../../types/kLine'
 import { createAlignedKLineFromPx, createVerticalLineRect } from '../draw/pixelAlign'
-import { getColors, type PriceColors, type VolumePriceColors } from '../theme/colors'
+import { resolveThemeColors, type VolumePriceColors } from '../../tokens'
 import { getPhysicalKLineConfig } from '../chart'
 import { VolumePriceRelation } from '../../types/volumePrice'
 import { analyzeVolumePriceRelationBatch, DEFAULT_VOLUME_PRICE_CONFIG } from '../../utils/volumePrice'
@@ -52,7 +52,7 @@ export function createCandleRenderer(): RendererPlugin {
 
         draw(context: RenderContext) {
             const { ctx, pane, data, range, scrollLeft, kWidth, kGap, dpr, kLinePositions, markerManager, settings } = context
-            const colors = getColors(context.theme)
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
             const klineData = data as KLineData[]
             if (!klineData.length) return
 
@@ -67,9 +67,9 @@ export function createCandleRenderer(): RendererPlugin {
                 settings,
             })
 
-            const usedWebGL = drawCandlesWithWebGL(context, prepared, colors.PRICE)
+            const usedWebGL = drawCandlesWithWebGL(context, prepared, colors.candleUpBody, colors.candleDownBody)
             if (!usedWebGL) {
-                drawCandlesWithCanvas2D(ctx, scrollLeft, prepared, colors.PRICE)
+                drawCandlesWithCanvas2D(ctx, scrollLeft, prepared, colors.candleUpBody, colors.candleDownBody)
             } else {
                 compositeWebGLToMainCanvas(ctx, context)
             }
@@ -238,29 +238,29 @@ function prepareCandles(args: {
     }
 }
 
-function drawCandlesWithCanvas2D(ctx: CanvasRenderingContext2D, scrollLeft: number, prepared: PreparedCandles, priceColors: PriceColors): void {
+function drawCandlesWithCanvas2D(ctx: CanvasRenderingContext2D, scrollLeft: number, prepared: PreparedCandles, upColor: string, downColor: string): void {
     ctx.save()
     ctx.translate(-scrollLeft, 0)
 
-    ctx.fillStyle = priceColors.UP
+    ctx.fillStyle = upColor
     for (let i = 0; i < prepared.upBodyCount; i++) {
         const off = i * 4
         ctx.fillRect(prepared.upBodyBuf[off], prepared.upBodyBuf[off + 1], prepared.upBodyBuf[off + 2], prepared.upBodyBuf[off + 3])
     }
 
-    ctx.fillStyle = priceColors.DOWN
+    ctx.fillStyle = downColor
     for (let i = 0; i < prepared.downBodyCount; i++) {
         const off = i * 4
         ctx.fillRect(prepared.downBodyBuf[off], prepared.downBodyBuf[off + 1], prepared.downBodyBuf[off + 2], prepared.downBodyBuf[off + 3])
     }
 
-    ctx.fillStyle = priceColors.UP
+    ctx.fillStyle = upColor
     for (let i = 0; i < prepared.upWickCount; i++) {
         const off = i * 4
         ctx.fillRect(prepared.upWickBuf[off], prepared.upWickBuf[off + 1], prepared.wickWidth, prepared.upWickBuf[off + 3])
     }
 
-    ctx.fillStyle = priceColors.DOWN
+    ctx.fillStyle = downColor
     for (let i = 0; i < prepared.downWickCount; i++) {
         const off = i * 4
         ctx.fillRect(prepared.downWickBuf[off], prepared.downWickBuf[off + 1], prepared.wickWidth, prepared.downWickBuf[off + 3])
@@ -269,17 +269,17 @@ function drawCandlesWithCanvas2D(ctx: CanvasRenderingContext2D, scrollLeft: numb
     ctx.restore()
 }
 
-function drawCandlesWithWebGL(context: RenderContext, prepared: PreparedCandles, priceColors: PriceColors): boolean {
+function drawCandlesWithWebGL(context: RenderContext, prepared: PreparedCandles, upColor: string, downColor: string): boolean {
     if (context.settings?.enableWebGLRendering === false) return false
     const surface = context.candleWebGLSurface
     if (!surface || !surface.isAvailable()) return false
 
     surface.clear()
 
-    const bodyUpOk = prepared.upBodyCount === 0 || surface.drawRectBuffer(prepared.upBodyBuf.subarray(0, prepared.upBodyCount * 4), prepared.upBodyCount, priceColors.UP, context.scrollLeft)
-    const bodyDownOk = prepared.downBodyCount === 0 || surface.drawRectBuffer(prepared.downBodyBuf.subarray(0, prepared.downBodyCount * 4), prepared.downBodyCount, priceColors.DOWN, context.scrollLeft)
-    const wickUpOk = prepared.upWickCount === 0 || surface.drawRectBuffer(prepared.upWickBuf.subarray(0, prepared.upWickCount * 4), prepared.upWickCount, priceColors.UP, context.scrollLeft)
-    const wickDownOk = prepared.downWickCount === 0 || surface.drawRectBuffer(prepared.downWickBuf.subarray(0, prepared.downWickCount * 4), prepared.downWickCount, priceColors.DOWN, context.scrollLeft)
+    const bodyUpOk = prepared.upBodyCount === 0 || surface.drawRectBuffer(prepared.upBodyBuf.subarray(0, prepared.upBodyCount * 4), prepared.upBodyCount, upColor, context.scrollLeft)
+    const bodyDownOk = prepared.downBodyCount === 0 || surface.drawRectBuffer(prepared.downBodyBuf.subarray(0, prepared.downBodyCount * 4), prepared.downBodyCount, downColor, context.scrollLeft)
+    const wickUpOk = prepared.upWickCount === 0 || surface.drawRectBuffer(prepared.upWickBuf.subarray(0, prepared.upWickCount * 4), prepared.upWickCount, upColor, context.scrollLeft)
+    const wickDownOk = prepared.downWickCount === 0 || surface.drawRectBuffer(prepared.downWickBuf.subarray(0, prepared.downWickCount * 4), prepared.downWickCount, downColor, context.scrollLeft)
 
     return bodyUpOk && bodyDownOk && wickUpOk && wickDownOk
 }
@@ -297,7 +297,7 @@ function drawVolumePriceMarkers(
     markerManager: MarkerManager | undefined
 ): void {
     const { ctx, range, kWidth, dpr } = context
-    const colors = getColors(context.theme)
+    const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
     if (!prepared.showVolumePriceMarkers || !markerManager || (context.zoomLevel ?? 1) < 2) {
         return
     }
@@ -312,7 +312,7 @@ function drawVolumePriceMarkers(
             const markerY = isRising ? k.alignedHighY - 15 : k.alignedLowY + 15
             const posIndex = k.i - range.start
             const markerX = context.kLineCenters[posIndex]!
-            drawVolumePriceMarker(ctx, markerX, markerY, relation, k.i, kWidth, 4, markerManager, dpr, colors.VOLUME_PRICE)
+            drawVolumePriceMarker(ctx, markerX, markerY, relation, k.i, kWidth, 4, markerManager, dpr, colors.volumePrice)
         }
     }
 
@@ -323,7 +323,7 @@ function drawVolumePriceMarkers(
             const markerY = isRising ? k.alignedHighY - 15 : k.alignedLowY + 15
             const posIndex = k.i - range.start
             const markerX = context.kLineCenters[posIndex]!
-            drawVolumePriceMarker(ctx, markerX, markerY, relation, k.i, kWidth, 4, markerManager, dpr, colors.VOLUME_PRICE)
+            drawVolumePriceMarker(ctx, markerX, markerY, relation, k.i, kWidth, 4, markerManager, dpr, colors.volumePrice)
         }
     }
 
@@ -366,19 +366,19 @@ export function drawVolumePriceMarker(
 
     switch (relation) {
         case VolumePriceRelation.RISE_WITH_VOLUME:
-            color = volumePriceColors.RISE_WITH
+            color = volumePriceColors.riseWith
             isUp = true
             break
         case VolumePriceRelation.RISE_WITHOUT_VOLUME:
-            color = volumePriceColors.RISE_WITHOUT
+            color = volumePriceColors.riseWithout
             isUp = true
             break
         case VolumePriceRelation.FALL_WITH_VOLUME:
-            color = volumePriceColors.FALL_WITH
+            color = volumePriceColors.fallWith
             isUp = false
             break
         case VolumePriceRelation.FALL_WITHOUT_VOLUME:
-            color = volumePriceColors.FALL_WITHOUT
+            color = volumePriceColors.fallWithout
             isUp = false
             break
         default:

package/src/engine/renderers/crosshair.ts

@@ -1,7 +1,7 @@
 import type { RendererPlugin, RenderContext } from '../../plugin'
 import { RENDERER_PRIORITY, GLOBAL_PANE_ID } from '../../plugin'
 import { createHorizontalLineRect, createVerticalLineRect } from '../draw/pixelAlign'
-import { getColors } from '../theme/colors'
+import { resolveThemeColors } from '../../tokens'
 
 /**
  * 创建十字线渲染器插件
@@ -27,7 +27,7 @@ export function createCrosshairRendererPlugin(options: {
 
     draw(context: RenderContext) {
       const { pane, dpr, paneWidth, overlayCtx } = context
-      const colors = getColors(context.theme)
+      const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
       const state = options.getCrosshairState()
 
       if (state.isDragging || !state.pos) return
@@ -50,7 +50,7 @@ export function createCrosshairRendererPlugin(options: {
       ctx.rect(0, 0, paneWidth, pane.height)
       ctx.clip()
 
-      ctx.fillStyle = colors.CROSSHAIR.LINE
+      ctx.fillStyle = colors.crosshairLine
 
       // 绘制垂直线
       const v = createVerticalLineRect(x, 0, pane.height, dpr)

package/src/engine/renderers/extremaMarkers.ts

@@ -2,7 +2,7 @@ import type { RendererPlugin, RenderContext } from '../../plugin'
 import { RENDERER_PRIORITY, GLOBAL_PANE_ID } from '../../plugin'
 import type { KLineData } from '../../types/price'
 import { roundToPhysicalPixel, alignToPhysicalPixelCenter, createHorizontalLineRect } from '../draw/pixelAlign'
-import { getColors, type ThemeColors } from '../theme/colors'
+import { resolveThemeColors } from '../../tokens'
 import { getFont, setCanvasFont } from '../theme/fonts'
 
 const textWidthCache = new Map<string, number>()
@@ -58,14 +58,15 @@ function drawAllMarkers(
     ctx: CanvasRenderingContext2D,
     markers: MarkerData[],
     dpr: number,
-    colors: ThemeColors
+    lineColor: string,
+    textColor: string
 ) {
     if (markers.length === 0) return
 
     ctx.save()
 
     // ========== 阶段1：批量绘制所有线条（同一 fillStyle）==========
-    ctx.fillStyle = colors.TEXT.WEAK
+    ctx.fillStyle = lineColor
     for (const m of markers) {
         const lineRect = createHorizontalLineRect(m.lineStartX, m.lineEndX, m.y, dpr)
         if (lineRect) {
@@ -84,7 +85,7 @@ function drawAllMarkers(
     // ========== 阶段3：批量绘制所有文字（同一 font/baseline/fillStyle）==========
     setCanvasFont(ctx, MARKER_FONT)
     ctx.textBaseline = 'middle'
-    ctx.fillStyle = colors.PRICE.NEUTRAL
+    ctx.fillStyle = textColor
 
     for (const m of markers) {
         ctx.textAlign = m.drawLeft ? 'right' : 'left'
@@ -108,7 +109,7 @@ export function createExtremaMarkersRendererPlugin(): RendererPlugin {
 
         draw(context: RenderContext) {
             const { ctx, pane, data, range, scrollLeft, dpr, paneWidth, kLineCenters } = context
-            const colors = getColors(context.theme)
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
             const klineData = data as KLineData[]
             if (!klineData.length) return
             if (pane.role !== 'price') return
@@ -150,9 +151,9 @@ export function createExtremaMarkersRendererPlugin(): RendererPlugin {
                 price: max,
                 y: pane.yAxis.priceToY(max),
                 style: {
-                    bgColor: colors.LAST_PRICE_LABEL.BG,
-                    borderColor: colors.PRICE.LAST_PRICE,
-                    textColor: colors.PRICE.LAST_PRICE,
+                    bgColor: colors.lastPriceLabel.bg,
+                    borderColor: colors.price.lastPrice,
+                    textColor: colors.price.lastPrice,
                 }
             })
 
@@ -161,9 +162,9 @@ export function createExtremaMarkersRendererPlugin(): RendererPlugin {
                 price: min,
                 y: pane.yAxis.priceToY(min),
                 style: {
-                    bgColor: colors.LAST_PRICE_LABEL.BG,
-                    borderColor: colors.PRICE.LAST_PRICE,
-                    textColor: colors.PRICE.LAST_PRICE,
+                    bgColor: colors.lastPriceLabel.bg,
+                    borderColor: colors.price.lastPrice,
+                    textColor: colors.price.lastPrice,
                 }
             })
 
@@ -193,7 +194,7 @@ export function createExtremaMarkersRendererPlugin(): RendererPlugin {
             // 批量绘制所有 markers
             ctx.save()
             ctx.translate(-scrollLeft, 0)
-            drawAllMarkers(ctx, markers, dpr, colors)
+            drawAllMarkers(ctx, markers, dpr, colors.text.weak, colors.text.primary)
             ctx.restore()
         },
     }

package/src/engine/renderers/gridLines.ts

@@ -3,7 +3,7 @@ import { RENDERER_PRIORITY, GLOBAL_PANE_ID } from '../../plugin'
 import type { KLineData } from '../../types/price'
 import { createHorizontalLineRect, createVerticalLineRect } from '../draw/pixelAlign'
 import { findMonthBoundaries } from '../../utils/dateFormat'
-import { getColors } from '../theme/colors'
+import { resolveThemeColors } from '../../tokens'
 import { calculateTickPositions, calculateValueTickPositions, type ScaleType } from '../utils/tickPosition'
 
 /**
@@ -22,13 +22,13 @@ export function createGridLinesRendererPlugin(): RendererPlugin {
 
         draw(context: RenderContext) {
             const { ctx, pane, data, range, scrollLeft, kWidth, dpr, kLinePositions, settings } = context
-            const colors = getColors(context.theme)
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
             const klineData = data as KLineData[]
             if (!klineData.length) return
             if (settings?.showGridLines === false) return
 
             ctx.save()
-            ctx.fillStyle = colors.GRID.HORIZONTAL
+            ctx.fillStyle = colors.gridMajor
             ctx.translate(-scrollLeft, 0)
 
             const plotWidth = ctx.canvas.width / dpr

package/src/engine/renderers/lastPrice.ts

@@ -1,7 +1,7 @@
 import type { RendererPlugin, RenderContext } from '../../plugin'
 import { RENDERER_PRIORITY } from '../../plugin'
 import type { KLineData } from '../../types/price'
-import { getColors } from '../theme/colors'
+import { resolveThemeColors } from '../../tokens'
 
 function getLastPriceInfo(context: RenderContext) {
     const { pane, data } = context
@@ -35,7 +35,7 @@ export function createLastPriceLabelRegistrarPlugin(): RendererPlugin {
         priority: RENDERER_PRIORITY.LAST_PRICE_LABEL,
 
         draw(context: RenderContext) {
-            const colors = getColors(context.theme)
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
             const info = getLastPriceInfo(context)
             if (!info) return
 
@@ -46,9 +46,9 @@ export function createLastPriceLabelRegistrarPlugin(): RendererPlugin {
                 y: info.y,
                 type: 'lastPrice',
                 style: {
-                    bgColor: colors.LAST_PRICE_LABEL.BG,
-                    borderColor: colors.PRICE.LAST_PRICE,
-                    textColor: colors.PRICE.LAST_PRICE,
+                    bgColor: colors.lastPriceLabel.bg,
+                    borderColor: colors.price.lastPrice,
+                    textColor: colors.price.lastPrice,
                 }
             })
         },
@@ -69,7 +69,7 @@ export function createLastPriceLineRendererPlugin(): RendererPlugin {
 
         draw(context: RenderContext) {
             const { ctx, scrollLeft, dpr, kLinePositions, paneWidth } = context
-            const colors = getColors(context.theme)
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
             const info = getLastPriceInfo(context)
             if (!info) return
 
@@ -81,7 +81,7 @@ export function createLastPriceLineRendererPlugin(): RendererPlugin {
             const startX = kLinePositions[0] ?? 0
             const endX = paneWidth + scrollLeft
 
-            ctx.strokeStyle = colors.PRICE.LAST_PRICE
+            ctx.strokeStyle = colors.price.lastPrice
             ctx.lineWidth = 1
             ctx.setLineDash([4, 3])
             ctx.beginPath()

package/src/engine/renderers/paneTitle.ts

@@ -1,6 +1,6 @@
 import type { RendererPluginWithHost, RenderContext, PluginHost } from '../../plugin'
 import { RENDERER_PRIORITY } from '../../plugin'
-import { getColors } from '../theme/colors'
+import { resolveThemeColors } from '../../tokens'
 import { getFont, setCanvasFont } from '../theme/fonts'
 import { SUB_PANE_INDICATOR_CONFIGS } from './Indicator/subPaneConfig'
 import type { SubIndicatorType } from './Indicator'
@@ -63,7 +63,7 @@ export function createPaneTitleRendererPlugin(options: PaneTitleOptions): Render
 
         draw(context: RenderContext) {
             const { overlayCtx, pane, paneWidth } = context
-            const colors = getColors(context.theme)
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
             if (pane.id !== currentOptions.paneId || !overlayCtx) return
 
             const fontSize = 12
@@ -85,13 +85,13 @@ export function createPaneTitleRendererPlugin(options: PaneTitleOptions): Render
             if (titleInfo) {
                 let currentX = x
 
-                overlayCtx.fillStyle = colors.TEXT.PRIMARY
+                overlayCtx.fillStyle = colors.text.primary
                 overlayCtx.fillText(titleInfo.name, currentX, y)
                 currentX += measureTextWidth(overlayCtx, titleInfo.name)
 
                 if (titleInfo.params && titleInfo.params.length > 0) {
                     const paramText = `(${titleInfo.params.join(',')})`
-                    overlayCtx.fillStyle = colors.TEXT.TERTIARY
+                    overlayCtx.fillStyle = colors.text.tertiary
                     overlayCtx.fillText(paramText, currentX, y)
                     currentX += measureTextWidth(overlayCtx, paramText) + gap
                 } else {
@@ -107,12 +107,12 @@ export function createPaneTitleRendererPlugin(options: PaneTitleOptions): Render
                     }
                 }
             } else {
-                overlayCtx.fillStyle = colors.TEXT.PRIMARY
+                overlayCtx.fillStyle = colors.text.primary
                 overlayCtx.fillText(currentOptions.title, x, y)
 
                 if (currentOptions.description) {
                     const titleWidth = measureTextWidth(overlayCtx, currentOptions.title)
-                    overlayCtx.fillStyle = colors.TEXT.WEAK
+                    overlayCtx.fillStyle = colors.text.weak
                     overlayCtx.fillText(` - ${currentOptions.description}`, x + titleWidth, y)
                 }
             }