change android package name to com.iou90.autoheightwebview; update index.ios.js to improve capacity; update rn version of demo to 0.54.3; bump version to 0.6.0

android/src/androidTest/java/com/dscj/autoheightwebview/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.dscj.autoheightwebview;
+package com.iou90.autoheightwebview;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.dscj.autoheightwebview.test", appContext.getPackageName());
+        assertEquals("com.iou90.autoheightwebview.test", appContext.getPackageName());
     }
 }

android/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.dscj.autoheightwebview">
+          package="com.iou90.autoheightwebview">
 
     <application android:allowBackup="false"
                  android:label="@string/app_name"

android/src/main/java/com/dscj/autoheightwebview/AutoHeightWebViewManager.java

@@ -1,4 +1,4 @@
-package com.dscj.autoheightwebview;
+package com.iou90.autoheightwebview;
 
 import android.webkit.WebView;
 

android/src/main/java/com/dscj/autoheightwebview/AutoHeightWebViewPackage.java

@@ -1,4 +1,4 @@
-package com.dscj.autoheightwebview;
+package com.iou90.autoheightwebview;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.JavaScriptModule;

android/src/main/java/com/dscj/autoheightwebview/JavascriptBridge.java

@@ -1,4 +1,4 @@
-package com.dscj.autoheightwebview;
+package com.iou90.autoheightwebview;
 
 import android.webkit.JavascriptInterface;
 import android.webkit.WebView;

android/src/test/java/com/dscj/autoheightwebview/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package com.dscj.autoheightwebview;
+package com.iou90.autoheightwebview;
 
 import org.junit.Test;
 

autoHeightWebView/common.js

@@ -52,6 +52,6 @@ observer.observe(document, {
     subtree: true,
     attributes: true
 });
-`
+`;
 
 export { getScript, onHeightUpdated, domMutationObserveScript };

autoHeightWebView/index.android.js

@@ -19,7 +19,7 @@ import PropTypes from 'prop-types';
 
 import Immutable from 'immutable';
 
-import { getScript, onHeightUpdated, domMutationObserveScript } from './common.js';
+import { getScript, onHeightUpdated, domMutationObserveScript, getHeight } from './common.js';
 
 const RCTAutoHeightWebView = requireNativeComponent('RCTAutoHeightWebView', AutoHeightWebView, {
   nativeOnly: {

autoHeightWebView/index.ios.js

@@ -146,21 +146,31 @@ const commonScript = `
     window.addEventListener('resize', updateHeight);
     `;
 
+const getHeight = `
+    function getHeight(height) {
+      if(height < 1) {
+        return document.body.offsetHeight;
+      }
+      return height;
+    }
+    `;
+
 const baseScript = `
     ;
+    ${getHeight}
     (function () {
         var i = 0;
         var height = 0;
         var wrapper = document.createElement('div');
         wrapper.id = 'height-wrapper';
-        while (document.body.firstChild) {
+        while (document.body.firstChild instanceof Node) {
             wrapper.appendChild(document.body.firstChild);
         }
         document.body.appendChild(wrapper);
         function updateHeight() {
             if(document.body.offsetHeight !== height) {
-                height = wrapper.clientHeight;
-                document.title = wrapper.clientHeight;
+                height = getHeight(wrapper.clientHeight);
+                document.title = height;
                 window.location.hash = ++i;
             }
         }
@@ -171,13 +181,14 @@ const baseScript = `
 
 const iframeBaseScript = `
     ;
+    ${getHeight}
     (function () {
         var i = 0;
         var height = 0;
         function updateHeight() {
             if(document.body.offsetHeight !== height) {
-                height = document.body.firstChild.clientHeight;
-                document.title = document.body.firstChild.clientHeight;
+                height = getHeight(document.body.firstChild.clientHeight);
+                document.title = height;
                 window.location.hash = ++i;
             }
         }

demo/.flowconfig

@@ -51,4 +51,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 [version]
-^0.63.0
+^0.65.0

demo/android/app/src/main/AndroidManifest.xml

@@ -1,20 +1,14 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.demo"
-    android:versionCode="1"
-    android:versionName="1.0">
+    package="com.demo">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="22" />
-
     <application
       android:name=".MainApplication"
-      android:allowBackup="false"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
+      android:allowBackup="false"
       android:theme="@style/AppTheme">
       <activity
         android:name=".MainActivity"

demo/android/app/src/main/java/com/demo/MainApplication.java

@@ -3,7 +3,7 @@ package com.demo;
 import android.app.Application;
 
 import com.facebook.react.ReactApplication;
-import com.dscj.autoheightwebview.AutoHeightWebViewPackage;
+import com.iou90.autoheightwebview.AutoHeightWebViewPackage;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;

demo/ios/demo.xcodeproj/project.pbxproj

@@ -499,7 +499,7 @@
 			isa = PBXGroup;
 			children = (
 				146834041AC3E56700842450 /* libReact.a */,
-				3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */,
+				3DAD3EA31DF850E9000B6D8A /* libReact.a */,
 				3DAD3EA51DF850E9000B6D8A /* libyoga.a */,
 				3DAD3EA71DF850E9000B6D8A /* libyoga.a */,
 				3DAD3EA91DF850E9000B6D8A /* libcxxreact.a */,
@@ -962,7 +962,7 @@
 			remoteRef = 3DAD3E981DF850E9000B6D8A /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		3DAD3EA31DF850E9000B6D8A /* libReact-tvOS.a */ = {
+		3DAD3EA31DF850E9000B6D8A /* libReact.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
 			path = libReact.a;

demo/ios/demo/Info.plist

@@ -24,6 +24,21 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+		<key>NSExceptionDomains</key>
+		<dict>
+			<key>localhost</key>
+			<dict>
+				<key>NSExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+			</dict>
+		</dict>
+	</dict>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string></string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIRequiredDeviceCapabilities</key>
@@ -38,19 +53,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string></string>
-	<key>NSAppTransportSecurity</key>
-	<!--See http://ste.vn/2015/06/10/configuring-app-transport-security-ios-9-osx-10-11/ -->
-	<dict>
-		<key>NSExceptionDomains</key>
-		<dict>
-			<key>localhost</key>
-			<dict>
-				<key>NSExceptionAllowsInsecureHTTPLoads</key>
-				<true/>
-			</dict>
-		</dict>
-	</dict>
 </dict>
 </plist>

demo/package.json

@@ -7,8 +7,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "react": "16.2.0",
-    "react-native": "0.53.3",
+    "react": "^16.3.0-alpha.1",
+    "react-native": "0.54.3",
     "react-native-autoheight-webview": "../"
   },
   "devDependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-autoheight-webview",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "description": "An auto height webview for React Native",
   "main": "autoHeightWebView",
   "files": [