From c1390b20a971dcb43f575699fba161a64a381f6d Mon Sep 17 00:00:00 2001 From: MadCcc <1075746765@qq.com> Date: Mon, 26 Dec 2022 16:08:42 +0800 Subject: [PATCH] fix: font-family for components (#39806) * fix: font-family for components * chore: code clean --- components/style/index.tsx | 6 +++++- components/theme/util/genComponentStyleHook.ts | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/components/style/index.tsx b/components/style/index.tsx index bcac9ee92a15..743ac86d504e 100644 --- a/components/style/index.tsx +++ b/components/style/index.tsx @@ -103,11 +103,15 @@ export const genLinkStyle = (token: DerivativeToken): CSSObject => ({ }, }); -export const genCommonStyle = (componentPrefixCls: string): CSSObject => { +export const genCommonStyle = (token: DerivativeToken, componentPrefixCls: string): CSSObject => { + const { fontFamily, fontSize } = token; + const rootPrefixSelector = `[class^="${componentPrefixCls}"], [class*=" ${componentPrefixCls}"]`; return { [rootPrefixSelector]: { + fontFamily, + fontSize, boxSizing: 'border-box', '&::before, &::after': { diff --git a/components/theme/util/genComponentStyleHook.ts b/components/theme/util/genComponentStyleHook.ts index 7b5d172fbc47..db2bd218bbd9 100644 --- a/components/theme/util/genComponentStyleHook.ts +++ b/components/theme/util/genComponentStyleHook.ts @@ -87,7 +87,7 @@ export default function genComponentStyleHook