Add usingScale to calculate scale only once per render

autoHeightWebView/utils.js

@@ -14,6 +14,7 @@ const domMutationObserveScript = `
 
 const updateSizeWithMessage = (element, scalesPageToFit) =>
   `
+  var usingScale = 0;
   var scaling = false;
   var zoomedin = false;
   var lastHeight = 0;
@@ -23,7 +24,7 @@ const updateSizeWithMessage = (element, scalesPageToFit) =>
   var forceRefreshTimeout;
   var checkPostMessageTimeout;
 
-  function updateSize(event) {
+  function updateSize() {
     if (zoomedin || scaling) {
       return;
     }
@@ -34,14 +35,20 @@ const updateSizeWithMessage = (element, scalesPageToFit) =>
       checkPostMessageTimeout = setTimeout(updateSize, 200);
       return;
     }
+
     clearTimeout(checkPostMessageTimeout);
     height = ${element}.offsetHeight || document.documentElement.offsetHeight;
     width = ${element}.offsetWidth || document.documentElement.offsetWidth;
-    var scale = ${scalesPageToFit ? 'screen.width / window.innerWidth' : '1'};
-    window.ReactNativeWebView.postMessage(JSON.stringify({ width: Math.min(width, screen.width), height: height * scale }));
+
+    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)
     clearTimeout(forceRefreshTimeout);
+
     if (lastHeight !== height) {
       heightTheSameTimes = 1;
     } else {
@@ -76,7 +83,7 @@ const detectZoomChanged = `
   var lastScale = 1.0;
   var doubleTapDelay = 400;
   function detectZoomChanged() {
-    var tempZoomedin = (screen.width / window.innerWidth) > 1;
+    var tempZoomedin = (screen.width / window.innerWidth) > (usingScale || 1);
     tempZoomedin !== zoomedin && window.ReactNativeWebView.postMessage(JSON.stringify({ zoomedin: tempZoomedin }));
     zoomedin = tempZoomedin;
   }
@@ -89,10 +96,12 @@ const detectZoomChanged = `
     if(scaling) {
       scaleing = false;
     }
+
     var tempScale = event.scale; 
     tempScale !== lastScale && detectZoomChanged();
     lastScale = tempScale;
     var timeSince = new Date().getTime() - latestTapStamp;
+
     // double tap   
     if(timeSince < 600 && timeSince > 0) {
       zoomedinTimeOut = setTimeout(() => {
@@ -100,11 +109,12 @@ const detectZoomChanged = `
         detectZoomChanged();
       }, doubleTapDelay);
     }
+
     latestTapStamp = new Date().getTime();
   });
 `;
 
-const getBaseScript = ({ style, viewportContent, scalesPageToFit, scrollEnabledWithZoomedin }) =>
+const getBaseScript = ({ viewportContent, scalesPageToFit, scrollEnabledWithZoomedin }) =>
   `
   ;
   if (!document.getElementById("rnahw-wrapper")) {
@@ -177,7 +187,7 @@ const getScript = ({
   scalesPageToFit,
   scrollEnabledWithZoomedin
 }) => {
-  let script = getBaseScript({ style, viewportContent, scalesPageToFit, scrollEnabledWithZoomedin });
+  let script = getBaseScript({ viewportContent, scalesPageToFit, scrollEnabledWithZoomedin });
   script = files && files.length > 0 ? appendFilesToHead({ files, script }) : script;
   script = appendStylesToHead({ style: customStyle, script });
   customScript && (script = customScript + script);