fix(aftershow): call afterShow only after state has fully updated

jafin · Feb 9, 2022 · 54752e8 · 54752e8
1 parent 8d260dc
commit 54752e8
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/src/index.js b/src/index.js
@@ -581,10 +581,11 @@ class ReactTooltip extends React.Component {
             show: true
           },
           () => {
-            this.updatePosition();
-            if (isInvisible && afterShow) {
-              afterShow(e);
-            }
+            this.updatePosition(() => {
+              if (isInvisible && afterShow) {
+                afterShow(e);
+              }
+            });
           }
         );
       }
@@ -692,7 +693,7 @@ class ReactTooltip extends React.Component {
   }
 
   // Calculation the position
-  updatePosition() {
+  updatePosition(callbackAfter) {
     const {
       currentEvent,
       currentTarget,
@@ -727,10 +728,12 @@ class ReactTooltip extends React.Component {
     if (result.isNewState) {
       // Switch to reverse placement
       return this.setState(result.newState, () => {
-        this.updatePosition();
+        this.updatePosition(callbackAfter);
       });
     }
 
+    callbackAfter();
+
     // Set tooltip position
     node.style.left = result.position.left + 'px';
     node.style.top = result.position.top + 'px';