chore: auto merge branches (ant-design#52683)

chore: sync feature into next
aojunhao123 · Feb 7, 2025 · 967695b · 967695b
2 parents 09d2e5c + b9e3fb8
commit 967695b
Show file tree

Hide file tree

Showing 24 changed files with 95 additions and 174 deletions.
diff --git a/.dumi/theme/common/ComponentChangelog/ComponentChangelog.tsx b/.dumi/theme/common/ComponentChangelog/ComponentChangelog.tsx
@@ -137,9 +137,9 @@ const ParseChangelog: React.FC<{ changelog: string }> = (props) => {
       } else {
         let node: React.ReactNode = lastStr;
         if (isQuota) {
-          node = <code>{node}</code>;
+          node = <code key={`code-${i}`}>{node}</code>;
         } else if (isBold) {
-          node = <strong>{node}</strong>;
+          node = <strong key={`strong-${i}`}>{node}</strong>;
         }
 
         nodes.push(node);

diff --git a/.github/workflows/release-tweet.yml → .github/workflows/release-x.yml b/.github/workflows/release-tweet.yml → .github/workflows/release-x.yml
@@ -1,22 +1,21 @@
-name: 🐦 Release to Tweet
+name: 🆇 Release to X
 
 on:
-  create
-
-permissions:
-  contents: read
+  workflow_dispatch:
+  release:
+    types: [published]
 
 jobs:
   tweet:
     if: ${{ github.event.ref_type == 'tag' && !contains(github.event.ref, 'alpha') }}
     runs-on: ubuntu-latest
     steps:
       - name: Tweet
-        uses: nearform-actions/github-action-notify-twitter@v1
+        uses: nearform-actions/github-action-notify-twitter@master
         with:
           message: |
-            🤖 Ant Design just released antd@${{ github.event.ref }} ✨🎊✨ Check out the full release note: https://github.com/ant-design/ant-design/releases/tag/${{ github.event.ref }}
+            🤖 Ant Design just released antd@${{ github.event.release.tag_name }} ✨🎊✨ Check out the full release note: ${{ github.event.release.html_url }}
           twitter-app-key: ${{ secrets.TWITTER_API_KEY }}
-          twitter-app-secret: ${{ secrets.TWITTER_API_SECRET_KEY }}
+          twitter-app-secret: ${{ secrets.TWITTER_API_SECRET }}
           twitter-access-token: ${{ secrets.TWITTER_ACCESS_TOKEN }}
           twitter-access-token-secret: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -15,6 +15,18 @@ tag: vVERSION
 
 ---
 
+### 5.23.4
+
+`2025-02-05`
+
+First release in the Year of the Snake, wishing you a prosperous start! 🐍
+
+- 🐞 Fixed Pagination accessibility issue by supplementing missing ARIA attributes support. [#52616](https://github.com/ant-design/ant-design/pull/52616) [@aojunhao123](https://github.com/aojunhao123)  
+- 🐞 Added TextArea component support in `Space.Compact`. [#52639](https://github.com/ant-design/ant-design/pull/52639) [@Can-Chen](https://github.com/Can-Chen)  
+- 🐞 Fixed Menu with `theme="dark"` and `mode="horizontal"` identical text/background color issue. [#52617](https://github.com/ant-design/ant-design/pull/52617) [@afc163](https://github.com/afc163)  
+- 🇦🇪 Add Tour Arabic translation. [#52642](https://github.com/ant-design/ant-design/pull/52642) [@Sagie501](https://github.com/Sagie501)
+- 🇮🇱 Add Tour Hebrew translation. [#52641](https://github.com/ant-design/ant-design/pull/52641) [@Sagie501](https://github.com/Sagie501)
+
 ## 5.23.3
 
 `2025-01-28`

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -15,6 +15,19 @@ tag: vVERSION
 
 ---
 
+## 5.23.4
+
+`2025-02-05`
+
+蛇年第一个版本，开工大吉！🐍
+
+- 🐞 修复 Pagination 可访问性问题，补充缺失的 ARIA 属性支持。[#52616](https://github.com/ant-design/ant-design/pull/52616) [@aojunhao123](https://github.com/aojunhao123)
+- 🐞 Space.Compact 支持 textarea 组件。[#52639](https://github.com/ant-design/ant-design/pull/52639) [@Can-Chen](https://github.com/Can-Chen)
+- 🐞 修复 Menu `theme="dark"` 时水平菜单的文字色和背景色同色的问题。[#52617](https://github.com/ant-design/ant-design/pull/52617) [@afc163](https://github.com/afc163)
+- 🇪🇬 Tour 增加阿拉伯文(埃及) (ar_EG) 的翻译。 [#52642](https://github.com/ant-design/ant-design/pull/52642) [@Sagie501](https://github.com/Sagie501)
+- 🇮🇱 Tour 增加以色列的国际化翻译。[#52641](https://github.com/ant-design/ant-design/pull/52641) [@Sagie501](https://github.com/Sagie501)
+
+
 ## 5.23.3
 
 `2025-01-28`

diff --git a/components/card/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/card/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -213,11 +213,9 @@ Array [
               aria-controls="rc-tabs-test-more-popup"
               aria-expanded="false"
               aria-haspopup="listbox"
-              aria-hidden="true"
               class="ant-tabs-nav-more"
               id="rc-tabs-test-more"
               style="visibility: hidden; order: 1;"
-              tabindex="-1"
               type="button"
             >
               <span
@@ -1181,11 +1179,9 @@ Array [
               aria-controls="rc-tabs-test-more-popup"
               aria-expanded="false"
               aria-haspopup="listbox"
-              aria-hidden="true"
               class="ant-tabs-nav-more"
               id="rc-tabs-test-more"
               style="visibility: hidden; order: 1;"
-              tabindex="-1"
               type="button"
             >
               <span
@@ -1337,11 +1333,9 @@ Array [
               aria-controls="rc-tabs-test-more-popup"
               aria-expanded="false"
               aria-haspopup="listbox"
-              aria-hidden="true"
               class="ant-tabs-nav-more"
               id="rc-tabs-test-more"
               style="visibility: hidden; order: 1;"
-              tabindex="-1"
               type="button"
             >
               <span

diff --git a/components/card/__tests__/__snapshots__/demo.test.ts.snap b/components/card/__tests__/__snapshots__/demo.test.ts.snap
@@ -205,11 +205,9 @@ Array [
               aria-controls="null-more-popup"
               aria-expanded="false"
               aria-haspopup="listbox"
-              aria-hidden="true"
               class="ant-tabs-nav-more"
               id="null-more"
               style="visibility:hidden;order:1"
-              tabindex="-1"
               type="button"
             >
               <span
@@ -1134,11 +1132,9 @@ Array [
               aria-controls="null-more-popup"
               aria-expanded="false"
               aria-haspopup="listbox"
-              aria-hidden="true"
               class="ant-tabs-nav-more"
               id="null-more"
               style="visibility:hidden;order:1"
-              tabindex="-1"
               type="button"
             >
               <span
@@ -1265,11 +1261,9 @@ Array [
               aria-controls="null-more-popup"
               aria-expanded="false"
               aria-haspopup="listbox"
-              aria-hidden="true"
               class="ant-tabs-nav-more"
               id="null-more"
               style="visibility:hidden;order:1"
-              tabindex="-1"
               type="button"
             >
               <span

diff --git a/components/card/__tests__/__snapshots__/index.test.tsx.snap b/components/card/__tests__/__snapshots__/index.test.tsx.snap
@@ -42,6 +42,7 @@ exports[`Card correct pass tabList props 1`] = `
               <button
                 aria-label="remove"
                 class="ant-tabs-tab-remove"
+                role="tab"
                 tabindex="0"
                 type="button"
               >
@@ -84,6 +85,7 @@ exports[`Card correct pass tabList props 1`] = `
               <button
                 aria-label="remove"
                 class="ant-tabs-tab-remove"
+                role="tab"
                 tabindex="-1"
                 type="button"
               >
@@ -179,11 +181,9 @@ exports[`Card correct pass tabList props 1`] = `
             aria-controls="rc-tabs-test-more-popup"
             aria-expanded="false"
             aria-haspopup="listbox"
-            aria-hidden="true"
             class="ant-tabs-nav-more"
             id="rc-tabs-test-more"
             style="visibility: hidden; order: 1;"
-            tabindex="-1"
             type="button"
           >
             <span

diff --git a/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap b/components/config-provider/__tests__/__snapshots__/components.test.tsx.snap
@@ -28945,11 +28945,9 @@ exports[`ConfigProvider components Tabs configProvider 1`] = `
         aria-controls="rc-tabs-test-more-popup"
         aria-expanded="false"
         aria-haspopup="listbox"
-        aria-hidden="true"
         class="config-tabs-nav-more"
         id="rc-tabs-test-more"
         style="visibility: hidden; order: 1;"
-        tabindex="-1"
         type="button"
       >
         <span
@@ -29036,11 +29034,9 @@ exports[`ConfigProvider components Tabs configProvider componentDisabled 1`] = `
         aria-controls="rc-tabs-test-more-popup"
         aria-expanded="false"
         aria-haspopup="listbox"
-        aria-hidden="true"
         class="config-tabs-nav-more"
         id="rc-tabs-test-more"
         style="visibility: hidden; order: 1;"
-        tabindex="-1"
         type="button"
       >
         <span
@@ -29127,11 +29123,9 @@ exports[`ConfigProvider components Tabs configProvider componentSize large 1`] =
         aria-controls="rc-tabs-test-more-popup"
         aria-expanded="false"
         aria-haspopup="listbox"
-        aria-hidden="true"
         class="config-tabs-nav-more"
         id="rc-tabs-test-more"
         style="visibility: hidden; order: 1;"
-        tabindex="-1"
         type="button"
       >
         <span
@@ -29218,11 +29212,9 @@ exports[`ConfigProvider components Tabs configProvider componentSize middle 1`]
         aria-controls="rc-tabs-test-more-popup"
         aria-expanded="false"
         aria-haspopup="listbox"
-        aria-hidden="true"
         class="config-tabs-nav-more"
         id="rc-tabs-test-more"
         style="visibility: hidden; order: 1;"
-        tabindex="-1"
         type="button"
       >
         <span
@@ -29309,11 +29301,9 @@ exports[`ConfigProvider components Tabs configProvider componentSize small 1`] =
         aria-controls="rc-tabs-test-more-popup"
         aria-expanded="false"
         aria-haspopup="listbox"
-        aria-hidden="true"
         class="config-tabs-nav-more"
         id="rc-tabs-test-more"
         style="visibility: hidden; order: 1;"
-        tabindex="-1"
         type="button"
       >
         <span
@@ -29400,11 +29390,9 @@ exports[`ConfigProvider components Tabs normal 1`] = `
         aria-controls="rc-tabs-test-more-popup"
         aria-expanded="false"
         aria-haspopup="listbox"
-        aria-hidden="true"
         class="ant-tabs-nav-more"
         id="rc-tabs-test-more"
         style="visibility: hidden; order: 1;"
-        tabindex="-1"
         type="button"
       >
         <span
@@ -29491,11 +29479,9 @@ exports[`ConfigProvider components Tabs prefixCls 1`] = `
         aria-controls="rc-tabs-test-more-popup"
         aria-expanded="false"
         aria-haspopup="listbox"
-        aria-hidden="true"
         class="prefix-Tabs-nav-more"
         id="rc-tabs-test-more"
         style="visibility: hidden; order: 1;"
-        tabindex="-1"
         type="button"
       >
         <span

diff --git a/components/input/TextArea.tsx b/components/input/TextArea.tsx
@@ -16,6 +16,7 @@ import useSize from '../config-provider/hooks/useSize';
 import type { SizeType } from '../config-provider/SizeContext';
 import { FormItemInputContext } from '../form/context';
 import useVariant from '../form/hooks/useVariants';
+import { useCompactItemContext } from '../space/Compact';
 import type { InputFocusOptions } from './Input';
 import { triggerFocus } from './Input';
 import { useSharedStyle } from './style';
@@ -73,9 +74,6 @@ const TextArea = forwardRef<TextAreaRef, TextAreaProps>((props, ref) => {
     styles: contextStyles,
   } = useComponentConfig('textArea');
 
-  // ===================== Size =====================
-  const mergedSize = useSize(customizeSize);
-
   // ===================== Disabled =====================
   const disabled = React.useContext(DisabledContext);
   const mergedDisabled = customDisabled ?? disabled;
@@ -106,6 +104,12 @@ const TextArea = forwardRef<TextAreaRef, TextAreaProps>((props, ref) => {
   const [wrapSharedCSSVar, hashId, cssVarCls] = useSharedStyle(prefixCls, rootClassName);
   const [wrapCSSVar] = useStyle(prefixCls, rootCls);
 
+  // ===================== Compact Item =====================
+  const { compactSize, compactItemClassnames } = useCompactItemContext(prefixCls, direction);
+
+  // ===================== Size =====================
+  const mergedSize = useSize((ctx) => customizeSize ?? compactSize ?? ctx);
+
   const [variant, enableVariantCls] = useVariant('textArea', customVariant, bordered);
 
   const mergedAllowClear = getAllowClear(allowClear ?? contextAllowClear);
@@ -119,7 +123,14 @@ const TextArea = forwardRef<TextAreaRef, TextAreaProps>((props, ref) => {
         styles={{ ...contextStyles, ...styles }}
         disabled={mergedDisabled}
         allowClear={mergedAllowClear}
-        className={classNames(cssVarCls, rootCls, className, rootClassName, contextClassName)}
+        className={classNames(
+          cssVarCls,
+          rootCls,
+          className,
+          rootClassName,
+          compactItemClassnames,
+          contextClassName,
+        )}
         classNames={{
           ...classes,
           ...contextClassNames,

diff --git a/components/input/index.en-US.md b/components/input/index.en-US.md
@@ -109,7 +109,7 @@ The rest of the props of `Input.TextArea` are the same as the original [textarea
 
 | Property | Description | Type | Default |
 | --- | --- | --- | --- |
-| enterButton | Whether to show an enter button after input. This property conflicts with the `addonAfter` property | ReactNode | false |
+| enterButton | false displays the default button color, true uses the primary color, or you can provide a custom button. Conflicts with addonAfter. | ReactNode | false |
 | loading | Search box with loading | boolean | false |
 | onSearch | The callback function triggered when you click on the search-icon, the clear-icon or press the Enter key | function(value, event, { source: "input" \| "clear" }) | - |
 

diff --git a/components/input/style/textarea.ts b/components/input/style/textarea.ts
@@ -45,6 +45,10 @@ const genTextAreaStyle: GenerateStyle<InputToken> = (token) => {
           border: 'none',
           outline: 'none',
           background: 'transparent',
+          minHeight: token
+            .calc(token.controlHeight)
+            .sub(token.calc(token.lineWidth).mul(2))
+            .equal(),
 
           '&:focus': {
             boxShadow: 'none !important',

diff --git a/components/locale/ar_EG.ts b/components/locale/ar_EG.ts
@@ -30,6 +30,11 @@ const localeValues: Locale = {
     triggerAsc: 'ترتيب تصاعدي',
     cancelSort: 'إلغاء الترتيب',
   },
+  Tour: {
+    Next: 'التالي',
+    Previous: 'السابق',
+    Finish: 'إنهاء',
+  },
   Modal: {
     okText: 'تأكيد',
     cancelText: 'إلغاء',

diff --git a/components/locale/he_IL.ts b/components/locale/he_IL.ts
@@ -30,6 +30,11 @@ const localeValues: Locale = {
     triggerAsc: 'לחץ למיון לפי סדר עולה',
     cancelSort: 'לחץ כדי לבטל את המיון',
   },
+  Tour: {
+    Next: 'הבא',
+    Previous: 'הקודם',
+    Finish: 'סיום',
+  },
   Modal: {
     okText: 'אישור',
     cancelText: 'ביטול',

diff --git a/components/menu/style/index.ts b/components/menu/style/index.ts
@@ -1020,6 +1020,7 @@ export default (prefixCls: string, rootCls: string = prefixCls, injectStyle = tr
         itemHoverColor: darkItemHoverColor,
         groupTitleColor: darkGroupTitleColor,
         itemSelectedColor: darkItemSelectedColor,
+        subMenuItemSelectedColor: darkItemSelectedColor,
         itemBg: darkItemBg,
         popupBg: darkPopupBg,
         subMenuItemBg: darkSubMenuItemBg,

diff --git a/components/pagination/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/pagination/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -4675,6 +4675,7 @@ Array [
       title="2/5"
     >
       <input
+        aria-label="Go to"
         size="3"
         type="text"
         value="2"
@@ -4841,6 +4842,7 @@ Array [
       title="2/5"
     >
       <input
+        aria-label="Go to"
         disabled=""
         size="3"
         type="text"

diff --git a/components/pagination/__tests__/__snapshots__/demo.test.ts.snap b/components/pagination/__tests__/__snapshots__/demo.test.ts.snap
@@ -3522,6 +3522,7 @@ Array [
       title="2/5"
     >
       <input
+        aria-label="Go to"
         size="3"
         type="text"
         value="2"
@@ -3688,6 +3689,7 @@ Array [
       title="2/5"
     >
       <input
+        aria-label="Go to"
         disabled=""
         size="3"
         type="text"