Merge branch 'main' into afc163-patch-2

Author: afc163

components/attachments/FileList/AudioIcon.tsx

@@ -8,10 +8,10 @@ export default function AudioIcon() {
       viewBox="0 0 16 16"
       version="1.1"
       xmlns="http://www.w3.org/2000/svg"
-      xmlnsXlink="http://www.w3.org/1999/xlink"
+      //xmlnsXlink="http://www.w3.org/1999/xlink"
     >
       <title>audio</title>
-      <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+      <g stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
         <path
           d="M14.1178571,4.0125 C14.225,4.11964286 14.2857143,4.26428571 14.2857143,4.41607143 L14.2857143,15.4285714 C14.2857143,15.7446429 14.0303571,16 13.7142857,16 L2.28571429,16 C1.96964286,16 1.71428571,15.7446429 1.71428571,15.4285714 L1.71428571,0.571428571 C1.71428571,0.255357143 1.96964286,0 2.28571429,0 L9.86964286,0 C10.0214286,0 10.1678571,0.0607142857 10.275,0.167857143 L14.1178571,4.0125 Z M10.7315824,7.11216117 C10.7428131,7.15148751 10.7485063,7.19218979 10.7485063,7.23309113 L10.7485063,8.07742614 C10.7484199,8.27364959 10.6183424,8.44607275 10.4296853,8.50003683 L8.32984514,9.09986306 L8.32984514,11.7071803 C8.32986605,12.5367078 7.67249692,13.217028 6.84345686,13.2454634 L6.79068592,13.2463395 C6.12766108,13.2463395 5.53916361,12.8217001 5.33010655,12.1924966 C5.1210495,11.563293 5.33842118,10.8709227 5.86959669,10.4741173 C6.40077221,10.0773119 7.12636292,10.0652587 7.67042486,10.4442027 L7.67020842,7.74937024 L7.68449368,7.74937024 C7.72405122,7.59919041 7.83988806,7.48101083 7.98924584,7.4384546 L10.1880418,6.81004755 C10.42156,6.74340323 10.6648954,6.87865515 10.7315824,7.11216117 Z M9.60714286,1.31785714 L12.9678571,4.67857143 L9.60714286,4.67857143 L9.60714286,1.31785714 Z"
           fill="currentColor"

components/attachments/FileList/VideoIcon.tsx

@@ -8,10 +8,10 @@ export default function VideoIcon() {
       viewBox="0 0 16 16"
       version="1.1"
       xmlns="http://www.w3.org/2000/svg"
-      xmlnsXlink="http://www.w3.org/1999/xlink"
+      // xmlnsXlink="http://www.w3.org/1999/xlink"
     >
       <title>video</title>
-      <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+      <g stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
         <path
           d="M14.1178571,4.0125 C14.225,4.11964286 14.2857143,4.26428571 14.2857143,4.41607143 L14.2857143,15.4285714 C14.2857143,15.7446429 14.0303571,16 13.7142857,16 L2.28571429,16 C1.96964286,16 1.71428571,15.7446429 1.71428571,15.4285714 L1.71428571,0.571428571 C1.71428571,0.255357143 1.96964286,0 2.28571429,0 L9.86964286,0 C10.0214286,0 10.1678571,0.0607142857 10.275,0.167857143 L14.1178571,4.0125 Z M12.9678571,4.67857143 L9.60714286,1.31785714 L9.60714286,4.67857143 L12.9678571,4.67857143 Z M10.5379461,10.3101106 L6.68957555,13.0059749 C6.59910784,13.0693494 6.47439406,13.0473861 6.41101953,12.9569184 C6.3874624,12.9232903 6.37482581,12.8832269 6.37482581,12.8421686 L6.37482581,7.45043999 C6.37482581,7.33998304 6.46436886,7.25043999 6.57482581,7.25043999 C6.61588409,7.25043999 6.65594753,7.26307658 6.68957555,7.28663371 L10.5379461,9.98249803 C10.6284138,10.0458726 10.6503772,10.1705863 10.5870027,10.2610541 C10.5736331,10.2801392 10.5570312,10.2967411 10.5379461,10.3101106 Z"
           fill="currentColor"

components/attachments/__tests__/__snapshots__/demo-extend.test.ts.snap

@@ -504,7 +504,6 @@ exports[`renders components/attachments/demo/files.tsx extend context correctly
           viewBox="0 0 16 16"
           width="1em"
           xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
         >
           <title>
             video
@@ -563,7 +562,6 @@ exports[`renders components/attachments/demo/files.tsx extend context correctly
           viewBox="0 0 16 16"
           width="1em"
           xmlns="http://www.w3.org/2000/svg"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
         >
           <title>
             audio
@@ -731,11 +729,7 @@ exports[`renders components/attachments/demo/files.tsx extend context correctly
 </div>
 `;
 
-exports[`renders components/attachments/demo/files.tsx extend context correctly 2`] = `
-[
-  "Invalid DOM property \`%s\`. Did you mean \`%s\`?",
-]
-`;
+exports[`renders components/attachments/demo/files.tsx extend context correctly 2`] = `[]`;
 
 exports[`renders components/attachments/demo/overflow.tsx extend context correctly 1`] = `
 <div

components/attachments/__tests__/__snapshots__/demo.test.tsx.snap

@@ -433,7 +433,6 @@ Array [
             viewBox="0 0 16 16"
             width="1em"
             xmlns="http://www.w3.org/2000/svg"
-            xmlns:xlink="http://www.w3.org/1999/xlink"
           >
             <title>
               video
@@ -492,7 +491,6 @@ Array [
             viewBox="0 0 16 16"
             width="1em"
             xmlns="http://www.w3.org/2000/svg"
-            xmlns:xlink="http://www.w3.org/1999/xlink"
           >
             <title>
               audio

components/sender/StopLoading.tsx

@@ -8,7 +8,7 @@ const StopLoadingIcon = memo((props: { className?: string }) => {
       color="currentColor"
       viewBox="0 0 1000 1000"
       xmlns="http://www.w3.org/2000/svg"
-      xmlnsXlink="http://www.w3.org/1999/xlink"
+      //xmlnsXlink="http://www.w3.org/1999/xlink"
       className={className}
     >
       <title>Stop Loading</title>

components/sender/__tests__/__snapshots__/demo-extend.test.ts.snap

@@ -231,7 +231,6 @@ exports[`renders components/sender/demo/basic.tsx extend context correctly 1`] =
                 color="currentColor"
                 viewBox="0 0 1000 1000"
                 xmlns="http://www.w3.org/2000/svg"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
               >
                 <title>
                   Stop Loading

components/sender/__tests__/__snapshots__/demo.test.ts.snap

@@ -226,7 +226,6 @@ exports[`renders components/sender/demo/basic.tsx correctly 1`] = `
                 color="currentColor"
                 viewBox="0 0 1000 1000"
                 xmlns="http://www.w3.org/2000/svg"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
               >
                 <title>
                   Stop Loading

components/sender/__tests__/__snapshots__/index.test.tsx.snap

@@ -27,7 +27,6 @@ exports[`Sender Component loading state 1`] = `
               color="currentColor"
               viewBox="0 0 1000 1000"
               xmlns="http://www.w3.org/2000/svg"
-              xmlns:xlink="http://www.w3.org/1999/xlink"
             >
               <title>
                 Stop Loading

components/sender/components/SpeechButton/RecordingIcon.tsx

@@ -18,7 +18,7 @@ export default function RecordingIcon({ className }: RecordingIconProps) {
       color="currentColor"
       viewBox={`0 0 ${SIZE} ${SIZE}`}
       xmlns="http://www.w3.org/2000/svg"
-      xmlnsXlink="http://www.w3.org/1999/xlink"
+      // xmlnsXlink="http://www.w3.org/1999/xlink"
       className={className}
     >
       <title>Speech Recording</title>

docs/react/contributing.zh-CN.md

@@ -21,7 +21,7 @@ title: 贡献指南
 
 ## Bugs
 
-我们使用 [GitHub Issues](https://github.com/ant-design/ant-design/issues) 来做 bug 追踪。 如果你想要你发现的 bug 被快速解决，最好的办法就是通过我们提供的 [issue 小助手](http://new-issue.ant.design) 来提 issue，并且能使用这个 [模板](https://u.ant.design/codesandbox-repro) 来提供重现。
+我们使用 [GitHub Issues](https://github.com/ant-design/ant-design/issues) 来做 bug 追踪。 如果你想要你发现的 bug 被快速解决，最好的办法就是通过我们提供的 [issue 小助手](http://new-issue.ant.design) 来提 issue，并且能使用这个 [模板](https://codesandbox.io/p/sandbox/ant-design-x-box-vmqvt8) 来提供重现。
 
 在你报告一个 bug 之前，请先确保已经搜索过已有的 issue 和阅读了我们的 [常见问题](/docs/react/faq)。
 

package.json

@@ -104,7 +104,7 @@
     "@ctrl/tinycolor": "^4.1.0",
     "@emotion/react": "^11.13.5",
     "@emotion/server": "^11.11.0",
-    "@happy-dom/jest-environment": "^17.0.0",
+    "@happy-dom/jest-environment": "^17.4.3",
     "@ianvs/prettier-plugin-sort-imports": "^4.3.1",
     "@madccc/duplicate-package-checker-webpack-plugin": "^1.0.0",
     "@microflash/rehype-figure": "^2.1.1",
@@ -158,7 +158,7 @@
     "@umijs/fabric": "^4.0.1",
     "adm-zip": "^0.5.16",
     "ali-oss": "^6.21.0",
-    "antd": "^5.20.6",
+    "antd": "^5.22.7",
     "antd-style": "^3.6.3",
     "antd-token-previewer": "^2.0.8",
     "axios": "^1.7.7",
@@ -183,7 +183,7 @@
     "fs-extra": "^11.2.0",
     "gh-pages": "^6.1.1",
     "glob": "^11.0.0",
-    "happy-dom": "^17.0.0",
+    "happy-dom": "^17.4.3",
     "html2sketch": "^1.0.2",
     "http-server": "^14.1.1",
     "husky": "^9.1.6",
@@ -283,4 +283,4 @@
       "limit": "350 KiB"
     }
   ]
-}
+}

tests/utils.tsx

@@ -29,8 +29,14 @@ export const sleep = async (timeout = 0) => {
   });
 };
 
-const customRender = (ui: ReactElement, options?: Omit<RenderOptions, 'wrapper'>): RenderResult =>
-  render(ui, { wrapper: StrictMode, ...options });
+const customRender = (ui: ReactElement, options?: Omit<RenderOptions, 'wrapper'>): RenderResult => {
+  try {
+    return render(ui, { wrapper: StrictMode, ...options });
+  } catch (error) {
+    console.error(error);
+    throw error;
+  }
+};
 
 export function renderHook<T>(func: () => T): { result: React.RefObject<T | null> } {
   const result = createRef<T>();