chore: rename

ant-design · Apr 18, 2024 · b55e065 · b55e065
1 parent 08714fa
commit b55e065
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/components/input/style/index.ts b/components/input/style/index.ts
@@ -882,6 +882,6 @@ export default genStyleHooks(
   },
   initComponentToken,
   {
-    resetStyle: 'strict',
+    resetFont: false,
   },
 );
diff --git a/components/style/index.ts b/components/style/index.ts
@@ -107,7 +107,7 @@ export const genCommonStyle = (
   token: DerivativeToken,
   componentPrefixCls: string,
   rootCls?: string,
-  strict = false,
+  resetFont?: boolean,
 ): CSSObject => {
   const prefixSelector = `[class^="${componentPrefixCls}"], [class*=" ${componentPrefixCls}"]`;
   const rootPrefixSelector = rootCls ? `.${rootCls}` : prefixSelector;
@@ -120,18 +120,18 @@ export const genCommonStyle = (
     },
   };
 
-  let resetFont: CSSObject = {};
+  let resetFontStyle: CSSObject = {};
 
-  if (!strict) {
-    resetFont = {
+  if (resetFont !== false) {
+    resetFontStyle = {
       fontFamily: token.fontFamily,
       fontSize: token.fontSize,
     };
   }
 
   return {
     [rootPrefixSelector]: {
-      ...resetFont,
+      ...resetFontStyle,
       ...resetStyle,
 
       [prefixSelector]: resetStyle,

diff --git a/components/theme/util/genComponentStyleHook.tsx b/components/theme/util/genComponentStyleHook.tsx
@@ -132,7 +132,8 @@ export default function genComponentStyleHook<C extends OverrideComponent>(
   styleFn: GenStyleFn<C>,
   getDefaultToken?: GetDefaultToken<C>,
   options: {
-    resetStyle?: boolean | 'strict';
+    resetStyle?: boolean;
+    resetFont?: boolean;
     // Deprecated token key map [["oldTokenKey", "newTokenKey"], ["oldTokenKey", "newTokenKey"]]
     deprecatedTokens?: [ComponentTokenKey<C>, ComponentTokenKey<C>][];
     /**
@@ -245,7 +246,7 @@ export default function genComponentStyleHook<C extends OverrideComponent>(
         return [
           options.resetStyle === false
             ? null
-            : genCommonStyle(mergedToken, prefixCls, rootCls, options.resetStyle === 'strict'),
+            : genCommonStyle(mergedToken, prefixCls, rootCls, options.resetFont),
           styleInterpolation,
         ];
       },
@@ -379,7 +380,8 @@ export const genStyleHooks = <C extends OverrideComponent>(
   styleFn: GenStyleFn<C>,
   getDefaultToken?: GetDefaultToken<C>,
   options?: {
-    resetStyle?: boolean | 'strict';
+    resetStyle?: boolean;
+    resetFont?: boolean;
     deprecatedTokens?: [ComponentTokenKey<C>, ComponentTokenKey<C>][];
     /**
      * Component tokens that do not need unit.