@@ -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
@@ -302,13 +303,13 @@ const Tooltip = ({
302
303
handleShow ( false )
303
304
}
304
305
305
- const tooltipParent = tooltipRef . current ?. parentElement
306
- const anchorParent = activeAnchor ?. parentElement
306
+ const anchorScrollParent = getScrollParent ( activeAnchor )
307
+ const tooltipScrollParent = getScrollParent ( tooltipRef . current )
307
308
308
309
if ( closeOnScroll ) {
309
310
window . addEventListener ( 'scroll' , handleScrollResize )
310
- tooltipParent ?. addEventListener ( 'scroll' , handleScrollResize )
311
- anchorParent ?. addEventListener ( 'scroll' , handleScrollResize )
311
+ anchorScrollParent ?. addEventListener ( 'scroll' , handleScrollResize )
312
+ tooltipScrollParent ?. addEventListener ( 'scroll' , handleScrollResize )
312
313
}
313
314
if ( closeOnResize ) {
314
315
window . addEventListener ( 'resize' , handleScrollResize )
@@ -367,8 +368,8 @@ const Tooltip = ({
367
368
return ( ) => {
368
369
if ( closeOnScroll ) {
369
370
window . removeEventListener ( 'scroll' , handleScrollResize )
370
- tooltipParent ?. removeEventListener ( 'scroll' , handleScrollResize )
371
- anchorParent ?. removeEventListener ( 'scroll' , handleScrollResize )
371
+ anchorScrollParent ?. removeEventListener ( 'scroll' , handleScrollResize )
372
+ tooltipScrollParent ?. removeEventListener ( 'scroll' , handleScrollResize )
372
373
}
373
374
if ( closeOnResize ) {
374
375
window . removeEventListener ( 'resize' , handleScrollResize )
0 commit comments