From 381ecebeed3fca25e95ba7becd3d8caa0398a40a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2024 03:36:34 +0800
Subject: [PATCH 1/6] chore: upgrade deps (#51913)

Co-authored-by: afc163 <507615+afc163@users.noreply.github.com>
---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index c78f032338..844a4f231c 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
   "dependencies": {
     "@ant-design/colors": "^7.1.0",
     "@ant-design/cssinjs": "^1.21.1",
-    "@ant-design/cssinjs-utils": "^1.1.1",
+    "@ant-design/cssinjs-utils": "^1.1.3",
     "@ant-design/icons": "^5.5.2",
     "@ant-design/react-slick": "~1.1.2",
     "@babel/runtime": "^7.25.7",
@@ -135,12 +135,12 @@
     "rc-motion": "^2.9.3",
     "rc-notification": "~5.6.2",
     "rc-pagination": "~4.3.0",
-    "rc-picker": "~4.8.2",
+    "rc-picker": "~4.8.3",
     "rc-progress": "~4.0.0",
     "rc-rate": "~2.13.0",
     "rc-resize-observer": "^1.4.0",
     "rc-segmented": "~2.5.0",
-    "rc-select": "~14.16.3",
+    "rc-select": "~14.16.4",
     "rc-slider": "~11.1.7",
     "rc-steps": "~6.0.1",
     "rc-switch": "~4.1.0",

From d65e99665886db41e672d5c0d5552a7cb772d3d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2024 03:37:21 +0800
Subject: [PATCH 2/6] chore(deps-dev): bump the dev-dependencies group with 2
 updates (#51908)

Bumps the dev-dependencies group with 2 updates: [@dnd-kit/modifiers](https://github.com/clauderic/dnd-kit/tree/HEAD/packages/modifiers) and [@dnd-kit/sortable](https://github.com/clauderic/dnd-kit/tree/HEAD/packages/sortable).


Updates `@dnd-kit/modifiers` from 8.0.0 to 9.0.0
- [Release notes](https://github.com/clauderic/dnd-kit/releases)
- [Changelog](https://github.com/clauderic/dnd-kit/blob/master/packages/modifiers/CHANGELOG.md)
- [Commits](https://github.com/clauderic/dnd-kit/commits/@dnd-kit/modifiers@9.0.0/packages/modifiers)

Updates `@dnd-kit/sortable` from 9.0.0 to 10.0.0
- [Release notes](https://github.com/clauderic/dnd-kit/releases)
- [Changelog](https://github.com/clauderic/dnd-kit/blob/master/packages/sortable/CHANGELOG.md)
- [Commits](https://github.com/clauderic/dnd-kit/commits/@dnd-kit/sortable@10.0.0/packages/sortable)

---
updated-dependencies:
- dependency-name: "@dnd-kit/modifiers"
  dependency-type: direct:development
  update-type: version-update:semver-major
  dependency-group: dev-dependencies
- dependency-name: "@dnd-kit/sortable"
  dependency-type: direct:development
  update-type: version-update:semver-major
  dependency-group: dev-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 844a4f231c..352ff70d6b 100644
--- a/package.json
+++ b/package.json
@@ -165,8 +165,8 @@
     "@codecov/webpack-plugin": "^1.2.1",
     "@codesandbox/sandpack-react": "^2.19.9",
     "@dnd-kit/core": "^6.2.0",
-    "@dnd-kit/modifiers": "^8.0.0",
-    "@dnd-kit/sortable": "^9.0.0",
+    "@dnd-kit/modifiers": "^9.0.0",
+    "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
     "@emotion/css": "^11.13.4",
     "@emotion/react": "^11.13.3",

From 093c6c2d1f305732a93d9b495bf1ff2b00122954 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A2=B3=E8=8B=AF=20Carbon?=
 <79406469+CoderSerio@users.noreply.github.com>
Date: Fri, 6 Dec 2024 10:28:15 +0800
Subject: [PATCH 3/6] docs: add target properties to all external url link
 (#51917)

---
 .../__snapshots__/demo-extend.test.ts.snap       |  3 +++
 .../__tests__/__snapshots__/demo.test.ts.snap    |  3 +++
 components/button/demo/debug-icon.tsx            |  4 ++--
 components/button/demo/icon-position.tsx         |  7 ++++++-
 components/button/demo/icon.tsx                  |  2 +-
 components/config-provider/demo/direction.tsx    |  5 ++++-
 .../__snapshots__/demo-extend.test.tsx.snap      |  2 ++
 components/drawer/demo/user-profile.tsx          |  2 +-
 .../__snapshots__/demo-extend.test.ts.snap       |  4 ++++
 components/dropdown/demo/trigger.tsx             | 12 ++++++++++--
 .../__snapshots__/demo-extend.test.ts.snap       |  4 ++++
 .../__tests__/__snapshots__/demo.test.tsx.snap   |  4 ++++
 components/form/demo/col-24-debug.tsx            | 10 +++++++++-
 components/modal/demo/footer.tsx                 |  1 +
 .../__snapshots__/demo-extend.test.ts.snap       |  2 ++
 .../__tests__/__snapshots__/demo.test.ts.snap    |  2 ++
 components/tag/demo/basic.tsx                    |  8 +++++++-
 components/tag/demo/component-token.tsx          | 16 ++++++++++++++--
 18 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/components/button/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/button/__tests__/__snapshots__/demo-extend.test.ts.snap
index ed0420ec52..33cde627cb 100644
--- a/components/button/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/button/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -1117,6 +1117,7 @@ Array [
         class="ant-btn ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-lg ant-btn-icon-only"
         href="https://www.google.com"
         tabindex="0"
+        target="_blank"
       >
         <span
           class="ant-btn-icon"
@@ -1843,6 +1844,7 @@ exports[`renders components/button/demo/icon.tsx extend context correctly 1`] =
       class="ant-btn ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only"
       href="https://www.google.com"
       tabindex="0"
+      target="_blank"
     >
       <span
         class="ant-btn-icon"
@@ -2271,6 +2273,7 @@ Array [
         class="ant-btn ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-icon-end"
         href="https://www.google.com"
         tabindex="0"
+        target="_blank"
       >
         <span
           class="ant-btn-icon"
diff --git a/components/button/__tests__/__snapshots__/demo.test.ts.snap b/components/button/__tests__/__snapshots__/demo.test.ts.snap
index 1d7d4ce349..8ae9c0f5ad 100644
--- a/components/button/__tests__/__snapshots__/demo.test.ts.snap
+++ b/components/button/__tests__/__snapshots__/demo.test.ts.snap
@@ -1022,6 +1022,7 @@ Array [
         class="ant-btn ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-lg ant-btn-icon-only"
         href="https://www.google.com"
         tabindex="0"
+        target="_blank"
       >
         <span
           class="ant-btn-icon"
@@ -1666,6 +1667,7 @@ exports[`renders components/button/demo/icon.tsx correctly 1`] = `
       class="ant-btn ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only"
       href="https://www.google.com"
       tabindex="0"
+      target="_blank"
     >
       <span
         class="ant-btn-icon"
@@ -2016,6 +2018,7 @@ Array [
         class="ant-btn ant-btn-default ant-btn-color-default ant-btn-variant-outlined ant-btn-icon-only ant-btn-icon-end"
         href="https://www.google.com"
         tabindex="0"
+        target="_blank"
       >
         <span
           class="ant-btn-icon"
diff --git a/components/button/demo/debug-icon.tsx b/components/button/demo/debug-icon.tsx
index 4a55ce220b..9d3baaf4f6 100644
--- a/components/button/demo/debug-icon.tsx
+++ b/components/button/demo/debug-icon.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { SearchOutlined, MinusSquareOutlined } from '@ant-design/icons';
+import { MinusSquareOutlined, SearchOutlined } from '@ant-design/icons';
 import { Button, ConfigProvider, Divider, Flex, Radio, Tooltip } from 'antd';
 import type { ConfigProviderProps } from 'antd';
 
@@ -52,7 +52,7 @@ const App: React.FC = () => {
             <Button type="dashed" icon={<SearchOutlined />}>
               Search
             </Button>
-            <Button icon={<SearchOutlined />} href="https://www.google.com" />
+            <Button icon={<SearchOutlined />} href="https://www.google.com" target="_blank" />
             <Button>
               <SearchOutlined />
               Search
diff --git a/components/button/demo/icon-position.tsx b/components/button/demo/icon-position.tsx
index bda8aa5089..48707d02bf 100644
--- a/components/button/demo/icon-position.tsx
+++ b/components/button/demo/icon-position.tsx
@@ -47,7 +47,12 @@ const App: React.FC = () => {
           <Button type="dashed" icon={<SearchOutlined />} iconPosition={position}>
             Search
           </Button>
-          <Button icon={<SearchOutlined />} href="https://www.google.com" iconPosition={position} />
+          <Button
+            icon={<SearchOutlined />}
+            href="https://www.google.com"
+            target="_blank"
+            iconPosition={position}
+          />
           <Button type="primary" loading iconPosition={position}>
             Loading
           </Button>
diff --git a/components/button/demo/icon.tsx b/components/button/demo/icon.tsx
index d6b0695024..10ca156140 100644
--- a/components/button/demo/icon.tsx
+++ b/components/button/demo/icon.tsx
@@ -30,7 +30,7 @@ const App: React.FC = () => (
       <Button type="dashed" icon={<SearchOutlined />}>
         Search
       </Button>
-      <Button icon={<SearchOutlined />} href="https://www.google.com" />
+      <Button icon={<SearchOutlined />} href="https://www.google.com" target="_blank" />
     </Flex>
   </Flex>
 );
diff --git a/components/config-provider/demo/direction.tsx b/components/config-provider/demo/direction.tsx
index b7d30e1fe4..b8d93a3861 100644
--- a/components/config-provider/demo/direction.tsx
+++ b/components/config-provider/demo/direction.tsx
@@ -406,7 +406,10 @@ const Page: React.FC<{ placement: Placement }> = ({ placement }) => {
               <Rate defaultValue={2.5} />
               <br />
               <strong>* Note:</strong> Half star not implemented in RTL direction, it will be
-              supported after <a href="https://github.com/react-component/rate">rc-rate</a>{' '}
+              supported after{' '}
+              <a href="https://github.com/react-component/rate" target="_blank" rel="noreferrer">
+                rc-rate
+              </a>{' '}
               implement rtl support.
             </Col>
             <Col span={12}>
diff --git a/components/drawer/__tests__/__snapshots__/demo-extend.test.tsx.snap b/components/drawer/__tests__/__snapshots__/demo-extend.test.tsx.snap
index cedeb93534..8db6c7b085 100644
--- a/components/drawer/__tests__/__snapshots__/demo-extend.test.tsx.snap
+++ b/components/drawer/__tests__/__snapshots__/demo-extend.test.tsx.snap
@@ -4343,6 +4343,8 @@ Array [
                 </p>
                 <a
                   href="http://github.com/ant-design/ant-design/"
+                  rel="noreferrer"
+                  target="_blank"
                 >
                   github.com/ant-design/ant-design/
                 </a>
diff --git a/components/drawer/demo/user-profile.tsx b/components/drawer/demo/user-profile.tsx
index 5c56c2bdb8..16d8079601 100644
--- a/components/drawer/demo/user-profile.tsx
+++ b/components/drawer/demo/user-profile.tsx
@@ -135,7 +135,7 @@ const App: React.FC = () => {
             <DescriptionItem
               title="Github"
               content={
-                <a href="http://github.com/ant-design/ant-design/">
+                <a href="http://github.com/ant-design/ant-design/" target="_blank" rel="noreferrer">
                   github.com/ant-design/ant-design/
                 </a>
               }
diff --git a/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap
index 9748a46f41..19324174bc 100644
--- a/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/dropdown/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -7263,6 +7263,8 @@ Array [
         >
           <a
             href="https://www.antgroup.com"
+            rel="noopener noreferrer"
+            target="_blank"
           >
             1st menu item
           </a>
@@ -7296,6 +7298,8 @@ Array [
         >
           <a
             href="https://www.aliyun.com"
+            rel="noopener noreferrer"
+            target="_blank"
           >
             2nd menu item
           </a>
diff --git a/components/dropdown/demo/trigger.tsx b/components/dropdown/demo/trigger.tsx
index ca85c6fb85..86dee437da 100644
--- a/components/dropdown/demo/trigger.tsx
+++ b/components/dropdown/demo/trigger.tsx
@@ -5,11 +5,19 @@ import { Dropdown, Space } from 'antd';
 
 const items: MenuProps['items'] = [
   {
-    label: <a href="https://www.antgroup.com">1st menu item</a>,
+    label: (
+      <a href="https://www.antgroup.com" target="_blank" rel="noopener noreferrer">
+        1st menu item
+      </a>
+    ),
     key: '0',
   },
   {
-    label: <a href="https://www.aliyun.com">2nd menu item</a>,
+    label: (
+      <a href="https://www.aliyun.com" target="_blank" rel="noopener noreferrer">
+        2nd menu item
+      </a>
+    ),
     key: '1',
   },
   {
diff --git a/components/form/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/form/__tests__/__snapshots__/demo-extend.test.ts.snap
index 0e32f7d2f5..40208dfa52 100644
--- a/components/form/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/form/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -942,6 +942,8 @@ Array [
           >
             <a
               href="https://github.com/ant-design/ant-design/issues/36459"
+              rel="noreferrer"
+              target="_blank"
             >
               #36459
             </a>
@@ -1376,6 +1378,8 @@ Array [
           >
             <a
               href="https://github.com/ant-design/ant-design/issues/36459"
+              rel="noreferrer"
+              target="_blank"
             >
               #36459
             </a>
diff --git a/components/form/__tests__/__snapshots__/demo.test.tsx.snap b/components/form/__tests__/__snapshots__/demo.test.tsx.snap
index 073d0bbb64..9dc70c7578 100644
--- a/components/form/__tests__/__snapshots__/demo.test.tsx.snap
+++ b/components/form/__tests__/__snapshots__/demo.test.tsx.snap
@@ -778,6 +778,8 @@ Array [
           >
             <a
               href="https://github.com/ant-design/ant-design/issues/36459"
+              rel="noreferrer"
+              target="_blank"
             >
               #36459
             </a>
@@ -1107,6 +1109,8 @@ Array [
           >
             <a
               href="https://github.com/ant-design/ant-design/issues/36459"
+              rel="noreferrer"
+              target="_blank"
             >
               #36459
             </a>
diff --git a/components/form/demo/col-24-debug.tsx b/components/form/demo/col-24-debug.tsx
index f7a288ff41..e4d923f35a 100644
--- a/components/form/demo/col-24-debug.tsx
+++ b/components/form/demo/col-24-debug.tsx
@@ -3,7 +3,15 @@ import { Button, Divider, Form, Input, Select } from 'antd';
 
 const sharedItem = (
   <Form.Item
-    label={<a href="https://github.com/ant-design/ant-design/issues/36459">#36459</a>}
+    label={
+      <a
+        href="https://github.com/ant-design/ant-design/issues/36459"
+        target="_blank"
+        rel="noreferrer"
+      >
+        #36459
+      </a>
+    }
     initialValue={['bamboo']}
     name="select"
     style={{ boxShadow: '0 0 3px red' }}
diff --git a/components/modal/demo/footer.tsx b/components/modal/demo/footer.tsx
index 32965e2a29..a1d7490959 100644
--- a/components/modal/demo/footer.tsx
+++ b/components/modal/demo/footer.tsx
@@ -41,6 +41,7 @@ const App: React.FC = () => {
           <Button
             key="link"
             href="https://google.com"
+            target="_blank"
             type="primary"
             loading={loading}
             onClick={handleOk}
diff --git a/components/tag/__tests__/__snapshots__/demo-extend.test.ts.snap b/components/tag/__tests__/__snapshots__/demo-extend.test.ts.snap
index 8382ece38a..56a32f6d31 100644
--- a/components/tag/__tests__/__snapshots__/demo-extend.test.ts.snap
+++ b/components/tag/__tests__/__snapshots__/demo-extend.test.ts.snap
@@ -143,6 +143,8 @@ Array [
   >
     <a
       href="https://github.com/ant-design/ant-design/issues/1862"
+      rel="noopener noreferrer"
+      target="_blank"
     >
       Link
     </a>
diff --git a/components/tag/__tests__/__snapshots__/demo.test.ts.snap b/components/tag/__tests__/__snapshots__/demo.test.ts.snap
index 8a3127e9e3..23c94e94b3 100644
--- a/components/tag/__tests__/__snapshots__/demo.test.ts.snap
+++ b/components/tag/__tests__/__snapshots__/demo.test.ts.snap
@@ -141,6 +141,8 @@ Array [
   >
     <a
       href="https://github.com/ant-design/ant-design/issues/1862"
+      rel="noopener noreferrer"
+      target="_blank"
     >
       Link
     </a>
diff --git a/components/tag/demo/basic.tsx b/components/tag/demo/basic.tsx
index 21134b87d6..394d01fdfa 100644
--- a/components/tag/demo/basic.tsx
+++ b/components/tag/demo/basic.tsx
@@ -11,7 +11,13 @@ const App: React.FC = () => (
   <>
     <Tag>Tag 1</Tag>
     <Tag>
-      <a href="https://github.com/ant-design/ant-design/issues/1862">Link</a>
+      <a
+        href="https://github.com/ant-design/ant-design/issues/1862"
+        target="_blank"
+        rel="noopener noreferrer"
+      >
+        Link
+      </a>
     </Tag>
     <Tag closeIcon onClose={preventDefault}>
       Prevent Default
diff --git a/components/tag/demo/component-token.tsx b/components/tag/demo/component-token.tsx
index a85dd57807..fdc2dfed39 100644
--- a/components/tag/demo/component-token.tsx
+++ b/components/tag/demo/component-token.tsx
@@ -8,10 +8,22 @@ const App: React.FC = () => (
   >
     <Flex gap="4px 0" wrap>
       <Tag>
-        <a href="https://github.com/ant-design/ant-design/issues/1862">Link</a>
+        <a
+          href="https://github.com/ant-design/ant-design/issues/1862"
+          target="_blank"
+          rel="noreferrer"
+        >
+          Link
+        </a>
       </Tag>
       <Tag bordered={false}>
-        <a href="https://github.com/ant-design/ant-design/issues/1862">Link</a>
+        <a
+          href="https://github.com/ant-design/ant-design/issues/1862"
+          target="_blank"
+          rel="noreferrer"
+        >
+          Link
+        </a>
       </Tag>
       <Tag closable color="magenta">
         Tag 2

From cc67ee200953cbf07964a7118b2cf4d32df5ca13 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 6 Dec 2024 11:39:25 +0800
Subject: [PATCH 4/6] chore: fix eslint warning and errors (#51920)

---
 components/avatar/group.tsx          | 5 ++++-
 components/breadcrumb/Breadcrumb.tsx | 1 +
 package.json                         | 2 +-
 tests/shared/accessibilityTest.tsx   | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/components/avatar/group.tsx b/components/avatar/group.tsx
index cccae8c40d..34fc2ee5ed 100644
--- a/components/avatar/group.tsx
+++ b/components/avatar/group.tsx
@@ -102,7 +102,10 @@ const Group: React.FC<GroupProps> = (props) => {
   );
 
   const childrenWithProps = toArray(children).map((child, index) =>
-    cloneElement(child, { key: `avatar-key-${index}` }),
+    cloneElement(child, {
+      // eslint-disable-next-line react/no-array-index-key
+      key: `avatar-key-${index}`,
+    }),
   );
 
   const mergeCount = max?.count || maxCount;
diff --git a/components/breadcrumb/Breadcrumb.tsx b/components/breadcrumb/Breadcrumb.tsx
index 049892e2a9..f23106db56 100755
--- a/components/breadcrumb/Breadcrumb.tsx
+++ b/components/breadcrumb/Breadcrumb.tsx
@@ -199,6 +199,7 @@ const Breadcrumb = <T extends AnyObject = AnyObject>(props: BreadcrumbProps<T>)
       const isLastItem = index === childrenLength - 1;
       return cloneElement(element, {
         separator: isLastItem ? '' : separator,
+        // eslint-disable-next-line react/no-array-index-key
         key: index,
       });
     });
diff --git a/package.json b/package.json
index 352ff70d6b..23d3f0d22a 100644
--- a/package.json
+++ b/package.json
@@ -237,7 +237,7 @@
     "eslint-plugin-compat": "^6.0.1",
     "eslint-plugin-jest": "^28.8.3",
     "eslint-plugin-jsx-a11y": "^6.10.0",
-    "eslint-plugin-react-hooks": "^5.0.0",
+    "eslint-plugin-react-hooks": "5.0.0",
     "eslint-plugin-react-refresh": "^0.4.13",
     "fast-glob": "^3.3.2",
     "fetch-jsonp": "^1.3.0",
diff --git a/tests/shared/accessibilityTest.tsx b/tests/shared/accessibilityTest.tsx
index 4df29d5045..6ab29067fb 100644
--- a/tests/shared/accessibilityTest.tsx
+++ b/tests/shared/accessibilityTest.tsx
@@ -120,6 +120,7 @@ type Options = {
 export default function accessibilityDemoTest(component: string, options: Options = {}) {
   // If skip is true, return immediately without executing any tests
   if (options.skip === true) {
+    // eslint-disable-next-line jest/no-disabled-tests
     describe.skip(`${component} demo a11y`, () => {
       it('skipped', () => {});
     });

From 506c13bc236545c4f7f56a1b560e2123b6769bee Mon Sep 17 00:00:00 2001
From: lijianan <574980606@qq.com>
Date: Fri, 6 Dec 2024 12:03:29 +0800
Subject: [PATCH 5/6] site: fix site btn style error (#51915)

---
 .dumi/theme/common/styles/Demo.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.dumi/theme/common/styles/Demo.tsx b/.dumi/theme/common/styles/Demo.tsx
index 912bd88afb..d738b76aab 100644
--- a/.dumi/theme/common/styles/Demo.tsx
+++ b/.dumi/theme/common/styles/Demo.tsx
@@ -350,9 +350,8 @@ const GlobalDemoStyles: React.FC = () => {
         }
 
         ${antCls}-btn {
-          opacity: 0.6;
           &.icon-enabled {
-            background: ${token.colorFillSecondary};
+            background-color: ${token.colorFillSecondary};
             opacity: 1;
             ${iconCls} {
               color: ${token.colorTextBase};

From cb25346d8c9883e0770316ffc7640970c7974226 Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Fri, 6 Dec 2024 13:40:58 +0800
Subject: [PATCH 6/6] site: enable prefetch for dumi Link (#51921)

* docs: enable prefetch for dumi Link

* simplify link implementation

* fix lint

* remove nprogress dep

---------

Co-authored-by: lijianan <574980606@qq.com>
---
 .../builtins/ComponentOverview/index.tsx      |  2 +-
 .dumi/theme/builtins/DemoWrapper/index.tsx    |  6 +-
 .dumi/theme/common/Link.tsx                   | 66 ++-----------------
 .dumirc.ts                                    |  4 ++
 package.json                                  |  2 -
 5 files changed, 14 insertions(+), 66 deletions(-)

diff --git a/.dumi/theme/builtins/ComponentOverview/index.tsx b/.dumi/theme/builtins/ComponentOverview/index.tsx
index 6b12828c7e..ad02ce28e5 100644
--- a/.dumi/theme/builtins/ComponentOverview/index.tsx
+++ b/.dumi/theme/builtins/ComponentOverview/index.tsx
@@ -243,7 +243,7 @@ const Overview: React.FC = () => {
                         {cardContent}
                       </a>
                     ) : (
-                      <Link to={url} prefetch key={component.title}>
+                      <Link to={url} key={component.title}>
                         {cardContent}
                       </Link>
                     );
diff --git a/.dumi/theme/builtins/DemoWrapper/index.tsx b/.dumi/theme/builtins/DemoWrapper/index.tsx
index dd6f1919a1..5f408be6cc 100644
--- a/.dumi/theme/builtins/DemoWrapper/index.tsx
+++ b/.dumi/theme/builtins/DemoWrapper/index.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react';
+import React, { Suspense, useContext } from 'react';
 import { BugOutlined, CodeOutlined, ExperimentOutlined } from '@ant-design/icons';
 import { ConfigProvider, Tooltip, Button } from 'antd';
 import classNames from 'classnames';
@@ -113,7 +113,9 @@ const DemoWrapper: typeof DumiDemoGrid = ({ items }) => {
         </Tooltip>
       </span>
       <ConfigProvider theme={{ cssVar: enableCssVar, hashed: !enableCssVar }}>
-        <DumiDemoGrid items={demos} />
+        <Suspense>
+          <DumiDemoGrid items={demos} />
+        </Suspense>
       </ConfigProvider>
     </div>
   );
diff --git a/.dumi/theme/common/Link.tsx b/.dumi/theme/common/Link.tsx
index 9cfea27292..bccbbc1547 100644
--- a/.dumi/theme/common/Link.tsx
+++ b/.dumi/theme/common/Link.tsx
@@ -1,7 +1,6 @@
-import type { MouseEvent, MouseEventHandler } from 'react';
-import React, { forwardRef, useLayoutEffect, useTransition } from 'react';
-import { Link as DumiLink, useLocation, useNavigate } from 'dumi';
-import nprogress from 'nprogress';
+import type { MouseEventHandler } from 'react';
+import React from 'react';
+import { Link as DumiLink } from 'dumi';
 
 export interface LinkProps {
   to: string | { pathname?: string; search?: string; hash?: string };
@@ -9,64 +8,9 @@ export interface LinkProps {
   className?: string;
   onClick?: MouseEventHandler;
   component?: React.ComponentType<any>;
+  children?: React.ReactNode;
 }
 
-nprogress.configure({ showSpinner: false });
-
-const Link = forwardRef<HTMLAnchorElement, React.PropsWithChildren<LinkProps>>((props, ref) => {
-  const { to, children, component, ...rest } = props;
-  const [isPending, startTransition] = useTransition();
-  const navigate = useNavigate();
-  const { pathname } = useLocation();
-
-  const href = React.useMemo<string>(() => {
-    if (typeof to === 'object') {
-      return `${to.pathname || pathname}${to.search || ''}${to.hash || ''}`;
-    }
-    return to;
-  }, [to]);
-
-  const handleClick = (e: MouseEvent<HTMLAnchorElement>) => {
-    props.onClick?.(e);
-    if (!href?.startsWith('http')) {
-      // Should support open in new tab
-      if (!e.metaKey && !e.ctrlKey && !e.shiftKey) {
-        e.preventDefault();
-        startTransition(() => {
-          if (href) {
-            navigate(href);
-          }
-        });
-      }
-    }
-  };
-
-  useLayoutEffect(() => {
-    if (isPending) {
-      nprogress.start();
-    } else {
-      nprogress.done();
-    }
-  }, [isPending]);
-
-  if (component) {
-    return React.createElement(
-      component,
-      {
-        ...rest,
-        ref,
-        onClick: handleClick,
-        href,
-      },
-      children,
-    );
-  }
-
-  return (
-    <DumiLink ref={ref} onClick={handleClick} {...rest} to={href} prefetch>
-      {children}
-    </DumiLink>
-  );
-});
+const Link: React.FC<LinkProps> = (props) => <DumiLink {...props} prefetch />;
 
 export default Link;
diff --git a/.dumirc.ts b/.dumirc.ts
index a440e99ef3..57672e5d8e 100644
--- a/.dumirc.ts
+++ b/.dumirc.ts
@@ -9,7 +9,11 @@ import { version } from './package.json';
 
 export default defineConfig({
   plugins: ['dumi-plugin-color-chunk'],
+
+  // For <Link prefetch />
+  routePrefetch: {},
   manifest: {},
+
   conventionRoutes: {
     // to avoid generate routes for .dumi/pages/index/components/xx
     exclude: [/index\/components\//],
diff --git a/package.json b/package.json
index 23d3f0d22a..777a90694a 100644
--- a/package.json
+++ b/package.json
@@ -201,7 +201,6 @@
     "@types/lodash": "^4.17.12",
     "@types/minimist": "^1.2.5",
     "@types/node": "^22.7.7",
-    "@types/nprogress": "^0.2.3",
     "@types/pixelmatch": "^5.2.6",
     "@types/pngjs": "^6.0.5",
     "@types/prismjs": "^1.26.4",
@@ -270,7 +269,6 @@
     "mockdate": "^3.0.5",
     "node-fetch": "^3.3.2",
     "node-notifier": "^10.0.1",
-    "nprogress": "^0.2.0",
     "open": "^10.1.0",
     "ora": "^8.1.0",
     "p-all": "^5.0.0",