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.

Sign up for GitHub

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

fix: accordion item focus effect input focus event #4201

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
514f9b6
fix: accordion item focus effect input focus event
chioio Dec 1, 2024
fd0f585
test: input focus error in default expanded accordion item
chioio Dec 3, 2024
40eaad1
chore: fix focus error changeset
chioio Dec 3, 2024
0e10eb9
test: accordion test
chioio Dec 4, 2024
10f3e6a
fix: completed accordion item content event
chioio Dec 4, 2024
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
20 changes: 20 additions & 0 deletions packages/components/accordion/__tests__/accordion.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,4 +345,24 @@ describe("Accordion", () => {

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

it("should focus input inside default expanded accordion item correctly", async () => {
const wrapper = render(
<Accordion selectedKeys={["1"]}>
wingkwong marked this conversation as resolved.
Show resolved Hide resolved
chioio marked this conversation as resolved.
Show resolved Hide resolved
<AccordionItem key="1" title="Accordion Item 1">
<Input label="name" type="text" />
</AccordionItem>
</Accordion>,
);

await new Promise((resolve) => setTimeout(resolve, 100));
wingkwong marked this conversation as resolved.
Show resolved Hide resolved
chioio marked this conversation as resolved.
Show resolved Hide resolved

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

expect(input).not.toBeNull();

await user.click(input!);

expect(input).toHaveFocus();
});
});
6 changes: 6 additions & 0 deletions packages/components/accordion/src/accordion-item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,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