@micromag/screen-urbania-article 0.3.65 → 0.3.68

package/es/index.js

@@ -100,7 +100,6 @@ var styles = {"container":"micromag-screen-urbania-article-container","empty":"m
 var propTypes$1 = {
   hasArticle: PropTypes.bool,
   type: PropTypes.oneOf(['article', 'video']),
-  video: PropTypes$1.videoElement,
   image: PropTypes$1.visualElement,
   title: PropTypes$1.headingElement,
   overTitle: PropTypes$1.headingElement,
@@ -120,7 +119,6 @@ var propTypes$1 = {
 var defaultProps$1 = {
   hasArticle: false,
   type: null,
-  video: null,
   image: null,
   title: null,
   overTitle: null,
@@ -142,9 +140,8 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
   var _ref6;
 
   var hasArticle = _ref.hasArticle,
-      type = _ref.type;
-      _ref.video;
-      var image = _ref.image,
+      type = _ref.type,
+      image = _ref.image,
       title = _ref.title,
       overTitle = _ref.overTitle,
       authors = _ref.authors,
@@ -188,9 +185,7 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
   }, [contentTop, contentHeight, width, height]),
       _useMemo$minContentHe = _useMemo.minContentHeight,
       minContentHeight = _useMemo$minContentHe === void 0 ? null : _useMemo$minContentHe,
-      imageHeight = _useMemo.imageHeight; // const { media: currentVideo = null } = video || {};
-  // console.log('cv', type, currentVideo, video);
-
+      imageHeight = _useMemo.imageHeight;
 
   var _useScreenRenderConte = useScreenRenderContext(),
       isView = _useScreenRenderConte.isView,
@@ -221,8 +216,7 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
   var backgroundShouldLoad = current || active || !isView;
   var transitionPlaying = current;
   var transitionDisabled = isStatic || isCapture || isPlaceholder || isPreview || isEdit;
-  var hasCallToAction = callToAction !== null && callToAction.active === true; // console.log('hasCTA', hasCallToAction, isEdit);
-
+  var hasCallToAction = callToAction !== null && callToAction.active === true;
   var items = [/*#__PURE__*/React.createElement(ScreenElement, {
     key: "overTitle",
     placeholder: /*#__PURE__*/React.createElement(PlaceholderSubtitle, {
@@ -445,8 +439,6 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
         author = _ref3$author === void 0 ? null : _ref3$author,
         _ref3$image = _ref3.image,
         image = _ref3$image === void 0 ? {} : _ref3$image,
-        _ref3$video = _ref3.video,
-        video = _ref3$video === void 0 ? {} : _ref3$video,
         _ref3$callToAction = _ref3.callToAction,
         callToAction = _ref3$callToAction === void 0 ? null : _ref3$callToAction;
 
@@ -460,59 +452,55 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
 
     var _ref6 = image || {},
         _ref6$url = _ref6.url,
-        imageUrl = _ref6$url === void 0 ? null : _ref6$url;
-
-    var _ref7 = video || {},
-        _ref7$media = _ref7.media,
-        videoMedia = _ref7$media === void 0 ? null : _ref7$media; // Straight from article
-
-
-    var _ref8 = article || {},
-        _ref8$type = _ref8.type,
-        type = _ref8$type === void 0 ? null : _ref8$type,
-        _ref8$title = _ref8.title,
-        articleTitle = _ref8$title === void 0 ? null : _ref8$title,
-        _ref8$image = _ref8.image,
-        articleImage = _ref8$image === void 0 ? null : _ref8$image,
-        _ref8$metadata = _ref8.metadata,
-        metadata = _ref8$metadata === void 0 ? {} : _ref8$metadata;
-
-    var _ref9 = metadata || {},
-        _ref9$authors = _ref9.authors,
-        authors = _ref9$authors === void 0 ? [] : _ref9$authors,
-        _ref9$sponsors = _ref9.sponsors,
-        sponsors = _ref9$sponsors === void 0 ? [] : _ref9$sponsors,
-        _ref9$site = _ref9.site,
-        site = _ref9$site === void 0 ? null : _ref9$site,
-        _ref9$canonical = _ref9.canonical,
-        canonical = _ref9$canonical === void 0 ? null : _ref9$canonical;
-
-    var _ref10 = articleImage || {},
-        _ref10$sizes = _ref10.sizes,
-        sizes = _ref10$sizes === void 0 ? {} : _ref10$sizes;
-
-    var _ref11 = sizes || {},
-        medium = _ref11.medium,
-        large = _ref11.large;
-
-    var hasSponsor = isTextFilled(sponsor); // Type
+        imageUrl = _ref6$url === void 0 ? null : _ref6$url; // Straight from article
+
+
+    var _ref7 = article || {},
+        _ref7$type = _ref7.type,
+        type = _ref7$type === void 0 ? null : _ref7$type,
+        _ref7$title = _ref7.title,
+        articleTitle = _ref7$title === void 0 ? null : _ref7$title,
+        _ref7$image = _ref7.image,
+        articleImage = _ref7$image === void 0 ? null : _ref7$image,
+        _ref7$metadata = _ref7.metadata,
+        metadata = _ref7$metadata === void 0 ? {} : _ref7$metadata;
+
+    var _ref8 = metadata || {},
+        _ref8$authors = _ref8.authors,
+        authors = _ref8$authors === void 0 ? [] : _ref8$authors,
+        _ref8$sponsors = _ref8.sponsors,
+        sponsors = _ref8$sponsors === void 0 ? [] : _ref8$sponsors,
+        _ref8$site = _ref8.site,
+        site = _ref8$site === void 0 ? null : _ref8$site,
+        _ref8$canonical = _ref8.canonical,
+        canonical = _ref8$canonical === void 0 ? null : _ref8$canonical;
+
+    var _ref9 = articleImage || {},
+        _ref9$sizes = _ref9.sizes,
+        sizes = _ref9$sizes === void 0 ? {} : _ref9$sizes;
+
+    var _ref10 = sizes || {},
+        medium = _ref10.medium,
+        large = _ref10.large; // Type
+
 
     var defaultType = articleType || type; // Sponsors
 
-    var sponsorPrefix = !hasSponsor ? /*#__PURE__*/React.createElement(FormattedMessage, {
+    var defaultSponsor = (sponsors || []).length > 0 ? (sponsors || []).map(function (_ref11) {
+      var _ref11$name = _ref11.name,
+          name = _ref11$name === void 0 ? null : _ref11$name;
+      return name;
+    }).filter(function (name) {
+      return name !== null;
+    }).join(', ').trim() : null;
+    var hasSponsor = isTextFilled(sponsor);
+    var sponsorPrefix = !hasSponsor && defaultSponsor === null ? /*#__PURE__*/React.createElement(FormattedMessage, {
       id: "+TPjd4",
       defaultMessage: [{
         "type": 0,
         "value": "Presented by"
       }]
     }) : null;
-    var defaultSponsor = (sponsors || []).length > 0 ? (sponsors || []).map(function (_ref12) {
-      var _ref12$name = _ref12.name,
-          name = _ref12$name === void 0 ? null : _ref12$name;
-      return name;
-    }).filter(function (name) {
-      return name !== null;
-    }).join(', ').trim() : null;
     return {
       type: defaultType,
       title: titleBody !== null ? title : _objectSpread(_objectSpread({}, title), {}, {
@@ -521,12 +509,12 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
       overTitle: overTitleBody !== null ? overTitle : _objectSpread(_objectSpread({}, overTitle), {}, {
         body: 'En vedette'
       }),
-      authors: authors.map(function (_ref13) {
-        var _ref13$name = _ref13.name,
-            name = _ref13$name === void 0 ? null : _ref13$name,
-            _ref13$url = _ref13.url,
-            authorUrl = _ref13$url === void 0 ? null : _ref13$url,
-            otherProps = _objectWithoutProperties(_ref13, _excluded2);
+      authors: authors.map(function (_ref12) {
+        var _ref12$name = _ref12.name,
+            name = _ref12$name === void 0 ? null : _ref12$name,
+            _ref12$url = _ref12.url,
+            authorUrl = _ref12$url === void 0 ? null : _ref12$url,
+            otherProps = _objectWithoutProperties(_ref12, _excluded2);
 
         return _objectSpread({
           name: {
@@ -549,11 +537,10 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
           large: large
         }
       }),
-      video: _objectSpread({}, video),
       callToAction: _objectSpread({
         active: true,
         type: 'swipe-up',
-        url: videoMedia !== null ? videoMedia.url : canonical,
+        url: canonical,
         label: defaultType === 'video' ? {
           body: 'Regarder'
         } : {
@@ -698,33 +685,6 @@ var definition = {
         "value": "Image"
       }]
     })
-  }, {
-    name: 'video',
-    type: 'video-element',
-    theme: {
-      color: 'primary'
-    },
-    defaultValue: {
-      autoPlay: true
-    },
-    label: defineMessage({
-      id: "tvl2Zc",
-      defaultMessage: [{
-        "type": 0,
-        "value": "Video"
-      }]
-    })
-  }, {
-    name: 'gotoNextScreenOnEnd',
-    type: 'toggle',
-    defaultValue: false,
-    label: defineMessage({
-      id: "n8zmLY",
-      defaultMessage: [{
-        "type": 0,
-        "value": "Go to next screen on end"
-      }]
-    })
   }, {
     name: 'background',
     type: 'background',

package/lib/index.js

@@ -120,7 +120,6 @@ var styles = {"container":"micromag-screen-urbania-article-container","empty":"m
 var propTypes$1 = {
   hasArticle: PropTypes__default["default"].bool,
   type: PropTypes__default["default"].oneOf(['article', 'video']),
-  video: core.PropTypes.videoElement,
   image: core.PropTypes.visualElement,
   title: core.PropTypes.headingElement,
   overTitle: core.PropTypes.headingElement,
@@ -140,7 +139,6 @@ var propTypes$1 = {
 var defaultProps$1 = {
   hasArticle: false,
   type: null,
-  video: null,
   image: null,
   title: null,
   overTitle: null,
@@ -162,9 +160,8 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
   var _ref6;
 
   var hasArticle = _ref.hasArticle,
-      type = _ref.type;
-      _ref.video;
-      var image = _ref.image,
+      type = _ref.type,
+      image = _ref.image,
       title = _ref.title,
       overTitle = _ref.overTitle,
       authors = _ref.authors,
@@ -208,9 +205,7 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
   }, [contentTop, contentHeight, width, height]),
       _useMemo$minContentHe = _useMemo.minContentHeight,
       minContentHeight = _useMemo$minContentHe === void 0 ? null : _useMemo$minContentHe,
-      imageHeight = _useMemo.imageHeight; // const { media: currentVideo = null } = video || {};
-  // console.log('cv', type, currentVideo, video);
-
+      imageHeight = _useMemo.imageHeight;
 
   var _useScreenRenderConte = contexts.useScreenRenderContext(),
       isView = _useScreenRenderConte.isView,
@@ -241,8 +236,7 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
   var backgroundShouldLoad = current || active || !isView;
   var transitionPlaying = current;
   var transitionDisabled = isStatic || isCapture || isPlaceholder || isPreview || isEdit;
-  var hasCallToAction = callToAction !== null && callToAction.active === true; // console.log('hasCTA', hasCallToAction, isEdit);
-
+  var hasCallToAction = callToAction !== null && callToAction.active === true;
   var items = [/*#__PURE__*/React__default["default"].createElement(components.ScreenElement, {
     key: "overTitle",
     placeholder: /*#__PURE__*/React__default["default"].createElement(components.PlaceholderSubtitle, {
@@ -465,8 +459,6 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
         author = _ref3$author === void 0 ? null : _ref3$author,
         _ref3$image = _ref3.image,
         image = _ref3$image === void 0 ? {} : _ref3$image,
-        _ref3$video = _ref3.video,
-        video = _ref3$video === void 0 ? {} : _ref3$video,
         _ref3$callToAction = _ref3.callToAction,
         callToAction = _ref3$callToAction === void 0 ? null : _ref3$callToAction;
 
@@ -480,59 +472,55 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
 
     var _ref6 = image || {},
         _ref6$url = _ref6.url,
-        imageUrl = _ref6$url === void 0 ? null : _ref6$url;
-
-    var _ref7 = video || {},
-        _ref7$media = _ref7.media,
-        videoMedia = _ref7$media === void 0 ? null : _ref7$media; // Straight from article
-
-
-    var _ref8 = article || {},
-        _ref8$type = _ref8.type,
-        type = _ref8$type === void 0 ? null : _ref8$type,
-        _ref8$title = _ref8.title,
-        articleTitle = _ref8$title === void 0 ? null : _ref8$title,
-        _ref8$image = _ref8.image,
-        articleImage = _ref8$image === void 0 ? null : _ref8$image,
-        _ref8$metadata = _ref8.metadata,
-        metadata = _ref8$metadata === void 0 ? {} : _ref8$metadata;
-
-    var _ref9 = metadata || {},
-        _ref9$authors = _ref9.authors,
-        authors = _ref9$authors === void 0 ? [] : _ref9$authors,
-        _ref9$sponsors = _ref9.sponsors,
-        sponsors = _ref9$sponsors === void 0 ? [] : _ref9$sponsors,
-        _ref9$site = _ref9.site,
-        site = _ref9$site === void 0 ? null : _ref9$site,
-        _ref9$canonical = _ref9.canonical,
-        canonical = _ref9$canonical === void 0 ? null : _ref9$canonical;
-
-    var _ref10 = articleImage || {},
-        _ref10$sizes = _ref10.sizes,
-        sizes = _ref10$sizes === void 0 ? {} : _ref10$sizes;
-
-    var _ref11 = sizes || {},
-        medium = _ref11.medium,
-        large = _ref11.large;
-
-    var hasSponsor = utils.isTextFilled(sponsor); // Type
+        imageUrl = _ref6$url === void 0 ? null : _ref6$url; // Straight from article
+
+
+    var _ref7 = article || {},
+        _ref7$type = _ref7.type,
+        type = _ref7$type === void 0 ? null : _ref7$type,
+        _ref7$title = _ref7.title,
+        articleTitle = _ref7$title === void 0 ? null : _ref7$title,
+        _ref7$image = _ref7.image,
+        articleImage = _ref7$image === void 0 ? null : _ref7$image,
+        _ref7$metadata = _ref7.metadata,
+        metadata = _ref7$metadata === void 0 ? {} : _ref7$metadata;
+
+    var _ref8 = metadata || {},
+        _ref8$authors = _ref8.authors,
+        authors = _ref8$authors === void 0 ? [] : _ref8$authors,
+        _ref8$sponsors = _ref8.sponsors,
+        sponsors = _ref8$sponsors === void 0 ? [] : _ref8$sponsors,
+        _ref8$site = _ref8.site,
+        site = _ref8$site === void 0 ? null : _ref8$site,
+        _ref8$canonical = _ref8.canonical,
+        canonical = _ref8$canonical === void 0 ? null : _ref8$canonical;
+
+    var _ref9 = articleImage || {},
+        _ref9$sizes = _ref9.sizes,
+        sizes = _ref9$sizes === void 0 ? {} : _ref9$sizes;
+
+    var _ref10 = sizes || {},
+        medium = _ref10.medium,
+        large = _ref10.large; // Type
+
 
     var defaultType = articleType || type; // Sponsors
 
-    var sponsorPrefix = !hasSponsor ? /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
+    var defaultSponsor = (sponsors || []).length > 0 ? (sponsors || []).map(function (_ref11) {
+      var _ref11$name = _ref11.name,
+          name = _ref11$name === void 0 ? null : _ref11$name;
+      return name;
+    }).filter(function (name) {
+      return name !== null;
+    }).join(', ').trim() : null;
+    var hasSponsor = utils.isTextFilled(sponsor);
+    var sponsorPrefix = !hasSponsor && defaultSponsor === null ? /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
       id: "+TPjd4",
       defaultMessage: [{
         "type": 0,
         "value": "Presented by"
       }]
     }) : null;
-    var defaultSponsor = (sponsors || []).length > 0 ? (sponsors || []).map(function (_ref12) {
-      var _ref12$name = _ref12.name,
-          name = _ref12$name === void 0 ? null : _ref12$name;
-      return name;
-    }).filter(function (name) {
-      return name !== null;
-    }).join(', ').trim() : null;
     return {
       type: defaultType,
       title: titleBody !== null ? title : _objectSpread__default["default"](_objectSpread__default["default"]({}, title), {}, {
@@ -541,12 +529,12 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
       overTitle: overTitleBody !== null ? overTitle : _objectSpread__default["default"](_objectSpread__default["default"]({}, overTitle), {}, {
         body: 'En vedette'
       }),
-      authors: authors.map(function (_ref13) {
-        var _ref13$name = _ref13.name,
-            name = _ref13$name === void 0 ? null : _ref13$name,
-            _ref13$url = _ref13.url,
-            authorUrl = _ref13$url === void 0 ? null : _ref13$url,
-            otherProps = _objectWithoutProperties__default["default"](_ref13, _excluded2);
+      authors: authors.map(function (_ref12) {
+        var _ref12$name = _ref12.name,
+            name = _ref12$name === void 0 ? null : _ref12$name,
+            _ref12$url = _ref12.url,
+            authorUrl = _ref12$url === void 0 ? null : _ref12$url,
+            otherProps = _objectWithoutProperties__default["default"](_ref12, _excluded2);
 
         return _objectSpread__default["default"]({
           name: {
@@ -569,11 +557,10 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
           large: large
         }
       }),
-      video: _objectSpread__default["default"]({}, video),
       callToAction: _objectSpread__default["default"]({
         active: true,
         type: 'swipe-up',
-        url: videoMedia !== null ? videoMedia.url : canonical,
+        url: canonical,
         label: defaultType === 'video' ? {
           body: 'Regarder'
         } : {
@@ -718,33 +705,6 @@ var definition = {
         "value": "Image"
       }]
     })
-  }, {
-    name: 'video',
-    type: 'video-element',
-    theme: {
-      color: 'primary'
-    },
-    defaultValue: {
-      autoPlay: true
-    },
-    label: reactIntl.defineMessage({
-      id: "tvl2Zc",
-      defaultMessage: [{
-        "type": 0,
-        "value": "Video"
-      }]
-    })
-  }, {
-    name: 'gotoNextScreenOnEnd',
-    type: 'toggle',
-    defaultValue: false,
-    label: reactIntl.defineMessage({
-      id: "n8zmLY",
-      defaultMessage: [{
-        "type": 0,
-        "value": "Go to next screen on end"
-      }]
-    })
   }, {
     name: 'background',
     type: 'background',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/screen-urbania-article",
-    "version": "0.3.65",
+    "version": "0.3.68",
     "description": "",
     "keywords": [
         "javascript"
@@ -51,18 +51,18 @@
         "@babel/runtime": "^7.13.10",
         "@folklore/fetch": "^0.1.15",
         "@folklore/size": "^0.1.20",
-        "@micromag/core": "^0.3.64",
-        "@micromag/element-background": "^0.3.64",
-        "@micromag/element-call-to-action": "^0.3.65",
-        "@micromag/element-closed-captions": "^0.3.64",
-        "@micromag/element-container": "^0.3.64",
-        "@micromag/element-heading": "^0.3.64",
-        "@micromag/element-image": "^0.3.64",
-        "@micromag/element-media-controls": "^0.3.64",
-        "@micromag/element-urbania-author": "^0.3.64",
-        "@micromag/element-video": "^0.3.64",
-        "@micromag/element-visual": "^0.3.64",
-        "@micromag/transforms": "^0.3.64",
+        "@micromag/core": "^0.3.68",
+        "@micromag/element-background": "^0.3.68",
+        "@micromag/element-call-to-action": "^0.3.68",
+        "@micromag/element-closed-captions": "^0.3.68",
+        "@micromag/element-container": "^0.3.68",
+        "@micromag/element-heading": "^0.3.68",
+        "@micromag/element-image": "^0.3.68",
+        "@micromag/element-media-controls": "^0.3.68",
+        "@micromag/element-urbania-author": "^0.3.68",
+        "@micromag/element-video": "^0.3.68",
+        "@micromag/element-visual": "^0.3.68",
+        "@micromag/transforms": "^0.3.68",
         "classnames": "^2.2.6",
         "lodash": "^4.17.21",
         "prop-types": "^15.7.2",
@@ -72,5 +72,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "aa150c0fbb32c481b04e4c98863b7656db714845"
+    "gitHead": "3f6e61d8a3340735f345a20d1f0f86e91c820d9a"
 }