@363045841yyt/klinechart-core 0.7.5 → 0.7.7

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

@@ -1,6 +1,6 @@
 import type { RendererPluginWithHost, PluginHost, RenderContext } from '../../../plugin'
 import { RENDERER_PRIORITY } from '../../../plugin'
-import { getColors } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 import { getFont, setCanvasFont } from '../../theme/fonts'
 import type { MACDRenderState } from '../../indicators/macdState'
 import { createMACDStateKey } from '../../indicators/macdState'
@@ -59,7 +59,7 @@ export function createMACDLegendRendererPlugin(options: MACDLegendOptions = {}):
 
         draw(context: RenderContext) {
             const { ctx, range } = context
-            const colors = getColors(context.theme)
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
 
             // 从 StateStore 读取 MACD 状态
             const state = pluginHost?.getSharedState<MACDRenderState>(stateKey)
@@ -103,22 +103,22 @@ export function createMACDLegendRendererPlugin(options: MACDLegendOptions = {}):
             ctx.textBaseline = 'top'
 
             const paramText = `MACD(${fastPeriod},${slowPeriod},${signalPeriod})`
-            ctx.fillStyle = colors.TEXT.TERTIARY
+            ctx.fillStyle = colors.text.tertiary
             ctx.fillText(paramText, x, y)
             x += measureTextWidth(ctx, paramText) + gap
 
             const difText = `DIF:${macdValue.dif.toFixed(2)}`
-            ctx.fillStyle = colors.MACD.DIF
+            ctx.fillStyle = colors.macd.dif
             ctx.fillText(difText, x, y)
             x += measureTextWidth(ctx, difText) + gap
 
             const deaText = `DEA:${macdValue.dea.toFixed(2)}`
-            ctx.fillStyle = colors.MACD.DEA
+            ctx.fillStyle = colors.macd.dea
             ctx.fillText(deaText, x, y)
             x += measureTextWidth(ctx, deaText) + gap
 
             const macdText = `MACD:${macdValue.macd.toFixed(2)}`
-            ctx.fillStyle = macdValue.macd >= 0 ? colors.MACD.BAR_UP : colors.MACD.BAR_DOWN
+            ctx.fillStyle = macdValue.macd >= 0 ? colors.macd.barUp : colors.macd.barDown
             ctx.fillText(macdText, x, y)
 
             ctx.restore()

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

@@ -5,7 +5,7 @@ import { MA_STATE_KEY, type MARenderState } from '../../indicators/maState'
 import { BOLL_STATE_KEY, type BOLLRenderState } from '../../indicators/bollState'
 import { EXPMA_STATE_KEY, type EXPMARenderState } from '../../indicators/expmaState'
 import { ENE_STATE_KEY, type ENERenderState } from '../../indicators/eneState'
-import { getColors } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 import { getFont, setCanvasFont } from '../../theme/fonts'
 
 const textWidthCache = new Map<string, number>()
@@ -80,7 +80,7 @@ export function createMainIndicatorLegendRendererPlugin(options: {
     draw(context: RenderContext) {
       const { overlayCtx, data, range, crosshairIndex } = context
       const klineData = data as KLineData[]
-      const colors = getColors(context.theme)
+      const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
       if (!klineData.length || !overlayCtx) return
 
       const fontSize = 12
@@ -104,13 +104,13 @@ export function createMainIndicatorLegendRendererPlugin(options: {
 
             if (state && state.visibleMin <= state.visibleMax) {
               for (const period of state.enabledPeriods) {
-                const colorKey = `MA${period}` as keyof typeof colors.MA
+                const colorKey = `ma${period}` as keyof typeof colors.ma
                 const series = state.series[period]
                 const value = series?.[targetIndex]
 
                 items.push({
                   label: `MA${period}`,
-                  color: colors.MA[colorKey] || colors.MA.MA5,
+                  color: colors.ma[colorKey] || colors.ma.ma5,
                   value: value,
                 })
               }
@@ -120,7 +120,7 @@ export function createMainIndicatorLegendRendererPlugin(options: {
               let x = legendX
               const y = config.yPaddingPx / 2 + fontSize + rowIndex * lineHeight
 
-              overlayCtx.fillStyle = colors.PRICE.NEUTRAL
+              overlayCtx.fillStyle = colors.text.primary
               overlayCtx.fillText('MA', x, y)
               x += measureTextWidth(overlayCtx, 'MA') + gap
 
@@ -149,23 +149,23 @@ export function createMainIndicatorLegendRendererPlugin(options: {
             const y = config.yPaddingPx / 2 + fontSize + rowIndex * lineHeight
             const titleText = `BOLL(${period},${multiplier})`
 
-            overlayCtx.fillStyle = colors.PRICE.NEUTRAL
+            overlayCtx.fillStyle = colors.text.primary
             overlayCtx.fillText(titleText, x, y)
             x += measureTextWidth(overlayCtx, titleText) + gap
 
             if (boll) {
               const upperText = `上轨:${boll.upper.toFixed(2)}`
-              overlayCtx.fillStyle = colors.BOLL.UPPER
+              overlayCtx.fillStyle = colors.boll.upper
               overlayCtx.fillText(upperText, x, y)
               x += measureTextWidth(overlayCtx, upperText) + gap
 
               const middleText = `中轨:${boll.middle.toFixed(2)}`
-              overlayCtx.fillStyle = colors.BOLL.MIDDLE
+              overlayCtx.fillStyle = colors.boll.middle
               overlayCtx.fillText(middleText, x, y)
               x += measureTextWidth(overlayCtx, middleText) + gap
 
               const lowerText = `下轨:${boll.lower.toFixed(2)}`
-              overlayCtx.fillStyle = colors.BOLL.LOWER
+              overlayCtx.fillStyle = colors.boll.lower
               overlayCtx.fillText(lowerText, x, y)
             }
           }
@@ -185,18 +185,18 @@ export function createMainIndicatorLegendRendererPlugin(options: {
             const y = config.yPaddingPx / 2 + fontSize + rowIndex * lineHeight
             const titleText = `EXPMA(${fastPeriod},${slowPeriod})`
 
-            overlayCtx.fillStyle = colors.PRICE.NEUTRAL
+            overlayCtx.fillStyle = colors.text.primary
             overlayCtx.fillText(titleText, x, y)
             x += measureTextWidth(overlayCtx, titleText) + gap
 
             if (expma) {
               const fastText = `快:${expma.fast.toFixed(2)}`
-              overlayCtx.fillStyle = colors.EXPMA.FAST
+              overlayCtx.fillStyle = colors.expma.fast
               overlayCtx.fillText(fastText, x, y)
               x += measureTextWidth(overlayCtx, fastText) + gap
 
               const slowText = `慢:${expma.slow.toFixed(2)}`
-              overlayCtx.fillStyle = colors.EXPMA.SLOW
+              overlayCtx.fillStyle = colors.expma.slow
               overlayCtx.fillText(slowText, x, y)
             }
           }
@@ -216,23 +216,23 @@ export function createMainIndicatorLegendRendererPlugin(options: {
             const y = config.yPaddingPx / 2 + fontSize + rowIndex * lineHeight
             const titleText = `ENE(${period},${deviation})`
 
-            overlayCtx.fillStyle = colors.PRICE.NEUTRAL
+            overlayCtx.fillStyle = colors.text.primary
             overlayCtx.fillText(titleText, x, y)
             x += measureTextWidth(overlayCtx, titleText) + gap
 
             if (ene) {
               const upperText = `上轨:${ene.upper.toFixed(2)}`
-              overlayCtx.fillStyle = colors.ENE.UPPER
+              overlayCtx.fillStyle = colors.ene.upper
               overlayCtx.fillText(upperText, x, y)
               x += measureTextWidth(overlayCtx, upperText) + gap
 
               const middleText = `中轨:${ene.middle.toFixed(2)}`
-              overlayCtx.fillStyle = colors.ENE.MIDDLE
+              overlayCtx.fillStyle = colors.ene.middle
               overlayCtx.fillText(middleText, x, y)
               x += measureTextWidth(overlayCtx, middleText) + gap
 
               const lowerText = `下轨:${ene.lower.toFixed(2)}`
-              overlayCtx.fillStyle = colors.ENE.LOWER
+              overlayCtx.fillStyle = colors.ene.lower
               overlayCtx.fillText(lowerText, x, y)
             }
           }

package/src/engine/renderers/Indicator/mom.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 { MOMRenderState } from '../../indicators/momState'
 import { createMOMStateKey } from '../../indicators/momState'
@@ -82,7 +82,7 @@ export function createMOMRendererPlugin(options: MOMRendererOptions = {}): Rende
         displayMin: number,
         displayMax: number,
         dpr: number,
-        colors: { MOM: { ZERO: string } }
+        colors: { mom: { zero: string } }
     ): void {
         const displayValueRange = displayMax - displayMin || 1
         const zeroY = alignToPhysicalPixelCenter(paneHeight - (0 - displayMin) / displayValueRange * paneHeight, dpr)
@@ -90,7 +90,7 @@ export function createMOMRendererPlugin(options: MOMRendererOptions = {}): Rende
         ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height)
         ctx.save()
         ctx.scale(dpr, dpr)
-        ctx.strokeStyle = colors.MOM.ZERO
+        ctx.strokeStyle = colors.mom.zero
         ctx.lineWidth = 1
         ctx.beginPath()
         ctx.moveTo(0, zeroY)
@@ -143,7 +143,7 @@ export function createMOMRendererPlugin(options: MOMRendererOptions = {}): Rende
 
         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
@@ -213,7 +213,7 @@ const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = co
             if (enableWebGL && lineWebGLSurface?.isAvailable()) {
                 if (params.showMOM && cachedMOMPoints.length >= 2) {
                     const ok = lineWebGLSurface.drawLineStrips(
-                        [{ points: cachedMOMPoints, width: 1, color: colors.MOM.MOM }],
+                        [{ points: cachedMOMPoints, width: 1, color: colors.mom.mom }],
                         scrollLeft
                     )
                     if (ok) {
@@ -249,13 +249,13 @@ function drawMOMLineWithCanvas2D(
     scrollLeft: number,
     momPoints: LinePoint[],
     params: { showMOM: boolean },
-    colors: { MOM: { MOM: string } }
+    colors: { mom: { mom: string } }
 ): void {
     if (!params.showMOM || momPoints.length < 2) return
 
     ctx.save()
     ctx.translate(-scrollLeft, 0)
-    ctx.strokeStyle = colors.MOM.MOM
+    ctx.strokeStyle = colors.mom.mom
     ctx.lineWidth = 1
     ctx.lineJoin = 'round'
     ctx.lineCap = 'round'
@@ -277,9 +277,10 @@ export function getMOMTitleInfo(
     period: number,
     pluginHost: PluginHost,
     paneId: string = 'sub_MOM',
-    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<MOMRenderState>(createMOMStateKey(paneId))
     if (!state) return null
 
@@ -290,7 +291,7 @@ export function getMOMTitleInfo(
         name: 'MOM',
         params: [period],
         values: [
-            { label: 'MOM', value: mom, color: colors.MOM.MOM },
+            { label: 'MOM', value: mom, color: colors.mom.mom },
         ],
     }
 }

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

@@ -1,6 +1,6 @@
 import type { RendererPluginWithHost, RenderContext, PluginHost } from '../../../plugin'
 import { RENDERER_PRIORITY } from '../../../plugin'
-import { getColors, type ThemeColors, type ChartTheme } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 import { alignToPhysicalPixelCenter } from '../../draw/pixelAlign'
 import type { RSIRenderState } from '../../indicators/rsiState'
 import { createRSIStateKey } from '../../indicators/rsiState'
@@ -168,7 +168,7 @@ export function createRSIRendererPlugin(options: RSIRendererOptions = {}): Rende
 
         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)
 
             // 从 StateStore 读取 RSI 状态
             const stateKey = resolveKey()
@@ -251,13 +251,13 @@ const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = co
             if (enableWebGL && lineWebGLSurface?.isAvailable()) {
                 const lines: Array<{ points: LinePoint[]; width: number; color: string }> = []
                 if (params.showRSI1 && cachedRSI1Points.length >= 2) {
-                    lines.push({ points: cachedRSI1Points, width: 1, color: colors.RSI.RSI1 })
+                    lines.push({ points: cachedRSI1Points, width: 1, color: colors.rsi.rsi1 })
                 }
                 if (params.showRSI2 && cachedRSI2Points.length >= 2) {
-                    lines.push({ points: cachedRSI2Points, width: 1, color: colors.RSI.RSI2 })
+                    lines.push({ points: cachedRSI2Points, width: 1, color: colors.rsi.rsi2 })
                 }
                 if (params.showRSI3 && cachedRSI3Points.length >= 2) {
-                    lines.push({ points: cachedRSI3Points, width: 1, color: colors.RSI.RSI3 })
+                    lines.push({ points: cachedRSI3Points, width: 1, color: colors.rsi.rsi3 })
                 }
 
                 const allOk = lines.length > 0 && lineWebGLSurface.drawLineStrips(lines, scrollLeft)
@@ -269,7 +269,7 @@ const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = co
             }
 
             if (!usedWebGL) {
-                drawRSILinesWithCanvas2D(ctx, scrollLeft, cachedRSI1Points, cachedRSI2Points, cachedRSI3Points, params, colors)
+                drawRSILinesWithCanvas2D(ctx, scrollLeft, cachedRSI1Points, cachedRSI2Points, cachedRSI3Points, params, colors.rsi.rsi1, colors.rsi.rsi2, colors.rsi.rsi3)
             }
         },
 
@@ -297,7 +297,9 @@ export function drawRSILinesWithCanvas2D(
     rsi2Points: LinePoint[],
     rsi3Points: LinePoint[],
     params: { showRSI1: boolean; showRSI2: boolean; showRSI3: boolean },
-    colors: ThemeColors
+    rsi1Color: string,
+    rsi2Color: string,
+    rsi3Color: string
 ): void {
     ctx.save()
     ctx.translate(-scrollLeft, 0)
@@ -306,7 +308,7 @@ export function drawRSILinesWithCanvas2D(
     ctx.lineCap = 'round'
 
     if (params.showRSI1 && rsi1Points.length >= 2) {
-        ctx.strokeStyle = colors.RSI.RSI1
+        ctx.strokeStyle = rsi1Color
         ctx.beginPath()
         ctx.moveTo(rsi1Points[0]!.x, rsi1Points[0]!.y)
         for (let i = 1; i < rsi1Points.length; i++) {
@@ -317,7 +319,7 @@ export function drawRSILinesWithCanvas2D(
     }
 
     if (params.showRSI2 && rsi2Points.length >= 2) {
-        ctx.strokeStyle = colors.RSI.RSI2
+        ctx.strokeStyle = rsi2Color
         ctx.beginPath()
         ctx.moveTo(rsi2Points[0]!.x, rsi2Points[0]!.y)
         for (let i = 1; i < rsi2Points.length; i++) {
@@ -328,7 +330,7 @@ export function drawRSILinesWithCanvas2D(
     }
 
     if (params.showRSI3 && rsi3Points.length >= 2) {
-        ctx.strokeStyle = colors.RSI.RSI3
+        ctx.strokeStyle = rsi3Color
         ctx.beginPath()
         ctx.moveTo(rsi3Points[0]!.x, rsi3Points[0]!.y)
         for (let i = 1; i < rsi3Points.length; i++) {
@@ -348,9 +350,10 @@ export function getRSITitleInfo(
     period3: number,
     pluginHost: PluginHost,
     paneId: string = 'sub_RSI',
-    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 stateKey = createRSIStateKey(paneId)
     const state = pluginHost.getSharedState<RSIRenderState>(stateKey)
 
@@ -361,9 +364,9 @@ export function getRSITitleInfo(
     const rsi3 = state.series[period3]?.[index]
 
     const values: Array<{ label: string; value: number; color: string }> = []
-    if (rsi1 !== undefined) values.push({ label: `RSI${period1}`, value: rsi1, color: colors.RSI.RSI1 })
-    if (rsi2 !== undefined) values.push({ label: `RSI${period2}`, value: rsi2, color: colors.RSI.RSI2 })
-    if (rsi3 !== undefined) values.push({ label: `RSI${period3}`, value: rsi3, color: colors.RSI.RSI3 })
+    if (rsi1 !== undefined) values.push({ label: `RSI${period1}`, value: rsi1, color: colors.rsi.rsi1 })
+    if (rsi2 !== undefined) values.push({ label: `RSI${period2}`, value: rsi2, color: colors.rsi.rsi2 })
+    if (rsi3 !== undefined) values.push({ label: `RSI${period3}`, value: rsi3, color: colors.rsi.rsi3 })
 
     if (values.length === 0) return null
 

package/src/engine/renderers/Indicator/scale/indicator_scale.ts

@@ -1,7 +1,7 @@
 import type { RendererPluginWithHost, PluginHost, RenderContext, BaseIndicatorState } from '../../../../plugin'
 import { RENDERER_PRIORITY } from '../../../../plugin'
 import { createIndicatorStateKey } from '../../../../plugin/stateKeys'
-import { getColors, type ThemeColors } from '../../../theme/colors'
+import { resolveThemeColors } from '../../../../tokens'
 import { getFont, setCanvasFont } from '../../../theme/fonts'
 import { calculateValueTickPositions, type ScaleType } from '../../../utils/tickPosition'
 import { drawCrosshairPriceLabel } from '../../../../utils/kLineDraw/axis'
@@ -62,7 +62,7 @@ export interface DrawScaleTicksOptions {
 const BASELINE_MIDDLE = 'middle' as const
 const ALIGN_CENTER = 'center' as const
 
-export function drawScaleTicks(options: DrawScaleTicksOptions & { colors: ThemeColors }): void {
+export function drawScaleTicks(options: DrawScaleTicksOptions & { tickColor: string }): void {
     const {
         ctx,
         dpr,
@@ -85,7 +85,7 @@ export function drawScaleTicks(options: DrawScaleTicksOptions & { colors: ThemeC
     setCanvasFont(ctx, font)
     ctx.textBaseline = BASELINE_MIDDLE
     ctx.textAlign = ALIGN_CENTER
-    ctx.fillStyle = options.colors.TEXT.SECONDARY
+    ctx.fillStyle = options.tickColor
 
     const centerX = axisWidth / 2
     const centerXPx = roundToPhysicalPixel(centerX, dpr)
@@ -148,7 +148,7 @@ export function createIndicatorScaleRendererPlugin(options: IndicatorScaleRender
 
             const effectiveScaleType: ScaleType = pane.yAxis.getScaleType() ?? scaleType
             const effectiveAxisWidth = yAxisCtx.canvas ? (yAxisCtx.canvas.width / dpr) : axisWidth
-            const colors = getColors(context.theme)
+            const tokenColors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
 
             const displayRange = pane.yAxis.getDisplayRange({
                 minPrice: state.valueMin,
@@ -156,7 +156,7 @@ export function createIndicatorScaleRendererPlugin(options: IndicatorScaleRender
             })
 
             drawScaleTicks({
-                colors,
+                tickColor: tokenColors.text.secondary,
                 ctx: yAxisCtx,
                 dpr,
                 axisWidth: effectiveAxisWidth,
@@ -198,7 +198,7 @@ export function createIndicatorScaleRendererPlugin(options: IndicatorScaleRender
                 priceOffset: 0,
                 price: displayPrice,
                 formatPrice: formatCrosshairLabel,
-            })
+            }, context.theme, context.isAsiaMarket, context.colorPresetSettings)
         },
     }
 }

package/src/engine/renderers/Indicator/stoch.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 { STOCHRenderState } from '../../indicators/stochState'
 import { createSTOCHStateKey } from '../../indicators/stochState'
@@ -152,7 +152,7 @@ export function createSTOCHRendererPlugin(options: STOCHRendererOptions = {}): R
 
         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
@@ -238,10 +238,10 @@ const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = co
             if (enableWebGL && lineWebGLSurface?.isAvailable()) {
                 const lines: Array<{ points: LinePoint[]; width: number; color: string }> = []
                 if (params.showK && cachedKPoints.length >= 2) {
-                    lines.push({ points: cachedKPoints, width: 1, color: colors.KDJ.K })
+                    lines.push({ points: cachedKPoints, width: 1, color: colors.kdj.k })
                 }
                 if (params.showD && cachedDPoints.length >= 2) {
-                    lines.push({ points: cachedDPoints, width: 1, color: colors.KDJ.D })
+                    lines.push({ points: cachedDPoints, width: 1, color: colors.kdj.d })
                 }
 
                 const allOk = lines.length > 0 && lineWebGLSurface.drawLineStrips(lines, scrollLeft)
@@ -279,7 +279,7 @@ function drawSTOCHLinesWithCanvas2D(
     kPoints: LinePoint[],
     dPoints: LinePoint[],
     params: { showK: boolean; showD: boolean },
-    colors: { KDJ: { K: string; D: string } }
+    colors: { kdj: { k: string; d: string } }
 ): void {
     ctx.save()
     ctx.translate(-scrollLeft, 0)
@@ -288,7 +288,7 @@ function drawSTOCHLinesWithCanvas2D(
     ctx.lineCap = 'round'
 
     if (params.showK && kPoints.length >= 2) {
-        ctx.strokeStyle = colors.KDJ.K
+        ctx.strokeStyle = colors.kdj.k
         ctx.beginPath()
         ctx.moveTo(kPoints[0]!.x, kPoints[0]!.y)
         for (let i = 1; i < kPoints.length; i++) {
@@ -299,7 +299,7 @@ function drawSTOCHLinesWithCanvas2D(
     }
 
     if (params.showD && dPoints.length >= 2) {
-        ctx.strokeStyle = colors.KDJ.D
+        ctx.strokeStyle = colors.kdj.d
         ctx.beginPath()
         ctx.moveTo(dPoints[0]!.x, dPoints[0]!.y)
         for (let i = 1; i < dPoints.length; i++) {
@@ -321,9 +321,10 @@ export function getSTOCHTitleInfo(
     m: number,
     pluginHost: PluginHost,
     paneId: string = 'sub_STOCH',
-    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<STOCHRenderState>(createSTOCHStateKey(paneId))
     if (!state) return null
 
@@ -331,8 +332,8 @@ export function getSTOCHTitleInfo(
     if (!point || point.k === undefined) return null
 
     const values = []
-    if (state.params.showK) values.push({ label: 'K', value: point.k, color: colors.KDJ.K })
-    if (state.params.showD) values.push({ label: 'D', value: point.d, color: colors.KDJ.D })
+    if (state.params.showK) values.push({ label: 'K', value: point.k, color: colors.kdj.k })
+    if (state.params.showD) values.push({ label: 'D', value: point.d, color: colors.kdj.d })
 
     if (values.length === 0) return null
 

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
-}
+}