Skip to content

Commit 8dc56b7

Browse files
committed
fix: remove event listeners from popover
1 parent 224cad7 commit 8dc56b7

File tree

2 files changed

+13
-31
lines changed

2 files changed

+13
-31
lines changed

GUI/ETVR/src/components/header/CustomPopover/index.tsx

+10-26
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,18 @@ export interface ICustomPopover {
1111

1212
export const CustomPopover = (props: ICustomPopover) => {
1313
const [open, setOpen] = createSignal(false)
14-
onMount(() => {
15-
document.querySelectorAll(`#${props.id}`).forEach((el) => {
16-
el.addEventListener('mouseenter', () => {
17-
setOpen(true)
18-
console.log('hovered')
19-
})
20-
el.addEventListener('mouseleave', () => {
21-
setOpen(false)
22-
console.log('not hovered')
23-
})
24-
})
25-
})
26-
createEffect(() => {
27-
if (!open()) {
28-
document.removeEventListener('mouseleave', (e) => {
29-
e.stopPropagation()
30-
console.log('not hovered')
31-
setOpen(false)
32-
})
33-
document.removeEventListener('mouseenter', (e) => {
34-
e.stopPropagation()
35-
console.log('not hovered')
36-
setOpen(false)
37-
})
14+
const handlePopOver = () => {
15+
if (props.disablePopover) {
16+
setOpen(false)
3817
}
39-
})
18+
setOpen(!open())
19+
}
4020
return (
41-
<div class="group relative inline-flex" onClick={() => props.onClick?.()}>
21+
<div
22+
onMouseEnter={handlePopOver}
23+
onMouseLeave={handlePopOver}
24+
class="group relative inline-flex"
25+
onClick={() => props.onClick?.()}>
4226
<Popover.Root isOpen={open()}>
4327
<Popover.Trigger class="rounded-[8px] pl-[1.5rem] pr-[1.5rem] focus:bg-[#252536] hover:bg-[#252536]">
4428
<Image.Root>

GUI/ETVR/src/main.tsx

+3-5
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ import App from './app'
66

77
render(
88
() => (
9-
<>
10-
<Router>
11-
<App />
12-
</Router>
13-
</>
9+
<Router>
10+
<App />
11+
</Router>
1412
),
1513
document.getElementById('root') as HTMLElement,
1614
)

0 commit comments

Comments
 (0)