From f77302553d775d03616dcf62b88555f2a948b114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E7=88=B1=E5=90=83=E7=99=BD=E8=90=9D?= =?UTF-8?q?=E5=8D=9C?= Date: Thu, 18 Apr 2024 16:06:35 +0800 Subject: [PATCH 01/14] fix: Input.Search large size button style (#48527) * fix: Input.Search large size button style * chore: adjust logic * chore: rename --- components/input/style/index.ts | 3 ++ components/style/index.ts | 37 +++++++++++-------- .../theme/util/genComponentStyleHook.tsx | 6 ++- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/components/input/style/index.ts b/components/input/style/index.ts index c90e9df438..cf0ab255c8 100644 --- 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 index 2915ea84b8..a6e1ded6f7 100644 --- 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; + const resetStyle: CSSObject = { + boxSizing: 'border-box', + + '&::before, &::after': { + boxSizing: 'border-box', + }, + }; + + let resetFontStyle: CSSObject = {}; + + if (resetFont !== false) { + resetFontStyle = { + fontFamily: token.fontFamily, + fontSize: token.fontSize, + }; + } + return { [rootPrefixSelector]: { - fontFamily, - fontSize, - boxSizing: 'border-box', + ...resetFontStyle, + ...resetStyle, - '&::before, &::after': { - boxSizing: 'border-box', - }, - - [prefixSelector]: { - boxSizing: 'border-box', - - '&::before, &::after': { - boxSizing: 'border-box', - }, - }, + [prefixSelector]: resetStyle, }, }; }; diff --git a/components/theme/util/genComponentStyleHook.tsx b/components/theme/util/genComponentStyleHook.tsx index a501a1966e..8dee7e34d6 100644 --- a/components/theme/util/genComponentStyleHook.tsx +++ b/components/theme/util/genComponentStyleHook.tsx @@ -133,6 +133,7 @@ export default function genComponentStyleHook( getDefaultToken?: GetDefaultToken, options: { resetStyle?: boolean; + resetFont?: boolean; // Deprecated token key map [["oldTokenKey", "newTokenKey"], ["oldTokenKey", "newTokenKey"]] deprecatedTokens?: [ComponentTokenKey, ComponentTokenKey][]; /** @@ -243,7 +244,9 @@ export default function genComponentStyleHook( }); flush(component, componentToken); return [ - options.resetStyle === false ? null : genCommonStyle(mergedToken, prefixCls, rootCls), + options.resetStyle === false + ? null + : genCommonStyle(mergedToken, prefixCls, rootCls, options.resetFont), styleInterpolation, ]; }, @@ -378,6 +381,7 @@ export const genStyleHooks = ( getDefaultToken?: GetDefaultToken, options?: { resetStyle?: boolean; + resetFont?: boolean; deprecatedTokens?: [ComponentTokenKey, ComponentTokenKey][]; /** * Component tokens that do not need unit. From f4b7c0122ff1808eff9a882d5458a33e5e996ec1 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 18 Apr 2024 17:45:47 +0800 Subject: [PATCH 02/14] demo: simplify transfer table example (#48529) * demo: simplify transfer table example * demo: simplify transfer table example --- .../__snapshots__/demo-extend.test.ts.snap | 1420 ++++++++--------- .../__tests__/__snapshots__/demo.test.ts.snap | 894 +++++------ components/transfer/demo/table-transfer.tsx | 67 +- 3 files changed, 1124 insertions(+), 1257 deletions(-) diff --git a/components/transfer/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/transfer/__tests__/__snapshots__/demo-extend.test.ts.snap index ee4309819f..e4fe695268 100644 --- a/components/transfer/__tests__/__snapshots__/demo-extend.test.ts.snap +++ b/components/transfer/__tests__/__snapshots__/demo-extend.test.ts.snap @@ -11414,161 +11414,85 @@ Array [
- - - - -
- -