From ec12cc0df204f596e8f92b6f21f39a20901ae468 Mon Sep 17 00:00:00 2001
From: WK Wong <wingkwong.code@gmail.com>
Date: Fri, 13 Dec 2024 14:16:26 +0800
Subject: [PATCH 1/7] refactor: use onPress event instead

---
 packages/components/alert/src/alert.tsx                   | 2 +-
 .../components/button/__tests__/button-group.test.tsx     | 2 +-
 packages/components/button/__tests__/button.test.tsx      | 8 ++++----
 packages/components/button/stories/button.stories.tsx     | 2 +-
 packages/components/card/__tests__/card.test.tsx          | 8 ++++----
 packages/components/dropdown/stories/dropdown.stories.tsx | 2 +-
 packages/components/link/__tests__/link.test.tsx          | 8 ++++----
 packages/components/link/stories/link.stories.tsx         | 2 +-
 packages/components/listbox/stories/listbox.stories.tsx   | 2 +-
 packages/components/menu/__tests__/menu.test.tsx          | 6 ++----
 packages/components/menu/stories/menu.stories.tsx         | 2 +-
 11 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/packages/components/alert/src/alert.tsx b/packages/components/alert/src/alert.tsx
index cc8c9a691d..84f77fd618 100644
--- a/packages/components/alert/src/alert.tsx
+++ b/packages/components/alert/src/alert.tsx
@@ -73,7 +73,7 @@ const Alert = forwardRef<"div", AlertProps>((props, ref) => {
           aria-label="Close"
           radius="full"
           variant="light"
-          onClick={handleClose}
+          onPress={handleClose}
           {...(getCloseButtonProps() as ButtonProps)}
         >
           <CloseIcon height={20} width={20} />
diff --git a/packages/components/button/__tests__/button-group.test.tsx b/packages/components/button/__tests__/button-group.test.tsx
index ce31a5b025..fe4569231f 100644
--- a/packages/components/button/__tests__/button-group.test.tsx
+++ b/packages/components/button/__tests__/button-group.test.tsx
@@ -26,7 +26,7 @@ describe("ButtonGroup", () => {
     const handler = jest.fn();
     const wrapper = render(
       <ButtonGroup isDisabled={true}>
-        <Button disableRipple data-testid="button-test" onClick={handler}>
+        <Button disableRipple data-testid="button-test" onPress={handler}>
           action
         </Button>
       </ButtonGroup>,
diff --git a/packages/components/button/__tests__/button.test.tsx b/packages/components/button/__tests__/button.test.tsx
index e019b4dd23..963eb8db91 100644
--- a/packages/components/button/__tests__/button.test.tsx
+++ b/packages/components/button/__tests__/button.test.tsx
@@ -36,15 +36,15 @@ describe("Button", () => {
     expect(onPress).toHaveBeenCalled();
   });
 
-  it("should trigger onClick function", async () => {
-    const onClick = jest.fn();
-    const {getByRole} = render(<Button disableRipple onClick={onClick} />);
+  it("should trigger onPress function", async () => {
+    const onPress = jest.fn();
+    const {getByRole} = render(<Button disableRipple onPress={onPress} />);
 
     const button = getByRole("button");
 
     await user.click(button);
 
-    expect(onClick).toHaveBeenCalled();
+    expect(onPress).toHaveBeenCalled();
   });
 
   it("should ignore events when disabled", async () => {
diff --git a/packages/components/button/stories/button.stories.tsx b/packages/components/button/stories/button.stories.tsx
index 8a3e5d3214..7dc1f405ca 100644
--- a/packages/components/button/stories/button.stories.tsx
+++ b/packages/components/button/stories/button.stories.tsx
@@ -82,7 +82,7 @@ const StateTemplate = (args: ButtonProps) => {
       {...args}
       aria-label={isOpen ? "Close" : "Open"}
       aria-pressed={isOpen}
-      onClick={handlePress}
+      onPress={handlePress}
     >
       {isOpen ? "Close" : "Open"}
     </Button>
diff --git a/packages/components/card/__tests__/card.test.tsx b/packages/components/card/__tests__/card.test.tsx
index ab0b9c642c..e963ca0673 100644
--- a/packages/components/card/__tests__/card.test.tsx
+++ b/packages/components/card/__tests__/card.test.tsx
@@ -41,15 +41,15 @@ describe("Card", () => {
     expect(onPress).toHaveBeenCalled();
   });
 
-  it("should trigger onClick function", async () => {
-    const onClick = jest.fn();
-    const {getByRole} = render(<Card disableRipple isPressable onClick={onClick} />);
+  it("should trigger onPress function", async () => {
+    const onPress = jest.fn();
+    const {getByRole} = render(<Card disableRipple isPressable onPress={onPress} />);
 
     const button = getByRole("button");
 
     await user.click(button);
 
-    expect(onClick).toHaveBeenCalled();
+    expect(onPress).toHaveBeenCalled();
   });
 
   it("should render correctly when nested", () => {
diff --git a/packages/components/dropdown/stories/dropdown.stories.tsx b/packages/components/dropdown/stories/dropdown.stories.tsx
index 12d1379d23..21e280b4a3 100644
--- a/packages/components/dropdown/stories/dropdown.stories.tsx
+++ b/packages/components/dropdown/stories/dropdown.stories.tsx
@@ -148,7 +148,7 @@ const Template = ({
       <Button>{label}</Button>
     </DropdownTrigger>
     <DropdownMenu aria-label="Actions" color={color} variant={variant}>
-      <DropdownItem key="new" onClick={() => alert("New file")}>
+      <DropdownItem key="new" onPress={() => alert("New file")}>
         New file
       </DropdownItem>
       <DropdownItem key="copy">Copy link</DropdownItem>
diff --git a/packages/components/link/__tests__/link.test.tsx b/packages/components/link/__tests__/link.test.tsx
index b9c5e92731..5f68c8de3f 100644
--- a/packages/components/link/__tests__/link.test.tsx
+++ b/packages/components/link/__tests__/link.test.tsx
@@ -51,15 +51,15 @@ describe("Link", () => {
     expect(onPress).toHaveBeenCalled();
   });
 
-  it("should trigger onClick function", async () => {
-    const onClick = jest.fn();
-    const {getByRole} = render(<Link onClick={onClick} />);
+  it("should trigger onPress function", async () => {
+    const onPress = jest.fn();
+    const {getByRole} = render(<Link onPress={onPress} />);
 
     const link = getByRole("link");
 
     await user.click(link);
 
-    expect(onClick).toHaveBeenCalled();
+    expect(onPress).toHaveBeenCalled();
   });
 
   it('should have target="_blank" and rel="noopener noreferrer" when "isExternal" is true', () => {
diff --git a/packages/components/link/stories/link.stories.tsx b/packages/components/link/stories/link.stories.tsx
index 9a56a60a42..578985704b 100644
--- a/packages/components/link/stories/link.stories.tsx
+++ b/packages/components/link/stories/link.stories.tsx
@@ -58,7 +58,7 @@ const PressableTemplate = (args: LinkProps) => {
   };
 
   return (
-    <Link {...args} onClick={handlePress}>
+    <Link {...args} onPress={handlePress}>
       {isOpen ? "Open" : "Close"}
     </Link>
   );
diff --git a/packages/components/listbox/stories/listbox.stories.tsx b/packages/components/listbox/stories/listbox.stories.tsx
index 38fb8147e1..3369384bf6 100644
--- a/packages/components/listbox/stories/listbox.stories.tsx
+++ b/packages/components/listbox/stories/listbox.stories.tsx
@@ -174,7 +174,7 @@ const Template = ({color, variant, ...args}: ListboxProps) => (
     onAction={(key: Key) => alert(key)}
     {...args}
   >
-    <ListboxItem key="new" onClick={() => alert("[onClick] New file")}>
+    <ListboxItem key="new" onPress={() => alert("[onPress] New file")}>
       New file
     </ListboxItem>
     <ListboxItem key="copy">Copy link</ListboxItem>
diff --git a/packages/components/menu/__tests__/menu.test.tsx b/packages/components/menu/__tests__/menu.test.tsx
index 698eaa59e4..9cc62cf51a 100644
--- a/packages/components/menu/__tests__/menu.test.tsx
+++ b/packages/components/menu/__tests__/menu.test.tsx
@@ -317,14 +317,13 @@ describe("Menu", () => {
     expect(onAction).toHaveBeenCalledTimes(0);
   });
 
-  it("should dispatch onPress, onAction and onClick events", async () => {
+  it("should dispatch onPress, onAction", async () => {
     let onPress = jest.fn();
-    let onClick = jest.fn();
     let onAction = jest.fn();
 
     const wrapper = render(
       <Menu aria-label="Actions" onAction={onAction}>
-        <MenuItem key="new" onClick={onClick} onPress={onPress}>
+        <MenuItem key="new" onPress={onPress}>
           New file
         </MenuItem>
         <MenuItem key="copy">Copy link</MenuItem>
@@ -341,7 +340,6 @@ describe("Menu", () => {
 
     expect(onAction).toHaveBeenCalledTimes(1);
     expect(onPress).toHaveBeenCalledTimes(1);
-    expect(onClick).toHaveBeenCalledTimes(1);
   });
 
   it("should menuItem classNames work", () => {
diff --git a/packages/components/menu/stories/menu.stories.tsx b/packages/components/menu/stories/menu.stories.tsx
index 0b026b22f7..ec9560300c 100644
--- a/packages/components/menu/stories/menu.stories.tsx
+++ b/packages/components/menu/stories/menu.stories.tsx
@@ -45,7 +45,7 @@ const defaultProps = {
 
 const Template = ({color, variant, ...args}: MenuProps) => (
   <Menu aria-label="Actions" color={color} variant={variant} onAction={alert} {...args}>
-    <MenuItem key="new" onClick={() => alert("[onClick] New file")}>
+    <MenuItem key="new" onPress={() => alert("[onPress] New file")}>
       New file
     </MenuItem>
     <MenuItem key="copy">Copy link</MenuItem>

From afc5b8f60cd827857976ca6ad457dde1dd30618e Mon Sep 17 00:00:00 2001
From: WK Wong <wingkwong.code@gmail.com>
Date: Fri, 13 Dec 2024 18:49:44 +0800
Subject: [PATCH 2/7] chore(changeset): add changeset

---
 .changeset/two-ghosts-search.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/two-ghosts-search.md

diff --git a/.changeset/two-ghosts-search.md b/.changeset/two-ghosts-search.md
new file mode 100644
index 0000000000..93c016e26b
--- /dev/null
+++ b/.changeset/two-ghosts-search.md
@@ -0,0 +1,5 @@
+---
+"@nextui-org/alert": patch
+---
+
+replace decrepate onClick in Alert

From 5186bdd0fceda0137bcd966d63258ba0ef374578 Mon Sep 17 00:00:00 2001
From: WK Wong <wingkwong.code@gmail.com>
Date: Fri, 13 Dec 2024 20:32:26 +0800
Subject: [PATCH 3/7] refactor(button): remove duplicate test case

---
 packages/components/button/__tests__/button.test.tsx | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/packages/components/button/__tests__/button.test.tsx b/packages/components/button/__tests__/button.test.tsx
index 963eb8db91..b3fa1b899d 100644
--- a/packages/components/button/__tests__/button.test.tsx
+++ b/packages/components/button/__tests__/button.test.tsx
@@ -36,17 +36,6 @@ describe("Button", () => {
     expect(onPress).toHaveBeenCalled();
   });
 
-  it("should trigger onPress function", async () => {
-    const onPress = jest.fn();
-    const {getByRole} = render(<Button disableRipple onPress={onPress} />);
-
-    const button = getByRole("button");
-
-    await user.click(button);
-
-    expect(onPress).toHaveBeenCalled();
-  });
-
   it("should ignore events when disabled", async () => {
     const onPress = jest.fn();
     const {getByRole} = render(<Button disableRipple isDisabled onPress={onPress} />);

From 194b5adf4c0ad4fb28be61d6f599e20b30190c69 Mon Sep 17 00:00:00 2001
From: WK Wong <wingkwong.code@gmail.com>
Date: Fri, 13 Dec 2024 20:32:59 +0800
Subject: [PATCH 4/7] refactor(link): remove duplicate test case

---
 packages/components/link/__tests__/link.test.tsx | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/packages/components/link/__tests__/link.test.tsx b/packages/components/link/__tests__/link.test.tsx
index 5f68c8de3f..bd7add9bc3 100644
--- a/packages/components/link/__tests__/link.test.tsx
+++ b/packages/components/link/__tests__/link.test.tsx
@@ -51,17 +51,6 @@ describe("Link", () => {
     expect(onPress).toHaveBeenCalled();
   });
 
-  it("should trigger onPress function", async () => {
-    const onPress = jest.fn();
-    const {getByRole} = render(<Link onPress={onPress} />);
-
-    const link = getByRole("link");
-
-    await user.click(link);
-
-    expect(onPress).toHaveBeenCalled();
-  });
-
   it('should have target="_blank" and rel="noopener noreferrer" when "isExternal" is true', () => {
     const {container} = render(
       <Link isExternal href="#">

From fd8d72301bafd70cf926d6baf0695e131d099792 Mon Sep 17 00:00:00 2001
From: WK Wong <wingkwong.code@gmail.com>
Date: Fri, 13 Dec 2024 22:32:38 +0800
Subject: [PATCH 5/7] chore: add back onClick test case

---
 packages/components/button/__tests__/button.test.tsx | 11 +++++++++++
 packages/components/link/__tests__/link.test.tsx     | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/packages/components/button/__tests__/button.test.tsx b/packages/components/button/__tests__/button.test.tsx
index b3fa1b899d..304936a763 100644
--- a/packages/components/button/__tests__/button.test.tsx
+++ b/packages/components/button/__tests__/button.test.tsx
@@ -25,6 +25,17 @@ describe("Button", () => {
     expect(ref.current).not.toBeNull();
   });
 
+  it("should trigger onClick function", async () => {
+    const onClick = jest.fn();
+    const {getByRole} = render(<Button disableRipple onClick={onClick} />);
+
+    const button = getByRole("button");
+
+    await user.click(button);
+
+    expect(onClick).toHaveBeenCalled();
+  });
+
   it("should trigger onPress function", async () => {
     const onPress = jest.fn();
     const {getByRole} = render(<Button disableRipple onPress={onPress} />);
diff --git a/packages/components/link/__tests__/link.test.tsx b/packages/components/link/__tests__/link.test.tsx
index bd7add9bc3..be1281b072 100644
--- a/packages/components/link/__tests__/link.test.tsx
+++ b/packages/components/link/__tests__/link.test.tsx
@@ -40,6 +40,17 @@ describe("Link", () => {
     expect(container.querySelector("svg")).not.toBeNull();
   });
 
+  it("should trigger onClick function", async () => {
+    const onClick = jest.fn();
+    const {getByRole} = render(<Link onClick={onClick} />);
+
+    const link = getByRole("link");
+
+    await user.click(link);
+
+    expect(onClick).toHaveBeenCalled();
+  });
+
   it("should trigger onPress function", async () => {
     const onPress = jest.fn();
     const {getByRole} = render(<Link onPress={onPress} />);

From 1751ae4016046c1753fd147e4bc8be9a432c6315 Mon Sep 17 00:00:00 2001
From: WK Wong <wingkwong.code@gmail.com>
Date: Fri, 13 Dec 2024 22:33:43 +0800
Subject: [PATCH 6/7] chore(menu): keep onClick test case

---
 packages/components/menu/__tests__/menu.test.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/components/menu/__tests__/menu.test.tsx b/packages/components/menu/__tests__/menu.test.tsx
index 9cc62cf51a..698eaa59e4 100644
--- a/packages/components/menu/__tests__/menu.test.tsx
+++ b/packages/components/menu/__tests__/menu.test.tsx
@@ -317,13 +317,14 @@ describe("Menu", () => {
     expect(onAction).toHaveBeenCalledTimes(0);
   });
 
-  it("should dispatch onPress, onAction", async () => {
+  it("should dispatch onPress, onAction and onClick events", async () => {
     let onPress = jest.fn();
+    let onClick = jest.fn();
     let onAction = jest.fn();
 
     const wrapper = render(
       <Menu aria-label="Actions" onAction={onAction}>
-        <MenuItem key="new" onPress={onPress}>
+        <MenuItem key="new" onClick={onClick} onPress={onPress}>
           New file
         </MenuItem>
         <MenuItem key="copy">Copy link</MenuItem>
@@ -340,6 +341,7 @@ describe("Menu", () => {
 
     expect(onAction).toHaveBeenCalledTimes(1);
     expect(onPress).toHaveBeenCalledTimes(1);
+    expect(onClick).toHaveBeenCalledTimes(1);
   });
 
   it("should menuItem classNames work", () => {

From 4120d2e344f9a2de42ddd4de82afd6bb7a9037b2 Mon Sep 17 00:00:00 2001
From: WK Wong <wingkwong.code@gmail.com>
Date: Fri, 13 Dec 2024 22:35:03 +0800
Subject: [PATCH 7/7] chore: keep the original order

---
 .../components/button/__tests__/button.test.tsx  | 16 ++++++++--------
 packages/components/link/__tests__/link.test.tsx | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/packages/components/button/__tests__/button.test.tsx b/packages/components/button/__tests__/button.test.tsx
index 304936a763..e019b4dd23 100644
--- a/packages/components/button/__tests__/button.test.tsx
+++ b/packages/components/button/__tests__/button.test.tsx
@@ -25,26 +25,26 @@ describe("Button", () => {
     expect(ref.current).not.toBeNull();
   });
 
-  it("should trigger onClick function", async () => {
-    const onClick = jest.fn();
-    const {getByRole} = render(<Button disableRipple onClick={onClick} />);
+  it("should trigger onPress function", async () => {
+    const onPress = jest.fn();
+    const {getByRole} = render(<Button disableRipple onPress={onPress} />);
 
     const button = getByRole("button");
 
     await user.click(button);
 
-    expect(onClick).toHaveBeenCalled();
+    expect(onPress).toHaveBeenCalled();
   });
 
-  it("should trigger onPress function", async () => {
-    const onPress = jest.fn();
-    const {getByRole} = render(<Button disableRipple onPress={onPress} />);
+  it("should trigger onClick function", async () => {
+    const onClick = jest.fn();
+    const {getByRole} = render(<Button disableRipple onClick={onClick} />);
 
     const button = getByRole("button");
 
     await user.click(button);
 
-    expect(onPress).toHaveBeenCalled();
+    expect(onClick).toHaveBeenCalled();
   });
 
   it("should ignore events when disabled", async () => {
diff --git a/packages/components/link/__tests__/link.test.tsx b/packages/components/link/__tests__/link.test.tsx
index be1281b072..b9c5e92731 100644
--- a/packages/components/link/__tests__/link.test.tsx
+++ b/packages/components/link/__tests__/link.test.tsx
@@ -40,26 +40,26 @@ describe("Link", () => {
     expect(container.querySelector("svg")).not.toBeNull();
   });
 
-  it("should trigger onClick function", async () => {
-    const onClick = jest.fn();
-    const {getByRole} = render(<Link onClick={onClick} />);
+  it("should trigger onPress function", async () => {
+    const onPress = jest.fn();
+    const {getByRole} = render(<Link onPress={onPress} />);
 
     const link = getByRole("link");
 
     await user.click(link);
 
-    expect(onClick).toHaveBeenCalled();
+    expect(onPress).toHaveBeenCalled();
   });
 
-  it("should trigger onPress function", async () => {
-    const onPress = jest.fn();
-    const {getByRole} = render(<Link onPress={onPress} />);
+  it("should trigger onClick function", async () => {
+    const onClick = jest.fn();
+    const {getByRole} = render(<Link onClick={onClick} />);
 
     const link = getByRole("link");
 
     await user.click(link);
 
-    expect(onPress).toHaveBeenCalled();
+    expect(onClick).toHaveBeenCalled();
   });
 
   it('should have target="_blank" and rel="noopener noreferrer" when "isExternal" is true', () => {