1
1
import * as React from 'react' ;
2
2
import PrimeReact , { PrimeReactContext } from '../api/Api' ;
3
3
import { useHandleStyle } from '../componentbase/ComponentBase' ;
4
- import { useMergeProps , useMountEffect , useOverlayScrollListener , useResizeListener , useUnmountEffect , useUpdateEffect , useGlobalOnEscapeKey , ESC_KEY_HANDLING_PRIORITIES } from '../hooks/Hooks' ;
4
+ import { ESC_KEY_HANDLING_PRIORITIES , useDisplayOrder , useGlobalOnEscapeKey , useMergeProps , useMountEffect , useOverlayScrollListener , useResizeListener , useUnmountEffect , useUpdateEffect } from '../hooks/Hooks' ;
5
5
import { Portal } from '../portal/Portal' ;
6
6
import { DomHandler , ObjectUtils , ZIndexUtils , classNames } from '../utils/Utils' ;
7
7
import { TooltipBase } from './TooltipBase' ;
@@ -15,6 +15,8 @@ export const Tooltip = React.memo(
15
15
const [ positionState , setPositionState ] = React . useState ( props . position || 'right' ) ;
16
16
const [ classNameState , setClassNameState ] = React . useState ( '' ) ;
17
17
const [ multipleFocusEvents , setMultipleFocusEvents ] = React . useState ( false ) ;
18
+ const isCloseOnEscape = visibleState && props . closeOnEscape ;
19
+ const overlayDisplayOrder = useDisplayOrder ( 'tooltip' , isCloseOnEscape ) ;
18
20
const metaData = {
19
21
props,
20
22
state : {
@@ -37,8 +39,8 @@ export const Tooltip = React.memo(
37
39
callback : ( ) => {
38
40
hide ( ) ;
39
41
} ,
40
- when : props . closeOnEscape ,
41
- priority : [ ESC_KEY_HANDLING_PRIORITIES . TOOLTIP , 0 ]
42
+ when : isCloseOnEscape ,
43
+ priority : [ ESC_KEY_HANDLING_PRIORITIES . TOOLTIP , overlayDisplayOrder ]
42
44
} ) ;
43
45
const elementRef = React . useRef ( null ) ;
44
46
const textRef = React . useRef ( null ) ;
0 commit comments