Merge pull request #3 from hegelstad/master

fixed measuring in scrollviews
AndreiCalazans · Aug 2, 2018 · ea8ac51 · ea8ac51
2 parents 00cc9f8 + fe2bb38
commit ea8ac51
Showing 1 changed file with 13 additions and 15 deletions.
diff --git a/src/Tooltip.js b/src/Tooltip.js
@@ -52,6 +52,7 @@ class Tooltip extends React.Component<Props, State> {
 
   toggleTooltip = () => {
     const { onClose } = this.props;
+    this.getElementPosition();
     this.setState(prevState => {
       if (prevState.isVisible && !isIOS) {
         onClose && onClose();
@@ -167,20 +168,17 @@ class Tooltip extends React.Component<Props, State> {
     setTimeout(this.getElementPosition, 500);
   }
 
-  getElementPosition = () => {
-    if (this.renderedElement) {
-      NativeMethodsMixin.measureInWindow.call(
-        this.renderedElement,
-        (x, y, width, height) => {
-          this.setState({
-            xOffset: x,
-            yOffset: y,
-            elementWidth: width,
-            elementHeight: height,
-          });
-        },
-      );
-    }
+  getElementPosition = (event) => {
+    this.renderedElement && this.renderedElement.measure(
+      (frameOffsetX, frameOffsetY, width, height, pageOffsetX, pageOffsetY) => {
+        this.setState({
+          xOffset: pageOffsetX,
+          yOffset: pageOffsetY,
+          elementWidth: width,
+          elementHeight: height,
+        });
+      }
+    );
   };
 
   render() {
@@ -217,7 +215,7 @@ Tooltip.propTypes = {
   popover: PropTypes.element,
   toggleOnPress: PropTypes.bool,
   height: PropTypes.number,
-  width: PropTypes.number,
+  width: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
   containerStyle: ViewPropTypes.style,
   pointerColor: PropTypes.string,
   onClose: PropTypes.func,