From bab66fdb821bbb968921c15264b04926d41638b6 Mon Sep 17 00:00:00 2001
From: damonyoungcc <damonyoungcc@icloud.com>
Date: Mon, 19 Feb 2024 16:38:07 +0800
Subject: [PATCH 1/3] fix: (FormItem) help icon click stopPropagation

---
 src/components/form/form-item.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/form/form-item.tsx b/src/components/form/form-item.tsx
index 3d21e3b037..8a21f75027 100644
--- a/src/components/form/form-item.tsx
+++ b/src/components/form/form-item.tsx
@@ -158,6 +158,7 @@ const FormItemLayout: FC<FormItemLayoutProps> = props => {
           <span
             className={`${classPrefix}-label-help`}
             onClick={e => {
+              e.stopPropagation()
               e.preventDefault()
             }}
           >

From aeb665a9c556727e1f53b41884fc4b9fd799c555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 <smith3816@gmail.com>
Date: Thu, 29 Feb 2024 17:16:06 +0800
Subject: [PATCH 2/3] test: add test case

---
 .gitignore                              |  2 ++
 package.json                            | 20 ++++++++++++++------
 src/components/form/tests/form.test.tsx | 24 ++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9dca8e96f8..a9ad3482a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,5 @@
 !.yarn/sdks
 !.yarn/versions
 .pnp.*
+.node
+package-lock.json
diff --git a/package.json b/package.json
index b888de0996..a5126445f9 100644
--- a/package.json
+++ b/package.json
@@ -60,9 +60,9 @@
     "@types/jest-axe": "3.5.4",
     "@types/lodash": "^4.14.194",
     "@types/node": "^18.15.13",
-    "@types/react": "^18.0.38",
+    "@types/react": "18",
     "@types/react-beautiful-dnd": "^13.1.4",
-    "@types/react-dom": "^18.0.11",
+    "@types/react-dom": "18",
     "@types/react-helmet": "^6.1.6",
     "@types/react-is": "^17.0.3",
     "@types/react-virtualized": "^9.21.21",
@@ -129,10 +129,6 @@
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
-  "resolutions": {
-    "@types/react": "18",
-    "@types/react-dom": "18"
-  },
   "main": "./cjs/index.js",
   "module": "./es/index.js",
   "types": "./es/index.d.ts",
@@ -158,5 +154,17 @@
     "url": "git+https://github.com/ant-design/ant-design-mobile.git",
     "branch": "master",
     "platform": "github"
+  },
+  "overrides": {
+    "@types/react": {
+      ".": "18"
+    },
+    "@types/react-dom": {
+      ".": "18"
+    }
+  },
+  "_resolutions": {
+    "@types/react": "18",
+    "@types/react-dom": "18"
   }
 }
diff --git a/src/components/form/tests/form.test.tsx b/src/components/form/tests/form.test.tsx
index cb9c0ba7f4..037cecd756 100644
--- a/src/components/form/tests/form.test.tsx
+++ b/src/components/form/tests/form.test.tsx
@@ -330,4 +330,28 @@ describe('Form', () => {
       expect(renderTimes).toEqual(1)
     })
   })
+
+  test('click help not propagate', () => {
+    jest.useFakeTimers()
+    const onClick = jest.fn()
+
+    const { container } = render(
+      <div onClick={onClick}>
+        <Form>
+          <Form.Item name='name' label='name' help='hello world'>
+            <Input />
+          </Form.Item>
+        </Form>
+      </div>
+    )
+
+    fireEvent.click(container.querySelector('.adm-form-item-label-help')!)
+    expect(onClick).not.toHaveBeenCalled()
+
+    // Click input
+    fireEvent.click(container.querySelector('input')!)
+    expect(onClick).toHaveBeenCalled()
+
+    jest.useRealTimers()
+  })
 })

From 8932a899047dbdf11a908c34b272e0d3ecba3944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8C=E8=B4=A7=E6=9C=BA=E5=99=A8=E4=BA=BA?=
 <smith3816@gmail.com>
Date: Thu, 29 Feb 2024 17:19:31 +0800
Subject: [PATCH 3/3] chore: clean up

---
 .gitignore   |  2 --
 package.json | 20 ++++++--------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index a9ad3482a1..9dca8e96f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,5 +33,3 @@
 !.yarn/sdks
 !.yarn/versions
 .pnp.*
-.node
-package-lock.json
diff --git a/package.json b/package.json
index a5126445f9..b888de0996 100644
--- a/package.json
+++ b/package.json
@@ -60,9 +60,9 @@
     "@types/jest-axe": "3.5.4",
     "@types/lodash": "^4.14.194",
     "@types/node": "^18.15.13",
-    "@types/react": "18",
+    "@types/react": "^18.0.38",
     "@types/react-beautiful-dnd": "^13.1.4",
-    "@types/react-dom": "18",
+    "@types/react-dom": "^18.0.11",
     "@types/react-helmet": "^6.1.6",
     "@types/react-is": "^17.0.3",
     "@types/react-virtualized": "^9.21.21",
@@ -129,6 +129,10 @@
   "peerDependencies": {
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
+  "resolutions": {
+    "@types/react": "18",
+    "@types/react-dom": "18"
+  },
   "main": "./cjs/index.js",
   "module": "./es/index.js",
   "types": "./es/index.d.ts",
@@ -154,17 +158,5 @@
     "url": "git+https://github.com/ant-design/ant-design-mobile.git",
     "branch": "master",
     "platform": "github"
-  },
-  "overrides": {
-    "@types/react": {
-      ".": "18"
-    },
-    "@types/react-dom": {
-      ".": "18"
-    }
-  },
-  "_resolutions": {
-    "@types/react": "18",
-    "@types/react-dom": "18"
   }
 }