Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: accordion item focus effect input focus event #4201

Open
wants to merge 5 commits into
base: canary
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/short-bulldogs-divide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@nextui-org/accordion": patch
---

Fix input focus error in default expanded accordion item, add `onClick`, `onFocus` to `AccordionItem` content wrapper
18 changes: 18 additions & 0 deletions packages/components/accordion/__tests__/accordion.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -345,4 +345,22 @@ describe("Accordion", () => {

expect(getByRole("separator")).toHaveClass("bg-rose-500");
});

it("should focus input inside default expanded accordion item correctly", async () => {
const wrapper = render(
<Accordion defaultExpandedKeys={["1"]}>
<AccordionItem key="1" title="Accordion Item 1">
<Input label="name" type="text" />
</AccordionItem>
</Accordion>,
);

const input = wrapper.container.querySelector("input");

expect(input).not.toBeNull();

await user.click(input!);

expect(input).toHaveFocus();
});
});
12 changes: 12 additions & 0 deletions packages/components/accordion/src/accordion-item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ const AccordionItem = forwardRef<"button", AccordionItemProps>((props, ref) => {
initial="exit"
style={{willChange}}
variants={transitionVariants}
onClick={(e) => {
e.stopPropagation();
}}
onFocus={(e) => {
e.stopPropagation();
}}
onKeyDown={(e) => {
e.stopPropagation();
}}
Expand All @@ -90,6 +96,12 @@ const AccordionItem = forwardRef<"button", AccordionItemProps>((props, ref) => {
initial="exit"
style={{willChange}}
variants={transitionVariants}
onClick={(e) => {
e.stopPropagation();
}}
onFocus={(e) => {
e.stopPropagation();
}}
chioio marked this conversation as resolved.
Show resolved Hide resolved
onKeyDown={(e) => {
e.stopPropagation();
}}
Expand Down
Loading