Skip to content

fix(Drawer): handle clicks in components inside Drawer #2264

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

Merged
merged 1 commit into from
May 12, 2025
Merged

fix(Drawer): handle clicks in components inside Drawer #2264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/components/Drawer/Drawer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
top: 0;
left: 0;

padding: var(--g-spacing-4) var(--g-spacing-4) 0 var(--g-spacing-6);
padding: var(--g-spacing-4) var(--g-spacing-4) 0 var(--g-spacing-4);

background-color: var(--g-color-base-background);
}
Expand All @@ -34,5 +34,10 @@
flex-direction: column;

height: 100%;
//split-pane resizer size
margin-left: var(--g-spacing-2);
}
&__click-handler {
display: contents;
}
}
24 changes: 21 additions & 3 deletions src/components/Drawer/Drawer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@

import './Drawer.scss';

type DrawerEvent = MouseEvent & {
_capturedInsideDrawer?: boolean;
};

interface DrawerPaneContentWrapperProps {
isVisible: boolean;
onClose: () => void;
Expand Down Expand Up @@ -64,7 +68,11 @@
return undefined;
}

const handleClickOutside = (event: MouseEvent) => {
const handleClickOutside = (event: DrawerEvent) => {
//skip if event is captured inside drawer or not triggered by user
if (event._capturedInsideDrawer || !event.isTrusted) {
return;
}
if (
isVisible &&
drawerRef.current &&
Expand All @@ -91,6 +99,10 @@
}
};

const handleClickInsideDrawer = (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
(event.nativeEvent as DrawerEvent)._capturedInsideDrawer = true;

Check warning on line 103 in src/components/Drawer/Drawer.tsx

View workflow job for this annotation

GitHub Actions / Verify Files 

Assignment to property of function parameter 'event'
};

return (
<GravityDrawer
onEscape={onClose}
Expand All @@ -109,7 +121,9 @@
className={b('item')}
ref={detectClickOutside ? drawerRef : undefined}
>
{children}
<div className={b('click-handler')} onClickCapture={handleClickInsideDrawer}>
{children}
</div>
</DrawerItem>
</GravityDrawer>
);
Expand Down Expand Up @@ -184,7 +198,11 @@
}

return (
<Flex justifyContent="space-between" className={b('header-wrapper', headerClassName)}>
<Flex
justifyContent="space-between"
alignItems="center"
className={b('header-wrapper', headerClassName)}
>
<Text variant="subheader-2">{title}</Text>
<Flex className={b('controls')}>{controls}</Flex>
</Flex>
Expand Down
Loading