Skip to content
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@netdata/netdata-ui",
"version": "5.2.1",
"version": "5.2.2",
"description": "netdata UI kit",
"main": "dist/index.js",
"module": "dist/es6/index.js",
Expand Down
26 changes: 23 additions & 3 deletions src/components/drops/popover/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useCallback, Fragment, useRef } from "react"
import React, { useCallback, Fragment, useRef, useEffect } from "react"
import Drop from "@/components/drops/drop"
import useForwardRef from "@/hooks/useForwardRef"
import useToggle from "@/hooks/useToggle"
Expand All @@ -7,6 +7,7 @@ import useDescribedId from "@/components/drops/mixins/useDescribedId"
import dropAlignMap from "@/components/drops/mixins/dropAlignMap"
import Container from "@/components/drops/container"

const noop = () => {}
const getContent = content => (typeof content === "function" ? content() : content)

const Popover = ({
Expand All @@ -19,6 +20,7 @@ const Popover = ({
children,
zIndex = 70,
ref: parentRef,
onHoverChange = noop,
...rest
}) => {
const id = useDescribedId(rest["aria-describedby"])
Expand All @@ -33,16 +35,34 @@ const Popover = ({

const [ref, setRef] = useForwardRef(parentRef)

const onTargetElementMouseOver = useCallback(() => {
open()
onHoverChange(true)
}, [open, onHoverChange])

const onTargetElementMouseLeave = useCallback(() => {
closeDrop()
onHoverChange(false)
}, [closeDrop, onHoverChange])

const targetElement = useClonedChildren(children, setRef, {
isOpen,
onMouseOver: open,
onMouseLeave: closeDrop,
onMouseOver: onTargetElementMouseOver,
onMouseLeave: onTargetElementMouseLeave,
onFocus: open,
onBlur: closeDrop,
...(isOpen && { "aria-describedby": id }),
...rest,
})

useEffect(() => {
if (initialOpen) {
open()
} else {
close()
}
}, [initialOpen, open, close])

const onMouseEnter = useCallback(() => {
dropHoverRef.current = true
}, [])
Expand Down