davidjbradshaw · davidjbradshaw · Sep 3, 2024 · Sep 3, 2024 · Sep 3, 2024 · Sep 3, 2024
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,6 +6,7 @@
     "delog",
     "filesize",
     "iife",
+    "Initialised",
     "Initialising",
     "javascripts",
     "logcapture",

diff --git a/example/html/child/frame.content.html b/example/html/child/frame.content.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <title>iFrame message passing test</title>
+    <title>Iframe-Resizer Test Content</title>
     <meta name="description" content="iframe-resizer examples" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <script

diff --git a/example/html/index.html b/example/html/index.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8" />
-    <title>iFrame message passing test</title>
+    <title>Iframe-Resizer Examples</title>
     <meta name="description" content="iFrame message passing test" />
     <meta name="viewport" content="width=device-width" />
     <style>

diff --git a/packages/child/index.js b/packages/child/index.js
@@ -8,7 +8,7 @@ import {
 } from '../common/consts'
 import { addEventListener, removeEventListener } from '../common/listeners'
 import { getModeData } from '../common/mode'
-import { id } from '../common/utils'
+import { id, round } from '../common/utils'
 import {
   advise,
   adviser,
@@ -99,6 +99,8 @@ function iframeResizerChild() {
   let taggedElements = []
   let target = window.parent
   let targetOriginDefault = '*'
+  let timerActive
+  let totalTime
   let tolerance = 0
   let triggerLocked = false
   let version = ''
@@ -1082,7 +1084,7 @@ The <b>size()</> method has been deprecated and replaced with  <b>resize()</>. U
     customWidth,
     msg,
   ) {
-    const isForceResizableEvent = () => !(triggerEvent in { init: 1, size: 1 })
+    const isForceResizableEvent = () => !triggerEvent !== MANUAL_RESIZE_REQUEST
 
     const isForceResizableCalcMode = () =>
       (calculateHeight && heightCalcMode in resetRequiredMethods) ||
@@ -1092,12 +1094,6 @@ The <b>size()</> method has been deprecated and replaced with  <b>resize()</>. U
       (calculateHeight && checkTolerance(height, newHeight)) ||
       (calculateWidth && checkTolerance(width, newWidth))
 
-    function checkDownSizing() {
-      if (isForceResizableEvent() && isForceResizableCalcMode()) {
-        resetIframe(triggerEventDesc)
-      }
-    }
-
     const newHeight =
       undefined === customHeight ? getHeight[heightCalcMode]() : customHeight
     const newWidth =
@@ -1108,8 +1104,10 @@ The <b>size()</> method has been deprecated and replaced with  <b>resize()</>. U
       height = newHeight
       width = newWidth
       sendMsg(height, width, triggerEvent, msg)
+    } else if (isForceResizableEvent() && isForceResizableCalcMode()) {
+      resetIframe(triggerEventDesc)
     } else {
-      checkDownSizing()
+      timerActive = false // We're not resizing, so turn off the timer
     }
   }
 
@@ -1122,6 +1120,8 @@ The <b>size()</> method has been deprecated and replaced with  <b>resize()</>. U
     customWidth,
     msg,
   ) {
+    totalTime = performance.now()
+
     if (!autoResize && triggerEvent !== MANUAL_RESIZE_REQUEST) {
       log('Resizing disabled')
       return
@@ -1136,6 +1136,7 @@ The <b>size()</> method has been deprecated and replaced with  <b>resize()</>. U
 
     if (!sendPending) {
       log(`Resize event: ${triggerEventDesc}`)
+      timerActive = true
       sizeIframe(triggerEvent, triggerEventDesc, customHeight, customWidth, msg)
       requestAnimationFrame(() => {
         sendPending = false
@@ -1188,14 +1189,25 @@ The <b>size()</> method has been deprecated and replaced with  <b>resize()</>. U
       log(`Message targetOrigin: ${targetOrigin}`)
     }
 
+    function displayTimeTaken() {
+      const timer = round(performance.now() - totalTime)
+      info(
+        triggerEvent === 'init'
+          ? `Initialised iFrame in ${timer}ms`
+          : `Content size recalculated in ${timer}ms`,
+      )
+      timerActive = false
+    }
+
     function sendToParent() {
       const size = `${height + (offsetHeight || 0)}:${width + (offsetWidth || 0)}`
       const message = `${myID}:${size}:${triggerEvent}${undefined === msg ? '' : `:${msg}`}`
 
-      log(
-        `Sending message to host page (${message}) via ${sameDomain ? 'sameDomain' : 'postMessage'}`,
-      )
+      if (timerActive) displayTimeTaken()
 
+      info(
+        `Sending message to host page via ${sameDomain ? 'sameDomain' : 'postMessage'} (${message})`,
+      )
 
       if (sameDomain) {
         window.parent.iframeParentListener(msgID + message)

diff --git a/packages/child/log.js b/packages/child/log.js
@@ -53,7 +53,7 @@ export const log = (...msg) =>
 // eslint-disable-next-line no-unused-vars
 export const info = (...msg) =>
   // eslint-disable-next-line no-console
-  console?.info(`[iframe-resizer][${id}]`, ...msg)
+  logging && console?.info(`[iframe-resizer][${id}]`, ...msg)
 
 export const warn = (...msg) =>
   // eslint-disable-next-line no-console

diff --git a/packages/child/perf.js b/packages/child/perf.js
@@ -1,7 +1,7 @@
+import { round } from '../common/utils'
 import { advise, info, log } from './log'
 
 const SECOND = 1000
-const DEC_PLACES = 100_000 // 5 decimal places
 const PERF_CHECK_INTERVAL = 5 * SECOND
 const THRESHOLD = 4 // ms
 
@@ -13,7 +13,6 @@ const timings = []
 const usedTags = new WeakSet()
 
 const addUsedTag = (el) => typeof el === 'object' && usedTags.add(el)
-const round = (num) => Math.floor(num * DEC_PLACES) / DEC_PLACES
 
 let lastPerfEl = null
 let perfEl = null

diff --git a/packages/common/utils.js b/packages/common/utils.js
@@ -11,3 +11,7 @@ export const once = (fn) => {
 }
 
 export const id = (x) => x
+
+const ROUNDING = 100_000
+
+export const round = (value) => Math.round(value * ROUNDING) / ROUNDING
diff --git a/spec/childSpec.js b/spec/childSpec.js
@@ -62,7 +62,7 @@ define(['iframeResizerChild', 'jquery'], (mockMsgListener, $) => {
         win.parentIFrame.autoResize(true)
 
         expect(console.log).toHaveBeenCalledWith(
-          '[iframe-resizer][parentIFrameTests] Sending message to host page (parentIFrameTests:0:0:autoResize:true) via postMessage',
+          '[iframe-resizer][parentIFrameTests] Resize event: Auto Resize enabled',
         )
       })