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
9 changes: 7 additions & 2 deletions packages/react-core/src/components/Tooltip/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ export interface TooltipProps extends Omit<React.HTMLProps<HTMLDivElement>, 'con
enableFlip?: boolean;
/** Delay in ms before the tooltip appears */
entryDelay?: number;
/** Delay in ms before the tooltip disappears */
/** Delay in ms before the tooltip disappears, Avoid passing in a value of "0", as users should
* be given ample time to move their mouse from the trigger to the tooltip content without the content
* being hidden.
*/
exitDelay?: number;
/**
* The desired position to flip the tooltip to if the initial position is not possible.
Expand Down Expand Up @@ -149,7 +152,7 @@ export const Tooltip: React.FunctionComponent<TooltipProps> = ({
enableFlip = true,
className = '',
entryDelay = 300,
exitDelay = 0,
exitDelay = 300,
appendTo = () => document.body,
zIndex = 9999,
maxWidth = tooltipMaxWidth.value,
Expand Down Expand Up @@ -318,6 +321,8 @@ export const Tooltip: React.FunctionComponent<TooltipProps> = ({
placement={position}
onMouseEnter={triggerOnMouseenter && show}
onMouseLeave={triggerOnMouseenter && hide}
onPopperMouseEnter={triggerOnMouseenter && show}
onPopperMouseLeave={triggerOnMouseenter && hide}
onFocus={triggerOnFocus && show}
onBlur={triggerOnFocus && hide}
onDocumentClick={triggerOnClick && onDocumentClick}
Expand Down
12 changes: 12 additions & 0 deletions packages/react-core/src/helpers/Popper/Popper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ export interface PopperProps {
onTriggerEnter?: (event?: KeyboardEvent) => void;
/** Callback function when popper is clicked */
onPopperClick?: (event?: MouseEvent) => void;
/** Callback function when mouse enters popper content */
onPopperMouseEnter?: (event?: MouseEvent) => void;
/** Callback function when mouse leaves popper content */
onPopperMouseLeave?: (event?: MouseEvent) => void;
/** Callback function when document is clicked */
onDocumentClick?: (event?: MouseEvent, triggerElement?: HTMLElement, popperElement?: HTMLElement) => void;
/** Callback function when keydown event occurs on document */
Expand Down Expand Up @@ -139,6 +143,8 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
onTriggerClick,
onTriggerEnter,
onPopperClick,
onPopperMouseEnter,
onPopperMouseLeave,
onDocumentKeyDown,
enableFlip = true,
flipBehavior = 'flip',
Expand Down Expand Up @@ -185,6 +191,8 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
addEventListener(onTriggerClick, refOrTrigger, 'click');
addEventListener(onTriggerEnter, refOrTrigger, 'keydown');
addEventListener(onPopperClick, popperElement, 'click');
addEventListener(onPopperMouseEnter, popperElement, 'mouseenter');
addEventListener(onPopperMouseLeave, popperElement, 'mouseleave');
onDocumentClick && addEventListener(onDocumentClickCallback, document, 'click');
addEventListener(onDocumentKeyDown, document, 'keydown');

Expand All @@ -202,6 +210,8 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
removeEventListener(onTriggerClick, refOrTrigger, 'click');
removeEventListener(onTriggerEnter, refOrTrigger, 'keydown');
removeEventListener(onPopperClick, popperElement, 'click');
removeEventListener(onPopperMouseEnter, popperElement, 'mouseenter');
removeEventListener(onPopperMouseLeave, popperElement, 'mouseleave');
onDocumentClick && removeEventListener(onDocumentClickCallback, document, 'click');
removeEventListener(onDocumentKeyDown, document, 'keydown');
observer.disconnect();
Expand All @@ -216,6 +226,8 @@ export const Popper: React.FunctionComponent<PopperProps> = ({
onTriggerClick,
onTriggerEnter,
onPopperClick,
onPopperMouseEnter,
onPopperMouseLeave,
onDocumentClick,
onDocumentKeyDown,
refElement
Expand Down