fix: font-family for components (#39806)

* fix: font-family for components * chore: code clean
ant-design · Dec 26, 2022 · c1390b2 · c1390b2
1 parent 663d145
commit c1390b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -87,7 +87,7 @@ export default function genComponentStyleHook<ComponentName extends OverrideComp
             overrideComponentToken: token[component],
           });
           flush(component, mergedComponentToken);
-          return [genCommonStyle(prefixCls), styleInterpolation];
+          return [genCommonStyle(token, prefixCls), styleInterpolation];
         },
       ),
       hashId,