From c8f6aee6e5a149b6e5c5a29ddf36448274677ae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=8C=E4=BA=9A=E7=9A=84=E8=A5=BF=E7=BA=A2=E6=9F=BF?= <97817985+nova1751@users.noreply.github.com> Date: Thu, 18 Apr 2024 10:31:22 +0800 Subject: [PATCH 1/3] fix: fix the flex gap problem (#48522) --- components/upload/style/motion.ts | 41 ++++++++++++++++--------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/components/upload/style/motion.ts b/components/upload/style/motion.ts index e3629a5d4f..9a097b2e76 100644 --- a/components/upload/style/motion.ts +++ b/components/upload/style/motion.ts @@ -4,30 +4,31 @@ import type { UploadToken } from '.'; import { initFadeMotion } from '../../style/motion'; import type { GenerateStyle } from '../../theme/internal'; -const uploadAnimateInlineIn = new Keyframes('uploadAnimateInlineIn', { - from: { - width: 0, - height: 0, - margin: 0, - padding: 0, - opacity: 0, - }, -}); - -const uploadAnimateInlineOut = new Keyframes('uploadAnimateInlineOut', { - to: { - width: 0, - height: 0, - margin: 0, - padding: 0, - opacity: 0, - }, -}); // =========================== Motion =========================== const genMotionStyle: GenerateStyle = (token) => { const { componentCls } = token; - const inlineCls = `${componentCls}-animate-inline`; + const uploadAnimateInlineIn = new Keyframes('uploadAnimateInlineIn', { + from: { + width: 0, + height: 0, + padding: 0, + opacity: 0, + margin: `calc(${token.marginXS} / -2)`, + }, + }); + + const uploadAnimateInlineOut = new Keyframes('uploadAnimateInlineOut', { + to: { + width: 0, + height: 0, + padding: 0, + opacity: 0, + margin: `calc(${token.marginXS} / -2)`, + }, + }); + + const inlineCls = `${componentCls}-animate-inline`; return [ { [`${componentCls}-wrapper`]: { From 1b43d38fd6ab87a70ce2f4187761139ae0a112f3 Mon Sep 17 00:00:00 2001 From: korkt-kim Date: Thu, 18 Apr 2024 12:00:51 +0900 Subject: [PATCH 2/3] fix: Change text color in disabled textarea (#48489) Co-authored-by: NZ10387 --- components/input/style/index.ts | 3 +++ components/input/style/variants.ts | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/components/input/style/index.ts b/components/input/style/index.ts index 480de0642f..c90e9df438 100644 --- a/components/input/style/index.ts +++ b/components/input/style/index.ts @@ -497,6 +497,9 @@ const genAffixStyle: GenerateStyle = (token: InputToken) => { [`> input${componentCls}`]: { padding: 0, + }, + + [`> input${componentCls}, > textarea${componentCls}`]: { fontSize: 'inherit', border: 'none', borderRadius: 0, diff --git a/components/input/style/variants.ts b/components/input/style/variants.ts index bea6da6894..2cda5ea928 100644 --- a/components/input/style/variants.ts +++ b/components/input/style/variants.ts @@ -17,7 +17,7 @@ export const genDisabledStyle = (token: InputToken): CSSObject => ({ cursor: 'not-allowed', opacity: 1, - 'input[disabled]': { + [`input[disabled], textarea[disabled]`]: { cursor: 'not-allowed', }, From 5fbca4afa9833156f5a17db76d55227367cf5f70 Mon Sep 17 00:00:00 2001 From: afc163 Date: Thu, 18 Apr 2024 11:01:43 +0800 Subject: [PATCH 3/3] chore: increase size-limit size limit (#48525) Signed-off-by: afc163 --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 9f9b2739ed..3c415d021e 100644 --- a/package.json +++ b/package.json @@ -362,11 +362,11 @@ "size-limit": [ { "path": "./dist/antd.min.js", - "limit": "337 KiB" + "limit": "350 KiB" }, { "path": "./dist/antd-with-locales.min.js", - "limit": "384 KiB" + "limit": "400 KiB" } ], "title": "Ant Design",