chore: auto merge branches (#48526)

chore: merge master into feature

components/input/style/index.ts

@@ -497,6 +497,9 @@ const genAffixStyle: GenerateStyle<InputToken> = (token: InputToken) => {
 
       [`> input${componentCls}`]: {
         padding: 0,
+      },
+
+      [`> input${componentCls}, > textarea${componentCls}`]: {
         fontSize: 'inherit',
         border: 'none',
         borderRadius: 0,

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',
   },
 

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<UploadToken> = (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`]: {

package.json

@@ -362,11 +362,11 @@
   "size-limit": [
     {
       "path": "./dist/antd.min.js",
-      "limit": "338 KiB"
+      "limit": "350 KiB"
     },
     {
       "path": "./dist/antd-with-locales.min.js",
-      "limit": "385 KiB"
+      "limit": "400 KiB"
     }
   ],
   "title": "Ant Design",