Merge branch 'next' into tag-disabled

aojunhao123 · Jan 13, 2025 · fc8bed7 · fc8bed7
2 parents aa06d1a + 5669073
commit fc8bed7
Show file tree

Hide file tree

Showing 105 changed files with 2,768 additions and 461 deletions.
diff --git a/.dumi/theme/layouts/GlobalLayout.tsx b/.dumi/theme/layouts/GlobalLayout.tsx
@@ -1,4 +1,5 @@
 import React, { Suspense, useCallback, useEffect } from 'react';
+import { Monitoring } from 'react-scan/monitoring';
 import {
   createCache,
   extractStyle,
@@ -12,7 +13,13 @@ import { getSandpackCssText } from '@codesandbox/sandpack-react';
 import { theme as antdTheme, App } from 'antd';
 import type { MappingAlgorithm } from 'antd';
 import type { DirectionType, ThemeConfig } from 'antd/es/config-provider';
-import { createSearchParams, useOutlet, useSearchParams, useServerInsertedHTML } from 'dumi';
+import {
+  createSearchParams,
+  useOutlet,
+  useParams,
+  useSearchParams,
+  useServerInsertedHTML,
+} from 'dumi';
 
 import { DarkContext } from '../../hooks/useDark';
 import useLayoutState from '../../hooks/useLayoutState';
@@ -63,6 +70,7 @@ const getAlgorithm = (themes: ThemeName[] = []) =>
 const GlobalLayout: React.FC = () => {
   const outlet = useOutlet();
   const { pathname } = useLocation();
+  const params = useParams();
   const [searchParams, setSearchParams] = useSearchParams();
   const [{ theme = [], direction, isMobile, bannerVisible = false }, setSiteState] =
     useLayoutState<SiteState>({
@@ -225,7 +233,17 @@ const GlobalLayout: React.FC = () => {
       >
         <SiteContext.Provider value={siteContextValue}>
           <SiteThemeProvider theme={themeConfig}>
-            <HappyProvider disabled={!theme.includes('happy-work')}>{content}</HappyProvider>
+            <HappyProvider disabled={!theme.includes('happy-work')}>
+              {content}
+              <Monitoring
+                apiKey="GhrCCNrHZHXlf4P6E03ntrFwhRLxJL30" // Safe to expose publically
+                url="https://monitoring.react-scan.com/api/v1/ingest"
+                commit={process.env.COMMIT_HASH}
+                branch={process.env.BRANCH}
+                params={params as Record<string, string>}
+                path={pathname}
+              />
+            </HappyProvider>
           </SiteThemeProvider>
         </SiteContext.Provider>
       </StyleProvider>

diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -17,7 +17,7 @@ tag: vVERSION
 
 ## 5.23.0
 
-`2024-01-06`
+`2025-01-06`
 
 - 🔥 TreeSelect support `maxCount` to limit the maximum number of selections. [#51759](https://github.com/ant-design/ant-design/pull/51759) [@aojunhao123](https://github.com/aojunhao123)
 - 🔥 Modal `width` support responsive size. [#51653](https://github.com/ant-design/ant-design/pull/51653) [@zombieJ](https://github.com/zombieJ)

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -17,7 +17,7 @@ tag: vVERSION
 
 ## 5.23.0
 
-`2024-01-06`
+`2025-01-06`
 
 - 🔥 TreeSelect 新增 `maxCount` 属性以限制最大选择数量。[#51759](https://github.com/ant-design/ant-design/pull/51759) [@aojunhao123](https://github.com/aojunhao123)
 - 🔥 Modal `width` 支持响应式尺寸。[#51653](https://github.com/ant-design/ant-design/pull/51653) [@zombieJ](https://github.com/zombieJ)

diff --git a/components/avatar/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/avatar/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -441,6 +441,7 @@ Array [
           </span>
         </span>
         <span
+          aria-describedby="test-id"
           class="ant-avatar ant-avatar-circle"
           style="color: rgb(245, 106, 0); background-color: rgb(253, 227, 207);"
         >
@@ -464,12 +465,14 @@ Array [
           >
             <div
               class="ant-popover-inner"
+              id="test-id"
               role="tooltip"
             >
               <div
                 class="ant-popover-inner-content"
               >
                 <span
+                  aria-describedby="test-id"
                   class="ant-avatar ant-avatar-circle ant-avatar-icon"
                   style="background-color: rgb(135, 208, 104);"
                 >
@@ -506,6 +509,7 @@ Array [
                   >
                     <div
                       class="ant-tooltip-inner"
+                      id="test-id"
                       role="tooltip"
                     >
                       Ant User
@@ -731,6 +735,7 @@ Array [
       </span>
     </a>
     <span
+      aria-describedby="test-id"
       class="ant-avatar ant-avatar-circle ant-avatar-icon"
       style="background-color: rgb(135, 208, 104);"
     >
@@ -767,6 +772,7 @@ Array [
       >
         <div
           class="ant-tooltip-inner"
+          id="test-id"
           role="tooltip"
         >
           Ant User
@@ -824,6 +830,7 @@ Array [
       </span>
     </span>
     <span
+      aria-describedby="test-id"
       class="ant-avatar ant-avatar-circle"
       style="color: rgb(245, 106, 0); background-color: rgb(253, 227, 207);"
     >
@@ -847,12 +854,14 @@ Array [
       >
         <div
           class="ant-popover-inner"
+          id="test-id"
           role="tooltip"
         >
           <div
             class="ant-popover-inner-content"
           >
             <span
+              aria-describedby="test-id"
               class="ant-avatar ant-avatar-circle ant-avatar-icon"
               style="background-color: rgb(135, 208, 104);"
             >
@@ -889,6 +898,7 @@ Array [
               >
                 <div
                   class="ant-tooltip-inner"
+                  id="test-id"
                   role="tooltip"
                 >
                   Ant User
@@ -950,6 +960,7 @@ Array [
       </span>
     </span>
     <span
+      aria-describedby="test-id"
       class="ant-avatar ant-avatar-lg ant-avatar-circle"
       style="color: rgb(245, 106, 0); background-color: rgb(253, 227, 207);"
     >
@@ -973,12 +984,14 @@ Array [
       >
         <div
           class="ant-popover-inner"
+          id="test-id"
           role="tooltip"
         >
           <div
             class="ant-popover-inner-content"
           >
             <span
+              aria-describedby="test-id"
               class="ant-avatar ant-avatar-lg ant-avatar-circle ant-avatar-icon"
               style="background-color: rgb(135, 208, 104);"
             >
@@ -1015,6 +1028,7 @@ Array [
               >
                 <div
                   class="ant-tooltip-inner"
+                  id="test-id"
                   role="tooltip"
                 >
                   Ant User
@@ -1076,6 +1090,7 @@ Array [
       </span>
     </span>
     <span
+      aria-describedby="test-id"
       class="ant-avatar ant-avatar-lg ant-avatar-circle"
       style="color: rgb(245, 106, 0); background-color: rgb(253, 227, 207); cursor: pointer;"
     >
@@ -1099,12 +1114,14 @@ Array [
       >
         <div
           class="ant-popover-inner"
+          id="test-id"
           role="tooltip"
         >
           <div
             class="ant-popover-inner-content"
           >
             <span
+              aria-describedby="test-id"
               class="ant-avatar ant-avatar-lg ant-avatar-circle ant-avatar-icon"
               style="background-color: rgb(135, 208, 104);"
             >
@@ -1141,6 +1158,7 @@ Array [
               >
                 <div
                   class="ant-tooltip-inner"
+                  id="test-id"
                   role="tooltip"
                 >
                   Ant User

diff --git a/components/avatar/__tests__/__snapshots__/demo.test.tsx.snap b/components/avatar/__tests__/__snapshots__/demo.test.tsx.snap
@@ -437,6 +437,7 @@ Array [
           </span>
         </span>
         <span
+          aria-describedby="test-id"
           class="ant-avatar ant-avatar-circle"
           style="color:#f56a00;background-color:#fde3cf"
         >
@@ -632,6 +633,7 @@ Array [
       </span>
     </a>
     <span
+      aria-describedby="test-id"
       class="ant-avatar ant-avatar-circle ant-avatar-icon"
       style="background-color:#87d068"
     >
@@ -706,6 +708,7 @@ Array [
       </span>
     </span>
     <span
+      aria-describedby="test-id"
       class="ant-avatar ant-avatar-circle"
       style="color:#f56a00;background-color:#fde3cf"
     >
@@ -743,6 +746,7 @@ Array [
       </span>
     </span>
     <span
+      aria-describedby="test-id"
       class="ant-avatar ant-avatar-lg ant-avatar-circle"
       style="color:#f56a00;background-color:#fde3cf"
     >
@@ -780,6 +784,7 @@ Array [
       </span>
     </span>
     <span
+      aria-describedby="test-id"
       class="ant-avatar ant-avatar-lg ant-avatar-circle"
       style="color:#f56a00;background-color:#fde3cf;cursor:pointer"
     >

diff --git a/components/breadcrumb/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/breadcrumb/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -144,6 +144,7 @@ exports[`renders components/breadcrumb/demo/component-token.tsx extend context c
           tabindex="0"
         >
           <li
+            aria-describedby="test-id"
             class="ant-dropdown-menu-item ant-dropdown-menu-item-only-child"
             data-menu-id="rc-menu-uuid-test-1"
             role="menuitem"
@@ -174,11 +175,13 @@ exports[`renders components/breadcrumb/demo/component-token.tsx extend context c
             >
               <div
                 class="ant-tooltip-inner"
+                id="test-id"
                 role="tooltip"
               />
             </div>
           </div>
           <li
+            aria-describedby="test-id"
             class="ant-dropdown-menu-item ant-dropdown-menu-item-only-child"
             data-menu-id="rc-menu-uuid-test-2"
             role="menuitem"
@@ -209,11 +212,13 @@ exports[`renders components/breadcrumb/demo/component-token.tsx extend context c
             >
               <div
                 class="ant-tooltip-inner"
+                id="test-id"
                 role="tooltip"
               />
             </div>
           </div>
           <li
+            aria-describedby="test-id"
             class="ant-dropdown-menu-item ant-dropdown-menu-item-only-child"
             data-menu-id="rc-menu-uuid-test-3"
             role="menuitem"
@@ -244,6 +249,7 @@ exports[`renders components/breadcrumb/demo/component-token.tsx extend context c
             >
               <div
                 class="ant-tooltip-inner"
+                id="test-id"
                 role="tooltip"
               />
             </div>
@@ -402,6 +408,7 @@ exports[`renders components/breadcrumb/demo/debug-routes.tsx extend context corr
           tabindex="0"
         >
           <li
+            aria-describedby="test-id"
             class="ant-dropdown-menu-item ant-dropdown-menu-item-only-child"
             data-menu-id="rc-menu-uuid-test-0"
             role="menuitem"
@@ -430,11 +437,13 @@ exports[`renders components/breadcrumb/demo/debug-routes.tsx extend context corr
             >
               <div
                 class="ant-tooltip-inner"
+                id="test-id"
                 role="tooltip"
               />
             </div>
           </div>
           <li
+            aria-describedby="test-id"
             class="ant-dropdown-menu-item ant-dropdown-menu-item-only-child"
             data-menu-id="rc-menu-uuid-test-1"
             role="menuitem"
@@ -463,6 +472,7 @@ exports[`renders components/breadcrumb/demo/debug-routes.tsx extend context corr
             >
               <div
                 class="ant-tooltip-inner"
+                id="test-id"
                 role="tooltip"
               />
             </div>
@@ -563,6 +573,7 @@ exports[`renders components/breadcrumb/demo/overlay.tsx extend context correctly
           tabindex="0"
         >
           <li
+            aria-describedby="test-id"
             class="ant-dropdown-menu-item ant-dropdown-menu-item-only-child"
             data-menu-id="rc-menu-uuid-test-1"
             role="menuitem"
@@ -593,11 +604,13 @@ exports[`renders components/breadcrumb/demo/overlay.tsx extend context correctly
             >
               <div
                 class="ant-tooltip-inner"
+                id="test-id"
                 role="tooltip"
               />
             </div>
           </div>
           <li
+            aria-describedby="test-id"
             class="ant-dropdown-menu-item ant-dropdown-menu-item-only-child"
             data-menu-id="rc-menu-uuid-test-2"
             role="menuitem"
@@ -628,11 +641,13 @@ exports[`renders components/breadcrumb/demo/overlay.tsx extend context correctly
             >
               <div
                 class="ant-tooltip-inner"
+                id="test-id"
                 role="tooltip"
               />
             </div>
           </div>
           <li
+            aria-describedby="test-id"
             class="ant-dropdown-menu-item ant-dropdown-menu-item-only-child"
             data-menu-id="rc-menu-uuid-test-3"
             role="menuitem"
@@ -663,6 +678,7 @@ exports[`renders components/breadcrumb/demo/overlay.tsx extend context correctly
             >
               <div
                 class="ant-tooltip-inner"
+                id="test-id"
                 role="tooltip"
               />
             </div>