@@ -555,7 +555,7 @@ class ReactTooltip extends React.Component {
555
555
*/
556
556
updateTooltip ( e ) {
557
557
const { delayShow, disable } = this . state ;
558
- const { afterShow } = this . props ;
558
+ const { afterShow, disable : disableProp } = this . props ;
559
559
const placeholder = this . getTooltipContent ( ) ;
560
560
const eventTarget = e . currentTarget || e . target ;
561
561
@@ -565,7 +565,7 @@ class ReactTooltip extends React.Component {
565
565
}
566
566
567
567
// if the tooltip is empty, disable the tooltip
568
- if ( this . isEmptyTip ( placeholder ) || disable ) {
568
+ if ( this . isEmptyTip ( placeholder ) || disable || disableProp ) {
569
569
return ;
570
570
}
571
571
@@ -631,10 +631,10 @@ class ReactTooltip extends React.Component {
631
631
const { disable } = this . state ;
632
632
const { isScroll } = options ;
633
633
const delayHide = isScroll ? 0 : this . state . delayHide ;
634
- const { afterHide } = this . props ;
634
+ const { afterHide, disable : disableProp } = this . props ;
635
635
const placeholder = this . getTooltipContent ( ) ;
636
636
if ( ! this . mount ) return ;
637
- if ( this . isEmptyTip ( placeholder ) || disable ) return ; // if the tooltip is empty, disable the tooltip
637
+ if ( this . isEmptyTip ( placeholder ) || disable || disableProp ) return ; // if the tooltip is empty, disable the tooltip
638
638
if ( hasTarget ) {
639
639
// Don't trigger other elements belongs to other ReactTooltip
640
640
const targetArray = this . getTargetArray ( this . props . id ) ;
0 commit comments