Skip to content

[Bug] Fix popover inside settings dialog #2822

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.

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
Jun 30, 2023
Merged
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
27 changes: 16 additions & 11 deletions src/frontend/components/UI/PopoverComponent/index.scss
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
.MuiPaper-root.MuiPopover-paper.popover-paper {
background-color: var(--background);
color: var(--text-primary);
border: 1px solid var(--border-color);
border-radius: 4px;
box-shadow: 0 0 0 1px var(--border-color);
padding: 16px;
width: fit-content;
max-width: 500px;
overflow-y: auto;
overflow-x: hidden;
.popover-wrapper {
position: relative;
.popover {
background-color: var(--background);
color: var(--text-primary);
border: 1px solid var(--border-color);
border-radius: 4px;
box-shadow: 0 0 0 1px var(--border-color);
padding: 16px;
width: fit-content;
max-width: 500px;
overflow-y: auto;
overflow-x: hidden;
position: absolute;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is only adding these last 2 props and the relative for the parent

z-index: 2;
}
}
62 changes: 30 additions & 32 deletions src/frontend/components/UI/PopoverComponent/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Popover from '@mui/material/Popover/Popover'
import React, { useState } from 'react'
import React, { useEffect, useRef, useState } from 'react'
import './index.scss'

interface PopoverComponentProps {
Expand All @@ -11,46 +10,45 @@ const PopoverComponent: React.FC<PopoverComponentProps> = ({
item,
children
}) => {
const [anchorEl, setAnchorEl] = useState<HTMLElement | null>(null)
const open = Boolean(anchorEl)
const [open, setOpen] = useState(false)
const wrapper = useRef<HTMLDivElement>(null)

const handleClick = (event: React.MouseEvent<HTMLElement>) => {
// if already open, close it
const handleClick = () => {
setOpen(!open)
}

useEffect(() => {
if (open) {
setAnchorEl(null)
return
}
// add a click listener to close the popover when clicking outside
const callback = (event: MouseEvent) => {
if (!wrapper.current!.contains(event.target as HTMLElement)) {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if clicked outside the wrapper, close the popover

setOpen(false)
}
}

setAnchorEl(event.currentTarget)
}
document.addEventListener('click', callback)

const handleClose = () => {
setAnchorEl(null)
}
return () => {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when the popover is closed, remove the listener

// remove the listener when the popover is closed
document.removeEventListener('click', callback)
}
} else {
return () => ''
}
}, [open])

return (
<>
<div className="popover-wrapper" ref={wrapper}>
{React.cloneElement(item, {
onClick: handleClick,
style: { cursor: 'pointer' }
})}
<Popover
id={item.props.id}
open={open}
anchorEl={anchorEl}
onClick={handleClick}
onClose={handleClose}
anchorOrigin={{
vertical: 'bottom',
horizontal: 'left'
}}
classes={{
paper: 'popover-paper'
}}
>
{children}
</Popover>
</>
{open && (
<div id={item.props.id} className="popover">
{children}
</div>
)}
</div>
)
}

Expand Down