fix(getposition): no error when all placements outside

ReactTooltip · Feb 15, 2022 · 249b925 · 249b925
1 parent 982d89d
commit 249b925
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/index.js b/src/index.js
@@ -425,7 +425,7 @@ class ReactTooltip extends React.Component {
       e,
       e.currentTarget,
       this.tooltipRef,
-      desiredPlace,
+      desiredPlace.split(',')[0],
       desiredPlace,
       effect,
       offset
@@ -443,7 +443,9 @@ class ReactTooltip extends React.Component {
       );
     }
 
-    const place = result.isNewState ? result.newState.place : desiredPlace;
+    const place = result.isNewState
+      ? result.newState.place
+      : desiredPlace.split(',')[0];
 
     // To prevent previously created timers from triggering
     this.clearTimer();

diff --git a/src/utils/getPosition.js b/src/utils/getPosition.js
@@ -83,17 +83,18 @@ export default function(e, target, node, place, desiredPlace, effect, offset) {
     right: inside('right')
   };
 
-  function firstInside() {
+  function choose() {
     const allPlaces = desiredPlace
       .split(',')
       .concat(place, ['top', 'bottom', 'left', 'right']);
     for (const d of allPlaces) {
       if (placeIsInside[d]) return d;
     }
-    return null;
+    // if nothing is inside, just use the old place.
+    return place;
   }
 
-  const chosen = firstInside();
+  const chosen = choose();
 
   let isNewState = false;
   let newPlace;