Merge branch 'master' of https://github.com/iou90/react-native-autoheight-webview

autoHeightWebView/index.android.js

@@ -217,6 +217,10 @@ export default class AutoHeightWebView extends PureComponent {
     if (!e.nativeEvent) {
       return;
     }
+    
+    // Sometimes the message is invalid JSON, so we ignore that case
+    try { JSON.parse(isBelowKitKat ? e.nativeEvent.message : e.nativeEvent.data) } catch(e) { return }
+
     const { height, width } = JSON.parse(isBelowKitKat ? e.nativeEvent.message : e.nativeEvent.data);
     const { height: oldHeight, width: oldWidth } = this.state;
     if (isSizeChanged(height, oldHeight, width, oldWidth)) {

autoHeightWebView/index.ios.js

@@ -205,24 +205,26 @@ function getBaseScript(style) {
     ;
     ${getCurrentSize}
     (function () {
-        var height = 0;
-        var width = ${getWidth(style)};
-        var wrapper = document.createElement('div');
-        wrapper.id = 'rnahw-wrapper';
-        while (document.body.firstChild instanceof Node) {
-            wrapper.appendChild(document.body.firstChild);
-        }
-        document.body.appendChild(wrapper);
-        function updateSize() {
-            if(document.body.offsetHeight !== height || document.body.offsetWidth !== width) {
-                var size = getSize(wrapper);
-                height = size.height;
-                width = size.width;
-                document.title = height.toString() + ',' + width.toString();
+      if (!document.getElementById("rnahw-wrapper")) { 
+          var height = 0;
+          var width = ${getWidth(style)};
+          var wrapper = document.createElement('div');
+          wrapper.id = 'rnahw-wrapper';
+          while (document.body.firstChild instanceof Node) {
+              wrapper.appendChild(document.body.firstChild);
+          }
+          document.body.appendChild(wrapper);
+          function updateSize() {
+            if (document.body.offsetHeight !== height || document.body.offsetWidth !== width) {
+               var size = getSize(wrapper);
+               height = size.height;
+               width = size.width;
+               document.title = height.toString() + ',' + width.toString();
             }
-        }
+          }
         ${commonScript}
         ${domMutationObserveScript}
+        }
     } ());
     `;
 }

index.js

@@ -0,0 +1,3 @@
+var ReactNative = require('react-native')
+module.exports = ReactNative.NativeModules.AutoHeightWebView
+

package.json

@@ -4,6 +4,7 @@
   "description": "An auto height webview for React Native",
   "main": "autoHeightWebView",
   "files": [
+    "index.js",
     "android",
     "autoHeightWebView"
   ],