@micromag/screen-urbania-article 0.3.572 → 0.3.575

package/es/index.js

@@ -22,6 +22,7 @@ import UrbaniaAuthor from '@micromag/element-urbania-author';
 import Visual from '@micromag/element-visual';
 import { useSpring, easings, animated } from '@react-spring/web';
 import { useGesture } from '@use-gesture/react';
+import isString from 'lodash/isString';
 import Button from '@micromag/element-button';
 import Layout from '@micromag/element-layout';
 
@@ -452,7 +453,6 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
 };
 UrbaniaArticle.propTypes = propTypes$2;
 UrbaniaArticle.defaultProps = defaultProps$2;
-var UrbaniaBaseArticle = UrbaniaArticle;
 
 var _excluded = ["component", "theme", "url", "article"];
 var propTypes$1 = {
@@ -464,7 +464,7 @@ var propTypes$1 = {
   })
 };
 var defaultProps$1 = {
-  component: UrbaniaBaseArticle,
+  component: UrbaniaArticle,
   theme: null,
   url: null,
   article: null
@@ -489,7 +489,15 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
 
   useEffect(function () {
     if (url !== null && isValidUrl(url)) {
-      getJSON("".concat(url, ".json"), {
+      if (url.indexOf('urbania.ca') === -1) {
+        return;
+      }
+      var finalUrl = url;
+      var isSimple = url.indexOf('simple.urbania.ca') !== -1;
+      if (!isSimple) {
+        finalUrl = url.replace(/^https?:\/\/([^.]+\.)?urbania\.ca\/article\//, 'https://simple.urbania.ca/article/');
+      }
+      getJSON("".concat(finalUrl, ".json"), {
         mode: 'cors'
       }).then(function (art) {
         setArticle(art || null);
@@ -911,13 +919,15 @@ var UrbaniaArticleCard = function UrbaniaArticleCard(_ref) {
   var _ref3 = author || {},
     _ref3$name = _ref3.name,
     authorName = _ref3$name === void 0 ? null : _ref3$name;
-  var hasUrl = url !== null && url.length > 0;
+  var hasUrl = url !== null && isString(url) && url.length > 0;
   var hasHeader = isHeaderFilled(header);
   var hasText = isTextFilled(text);
   var hasTitle = isTextFilled(title);
   var hasAuthorName = isTextFilled(authorName);
   var hasCta = isTextFilled(callToAction);
-  var finalUrl = hasUrl ? url.replace(/^https?:\/\/([^.]+\.)?urbania\.ca\/article\//, 'https://simple.urbania.ca/article/') : url;
+  var isUrbania = hasUrl && url.indexOf('urbania.ca') === -1;
+  var isSimple = hasUrl && url.indexOf('simple.urbania.ca') !== -1;
+  var finalUrl = hasUrl && isUrbania && !isSimple ? url.replace(/^https?:\/\/([^.]+\.)?urbania\.ca\/article\//, 'https://simple.urbania.ca/article/') : url;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     articleOpened = _useState2[0],
@@ -1198,7 +1208,6 @@ var UrbaniaArticleCard = function UrbaniaArticleCard(_ref) {
 };
 UrbaniaArticleCard.defaultProps = defaultProps;
 UrbaniaArticleCard.propTypes = propTypes;
-var UrbaniaBaseArticleCard = UrbaniaArticleCard;
 
 /* eslint-disable react/jsx-props-no-spreading */
 function UrbaniaCardLoader(props) {
@@ -1206,7 +1215,7 @@ function UrbaniaCardLoader(props) {
     _ref$cardCallToAction = _ref.cardCallToAction,
     cardCallToAction = _ref$cardCallToAction === void 0 ? {} : _ref$cardCallToAction;
   return /*#__PURE__*/React.createElement(UrbaniaLoader, Object.assign({
-    component: UrbaniaBaseArticleCard,
+    component: UrbaniaArticleCard,
     callToAction: cardCallToAction
   }, props));
 }
@@ -1324,4 +1333,4 @@ var definitionCard = {
   }]
 };
 
-export { UrbaniaLoader as UrbaniaArticle, UrbaniaCardLoader as UrbaniaArticleCard, UrbaniaBaseArticle, UrbaniaBaseArticleCard, definition as default, definitionCard };
+export { UrbaniaLoader as UrbaniaArticle, UrbaniaCardLoader as UrbaniaArticleCard, UrbaniaArticle as UrbaniaBaseArticle, UrbaniaArticleCard as UrbaniaBaseArticleCard, definition as default, definitionCard };

package/package.json

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