@twreporter/react-article-components 2.4.0-rc.0 → 2.4.0-rc.1

package/lib/components/body/embedded-code.js

@@ -120,6 +120,7 @@ var EmbeddedCode = /*#__PURE__*/function (_React$PureComponent) {
               dispatchWindowLoadEvent();
             }
             scriptEle.removeEventListener('load', handleLoad);
+            _this.props.handleIsLoaded();
           };
           scriptEle.addEventListener('load', handleLoad);
           scriptsFragment.appendChild(scriptEle);
@@ -206,11 +207,13 @@ var EmbeddedCode = /*#__PURE__*/function (_React$PureComponent) {
 _defineProperty(EmbeddedCode, "propTypes", {
   className: _propTypes["default"].string,
   data: _body["default"].elementData,
-  showCaption: _propTypes["default"].bool
+  showCaption: _propTypes["default"].bool,
+  handleIsLoaded: _propTypes["default"].func
 });
 _defineProperty(EmbeddedCode, "defaultProps", {
   className: '',
-  showCaption: true
+  showCaption: true,
+  handleIsLoaded: function handleIsLoaded() {}
 });
 var WayPointWrapper = function WayPointWrapper(props) {
   var isScrollingToAnchor = props.isScrollingToAnchor;

package/lib/components/leading/embedded.js

@@ -101,6 +101,9 @@ var Embedded = function Embedded(_ref) {
   var onTopicClick = function onTopicClick() {
     navigate.push(topicHref);
   };
+  var handleIsLoaded = function handleIsLoaded() {
+    setIsLoading(false);
+  };
   (0, _react.useEffect)(function () {
     if (embedded.length > 0) {
       _.map(embedded, function (code) {
@@ -120,19 +123,12 @@ var Embedded = function Embedded(_ref) {
         }
       });
     }
-    var handleLoad = function handleLoad() {
-      setIsLoading(false);
-    };
-    window.addEventListener('load', handleLoad);
-    return function () {
-      window.removeEventListener('load', handleLoad);
-    };
   }, []);
-  if (isLoading) return /*#__PURE__*/_react["default"].createElement(LoaderContainer, null, /*#__PURE__*/_react["default"].createElement(Loader, null));
-  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(EmbeddedBlock, null, /*#__PURE__*/_react["default"].createElement(_embeddedCode["default"], {
+  return /*#__PURE__*/_react["default"].createElement("div", null, isLoading ? /*#__PURE__*/_react["default"].createElement(LoaderContainer, null, /*#__PURE__*/_react["default"].createElement(Loader, null)) : null, embeddedCode ? /*#__PURE__*/_react["default"].createElement(EmbeddedBlock, null, /*#__PURE__*/_react["default"].createElement(_embeddedCode["default"], {
     data: embeddedCode,
-    showCaption: !captionText
-  })), /*#__PURE__*/_react["default"].createElement(ContentBlock, null, /*#__PURE__*/_react["default"].createElement(TitleBlock, null, isTopicPublished && shortTitle ? /*#__PURE__*/_react["default"].createElement(TopicTitle, {
+    showCaption: !captionText,
+    handleIsLoaded: handleIsLoaded
+  })) : null, /*#__PURE__*/_react["default"].createElement(ContentBlock, null, /*#__PURE__*/_react["default"].createElement(TitleBlock, null, isTopicPublished && shortTitle ? /*#__PURE__*/_react["default"].createElement(TopicTitle, {
     onClick: onTopicClick
   }, /*#__PURE__*/_react["default"].createElement(_paragraph.P2, {
     text: shortTitle,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@twreporter/react-article-components",
-  "version": "2.4.0-rc.0",
+  "version": "2.4.0-rc.1",
   "description": "The Reporter react article components, which are used in article page",
   "main": "lib/components/article-page.js",
   "repository": "https://github.com/twreporter/twreporter-npm-packages.git",
@@ -41,5 +41,5 @@
   "files": [
     "lib"
   ],
-  "gitHead": "e7e704404a5723189a9386ac47cadad098b8d2f2"
+  "gitHead": "cef8fdb11c0c1845576862d69bcd88469b987bd1"
 }