@@ -3,7 +3,8 @@ import classNames from 'classnames'
3
3
import debounce from 'utils/debounce'
4
4
import { useTooltip } from 'components/TooltipProvider'
5
5
import useIsomorphicLayoutEffect from 'utils/use-isomorphic-layout-effect'
6
- import { computeTooltipPosition } from '../../utils/compute-positions'
6
+ import { getScrollParent } from 'utils/get-scroll-parent'
7
+ import { computeTooltipPosition } from 'utils/compute-positions'
7
8
import styles from './styles.module.css'
8
9
import type { IPosition , ITooltip , PlacesType } from './TooltipTypes'
9
10
@@ -299,13 +300,13 @@ const Tooltip = ({
299
300
handleShow ( false )
300
301
}
301
302
302
- const tooltipParent = tooltipRef . current ?. parentElement
303
- const anchorParent = activeAnchor ?. parentElement
303
+ const anchorScrollParent = getScrollParent ( activeAnchor )
304
+ const tooltipScrollParent = getScrollParent ( tooltipRef . current )
304
305
305
306
if ( closeOnScroll ) {
306
307
window . addEventListener ( 'scroll' , handleScrollResize )
307
- tooltipParent ?. addEventListener ( 'scroll' , handleScrollResize )
308
- anchorParent ?. addEventListener ( 'scroll' , handleScrollResize )
308
+ anchorScrollParent ?. addEventListener ( 'scroll' , handleScrollResize )
309
+ tooltipScrollParent ?. addEventListener ( 'scroll' , handleScrollResize )
309
310
}
310
311
if ( closeOnResize ) {
311
312
window . addEventListener ( 'resize' , handleScrollResize )
@@ -364,8 +365,8 @@ const Tooltip = ({
364
365
return ( ) => {
365
366
if ( closeOnScroll ) {
366
367
window . removeEventListener ( 'scroll' , handleScrollResize )
367
- tooltipParent ?. removeEventListener ( 'scroll' , handleScrollResize )
368
- anchorParent ?. removeEventListener ( 'scroll' , handleScrollResize )
368
+ anchorScrollParent ?. removeEventListener ( 'scroll' , handleScrollResize )
369
+ tooltipScrollParent ?. removeEventListener ( 'scroll' , handleScrollResize )
369
370
}
370
371
if ( closeOnResize ) {
371
372
window . removeEventListener ( 'resize' , handleScrollResize )
0 commit comments