@janiscommerce/ui-web 0.27.1 → 0.28.0

package/dist/index.umd.js

@@ -4444,7 +4444,17 @@
       };
 
       _this.handleLoad = function () {
-        _this.setState({ iframeLoaded: true });
+        clearInterval(_this.loadCheck);
+        // Bail update as some browsers will trigger on both DOMContentLoaded & onLoad ala firefox
+        if (!_this.state.iframeLoaded) {
+          _this.setState({ iframeLoaded: true });
+        }
+      };
+
+      _this.loadCheck = function () {
+        return setInterval(function () {
+          _this.handleLoad();
+        }, 500);
       };
 
       _this._isMounted = false;
@@ -4459,10 +4469,9 @@
         this._isMounted = true;
 
         var doc = this.getDoc();
-        if (doc && doc.readyState === 'complete') {
-          this.forceUpdate();
-        } else {
-          this.nodeRef.current.addEventListener('load', this.handleLoad);
+
+        if (doc) {
+          this.nodeRef.current.contentWindow.addEventListener('DOMContentLoaded', this.handleLoad);
         }
       }
     }, {
@@ -4470,7 +4479,7 @@
       value: function componentWillUnmount() {
         this._isMounted = false;
 
-        this.nodeRef.current.removeEventListener('load', this.handleLoad);
+        this.nodeRef.current.removeEventListener('DOMContentLoaded', this.handleLoad);
       }
     }, {
       key: 'getDoc',
@@ -4486,6 +4495,10 @@
         }
         return doc.body.children[0];
       }
+
+      // In certain situations on a cold cache DOMContentLoaded never gets called
+      // fallback to an interval to check if that's the case
+
     }, {
       key: 'renderFrameContents',
       value: function renderFrameContents() {
@@ -4522,6 +4535,10 @@
 
         var mountTarget = this.getMountTarget();
 
+        if (!mountTarget) {
+          return null;
+        }
+
         return [_reactDom2.default.createPortal(this.props.head, this.getDoc().head), _reactDom2.default.createPortal(contents, mountTarget)];
       }
     }, {
@@ -4537,6 +4554,7 @@
         delete props.contentDidMount;
         delete props.contentDidUpdate;
         delete props.forwardedRef;
+
         return _react2.default.createElement(
           'iframe',
           _extends({}, props, { ref: this.setRef, onLoad: this.handleLoad }),