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: switch to onClick from onMouseDown in modal components #16847

Merged
merged 10 commits into from
Jul 16, 2024
Merged

fix: switch to onClick from onMouseDown in modal components #16847

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bc99a9f
fix: switch onmousedown to onclick handler in modal components
davidmenendez Jun 21, 2024
e15c6a1
Merge branch 'main' into modal-mousedown-onclick
davidmenendez Jun 21, 2024
5540e6d
Merge branch 'main' into modal-mousedown-onclick
davidmenendez Jun 25, 2024
dff0e54
fix: include user onclick
davidmenendez Jun 25, 2024
5dbff02
fix: added test
davidmenendez Jun 25, 2024
d2b3268
fix: include test
davidmenendez Jun 25, 2024
51480ee
Merge branch 'main' into modal-mousedown-onclick
davidmenendez Jun 25, 2024
e500ce6
Merge branch 'main' into modal-mousedown-onclick
davidmenendez Jun 26, 2024
23b23ee
Merge branch 'main' into modal-mousedown-onclick
guidari Jul 1, 2024
520a644
Merge branch 'main' into modal-mousedown-onclick
davidmenendez Jul 2, 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
4 changes: 2 additions & 2 deletions packages/react/src/components/ComposedModal/ComposedModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ const ComposedModal = React.forwardRef<HTMLDivElement, ComposedModalProps>(
onKeyDown?.(event);
}

function handleMousedown(evt: React.MouseEvent<HTMLDivElement>) {
function handleClick(evt: React.MouseEvent<HTMLDivElement>) {
const target = evt.target as Node;
evt.stopPropagation();
if (
Expand Down Expand Up @@ -421,7 +421,7 @@ const ComposedModal = React.forwardRef<HTMLDivElement, ComposedModalProps>(
ref={ref}
aria-hidden={!open}
onBlur={!focusTrapWithoutSentinels ? handleBlur : () => {}}
onMouseDown={handleMousedown}
onClick={handleClick}
davidmenendez marked this conversation as resolved.
Show resolved Hide resolved
onKeyDown={handleKeyDown}
className={modalClass}>
<div
Expand Down
4 changes: 2 additions & 2 deletions packages/react/src/components/Modal/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ const Modal = React.forwardRef(function Modal(
}
}

function handleMousedown(evt: React.MouseEvent<HTMLDivElement>) {
function handleOnclick(evt: React.MouseEvent<HTMLDivElement>) {
const target = evt.target as Node;
evt.stopPropagation();
if (
Expand Down Expand Up @@ -584,7 +584,7 @@ const Modal = React.forwardRef(function Modal(
<div
{...rest}
onKeyDown={handleKeyDown}
onMouseDown={handleMousedown}
onClick={handleOnclick}
onBlur={!focusTrapWithoutSentinels ? handleBlur : () => {}}
className={modalClasses}
role="presentation"
Expand Down
Loading