Skip to content
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
4 changes: 2 additions & 2 deletions src/click_outside_wrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ const useDetectClickOutside = (
[ignoreClass],
);
useEffect(() => {
document.addEventListener("mousedown", handleClickOutside);
document.addEventListener("mousedown", handleClickOutside, true);
return () => {
document.removeEventListener("mousedown", handleClickOutside);
document.removeEventListener("mousedown", handleClickOutside, true);
};
}, [handleClickOutside]);
return ref;
Expand Down
21 changes: 21 additions & 0 deletions src/test/click_outside_wrapper.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,26 @@ describe("ClickOutsideWrapper", () => {
expect(onClickOutsideMock).toHaveBeenCalledTimes(1);
});

it("calls onClickOutside when an outside element stops mousedown propagation", () => {
const { getByTestId } = render(
<div>
<ClickOutsideWrapper onClickOutside={onClickOutsideMock}>
<div>Inside</div>
</ClickOutsideWrapper>
<button
data-testid="outside"
onMouseDown={(event) => event.stopPropagation()}
>
Outside
</button>
</div>,
);

fireEvent.mouseDown(getByTestId("outside"));

expect(onClickOutsideMock).toHaveBeenCalledTimes(1);
});

it("does not call onClickOutside when clicking inside the wrapper", () => {
const { container } = render(
<ClickOutsideWrapper onClickOutside={onClickOutsideMock}>
Expand Down Expand Up @@ -190,6 +210,7 @@ describe("ClickOutsideWrapper", () => {
expect(removeEventListenerSpy).toHaveBeenCalledWith(
"mousedown",
expect.any(Function),
true,
);

removeEventListenerSpy.mockRestore();
Expand Down
18 changes: 18 additions & 0 deletions src/test/datepicker_test.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2865,6 +2865,24 @@ describe("DatePicker", () => {
expect(onClickOutsideSpy).toHaveBeenCalledTimes(1);
});

it("should close when an outside element stops mousedown propagation", () => {
const { container, getByRole } = render(
<div>
<button onMouseDown={(event) => event.stopPropagation()}>
Outside
</button>
<DatePicker />
</div>,
);

fireEvent.focus(safeQuerySelector(container, "input"));
expect(container.querySelector(".react-datepicker")).not.toBeNull();

fireEvent.mouseDown(getByRole("button", { name: "Outside" }));

expect(container.querySelector(".react-datepicker")).toBeNull();
});

it("should not close date picker when onClickOutside calls preventDefault", () => {
const onClickOutside = (event: MouseEvent) => {
event.preventDefault();
Expand Down