@micromag/screen-urbania-article 0.3.742 → 0.3.744

package/es/index.js

@@ -5,10 +5,10 @@ import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProper
 import { getJSON } from '@folklore/fetch';
 import PropTypes from 'prop-types';
 import React, { useMemo, useState, useEffect, useCallback } from 'react';
+import { PropTypes as PropTypes$1 } from '@micromag/core';
 import { isTextFilled, isHeaderFilled, isFooterFilled, getFooterProps, getStyleFromColor, isValidUrl } from '@micromag/core/utils';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import classNames from 'classnames';
-import { PropTypes as PropTypes$1 } from '@micromag/core';
 import { ScreenElement, Empty, PlaceholderSubtitle, PlaceholderTitle, PlaceholderImage, PlaceholderText, Close, Spinner } from '@micromag/core/components';
 import { useScreenSize, useScreenRenderContext, useViewerWebView, useViewerContext, useViewerInteraction, usePlaybackContext, usePlaybackMediaRef } from '@micromag/core/contexts';
 import { useDimensionObserver, useResizeObserver } from '@micromag/core/hooks';
@@ -455,10 +455,22 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
 UrbaniaArticle.propTypes = propTypes$2;
 UrbaniaArticle.defaultProps = defaultProps$2;
 
-var _excluded = ["component", "theme", "url", "article"];
+var _excluded = ["component", "title", "articleType", "overTitle", "sponsorLabel", "author", "image", "header", "footer", "url", "article"];
 var propTypes$1 = {
   component: PropTypes.elementType,
-  theme: PropTypes.string,
+  // theme: PropTypes.string,
+  title: PropTypes$1.headingElement,
+  articleType: PropTypes.string,
+  overTitle: PropTypes.shape({
+    body: PropTypes.string
+  }),
+  sponsorLabel: PropTypes.shape({
+    body: PropTypes.string
+  }),
+  author: PropTypes$1.authorElement,
+  image: PropTypes$1.image,
+  header: PropTypes$1.header,
+  footer: PropTypes$1.footer,
   url: PropTypes.string,
   article: PropTypes.shape({
     type: PropTypes.string
@@ -466,109 +478,110 @@ var propTypes$1 = {
 };
 var defaultProps$1 = {
   component: UrbaniaArticle,
-  theme: null,
+  // theme: null,
+  title: null,
+  articleType: null,
+  overTitle: null,
+  sponsorLabel: null,
+  author: null,
+  image: null,
+  header: null,
+  footer: null,
   url: null,
   article: null
 };
 var UrbaniaLoader = function UrbaniaLoader(_ref) {
-  var Component = _ref.component;
-    _ref.theme;
-    var url = _ref.url,
+  var Component = _ref.component,
+    _ref$title = _ref.title,
+    title = _ref$title === void 0 ? null : _ref$title,
+    _ref$articleType = _ref.articleType,
+    articleType = _ref$articleType === void 0 ? null : _ref$articleType,
+    _ref$overTitle = _ref.overTitle,
+    overTitle = _ref$overTitle === void 0 ? null : _ref$overTitle,
+    _ref$sponsorLabel = _ref.sponsorLabel,
+    sponsorLabel = _ref$sponsorLabel === void 0 ? null : _ref$sponsorLabel,
+    _ref$author = _ref.author,
+    author = _ref$author === void 0 ? null : _ref$author,
+    _ref$image = _ref.image,
+    image = _ref$image === void 0 ? null : _ref$image,
+    _ref$header = _ref.header,
+    header = _ref$header === void 0 ? null : _ref$header,
+    _ref$footer = _ref.footer,
+    footer = _ref$footer === void 0 ? null : _ref$footer,
+    _ref$url = _ref.url,
+    url = _ref$url === void 0 ? null : _ref$url,
     initialArticle = _ref.article,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(initialArticle),
     _useState2 = _slicedToArray(_useState, 2),
     article = _useState2[0],
     setArticle = _useState2[1];
-  // const { isView } = useScreenRenderContext();
-
-  // const hostname = useMemo(() => {
-  //     const { hostname: urlHostname = null } =
-  //         url !== null && isValidUrl(url) ? new URL(url) : {};
-  //     return urlHostname;
-  // }, [url]);
-
-  var finalUrl = url !== null && isValidUrl(url) ? url.replace(/^https?:\/\/([^.]+\.)?urbania\.(ca|ƒr)\//, 'https://urbania.$2/') : url;
+  var finalUrl = url !== null && isValidUrl(url) ? url.replace(/^https?:\/\/([^.]+\.)?urbania\.(ca|ƒr)\//, 'https://urbania.$2/') : null;
   useEffect(function () {
-    if (finalUrl !== null && isValidUrl(finalUrl)) {
+    if (finalUrl !== null) {
       getJSON("https://api.urbania.ca/documents?uri=".concat(finalUrl), {
         mode: 'cors'
       }).then(function (art) {
+        console.log('art loaded', art);
         setArticle(art || null);
-      })["catch"](function () {
-        return setArticle(null);
+      })["catch"](function (e) {
+        console.log('art error', e);
+        setArticle(null);
       });
     }
-  }, [finalUrl, setArticle]);
+  }, [url, finalUrl, setArticle]);
   var values = useMemo(function () {
-    var _ref2 = props || {},
-      _ref2$articleType = _ref2.articleType,
-      articleType = _ref2$articleType === void 0 ? null : _ref2$articleType,
-      _ref2$title = _ref2.title,
-      title = _ref2$title === void 0 ? {} : _ref2$title,
-      _ref2$overTitle = _ref2.overTitle,
-      overTitle = _ref2$overTitle === void 0 ? {} : _ref2$overTitle,
-      _ref2$sponsorLabel = _ref2.sponsorLabel,
-      sponsorLabel = _ref2$sponsorLabel === void 0 ? {} : _ref2$sponsorLabel,
-      _ref2$author = _ref2.author,
-      author = _ref2$author === void 0 ? null : _ref2$author,
-      _ref2$image = _ref2.image,
-      image = _ref2$image === void 0 ? {} : _ref2$image,
-      _ref2$header = _ref2.header,
-      header = _ref2$header === void 0 ? {} : _ref2$header,
-      _ref2$footer = _ref2.footer,
-      footer = _ref2$footer === void 0 ? {} : _ref2$footer;
-    var _ref3 = image || {},
-      _ref3$url = _ref3.url,
-      imageUrl = _ref3$url === void 0 ? null : _ref3$url;
-    var _ref4 = footer || {},
-      _ref4$callToAction = _ref4.callToAction,
-      callToAction = _ref4$callToAction === void 0 ? null : _ref4$callToAction;
-    var _ref5 = callToAction || {},
-      _ref5$url = _ref5.url,
-      ctaUrl = _ref5$url === void 0 ? null : _ref5$url;
+    var _ref2 = image || {},
+      _ref2$url = _ref2.url,
+      imageUrl = _ref2$url === void 0 ? null : _ref2$url;
+    var _ref3 = footer || {},
+      _ref3$callToAction = _ref3.callToAction,
+      callToAction = _ref3$callToAction === void 0 ? null : _ref3$callToAction;
+    var _ref4 = callToAction || {},
+      _ref4$url = _ref4.url,
+      ctaUrl = _ref4$url === void 0 ? null : _ref4$url;
 
     // Straight from article
-    var _ref6 = article || {},
-      _ref6$type = _ref6.type,
-      type = _ref6$type === void 0 ? null : _ref6$type,
-      _ref6$title = _ref6.title,
-      articleTitle = _ref6$title === void 0 ? null : _ref6$title,
-      _ref6$image = _ref6.image,
-      articleImage = _ref6$image === void 0 ? null : _ref6$image,
-      _ref6$metadata = _ref6.metadata,
-      metadata = _ref6$metadata === void 0 ? {} : _ref6$metadata;
+    var _ref5 = article || {},
+      _ref5$type = _ref5.type,
+      type = _ref5$type === void 0 ? null : _ref5$type,
+      _ref5$title = _ref5.title,
+      articleTitle = _ref5$title === void 0 ? null : _ref5$title,
+      _ref5$image = _ref5.image,
+      articleImage = _ref5$image === void 0 ? null : _ref5$image,
+      _ref5$metadata = _ref5.metadata,
+      metadata = _ref5$metadata === void 0 ? {} : _ref5$metadata;
     var hasArticle = article !== null;
-    var _ref7 = metadata || {},
-      _ref7$authors = _ref7.authors,
-      authors = _ref7$authors === void 0 ? [] : _ref7$authors,
-      _ref7$sponsors = _ref7.sponsors,
-      sponsors = _ref7$sponsors === void 0 ? [] : _ref7$sponsors,
-      _ref7$brands = _ref7.brands,
-      brands = _ref7$brands === void 0 ? [] : _ref7$brands;
-    var _ref8 = authors || [],
-      _ref9 = _slicedToArray(_ref8, 1),
-      _ref9$ = _ref9[0],
-      creditAuthor = _ref9$ === void 0 ? null : _ref9$;
-    var _ref0 = brands || [],
-      _ref1 = _slicedToArray(_ref0, 1),
-      _ref1$ = _ref1[0],
-      _ref1$2 = _ref1$ === void 0 ? {} : _ref1$,
-      _ref1$2$handle = _ref1$2.handle,
-      site = _ref1$2$handle === void 0 ? null : _ref1$2$handle;
-    var _ref10 = articleImage || {},
-      _ref10$sizes = _ref10.sizes,
-      sizes = _ref10$sizes === void 0 ? {} : _ref10$sizes;
-    var _ref11 = sizes || {},
-      _ref11$medium = _ref11.medium,
-      medium = _ref11$medium === void 0 ? {} : _ref11$medium,
-      _ref11$large = _ref11.large,
-      large = _ref11$large === void 0 ? {} : _ref11$large;
-    var _ref12 = creditAuthor || {},
-      _ref12$name = _ref12.name,
-      authorName = _ref12$name === void 0 ? null : _ref12$name,
-      _ref12$image = _ref12.image,
-      authorImage = _ref12$image === void 0 ? null : _ref12$image;
+    var _ref6 = metadata || {},
+      _ref6$authors = _ref6.authors,
+      authors = _ref6$authors === void 0 ? [] : _ref6$authors,
+      _ref6$sponsors = _ref6.sponsors,
+      sponsors = _ref6$sponsors === void 0 ? [] : _ref6$sponsors,
+      _ref6$brands = _ref6.brands,
+      brands = _ref6$brands === void 0 ? [] : _ref6$brands;
+    var _ref7 = authors || [],
+      _ref8 = _slicedToArray(_ref7, 1),
+      _ref8$ = _ref8[0],
+      creditAuthor = _ref8$ === void 0 ? null : _ref8$;
+    var _ref9 = brands || [],
+      _ref0 = _slicedToArray(_ref9, 1),
+      _ref0$ = _ref0[0],
+      _ref0$2 = _ref0$ === void 0 ? {} : _ref0$,
+      _ref0$2$handle = _ref0$2.handle,
+      site = _ref0$2$handle === void 0 ? null : _ref0$2$handle;
+    var _ref1 = articleImage || {},
+      _ref1$sizes = _ref1.sizes,
+      sizes = _ref1$sizes === void 0 ? {} : _ref1$sizes;
+    var _ref10 = sizes || {},
+      _ref10$medium = _ref10.medium,
+      medium = _ref10$medium === void 0 ? {} : _ref10$medium,
+      _ref10$large = _ref10.large,
+      large = _ref10$large === void 0 ? {} : _ref10$large;
+    var _ref11 = creditAuthor || {},
+      _ref11$name = _ref11.name,
+      authorName = _ref11$name === void 0 ? null : _ref11$name,
+      _ref11$image = _ref11.image,
+      authorImage = _ref11$image === void 0 ? null : _ref11$image;
     var finalArticleAuthor = _objectSpread(_objectSpread({}, authorName !== null ? {
       name: {
         body: "<p>".concat(authorName, "</p>")
@@ -581,11 +594,11 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
     var defaultType = articleType || type;
 
     // Sponsors
-    var defaultSponsor = (sponsors || []).length > 0 ? (sponsors || []).map(function (_ref13) {
-      var _ref13$organisation = _ref13.organisation,
-        _ref13$organisation2 = _ref13$organisation === void 0 ? {} : _ref13$organisation,
-        _ref13$organisation2$ = _ref13$organisation2.name,
-        name = _ref13$organisation2$ === void 0 ? null : _ref13$organisation2$;
+    var defaultSponsor = (sponsors || []).length > 0 ? (sponsors || []).map(function (_ref12) {
+      var _ref12$organisation = _ref12.organisation,
+        _ref12$organisation2 = _ref12$organisation === void 0 ? {} : _ref12$organisation,
+        _ref12$organisation2$ = _ref12$organisation2.name,
+        name = _ref12$organisation2$ === void 0 ? null : _ref12$organisation2$;
       return name;
     }).filter(function (name) {
       return name !== null;
@@ -643,9 +656,15 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
         })
       })
     };
-  }, [article, finalUrl, props]);
+  }, [article, url, title, finalUrl, props, articleType, overTitle, sponsorLabel, author, image, header, footer]);
+  var _ref13 = values || {},
+    _ref13$title = _ref13.title,
+    articleTitle = _ref13$title === void 0 ? null : _ref13$title;
+  var _ref14 = articleTitle || {},
+    _ref14$body = _ref14.body,
+    titleBody = _ref14$body === void 0 ? null : _ref14$body;
   return /*#__PURE__*/React.createElement(Component, Object.assign({}, props, values, {
-    hasArticle: finalUrl !== null && article !== null
+    hasArticle: titleBody !== null
   }));
 };
 UrbaniaLoader.propTypes = propTypes$1;
@@ -1091,7 +1110,6 @@ var UrbaniaArticleCard = function UrbaniaArticleCard(_ref) {
       setControlsSuggestPlay(true);
     }
   }, [isView, current, playing, isBackgroundVideo, setPlaying, setControlsSuggestPlay]);
-  console.log('hasUrl, hasArticle', hasUrl, hasArticle);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames([styles.container, _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, className, className !== null), styles.articleOpened, articleOpened), styles.isCurrent, current), styles.isPlaceholder, isPlaceholder)]),
     "data-screen-ready": isStatic || isCapture

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/screen-urbania-article",
-    "version": "0.3.742",
+    "version": "0.3.744",
     "private": false,
     "description": "",
     "keywords": [
@@ -63,19 +63,19 @@
         "@folklore/fetch": "^0.1.17",
         "@folklore/size": "^0.1.20",
         "@micromag/core": "^0.3.742",
-        "@micromag/element-background": "^0.3.742",
+        "@micromag/element-background": "^0.3.743",
         "@micromag/element-button": "^0.3.742",
-        "@micromag/element-closed-captions": "^0.3.742",
+        "@micromag/element-closed-captions": "^0.3.743",
         "@micromag/element-container": "^0.3.742",
-        "@micromag/element-footer": "^0.3.742",
-        "@micromag/element-header": "^0.3.742",
-        "@micromag/element-heading": "^0.3.742",
+        "@micromag/element-footer": "^0.3.743",
+        "@micromag/element-header": "^0.3.743",
+        "@micromag/element-heading": "^0.3.743",
         "@micromag/element-image": "^0.3.742",
         "@micromag/element-layout": "^0.3.742",
-        "@micromag/element-text": "^0.3.742",
-        "@micromag/element-urbania-author": "^0.3.742",
-        "@micromag/element-video": "^0.3.742",
-        "@micromag/element-visual": "^0.3.742",
+        "@micromag/element-text": "^0.3.743",
+        "@micromag/element-urbania-author": "^0.3.743",
+        "@micromag/element-video": "^0.3.743",
+        "@micromag/element-visual": "^0.3.743",
         "@micromag/transforms": "^0.3.742",
         "@react-spring/web": "^9.6.1",
         "@use-gesture/react": "^10.3.0",
@@ -90,5 +90,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "6d91233414c1db0bd803e405210418d05064714c"
+    "gitHead": "44104ef3b161bec4ad6d4e7fc41723df053513a0"
 }