From 5990a284794ecfb10595c8d2cfede460ba3499ed Mon Sep 17 00:00:00 2001 From: saller Date: Mon, 8 Jan 2024 20:00:41 +0800 Subject: [PATCH] fix(comp:tag): modify tag normal bg color (#1792) --- packages/components/tag/theme/default.ts | 18 +++++++++++++++--- packages/components/tag/theme/index.ts | 4 ++-- packages/components/tag/theme/tokens.ts | 7 ++++++- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/packages/components/tag/theme/default.ts b/packages/components/tag/theme/default.ts index e231a3318..9fbaf3cc0 100644 --- a/packages/components/tag/theme/default.ts +++ b/packages/components/tag/theme/default.ts @@ -5,12 +5,21 @@ * found in the LICENSE file at https://github.com/IDuxFE/idux/blob/main/LICENSE */ -import { type CertainThemeTokens, type GlobalThemeTokens, getAlphaColor } from '@idux/components/theme' -export function getDefaultThemeTokens(tokens: GlobalThemeTokens): CertainThemeTokens<'tag'> { +import { + type CertainThemeTokens, + type GlobalThemeTokens, + type ThemeTokenAlgorithms, + getAlphaColor, +} from '@idux/components/theme' +export function getDefaultThemeTokens( + tokens: GlobalThemeTokens, + algrithms: ThemeTokenAlgorithms, +): CertainThemeTokens<'tag'> { const { lineWidth, borderRadiusSm, tagCompColorAlpha, + colorTextInfo, colorSuccessBg, colorInfoBg, colorWarningBg, @@ -18,9 +27,12 @@ export function getDefaultThemeTokens(tokens: GlobalThemeTokens): CertainThemeTo colorErrorBg, colorFatalBg, } = tokens + const { getGreyColors } = algrithms + const greyColors = getGreyColors() return { - bgColorFilled: '#99acd1', + bgColorNormal: getAlphaColor(colorTextInfo, tagCompColorAlpha), + bgColorFilled: greyColors.base, borderWidth: lineWidth, borderRadius: borderRadiusSm, diff --git a/packages/components/tag/theme/index.ts b/packages/components/tag/theme/index.ts index 5e049cd67..393a8c488 100644 --- a/packages/components/tag/theme/index.ts +++ b/packages/components/tag/theme/index.ts @@ -9,8 +9,8 @@ import type { TokenGetter } from '@idux/components/theme' import { getDefaultThemeTokens } from './default' -export const getThemeTokens: TokenGetter<'tag'> = (tokens, presetTheme) => { - return presetTheme === 'default' ? getDefaultThemeTokens(tokens) : getDefaultThemeTokens(tokens) +export const getThemeTokens: TokenGetter<'tag'> = (tokens, presetTheme, algrithms) => { + return presetTheme === 'default' ? getDefaultThemeTokens(tokens, algrithms) : getDefaultThemeTokens(tokens, algrithms) } export type { TagThemeTokens } from './tokens' diff --git a/packages/components/tag/theme/tokens.ts b/packages/components/tag/theme/tokens.ts index cf17c1d70..493c617cc 100644 --- a/packages/components/tag/theme/tokens.ts +++ b/packages/components/tag/theme/tokens.ts @@ -7,7 +7,12 @@ export interface TagThemeTokens { /** - * @desc 标签背景颜色 + * @desc 标签普通背景颜色 + */ + bgColorNormal: string + + /** + * @desc 标签填充背景颜色 */ bgColorFilled: string