Merge branch 'master' into patch-1

autoHeightWebView/utils.js

@@ -14,7 +14,7 @@ const domMutationObserveScript = `
 
 const updateSizeWithMessage = (element, scalesPageToFit) =>
   `
-  var usingScale = 0;
+  var usingScale = ${scalesPageToFit} ? screen.width / window.innerWidth : 1};
   var scaling = false;
   var zoomedin = false;
   var lastHeight = 0;
@@ -25,7 +25,7 @@ const updateSizeWithMessage = (element, scalesPageToFit) =>
   var checkPostMessageTimeout;
 
   function updateSize() {
-    if (zoomedin || scaling) {
+    if (zoomedin || scaling || document.fullscreenElement) {
       return;
     }
     if (
@@ -40,10 +40,6 @@ const updateSizeWithMessage = (element, scalesPageToFit) =>
     height = ${element}.offsetHeight || document.documentElement.offsetHeight;
     width = ${element}.offsetWidth || document.documentElement.offsetWidth;
 
-    if(!usingScale && window.innerWidth) {
-      usingScale = ${scalesPageToFit ? 'screen.width / window.innerWidth' : '1'};
-    }
-
     window.ReactNativeWebView.postMessage(JSON.stringify({ width: Math.min(width, screen.width), height: height * usingScale }));
 
     // Make additional height checks (required to fix issues wit twitter embeds)
@@ -83,7 +79,7 @@ const detectZoomChanged = `
   var lastScale = 1.0;
   var doubleTapDelay = 400;
   function detectZoomChanged() {
-    var tempZoomedin = (screen.width / window.innerWidth) > (usingScale || 1);
+    var tempZoomedin = (screen.width / window.innerWidth) > usingScale;
     tempZoomedin !== zoomedin && window.ReactNativeWebView.postMessage(JSON.stringify({ zoomedin: tempZoomedin }));
     zoomedin = tempZoomedin;
   }
@@ -242,4 +238,4 @@ export const shouldUpdate = ({ prevProps, nextProps }) => {
     }
   }
   return false;
-};
+};

demo/ios/Podfile.lock

@@ -236,7 +236,7 @@ PODS:
     - React-cxxreact (= 0.63.0)
     - React-jsi (= 0.63.0)
   - React-jsinspector (0.63.0)
-  - react-native-webview (10.3.2):
+  - react-native-webview (10.7.0):
     - React
   - React-RCTActionSheet (0.63.0):
     - React-Core/RCTActionSheetHeaders (= 0.63.0)
@@ -450,7 +450,7 @@ SPEC CHECKSUMS:
   React-jsi: 254710f3a97e587427bfbf3011dacec2af66a1fc
   React-jsiexecutor: 0e0cb4e170ca72d4bb1179843d08dcbea3d100ac
   React-jsinspector: fc661eff8edbfb7e22119382c13f33bcadde0f3c
-  react-native-webview: 679b6f400176e2ea8a785acf7ae16cf282e7d1eb
+  react-native-webview: 6edf4d6f71b9161fc3e96083726a538ee395304d
   React-RCTActionSheet: aadd91a1d6cbfae50dd41f140004f816e9e47ade
   React-RCTAnimation: 7fa2ef6c0ef1e3f0b7d2261c827ec94412deb5e6
   React-RCTBlob: ccbbc70295aee3a76a70323b48f63fb7a7fcffd6

demo/package.json

@@ -13,7 +13,7 @@
     "react": "16.13.1",
     "react-native": "0.63.0",
     "react-native-autoheight-webview": "../",
-    "react-native-webview": "^10.3.2"
+    "react-native-webview": "^10.7.0"
   },
   "devDependencies": {
     "@babel/core": "^7.8.4",

demo/yarn.lock

@@ -5432,14 +5432,14 @@ react-is@^16.12.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
 react-native-autoheight-webview@../:
-  version "1.5.1"
+  version "1.5.2"
   dependencies:
     prop-types "^15.7.2"
 
-react-native-webview@^10.3.2:
-  version "10.3.2"
-  resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-10.3.2.tgz#c634946152099c95d521a3abc71065d1d642e192"
-  integrity sha512-4A8FKL/puonkqQ1FOKd+iPulqRXCG4inmIK4pQ60zv9Ua+YkBKLxxofQiCvRwIXSSgAXYT+AE3rOHr3bx4A/cw==
+react-native-webview@^10.7.0:
+  version "10.7.0"
+  resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-10.7.0.tgz#b96e152ffdae4eeffaa74f43671a35733885b52d"
+  integrity sha512-4TSYwJqMBUTKB9+xqGbPwx+eLXbp6RRD7lQ2BumT8eSTfuuqr2rXNqcrlKU1VRla7QGGYowmYmxl2aXIx5k9wA==
   dependencies:
     escape-string-regexp "2.0.0"
     invariant "2.2.4"