@363045841yyt/klinechart-core 0.7.5 → 0.7.7

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

@@ -2,7 +2,7 @@ import type { RendererPluginWithHost, PluginHost, RenderContext } from '../../..
 import { RENDERER_PRIORITY } from '../../../plugin'
 import type { KLineData } from '../../../types/price'
 import { alignToPhysicalPixelCenter } from '../../draw/pixelAlign'
-import { getColors } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 import { BOLL_STATE_KEY, type BOLLRenderState } from '../../indicators/bollState'
 import { Indicator } from '../../indicators/indicatorDefinitionRegistry'
 import { resolveStateKey } from '../../indicators/indicatorMetadata'
@@ -54,7 +54,7 @@ function drawBOLLWithWebGL(
         bandLowerPoints: LinePoint[]
     }
 ): boolean {
-    const colors = getColors(context.theme)
+    const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
     if (context.settings?.enableWebGLRendering === false) return false
     const surface = context.lineWebGLSurface
     if (!surface || !surface.isAvailable()) return false
@@ -66,24 +66,24 @@ function drawBOLLWithWebGL(
         surface.clear()
         allOk = surface.drawFilledBand(
             { upperPoints: data.bandUpperPoints, lowerPoints: data.bandLowerPoints },
-            toOpaqueRgba(colors.BOLL.BAND_FILL),
+            toOpaqueRgba(colors.boll.bandFill),
             context.scrollLeft
         )
         if (allOk) {
-            compositeLineSurface(context, surface, getRgbaAlpha(colors.BOLL.BAND_FILL))
+            compositeLineSurface(context, surface, getRgbaAlpha(colors.boll.bandFill))
         }
     }
     surface.clear()
 
     const lineStrips: Array<{ points: LinePoint[]; width: number; color: string }> = []
     if (data.showUpper && data.upperPoints.length >= 2) {
-        lineStrips.push({ points: data.upperPoints, width: BOLL_LINE_WIDTH, color: colors.BOLL.UPPER })
+        lineStrips.push({ points: data.upperPoints, width: BOLL_LINE_WIDTH, color: colors.boll.upper })
     }
     if (data.showMiddle && data.middlePoints.length >= 2) {
-        lineStrips.push({ points: data.middlePoints, width: BOLL_LINE_WIDTH, color: colors.BOLL.MIDDLE })
+        lineStrips.push({ points: data.middlePoints, width: BOLL_LINE_WIDTH, color: colors.boll.middle })
     }
     if (data.showLower && data.lowerPoints.length >= 2) {
-        lineStrips.push({ points: data.lowerPoints, width: BOLL_LINE_WIDTH, color: colors.BOLL.LOWER })
+        lineStrips.push({ points: data.lowerPoints, width: BOLL_LINE_WIDTH, color: colors.boll.lower })
     }
 
     if (lineStrips.length > 0) {
@@ -183,7 +183,7 @@ export function createBOLLRendererPlugin(): RendererPluginWithHost {
         draw(context: RenderContext) {
             const { ctx, pane, data, range, scrollLeft, dpr, kLineCenters } = context
             const klineData = data as KLineData[]
-            const colors = getColors(context.theme)
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
 
             const stateKey = resolveKey()
             if (!stateKey) return
@@ -281,7 +281,7 @@ export function createBOLLRendererPlugin(): RendererPluginWithHost {
                     bandPath.lineTo(bandLowerPoints[i].x, bandLowerPoints[i].y)
                 }
                 bandPath.closePath()
-                ctx.fillStyle = colors.BOLL.BAND_FILL
+                ctx.fillStyle = colors.boll.bandFill
                 ctx.fill(bandPath)
             }
 
@@ -296,9 +296,9 @@ export function createBOLLRendererPlugin(): RendererPluginWithHost {
                 ctx.stroke()
             }
 
-            if (showUpper) drawLine(upperPoints, colors.BOLL.UPPER)
-            if (showMiddle) drawLine(middlePoints, colors.BOLL.MIDDLE)
-            if (showLower) drawLine(lowerPoints, colors.BOLL.LOWER)
+            if (showUpper) drawLine(upperPoints, colors.boll.upper)
+            if (showMiddle) drawLine(middlePoints, colors.boll.middle)
+            if (showLower) drawLine(lowerPoints, colors.boll.lower)
 
             ctx.restore()
         },

package/src/engine/renderers/Indicator/cci.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 type { CCIRenderState } from '../../indicators/cciState'
 import { createCCIStateKey } from '../../indicators/cciState'
 import { Indicator } from '../../indicators/indicatorDefinitionRegistry'
@@ -92,7 +92,7 @@ export function createCCIRendererPlugin(options: CCIRendererOptions = {}): 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
@@ -123,7 +123,7 @@ const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = co
             const lineStartX = scrollLeft
             const lineEndX = scrollLeft + context.paneWidth
 
-            ctx.strokeStyle = colors.CCI.OVERBOUGHT
+            ctx.strokeStyle = colors.cci.overbought
             ctx.lineWidth = 1
             ctx.setLineDash([4, 4])
             ctx.beginPath()
@@ -131,7 +131,7 @@ const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = co
             ctx.lineTo(lineEndX, y100)
             ctx.stroke()
 
-            ctx.strokeStyle = colors.CCI.OVERSOLD
+            ctx.strokeStyle = colors.cci.oversold
             ctx.beginPath()
             ctx.moveTo(lineStartX, yNeg100)
             ctx.lineTo(lineEndX, yNeg100)
@@ -177,7 +177,7 @@ const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = co
             if (enableWebGL && lineWebGLSurface?.isAvailable()) {
                 if (params.showCCI && cachedCCIPoints.length >= 2) {
                     const ok = lineWebGLSurface.drawLineStrips(
-                        [{ points: cachedCCIPoints, width: 1, color: colors.CCI.CCI }],
+                        [{ points: cachedCCIPoints, width: 1, color: colors.cci.cci }],
                         scrollLeft
                     )
                     if (ok) {
@@ -213,13 +213,13 @@ function drawCCILineWithCanvas2D(
     scrollLeft: number,
     cciPoints: LinePoint[],
     params: { showCCI: boolean },
-    colors: { CCI: { CCI: string; OVERBOUGHT: string; OVERSOLD: string } }
+    colors: { cci: { cci: string; overbought: string; oversold: string } }
 ): void {
     if (!params.showCCI || cciPoints.length < 2) return
 
     ctx.save()
     ctx.translate(-scrollLeft, 0)
-    ctx.strokeStyle = colors.CCI.CCI
+    ctx.strokeStyle = colors.cci.cci
     ctx.lineWidth = 1
     ctx.lineJoin = 'round'
     ctx.lineCap = 'round'
@@ -241,9 +241,10 @@ export function getCCITitleInfo(
     period: number,
     pluginHost: PluginHost,
     paneId: string = 'sub_CCI',
-    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<CCIRenderState>(createCCIStateKey(paneId))
     if (!state) return null
 
@@ -254,7 +255,7 @@ export function getCCITitleInfo(
         name: 'CCI',
         params: [period],
         values: [
-            { label: 'CCI', value: cci, color: colors.CCI.CCI },
+            { label: 'CCI', value: cci, color: colors.cci.cci },
         ],
     }
 }

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

@@ -2,7 +2,7 @@ import type { RendererPluginWithHost, PluginHost, RenderContext } from '../../..
 import { RENDERER_PRIORITY } from '../../../plugin'
 import type { KLineData } from '../../../types/price'
 import { alignToPhysicalPixelCenter } from '../../draw/pixelAlign'
-import { getColors } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 import { ENE_STATE_KEY, type ENERenderState } from '../../indicators/eneState'
 import { Indicator } from '../../indicators/indicatorDefinitionRegistry'
 import { resolveStateKey } from '../../indicators/indicatorMetadata'
@@ -40,7 +40,7 @@ function drawENEWithWebGL(
         lowerPoints: LinePoint[]
     }
 ): boolean {
-    const colors = getColors(context.theme)
+    const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
     if (context.settings?.enableWebGLRendering === false) return false
     const surface = context.lineWebGLSurface
     if (!surface || !surface.isAvailable()) return false
@@ -52,24 +52,24 @@ function drawENEWithWebGL(
         surface.clear()
         allOk = surface.drawFilledBand(
             { upperPoints: data.upperPoints, lowerPoints: data.lowerPoints },
-            toOpaqueRgba(colors.ENE.BAND_FILL),
+            toOpaqueRgba(colors.ene.bandFill),
             context.scrollLeft
         )
         if (allOk) {
-            compositeLineSurface(context, surface, getRgbaAlpha(colors.ENE.BAND_FILL))
+            compositeLineSurface(context, surface, getRgbaAlpha(colors.ene.bandFill))
         }
     }
     surface.clear()
 
     const lineStrips: Array<{ points: LinePoint[]; width: number; color: string }> = []
     if (data.upperPoints.length >= 2) {
-        lineStrips.push({ points: data.upperPoints, width: 1, color: colors.ENE.UPPER })
+        lineStrips.push({ points: data.upperPoints, width: 1, color: colors.ene.upper })
     }
     if (data.middlePoints.length >= 2) {
-        lineStrips.push({ points: data.middlePoints, width: 1, color: colors.ENE.MIDDLE })
+        lineStrips.push({ points: data.middlePoints, width: 1, color: colors.ene.middle })
     }
     if (data.lowerPoints.length >= 2) {
-        lineStrips.push({ points: data.lowerPoints, width: 1, color: colors.ENE.LOWER })
+        lineStrips.push({ points: data.lowerPoints, width: 1, color: colors.ene.lower })
     }
     if (lineStrips.length > 0) {
         allOk = surface.drawLineStrips(lineStrips, context.scrollLeft)
@@ -143,7 +143,7 @@ export function createENERendererPlugin(): RendererPluginWithHost {
         draw(context: RenderContext) {
             const { ctx, pane, data, range, scrollLeft, dpr, kLineCenters } = context
             const klineData = data as KLineData[]
-            const colors = getColors(context.theme)
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
 
             const stateKey = resolveKey()
             if (!stateKey) return
@@ -193,7 +193,7 @@ export function createENERendererPlugin(): RendererPluginWithHost {
             ctx.save()
             ctx.translate(-scrollLeft, 0)
 
-            ctx.fillStyle = colors.ENE.BAND_FILL
+            ctx.fillStyle = colors.ene.bandFill
             ctx.beginPath()
             if (upperPoints.length > 0) {
                 ctx.moveTo(upperPoints[0]!.x, upperPoints[0]!.y)
@@ -225,9 +225,9 @@ export function createENERendererPlugin(): RendererPluginWithHost {
                 ctx.stroke()
             }
 
-            drawLine(upperPoints, colors.ENE.UPPER)
-            drawLine(middlePoints, colors.ENE.MIDDLE)
-            drawLine(lowerPoints, colors.ENE.LOWER)
+            drawLine(upperPoints, colors.ene.upper)
+            drawLine(middlePoints, colors.ene.middle)
+            drawLine(lowerPoints, colors.ene.lower)
 
             ctx.restore()
         },

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

@@ -2,7 +2,7 @@ import type { RendererPluginWithHost, PluginHost, RenderContext } from '../../..
 import { RENDERER_PRIORITY } from '../../../plugin'
 import type { KLineData } from '../../../types/price'
 import { alignToPhysicalPixelCenter } from '../../draw/pixelAlign'
-import { getColors } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 import { EXPMA_STATE_KEY, type EXPMARenderState } from '../../indicators/expmaState'
 import { Indicator } from '../../indicators/indicatorDefinitionRegistry'
 import { resolveStateKey } from '../../indicators/indicatorMetadata'
@@ -82,7 +82,7 @@ export function createEXPMARendererPlugin(): RendererPluginWithHost {
         draw(context: RenderContext) {
             const { ctx, pane, data, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = context
             const klineData = data as KLineData[]
-            const colors = getColors(context.theme)
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
             const stateKey = resolveKey()
             if (!stateKey) return
             const state = pluginHost?.getSharedState<EXPMARenderState>(stateKey)
@@ -123,10 +123,10 @@ export function createEXPMARendererPlugin(): RendererPluginWithHost {
             if (enableWebGL && lineWebGLSurface?.isAvailable()) {
                 const lines: Array<{ points: LinePoint[]; width: number; color: string }> = []
                 if (cachedFastPoints.length >= 2) {
-                    lines.push({ points: cachedFastPoints, width: 1, color: colors.EXPMA.FAST })
+                    lines.push({ points: cachedFastPoints, width: 1, color: colors.expma.fast })
                 }
                 if (cachedSlowPoints.length >= 2) {
-                    lines.push({ points: cachedSlowPoints, width: 1, color: colors.EXPMA.SLOW })
+                    lines.push({ points: cachedSlowPoints, width: 1, color: colors.expma.slow })
                 }
 
                 const allOk = lines.length > 0 && lineWebGLSurface.drawLineStrips(lines, scrollLeft)
@@ -146,7 +146,7 @@ export function createEXPMARendererPlugin(): RendererPluginWithHost {
             ctx.lineCap = 'round'
 
             if (cachedFastPoints.length >= 2) {
-                ctx.strokeStyle = colors.EXPMA.FAST
+                ctx.strokeStyle = colors.expma.fast
                 ctx.beginPath()
                 ctx.moveTo(cachedFastPoints[0]!.x, cachedFastPoints[0]!.y)
                 for (let i = 1; i < cachedFastPoints.length; i++) {
@@ -157,7 +157,7 @@ export function createEXPMARendererPlugin(): RendererPluginWithHost {
             }
 
             if (cachedSlowPoints.length >= 2) {
-                ctx.strokeStyle = colors.EXPMA.SLOW
+                ctx.strokeStyle = colors.expma.slow
                 ctx.beginPath()
                 ctx.moveTo(cachedSlowPoints[0]!.x, cachedSlowPoints[0]!.y)
                 for (let i = 1; i < cachedSlowPoints.length; i++) {

package/src/engine/renderers/Indicator/fastk.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 { FASTKRenderState } from '../../indicators/fastkState'
 import { createFASTKStateKey } from '../../indicators/fastkState'
@@ -148,7 +148,7 @@ export function createFASTKRendererPlugin(options: FASTKRendererOptions = {}): 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
@@ -218,7 +218,7 @@ const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = co
             if (enableWebGL && lineWebGLSurface?.isAvailable()) {
                 if (params.showFASTK && cachedFASTKPoints.length >= 2) {
                     const ok = lineWebGLSurface.drawLineStrips(
-                        [{ points: cachedFASTKPoints, width: 1, color: colors.KDJ.K }],
+                        [{ points: cachedFASTKPoints, width: 1, color: colors.kdj.k }],
                         scrollLeft
                     )
                     if (ok) {
@@ -254,13 +254,13 @@ function drawFASTKLineWithCanvas2D(
     scrollLeft: number,
     fastkPoints: LinePoint[],
     params: { showFASTK: boolean },
-    colors: { KDJ: { K: string } }
+    colors: { kdj: { k: string } }
 ): void {
     if (!params.showFASTK || fastkPoints.length < 2) return
 
     ctx.save()
     ctx.translate(-scrollLeft, 0)
-    ctx.strokeStyle = colors.KDJ.K
+    ctx.strokeStyle = colors.kdj.k
     ctx.lineWidth = 1
     ctx.lineJoin = 'round'
     ctx.lineCap = 'round'
@@ -282,9 +282,10 @@ export function getFASTKTitleInfo(
     period: number,
     pluginHost: PluginHost,
     paneId: string = 'sub_FASTK',
-    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<FASTKRenderState>(createFASTKStateKey(paneId))
     if (!state) return null
 
@@ -295,7 +296,7 @@ export function getFASTKTitleInfo(
         name: 'FASTK',
         params: [period],
         values: [
-            { label: 'FASTK', value: fastk, color: colors.KDJ.K },
+            { label: 'FASTK', value: fastk, color: colors.kdj.k },
         ],
     }
 }

package/src/engine/renderers/Indicator/kst.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 type { KSTRenderState } from '../../indicators/kstState'
 import { createKSTStateKey } from '../../indicators/kstState'
 import { Indicator } from '../../indicators/indicatorDefinitionRegistry'
@@ -99,7 +99,7 @@ export function createKSTRendererPlugin(options: KSTRendererOptions = {}): 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
@@ -178,10 +178,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.showKST && cachedKSTPoints.length >= 2) {
-                    lines.push({ points: cachedKSTPoints, width: 1, color: colors.KST.KST })
+                    lines.push({ points: cachedKSTPoints, width: 1, color: colors.kst.kst })
                 }
                 if (params.showSignal && cachedSignalPoints.length >= 2) {
-                    lines.push({ points: cachedSignalPoints, width: 1, color: colors.KST.SIGNAL })
+                    lines.push({ points: cachedSignalPoints, width: 1, color: colors.kst.signal })
                 }
 
                 const allOk = lines.length > 0 && lineWebGLSurface.drawLineStrips(lines, scrollLeft)
@@ -219,7 +219,7 @@ function drawKSTLinesWithCanvas2D(
     kstPoints: LinePoint[],
     signalPoints: LinePoint[],
     params: { showKST: boolean; showSignal: boolean },
-    colors: { KST: { KST: string; SIGNAL: string } }
+    colors: { kst: { kst: string; signal: string } }
 ): void {
     ctx.save()
     ctx.translate(-scrollLeft, 0)
@@ -228,7 +228,7 @@ function drawKSTLinesWithCanvas2D(
     ctx.lineCap = 'round'
 
     if (params.showKST && kstPoints.length >= 2) {
-        ctx.strokeStyle = colors.KST.KST
+        ctx.strokeStyle = colors.kst.kst
         ctx.beginPath()
         ctx.moveTo(kstPoints[0]!.x, kstPoints[0]!.y)
         for (let i = 1; i < kstPoints.length; i++) {
@@ -239,7 +239,7 @@ function drawKSTLinesWithCanvas2D(
     }
 
     if (params.showSignal && signalPoints.length >= 2) {
-        ctx.strokeStyle = colors.KST.SIGNAL
+        ctx.strokeStyle = colors.kst.signal
         ctx.beginPath()
         ctx.moveTo(signalPoints[0]!.x, signalPoints[0]!.y)
         for (let i = 1; i < signalPoints.length; i++) {
@@ -264,9 +264,10 @@ export function getKSTTitleInfo(
     signalPeriod: number,
     pluginHost: PluginHost,
     paneId: string = 'sub_KST',
-    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<KSTRenderState>(createKSTStateKey(paneId))
     if (!state) return null
 
@@ -274,8 +275,8 @@ export function getKSTTitleInfo(
     if (!point) return null
 
     const values = []
-    if (state.params.showKST) values.push({ label: 'KST', value: point.kst, color: colors.KST.KST })
-    if (state.params.showSignal) values.push({ label: 'Signal', value: point.signal, color: colors.KST.SIGNAL })
+    if (state.params.showKST) values.push({ label: 'KST', value: point.kst, color: colors.kst.kst })
+    if (state.params.showSignal) values.push({ label: 'Signal', value: point.signal, color: colors.kst.signal })
 
     if (values.length === 0) return null
 

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

@@ -5,7 +5,7 @@ import { Indicator } from '../../indicators/indicatorDefinitionRegistry'
 import { resolveStateKey } from '../../indicators/indicatorMetadata'
 import type { IndicatorScheduler } from '../../indicators/scheduler'
 import { alignToPhysicalPixelCenter } from '../../draw/pixelAlign'
-import { getColors } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 
 // Re-export MAFlags from calculators for backward compatibility
 export type { MAFlags } from '../../indicators/calculators'
@@ -97,8 +97,8 @@ export function createMARendererPlugin(): RendererPluginWithHost {
 
         draw(context: RenderContext) {
             const { ctx, pane, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = context
-            const colors = getColors(context.theme)
-            const maColors: Record<number, string> = { 5: colors.MA.MA5, 10: colors.MA.MA10, 20: colors.MA.MA20, 30: colors.MA.MA30, 60: colors.MA.MA60 }
+            const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
+            const maColors: Record<number, string> = { 5: colors.ma.ma5, 10: colors.ma.ma10, 20: colors.ma.ma20, 30: colors.ma.ma30, 60: colors.ma.ma60 }
             const stateKey = resolveKey()
             if (!stateKey) return
             const state = pluginHost?.getSharedState<MARenderState>(stateKey)
@@ -147,7 +147,7 @@ export function createMARendererPlugin(): RendererPluginWithHost {
                 for (const period of state.enabledPeriods) {
                     const points = cachedLines.get(period)
                     if (!points) continue
-                    lines.push({ points, width: 1, color: maColors[period] ?? colors.MA.MA5 })
+                    lines.push({ points, width: 1, color: maColors[period] ?? colors.ma.ma5 })
                 }
                 const allOk = lines.length > 0 && lineWebGLSurface.drawLineStrips(lines, scrollLeft)
 
@@ -170,7 +170,7 @@ export function createMARendererPlugin(): RendererPluginWithHost {
             for (const period of state.enabledPeriods) {
                 const points = cachedLines.get(period)
                 if (!points || points.length < 2) continue
-                ctx.strokeStyle = maColors[period] ?? colors.MA.MA5
+                ctx.strokeStyle = maColors[period] ?? colors.ma.ma5
                 ctx.beginPath()
                 ctx.moveTo(points[0]!.x, points[0]!.y)
                 for (let i = 1; i < points.length; i++) {

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

@@ -1,8 +1,7 @@
 import type { RendererPluginWithHost, RenderContext, PluginHost } from '../../../plugin'
 import { RENDERER_PRIORITY } from '../../../plugin'
 import type { KLineData } from '../../../types/price'
-import { getColors } from '../../theme/colors'
-import type { ChartTheme, ThemeColors } from '../../theme/colors'
+import { resolveThemeColors } from '../../../tokens'
 import { alignToPhysicalPixelCenter } from '../../draw/pixelAlign'
 import type { MACDRenderState } from '../../indicators/macdState'
 import { createMACDStateKey } from '../../indicators/macdState'
@@ -131,7 +130,7 @@ export function createMACDRendererPlugin(options: MACDRendererOptions = {}): Ren
     draw(context: RenderContext) {
       const { ctx, pane, data, range, scrollLeft, dpr, kLineCenters, lineWebGLSurface } = context
       const klineData = data as KLineData[]
-      const colors = getColors(context.theme)
+      const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
 
       // 从 StateStore 读取 MACD 状态
       const stateKey = resolveKey()
@@ -214,7 +213,7 @@ export function createMACDRendererPlugin(options: MACDRendererOptions = {}): Ren
 
         const usedWebGL = drawMacdBarsWithWebGL(context, barUpBuf, barUpCount, barUpLightBuf, barUpLightCount, barDownBuf, barDownCount, barDownLightBuf, barDownLightCount)
         if (!usedWebGL) {
-          drawMacdBarsWithCanvas2D(ctx, scrollLeft, colors, barUpBuf, barUpCount, barUpLightBuf, barUpLightCount, barDownBuf, barDownCount, barDownLightBuf, barDownLightCount)
+          drawMacdBarsWithCanvas2D(ctx, scrollLeft, colors.macd.barUp, colors.macd.barUpLight, colors.macd.barDown, colors.macd.barDownLight, barUpBuf, barUpCount, barUpLightBuf, barUpLightCount, barDownBuf, barDownCount, barDownLightBuf, barDownLightCount)
         } else {
           compositeMacdWebGL(ctx, context)
         }
@@ -256,10 +255,10 @@ export function createMACDRendererPlugin(options: MACDRendererOptions = {}): Ren
       if (enableWebGL && lineWebGLSurface?.isAvailable()) {
         const lines: Array<{ points: LinePoint[]; width: number; color: string }> = []
         if (config.showDIF && cachedDifPoints.length >= 2) {
-          lines.push({ points: cachedDifPoints, width: 1, color: colors.MACD.DIF })
+          lines.push({ points: cachedDifPoints, width: 1, color: colors.macd.dif })
         }
         if (config.showDEA && cachedDeaPoints.length >= 2) {
-          lines.push({ points: cachedDeaPoints, width: 1, color: colors.MACD.DEA })
+          lines.push({ points: cachedDeaPoints, width: 1, color: colors.macd.dea })
         }
         const allOk = lines.length > 0 && lineWebGLSurface.drawLineStrips(lines, scrollLeft)
         if (allOk) {
@@ -269,7 +268,7 @@ export function createMACDRendererPlugin(options: MACDRendererOptions = {}): Ren
       }
 
       if (!usedWebGLForLines) {
-        drawMacdLinesWithCanvas2D(ctx, scrollLeft, colors, cachedDifPoints, cachedDeaPoints, config)
+        drawMacdLinesWithCanvas2D(ctx, scrollLeft, colors.macd.dif, colors.macd.dea, cachedDifPoints, cachedDeaPoints, config)
       }
     },
 
@@ -313,17 +312,17 @@ function drawMacdBarsWithWebGL(
   barDownBuf: Float32Array, barDownCount: number,
   barDownLightBuf: Float32Array, barDownLightCount: number
 ): boolean {
-  const colors = getColors(context.theme)
+  const colors = resolveThemeColors(context.theme, context.isAsiaMarket, context.colorPresetSettings)
   if (context.settings?.enableWebGLRendering === false) return false
   const surface = context.candleWebGLSurface
   if (!surface || !surface.isAvailable()) return false
 
   surface.clear()
 
-  const ok1 = barUpCount === 0 || surface.drawRectBuffer(barUpBuf.subarray(0, barUpCount * 4), barUpCount, colors.MACD.BAR_UP, context.scrollLeft)
-  const ok2 = barUpLightCount === 0 || surface.drawRectBuffer(barUpLightBuf.subarray(0, barUpLightCount * 4), barUpLightCount, colors.MACD.BAR_UP_LIGHT, context.scrollLeft)
-  const ok3 = barDownCount === 0 || surface.drawRectBuffer(barDownBuf.subarray(0, barDownCount * 4), barDownCount, colors.MACD.BAR_DOWN, context.scrollLeft)
-  const ok4 = barDownLightCount === 0 || surface.drawRectBuffer(barDownLightBuf.subarray(0, barDownLightCount * 4), barDownLightCount, colors.MACD.BAR_DOWN_LIGHT, context.scrollLeft)
+  const ok1 = barUpCount === 0 || surface.drawRectBuffer(barUpBuf.subarray(0, barUpCount * 4), barUpCount, colors.macd.barUp, context.scrollLeft)
+  const ok2 = barUpLightCount === 0 || surface.drawRectBuffer(barUpLightBuf.subarray(0, barUpLightCount * 4), barUpLightCount, colors.macd.barUpLight, context.scrollLeft)
+  const ok3 = barDownCount === 0 || surface.drawRectBuffer(barDownBuf.subarray(0, barDownCount * 4), barDownCount, colors.macd.barDown, context.scrollLeft)
+  const ok4 = barDownLightCount === 0 || surface.drawRectBuffer(barDownLightBuf.subarray(0, barDownLightCount * 4), barDownLightCount, colors.macd.barDownLight, context.scrollLeft)
 
   return ok1 && ok2 && ok3 && ok4
 }
@@ -331,7 +330,8 @@ function drawMacdBarsWithWebGL(
 function drawMacdBarsWithCanvas2D(
   ctx: CanvasRenderingContext2D,
   scrollLeft: number,
-  colors: { MACD: { BAR_UP: string; BAR_UP_LIGHT: string; BAR_DOWN: string; BAR_DOWN_LIGHT: string } },
+  barUpColor: string, barUpLightColor: string,
+  barDownColor: string, barDownLightColor: string,
   barUpBuf: Float32Array, barUpCount: number,
   barUpLightBuf: Float32Array, barUpLightCount: number,
   barDownBuf: Float32Array, barDownCount: number,
@@ -340,25 +340,25 @@ function drawMacdBarsWithCanvas2D(
   ctx.save()
   ctx.translate(-scrollLeft, 0)
 
-  ctx.fillStyle = colors.MACD.BAR_UP
+  ctx.fillStyle = barUpColor
   for (let i = 0; i < barUpCount; i++) {
     const off = i * 4
     ctx.fillRect(barUpBuf[off], barUpBuf[off + 1], barUpBuf[off + 2], barUpBuf[off + 3])
   }
 
-  ctx.fillStyle = colors.MACD.BAR_UP_LIGHT
+  ctx.fillStyle = barUpLightColor
   for (let i = 0; i < barUpLightCount; i++) {
     const off = i * 4
     ctx.fillRect(barUpLightBuf[off], barUpLightBuf[off + 1], barUpLightBuf[off + 2], barUpLightBuf[off + 3])
   }
 
-  ctx.fillStyle = colors.MACD.BAR_DOWN
+  ctx.fillStyle = barDownColor
   for (let i = 0; i < barDownCount; i++) {
     const off = i * 4
     ctx.fillRect(barDownBuf[off], barDownBuf[off + 1], barDownBuf[off + 2], barDownBuf[off + 3])
   }
 
-  ctx.fillStyle = colors.MACD.BAR_DOWN_LIGHT
+  ctx.fillStyle = barDownLightColor
   for (let i = 0; i < barDownLightCount; i++) {
     const off = i * 4
     ctx.fillRect(barDownLightBuf[off], barDownLightBuf[off + 1], barDownLightBuf[off + 2], barDownLightBuf[off + 3])
@@ -370,7 +370,8 @@ function drawMacdBarsWithCanvas2D(
 function drawMacdLinesWithCanvas2D(
   ctx: CanvasRenderingContext2D,
   scrollLeft: number,
-  colors: ThemeColors,
+  difColor: string,
+  deaColor: string,
   difPoints: LinePoint[],
   deaPoints: LinePoint[],
   config: { showDIF: boolean; showDEA: boolean }
@@ -382,7 +383,7 @@ function drawMacdLinesWithCanvas2D(
   ctx.lineCap = 'round'
 
   if (config.showDIF && difPoints.length >= 2) {
-    ctx.strokeStyle = colors.MACD.DIF
+    ctx.strokeStyle = difColor
     ctx.beginPath()
     ctx.moveTo(difPoints[0]!.x, difPoints[0]!.y)
     for (let i = 1; i < difPoints.length; i++) {
@@ -393,7 +394,7 @@ function drawMacdLinesWithCanvas2D(
   }
 
   if (config.showDEA && deaPoints.length >= 2) {
-    ctx.strokeStyle = colors.MACD.DEA
+    ctx.strokeStyle = deaColor
     ctx.beginPath()
     ctx.moveTo(deaPoints[0]!.x, deaPoints[0]!.y)
     for (let i = 1; i < deaPoints.length; i++) {
@@ -441,9 +442,10 @@ export function getMACDTitleInfo(
   signalPeriod: number,
   pluginHost: PluginHost,
   paneId: string = 'sub_MACD',
-  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<MACDRenderState>(createMACDStateKey(paneId))
   if (!state) return null
 
@@ -454,9 +456,9 @@ export function getMACDTitleInfo(
     name: 'MACD',
     params: [fastPeriod, slowPeriod, signalPeriod],
     values: [
-      { label: 'DIF', value: point.dif, color: colors.MACD.DIF },
-      { label: 'DEA', value: point.dea, color: colors.MACD.DEA },
-      { label: 'MACD', value: point.macd, color: point.macd >= 0 ? colors.MACD.BAR_UP : colors.MACD.BAR_DOWN },
+      { label: 'DIF', value: point.dif, color: colors.macd.dif },
+      { label: 'DEA', value: point.dea, color: colors.macd.dea },
+      { label: 'MACD', value: point.macd, color: point.macd >= 0 ? colors.macd.barUp : colors.macd.barDown },
     ],
   }
 }