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
5 changes: 5 additions & 0 deletions .changeset/nine-yaks-tap.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@radix-ui/react-dialog': patch
---

Stop event propagation to avoid unintended side effects.
2 changes: 1 addition & 1 deletion context7.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"url": "https://context7.com/radix-ui/primitives",
"public_key": "pk_q7NnKuFFXMWA7WnmjMHQU"
}
}
24 changes: 18 additions & 6 deletions packages/react/dialog/src/dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ type DialogContextValue = {
descriptionId: string;
open: boolean;
onOpenChange(open: boolean): void;
onOpenToggle(): void;
onOpenToggle(event: React.MouseEvent): void;
modal: boolean;
};

Expand Down Expand Up @@ -75,7 +75,13 @@ const Dialog: React.FC<DialogProps> = (props: ScopedProps<DialogProps>) => {
descriptionId={useId()}
open={open}
onOpenChange={setOpen}
onOpenToggle={React.useCallback(() => setOpen((prevOpen) => !prevOpen), [setOpen])}
onOpenToggle={React.useCallback(
(e) => {
e.stopPropagation();
setOpen((prevOpen) => !prevOpen);
},
[setOpen],
)}
modal={modal}
>
{children}
Expand Down Expand Up @@ -278,9 +284,11 @@ const DialogContentModal = React.forwardRef<DialogContentTypeElement, DialogCont
disableOutsidePointerEvents
onCloseAutoFocus={composeEventHandlers(props.onCloseAutoFocus, (event) => {
event.preventDefault();
event.stopPropagation();
context.triggerRef.current?.focus();
})}
onPointerDownOutside={composeEventHandlers(props.onPointerDownOutside, (event) => {
event.stopPropagation();
const originalEvent = event.detail.originalEvent;
const ctrlLeftClick = originalEvent.button === 0 && originalEvent.ctrlKey === true;
const isRightClick = originalEvent.button === 2 || ctrlLeftClick;
Expand All @@ -291,9 +299,10 @@ const DialogContentModal = React.forwardRef<DialogContentTypeElement, DialogCont
})}
// When focus is trapped, a `focusout` event may still happen.
// We make sure we don't trigger our `onDismiss` in such case.
onFocusOutside={composeEventHandlers(props.onFocusOutside, (event) =>
event.preventDefault(),
)}
onFocusOutside={composeEventHandlers(props.onFocusOutside, (event) => {
event.preventDefault();
event.stopPropagation();
})}
/>
);
},
Expand Down Expand Up @@ -481,7 +490,10 @@ const DialogClose = React.forwardRef<DialogCloseElement, DialogCloseProps>(
type="button"
{...closeProps}
ref={forwardedRef}
onClick={composeEventHandlers(props.onClick, () => context.onOpenChange(false))}
onClick={composeEventHandlers(props.onClick, (event) => {
event.stopPropagation();
context.onOpenChange(false);
})}
/>
);
},
Expand Down