fix: Input.Search large size button style (ant-design#48527)

* fix: Input.Search large size button style * chore: adjust logic * chore: rename
Enigama · Apr 20, 2024 · 575e7df · 575e7df
1 parent ed127e9
commit 575e7df
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 16 deletions.
diff --git a/components/input/style/index.ts b/components/input/style/index.ts
@@ -881,4 +881,7 @@ export default genStyleHooks(
     ];
   },
   initComponentToken,
+  {
+    resetFont: false,
+  },
 );
diff --git a/components/style/index.ts b/components/style/index.ts
@@ -107,29 +107,34 @@ export const genCommonStyle = (
   token: DerivativeToken,
   componentPrefixCls: string,
   rootCls?: string,
+  resetFont?: boolean,
 ): CSSObject => {
-  const { fontFamily, fontSize } = token;
-
   const prefixSelector = `[class^="${componentPrefixCls}"], [class*=" ${componentPrefixCls}"]`;
   const rootPrefixSelector = rootCls ? `.${rootCls}` : prefixSelector;
 
-  return {
-    [rootPrefixSelector]: {
-      fontFamily,
-      fontSize,
+  const resetStyle: CSSObject = {
+    boxSizing: 'border-box',
+
+    '&::before, &::after': {
       boxSizing: 'border-box',
+    },
+  };
+
+  let resetFontStyle: CSSObject = {};
 
-      '&::before, &::after': {
-        boxSizing: 'border-box',
-      },
+  if (resetFont !== false) {
+    resetFontStyle = {
+      fontFamily: token.fontFamily,
+      fontSize: token.fontSize,
+    };
+  }
 
-      [prefixSelector]: {
-        boxSizing: 'border-box',
+  return {
+    [rootPrefixSelector]: {
+      ...resetFontStyle,
+      ...resetStyle,
 
-        '&::before, &::after': {
-          boxSizing: 'border-box',
-        },
-      },
+      [prefixSelector]: resetStyle,
     },
   };
 };

diff --git a/components/theme/util/genComponentStyleHook.tsx b/components/theme/util/genComponentStyleHook.tsx
@@ -133,6 +133,7 @@ export default function genComponentStyleHook<C extends OverrideComponent>(
   getDefaultToken?: GetDefaultToken<C>,
   options: {
     resetStyle?: boolean;
+    resetFont?: boolean;
     // Deprecated token key map [["oldTokenKey", "newTokenKey"], ["oldTokenKey", "newTokenKey"]]
     deprecatedTokens?: [ComponentTokenKey<C>, ComponentTokenKey<C>][];
     /**
@@ -246,7 +247,9 @@ export default function genComponentStyleHook<C extends OverrideComponent>(
         });
         flush(component, componentToken);
         return [
-          options.resetStyle === false ? null : genCommonStyle(mergedToken, prefixCls, rootCls),
+          options.resetStyle === false
+            ? null
+            : genCommonStyle(mergedToken, prefixCls, rootCls, options.resetFont),
           styleInterpolation,
         ];
       },
@@ -381,6 +384,7 @@ export const genStyleHooks = <C extends OverrideComponent>(
   getDefaultToken?: GetDefaultToken<C>,
   options?: {
     resetStyle?: boolean;
+    resetFont?: boolean;
     deprecatedTokens?: [ComponentTokenKey<C>, ComponentTokenKey<C>][];
     /**
      * Component tokens that do not need unit.