@micromag/screen-urbania-article 0.3.73 → 0.3.76

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/es/index.js +84 -90
  2. package/lib/index.js +84 -90
  3. package/package.json +14 -14
package/es/index.js CHANGED
@@ -103,7 +103,6 @@ var propTypes$1 = {
103
103
  image: PropTypes$1.visualElement,
104
104
  title: PropTypes$1.headingElement,
105
105
  overTitle: PropTypes$1.headingElement,
106
- authors: PropTypes.arrayOf(PropTypes.shape({})),
107
106
  author: PropTypes$1.authorElement,
108
107
  sponsor: PropTypes.arrayOf(PropTypes.shape({})),
109
108
  sponsorPrefix: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
@@ -122,7 +121,6 @@ var defaultProps$1 = {
122
121
  image: null,
123
122
  title: null,
124
123
  overTitle: null,
125
- authors: null,
126
124
  author: null,
127
125
  sponsor: null,
128
126
  sponsorPrefix: null,
@@ -137,14 +135,13 @@ var defaultProps$1 = {
137
135
  };
138
136
 
139
137
  var UrbaniaArticle = function UrbaniaArticle(_ref) {
140
- var _ref6;
138
+ var _ref5;
141
139
 
142
140
  var hasArticle = _ref.hasArticle,
143
141
  type = _ref.type,
144
142
  image = _ref.image,
145
143
  title = _ref.title,
146
144
  overTitle = _ref.overTitle,
147
- authors = _ref.authors,
148
145
  author = _ref.author,
149
146
  sponsor = _ref.sponsor,
150
147
  sponsorPrefix = _ref.sponsorPrefix,
@@ -200,17 +197,15 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
200
197
  var hasOverTitle = isTextFilled(overTitle);
201
198
  var hasTitle = isTextFilled(title);
202
199
  var hasSponsor = isTextFilled(sponsor);
203
- var hasAuthors = (authors || []).length > 0 || author !== null;
204
200
 
205
201
  var _ref3 = author || {},
206
202
  authorFullName = _ref3.name;
207
203
 
208
- var _ref4 = authorFullName || {},
209
- authorName = _ref4.body;
204
+ var hasAuthor = isTextFilled(authorFullName);
210
205
 
211
- var _ref5 = image || {},
212
- _ref5$url = _ref5.url,
213
- url = _ref5$url === void 0 ? null : _ref5$url;
206
+ var _ref4 = image || {},
207
+ _ref4$url = _ref4.url,
208
+ url = _ref4$url === void 0 ? null : _ref4$url;
214
209
 
215
210
  var hasImage = url !== null;
216
211
  var backgroundPlaying = current && (isView || isEdit);
@@ -269,15 +264,11 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
269
264
  "value": "Authors"
270
265
  }]
271
266
  }))),
272
- isEmpty: !hasAuthors
273
- }, hasAuthors ? /*#__PURE__*/React.createElement("div", {
267
+ isEmpty: !hasAuthor
268
+ }, hasAuthor ? /*#__PURE__*/React.createElement("div", {
274
269
  className: classNames([styles.authors])
275
- }, author !== null && authorName !== null ? /*#__PURE__*/React.createElement(UrbaniaAuthor, {
270
+ }, /*#__PURE__*/React.createElement(UrbaniaAuthor, {
276
271
  author: author
277
- }) : (authors || []).map(function (a) {
278
- return /*#__PURE__*/React.createElement(UrbaniaAuthor, {
279
- author: a
280
- });
281
272
  })) : null) : null, /*#__PURE__*/React.createElement(ScreenElement, {
282
273
  key: "sponsors",
283
274
  empty: /*#__PURE__*/React.createElement("div", {
@@ -303,7 +294,7 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
303
294
  return it !== null;
304
295
  });
305
296
  return /*#__PURE__*/React.createElement("div", {
306
- className: classNames([styles.container, (_ref6 = {}, _defineProperty(_ref6, className, className !== null), _defineProperty(_ref6, styles.isVideo, isVideo), _defineProperty(_ref6, styles.isPlaceholder, isPlaceholder), _ref6)]),
297
+ className: classNames([styles.container, (_ref5 = {}, _defineProperty(_ref5, className, className !== null), _defineProperty(_ref5, styles.isVideo, isVideo), _defineProperty(_ref5, styles.isPlaceholder, isPlaceholder), _ref5)]),
307
298
  "data-screen-ready": isStatic || isCapture
308
299
  }, /*#__PURE__*/React.createElement(Background, {
309
300
  background: background,
@@ -389,8 +380,7 @@ UrbaniaArticle.propTypes = propTypes$1;
389
380
  UrbaniaArticle.defaultProps = defaultProps$1;
390
381
  var UrbaniaArticle$1 = /*#__PURE__*/React.memo(UrbaniaArticle);
391
382
 
392
- var _excluded = ["url", "article"],
393
- _excluded2 = ["name", "url"];
383
+ var _excluded = ["url", "article"];
394
384
  var propTypes = {
395
385
  url: PropTypes.string,
396
386
  article: PropTypes.shape({
@@ -421,11 +411,10 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
421
411
  }, [url]);
422
412
  useEffect(function () {
423
413
  if (url !== null) {
424
- // TODO: fix cors on urbania.ca
425
414
  getJSON("".concat(url, ".json"), {
426
415
  mode: 'cors'
427
416
  }).then(function (art) {
428
- setArticle(art);
417
+ setArticle(art || null);
429
418
  });
430
419
  }
431
420
  }, [url, setArticle]);
@@ -446,59 +435,76 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
446
435
  _ref3$callToAction = _ref3.callToAction,
447
436
  callToAction = _ref3$callToAction === void 0 ? null : _ref3$callToAction;
448
437
 
449
- var _ref4 = title || {},
450
- _ref4$body = _ref4.body,
451
- titleBody = _ref4$body === void 0 ? null : _ref4$body;
452
-
453
- var _ref5 = overTitle || {},
454
- _ref5$body = _ref5.body,
455
- overTitleBody = _ref5$body === void 0 ? null : _ref5$body;
456
-
457
- var _ref6 = image || {},
458
- _ref6$url = _ref6.url,
459
- imageUrl = _ref6$url === void 0 ? null : _ref6$url; // Straight from article
460
-
461
-
462
- var _ref7 = article || {},
463
- _ref7$type = _ref7.type,
464
- type = _ref7$type === void 0 ? null : _ref7$type,
465
- _ref7$title = _ref7.title,
466
- articleTitle = _ref7$title === void 0 ? null : _ref7$title,
467
- _ref7$image = _ref7.image,
468
- articleImage = _ref7$image === void 0 ? null : _ref7$image,
469
- _ref7$metadata = _ref7.metadata,
470
- metadata = _ref7$metadata === void 0 ? {} : _ref7$metadata;
471
-
472
- var _ref8 = metadata || {},
473
- _ref8$authors = _ref8.authors,
474
- authors = _ref8$authors === void 0 ? [] : _ref8$authors,
475
- _ref8$sponsors = _ref8.sponsors,
476
- sponsors = _ref8$sponsors === void 0 ? [] : _ref8$sponsors,
477
- _ref8$site = _ref8.site,
478
- site = _ref8$site === void 0 ? null : _ref8$site,
479
- _ref8$canonical = _ref8.canonical,
480
- canonical = _ref8$canonical === void 0 ? null : _ref8$canonical;
481
-
482
- var _ref9 = articleImage || {},
483
- _ref9$sizes = _ref9.sizes,
484
- sizes = _ref9$sizes === void 0 ? {} : _ref9$sizes;
485
-
486
- var _ref10 = sizes || {},
487
- medium = _ref10.medium,
488
- large = _ref10.large; // Type
438
+ var _ref4 = image || {},
439
+ _ref4$url = _ref4.url,
440
+ imageUrl = _ref4$url === void 0 ? null : _ref4$url; // Straight from article
441
+
442
+
443
+ var _ref5 = article || {},
444
+ _ref5$type = _ref5.type,
445
+ type = _ref5$type === void 0 ? null : _ref5$type,
446
+ _ref5$title = _ref5.title,
447
+ articleTitle = _ref5$title === void 0 ? null : _ref5$title,
448
+ _ref5$image = _ref5.image,
449
+ articleImage = _ref5$image === void 0 ? null : _ref5$image,
450
+ _ref5$metadata = _ref5.metadata,
451
+ metadata = _ref5$metadata === void 0 ? {} : _ref5$metadata;
452
+
453
+ var hasArticle = url !== null && article !== null;
454
+
455
+ var _ref6 = metadata || {},
456
+ _ref6$authors = _ref6.authors,
457
+ authors = _ref6$authors === void 0 ? [] : _ref6$authors,
458
+ _ref6$sponsors = _ref6.sponsors,
459
+ sponsors = _ref6$sponsors === void 0 ? [] : _ref6$sponsors,
460
+ _ref6$site = _ref6.site,
461
+ site = _ref6$site === void 0 ? null : _ref6$site,
462
+ _ref6$canonical = _ref6.canonical,
463
+ canonical = _ref6$canonical === void 0 ? null : _ref6$canonical;
464
+
465
+ var _ref7 = articleImage || {},
466
+ _ref7$sizes = _ref7.sizes,
467
+ sizes = _ref7$sizes === void 0 ? {} : _ref7$sizes;
468
+
469
+ var _ref8 = sizes || {},
470
+ medium = _ref8.medium,
471
+ large = _ref8.large;
472
+
473
+ var articleAuthor = (authors || []).length > 0 ? authors[0] : null;
474
+
475
+ var _ref9 = articleAuthor || {},
476
+ _ref9$name = _ref9.name,
477
+ authorName = _ref9$name === void 0 ? null : _ref9$name,
478
+ _ref9$avatar = _ref9.avatar,
479
+ authorImage = _ref9$avatar === void 0 ? null : _ref9$avatar,
480
+ _ref9$url = _ref9.url,
481
+ authorUrl = _ref9$url === void 0 ? null : _ref9$url;
482
+
483
+ var finalArticleAuthor = _objectSpread(_objectSpread(_objectSpread({}, authorName !== null ? {
484
+ name: {
485
+ body: "<p>".concat(authorName, "</p>")
486
+ }
487
+ } : null), authorUrl !== null ? {
488
+ url: "".concat(hostname).concat(authorUrl)
489
+ } : null), authorImage !== null ? {
490
+ image: authorImage
491
+ } : null); // Type
489
492
 
490
493
 
491
494
  var defaultType = articleType || type; // Sponsors
492
495
 
493
- var defaultSponsor = (sponsors || []).length > 0 ? (sponsors || []).map(function (_ref11) {
494
- var _ref11$name = _ref11.name,
495
- name = _ref11$name === void 0 ? null : _ref11$name;
496
+ var defaultSponsor = (sponsors || []).length > 0 ? (sponsors || []).map(function (_ref10) {
497
+ var _ref10$name = _ref10.name,
498
+ name = _ref10$name === void 0 ? null : _ref10$name;
496
499
  return name;
497
500
  }).filter(function (name) {
498
501
  return name !== null;
499
- }).join(', ').trim() : null;
500
- var hasSponsor = isTextFilled(sponsor);
501
- var sponsorPrefix = !hasSponsor && defaultSponsor === null ? /*#__PURE__*/React.createElement(FormattedMessage, {
502
+ }).join(', ').trim() : null; // Content
503
+
504
+ var hasTitle = isTextFilled(title);
505
+ var hasOverTitle = isTextFilled(overTitle);
506
+ var hasSponsorProps = isTextFilled(sponsor);
507
+ var sponsorPrefix = !hasSponsorProps && defaultSponsor !== null ? /*#__PURE__*/React.createElement(FormattedMessage, {
502
508
  id: "+TPjd4",
503
509
  defaultMessage: [{
504
510
  "type": 0,
@@ -507,28 +513,14 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
507
513
  }) : null;
508
514
  return {
509
515
  type: defaultType,
510
- title: titleBody !== null ? title : _objectSpread(_objectSpread({}, title), {}, {
516
+ title: hasTitle ? title : _objectSpread(_objectSpread({}, title), {}, {
511
517
  body: articleTitle
512
518
  }),
513
- overTitle: overTitleBody !== null ? overTitle : _objectSpread(_objectSpread({}, overTitle), {}, {
519
+ overTitle: hasOverTitle ? overTitle : _objectSpread(_objectSpread({}, overTitle), {}, {
514
520
  body: 'En vedette'
515
521
  }),
516
- authors: authors.map(function (_ref12) {
517
- var _ref12$name = _ref12.name,
518
- name = _ref12$name === void 0 ? null : _ref12$name,
519
- _ref12$url = _ref12.url,
520
- authorUrl = _ref12$url === void 0 ? null : _ref12$url,
521
- otherProps = _objectWithoutProperties(_ref12, _excluded2);
522
-
523
- return _objectSpread({
524
- name: {
525
- body: "<p>".concat(name, "</p>")
526
- },
527
- url: "".concat(hostname).concat(authorUrl)
528
- }, otherProps);
529
- }),
530
- author: author,
531
- sponsor: !hasSponsor ? _objectSpread(_objectSpread({}, sponsor), {}, {
522
+ author: _objectSpread(_objectSpread({}, finalArticleAuthor), author),
523
+ sponsor: defaultSponsor !== null && !hasSponsorProps ? _objectSpread(_objectSpread({}, sponsor), {}, {
532
524
  body: "<strong>".concat(defaultSponsor, "</strong>")
533
525
  }) : sponsor,
534
526
  sponsorPrefix: sponsorPrefix,
@@ -541,7 +533,7 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
541
533
  large: large
542
534
  }
543
535
  }),
544
- callToAction: _objectSpread({
536
+ callToAction: _objectSpread(_objectSpread({
545
537
  active: true,
546
538
  type: 'swipe-up',
547
539
  url: canonical,
@@ -554,7 +546,9 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
554
546
  id: 'play'
555
547
  } : null,
556
548
  inWebView: true
557
- }, callToAction)
549
+ }, callToAction), hasArticle ? {
550
+ active: true
551
+ } : null)
558
552
  };
559
553
  }, [article, url, hostname, props]);
560
554
  return /*#__PURE__*/React.createElement(UrbaniaArticle$1, Object.assign({}, props, values, {
@@ -581,10 +575,10 @@ var definition = {
581
575
  order: 10
582
576
  },
583
577
  title: defineMessage({
584
- id: "Oqks/j",
578
+ id: "nJgzwC",
585
579
  defaultMessage: [{
586
580
  "type": 0,
587
- "value": "Urbania article screen"
581
+ "value": "Urbania article"
588
582
  }]
589
583
  }),
590
584
  component: UrbaniaLoaderScreen,
package/lib/index.js CHANGED
@@ -123,7 +123,6 @@ var propTypes$1 = {
123
123
  image: core.PropTypes.visualElement,
124
124
  title: core.PropTypes.headingElement,
125
125
  overTitle: core.PropTypes.headingElement,
126
- authors: PropTypes__default["default"].arrayOf(PropTypes__default["default"].shape({})),
127
126
  author: core.PropTypes.authorElement,
128
127
  sponsor: PropTypes__default["default"].arrayOf(PropTypes__default["default"].shape({})),
129
128
  sponsorPrefix: PropTypes__default["default"].oneOfType([PropTypes__default["default"].node, PropTypes__default["default"].func]),
@@ -142,7 +141,6 @@ var defaultProps$1 = {
142
141
  image: null,
143
142
  title: null,
144
143
  overTitle: null,
145
- authors: null,
146
144
  author: null,
147
145
  sponsor: null,
148
146
  sponsorPrefix: null,
@@ -157,14 +155,13 @@ var defaultProps$1 = {
157
155
  };
158
156
 
159
157
  var UrbaniaArticle = function UrbaniaArticle(_ref) {
160
- var _ref6;
158
+ var _ref5;
161
159
 
162
160
  var hasArticle = _ref.hasArticle,
163
161
  type = _ref.type,
164
162
  image = _ref.image,
165
163
  title = _ref.title,
166
164
  overTitle = _ref.overTitle,
167
- authors = _ref.authors,
168
165
  author = _ref.author,
169
166
  sponsor = _ref.sponsor,
170
167
  sponsorPrefix = _ref.sponsorPrefix,
@@ -220,17 +217,15 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
220
217
  var hasOverTitle = utils.isTextFilled(overTitle);
221
218
  var hasTitle = utils.isTextFilled(title);
222
219
  var hasSponsor = utils.isTextFilled(sponsor);
223
- var hasAuthors = (authors || []).length > 0 || author !== null;
224
220
 
225
221
  var _ref3 = author || {},
226
222
  authorFullName = _ref3.name;
227
223
 
228
- var _ref4 = authorFullName || {},
229
- authorName = _ref4.body;
224
+ var hasAuthor = utils.isTextFilled(authorFullName);
230
225
 
231
- var _ref5 = image || {},
232
- _ref5$url = _ref5.url,
233
- url = _ref5$url === void 0 ? null : _ref5$url;
226
+ var _ref4 = image || {},
227
+ _ref4$url = _ref4.url,
228
+ url = _ref4$url === void 0 ? null : _ref4$url;
234
229
 
235
230
  var hasImage = url !== null;
236
231
  var backgroundPlaying = current && (isView || isEdit);
@@ -289,15 +284,11 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
289
284
  "value": "Authors"
290
285
  }]
291
286
  }))),
292
- isEmpty: !hasAuthors
293
- }, hasAuthors ? /*#__PURE__*/React__default["default"].createElement("div", {
287
+ isEmpty: !hasAuthor
288
+ }, hasAuthor ? /*#__PURE__*/React__default["default"].createElement("div", {
294
289
  className: classNames__default["default"]([styles.authors])
295
- }, author !== null && authorName !== null ? /*#__PURE__*/React__default["default"].createElement(UrbaniaAuthor__default["default"], {
290
+ }, /*#__PURE__*/React__default["default"].createElement(UrbaniaAuthor__default["default"], {
296
291
  author: author
297
- }) : (authors || []).map(function (a) {
298
- return /*#__PURE__*/React__default["default"].createElement(UrbaniaAuthor__default["default"], {
299
- author: a
300
- });
301
292
  })) : null) : null, /*#__PURE__*/React__default["default"].createElement(components.ScreenElement, {
302
293
  key: "sponsors",
303
294
  empty: /*#__PURE__*/React__default["default"].createElement("div", {
@@ -323,7 +314,7 @@ var UrbaniaArticle = function UrbaniaArticle(_ref) {
323
314
  return it !== null;
324
315
  });
325
316
  return /*#__PURE__*/React__default["default"].createElement("div", {
326
- className: classNames__default["default"]([styles.container, (_ref6 = {}, _defineProperty__default["default"](_ref6, className, className !== null), _defineProperty__default["default"](_ref6, styles.isVideo, isVideo), _defineProperty__default["default"](_ref6, styles.isPlaceholder, isPlaceholder), _ref6)]),
317
+ className: classNames__default["default"]([styles.container, (_ref5 = {}, _defineProperty__default["default"](_ref5, className, className !== null), _defineProperty__default["default"](_ref5, styles.isVideo, isVideo), _defineProperty__default["default"](_ref5, styles.isPlaceholder, isPlaceholder), _ref5)]),
327
318
  "data-screen-ready": isStatic || isCapture
328
319
  }, /*#__PURE__*/React__default["default"].createElement(Background__default["default"], {
329
320
  background: background,
@@ -409,8 +400,7 @@ UrbaniaArticle.propTypes = propTypes$1;
409
400
  UrbaniaArticle.defaultProps = defaultProps$1;
410
401
  var UrbaniaArticle$1 = /*#__PURE__*/React__default["default"].memo(UrbaniaArticle);
411
402
 
412
- var _excluded = ["url", "article"],
413
- _excluded2 = ["name", "url"];
403
+ var _excluded = ["url", "article"];
414
404
  var propTypes = {
415
405
  url: PropTypes__default["default"].string,
416
406
  article: PropTypes__default["default"].shape({
@@ -441,11 +431,10 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
441
431
  }, [url]);
442
432
  React.useEffect(function () {
443
433
  if (url !== null) {
444
- // TODO: fix cors on urbania.ca
445
434
  fetch.getJSON("".concat(url, ".json"), {
446
435
  mode: 'cors'
447
436
  }).then(function (art) {
448
- setArticle(art);
437
+ setArticle(art || null);
449
438
  });
450
439
  }
451
440
  }, [url, setArticle]);
@@ -466,59 +455,76 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
466
455
  _ref3$callToAction = _ref3.callToAction,
467
456
  callToAction = _ref3$callToAction === void 0 ? null : _ref3$callToAction;
468
457
 
469
- var _ref4 = title || {},
470
- _ref4$body = _ref4.body,
471
- titleBody = _ref4$body === void 0 ? null : _ref4$body;
472
-
473
- var _ref5 = overTitle || {},
474
- _ref5$body = _ref5.body,
475
- overTitleBody = _ref5$body === void 0 ? null : _ref5$body;
476
-
477
- var _ref6 = image || {},
478
- _ref6$url = _ref6.url,
479
- imageUrl = _ref6$url === void 0 ? null : _ref6$url; // Straight from article
480
-
481
-
482
- var _ref7 = article || {},
483
- _ref7$type = _ref7.type,
484
- type = _ref7$type === void 0 ? null : _ref7$type,
485
- _ref7$title = _ref7.title,
486
- articleTitle = _ref7$title === void 0 ? null : _ref7$title,
487
- _ref7$image = _ref7.image,
488
- articleImage = _ref7$image === void 0 ? null : _ref7$image,
489
- _ref7$metadata = _ref7.metadata,
490
- metadata = _ref7$metadata === void 0 ? {} : _ref7$metadata;
491
-
492
- var _ref8 = metadata || {},
493
- _ref8$authors = _ref8.authors,
494
- authors = _ref8$authors === void 0 ? [] : _ref8$authors,
495
- _ref8$sponsors = _ref8.sponsors,
496
- sponsors = _ref8$sponsors === void 0 ? [] : _ref8$sponsors,
497
- _ref8$site = _ref8.site,
498
- site = _ref8$site === void 0 ? null : _ref8$site,
499
- _ref8$canonical = _ref8.canonical,
500
- canonical = _ref8$canonical === void 0 ? null : _ref8$canonical;
501
-
502
- var _ref9 = articleImage || {},
503
- _ref9$sizes = _ref9.sizes,
504
- sizes = _ref9$sizes === void 0 ? {} : _ref9$sizes;
505
-
506
- var _ref10 = sizes || {},
507
- medium = _ref10.medium,
508
- large = _ref10.large; // Type
458
+ var _ref4 = image || {},
459
+ _ref4$url = _ref4.url,
460
+ imageUrl = _ref4$url === void 0 ? null : _ref4$url; // Straight from article
461
+
462
+
463
+ var _ref5 = article || {},
464
+ _ref5$type = _ref5.type,
465
+ type = _ref5$type === void 0 ? null : _ref5$type,
466
+ _ref5$title = _ref5.title,
467
+ articleTitle = _ref5$title === void 0 ? null : _ref5$title,
468
+ _ref5$image = _ref5.image,
469
+ articleImage = _ref5$image === void 0 ? null : _ref5$image,
470
+ _ref5$metadata = _ref5.metadata,
471
+ metadata = _ref5$metadata === void 0 ? {} : _ref5$metadata;
472
+
473
+ var hasArticle = url !== null && article !== null;
474
+
475
+ var _ref6 = metadata || {},
476
+ _ref6$authors = _ref6.authors,
477
+ authors = _ref6$authors === void 0 ? [] : _ref6$authors,
478
+ _ref6$sponsors = _ref6.sponsors,
479
+ sponsors = _ref6$sponsors === void 0 ? [] : _ref6$sponsors,
480
+ _ref6$site = _ref6.site,
481
+ site = _ref6$site === void 0 ? null : _ref6$site,
482
+ _ref6$canonical = _ref6.canonical,
483
+ canonical = _ref6$canonical === void 0 ? null : _ref6$canonical;
484
+
485
+ var _ref7 = articleImage || {},
486
+ _ref7$sizes = _ref7.sizes,
487
+ sizes = _ref7$sizes === void 0 ? {} : _ref7$sizes;
488
+
489
+ var _ref8 = sizes || {},
490
+ medium = _ref8.medium,
491
+ large = _ref8.large;
492
+
493
+ var articleAuthor = (authors || []).length > 0 ? authors[0] : null;
494
+
495
+ var _ref9 = articleAuthor || {},
496
+ _ref9$name = _ref9.name,
497
+ authorName = _ref9$name === void 0 ? null : _ref9$name,
498
+ _ref9$avatar = _ref9.avatar,
499
+ authorImage = _ref9$avatar === void 0 ? null : _ref9$avatar,
500
+ _ref9$url = _ref9.url,
501
+ authorUrl = _ref9$url === void 0 ? null : _ref9$url;
502
+
503
+ var finalArticleAuthor = _objectSpread__default["default"](_objectSpread__default["default"](_objectSpread__default["default"]({}, authorName !== null ? {
504
+ name: {
505
+ body: "<p>".concat(authorName, "</p>")
506
+ }
507
+ } : null), authorUrl !== null ? {
508
+ url: "".concat(hostname).concat(authorUrl)
509
+ } : null), authorImage !== null ? {
510
+ image: authorImage
511
+ } : null); // Type
509
512
 
510
513
 
511
514
  var defaultType = articleType || type; // Sponsors
512
515
 
513
- var defaultSponsor = (sponsors || []).length > 0 ? (sponsors || []).map(function (_ref11) {
514
- var _ref11$name = _ref11.name,
515
- name = _ref11$name === void 0 ? null : _ref11$name;
516
+ var defaultSponsor = (sponsors || []).length > 0 ? (sponsors || []).map(function (_ref10) {
517
+ var _ref10$name = _ref10.name,
518
+ name = _ref10$name === void 0 ? null : _ref10$name;
516
519
  return name;
517
520
  }).filter(function (name) {
518
521
  return name !== null;
519
- }).join(', ').trim() : null;
520
- var hasSponsor = utils.isTextFilled(sponsor);
521
- var sponsorPrefix = !hasSponsor && defaultSponsor === null ? /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
522
+ }).join(', ').trim() : null; // Content
523
+
524
+ var hasTitle = utils.isTextFilled(title);
525
+ var hasOverTitle = utils.isTextFilled(overTitle);
526
+ var hasSponsorProps = utils.isTextFilled(sponsor);
527
+ var sponsorPrefix = !hasSponsorProps && defaultSponsor !== null ? /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
522
528
  id: "+TPjd4",
523
529
  defaultMessage: [{
524
530
  "type": 0,
@@ -527,28 +533,14 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
527
533
  }) : null;
528
534
  return {
529
535
  type: defaultType,
530
- title: titleBody !== null ? title : _objectSpread__default["default"](_objectSpread__default["default"]({}, title), {}, {
536
+ title: hasTitle ? title : _objectSpread__default["default"](_objectSpread__default["default"]({}, title), {}, {
531
537
  body: articleTitle
532
538
  }),
533
- overTitle: overTitleBody !== null ? overTitle : _objectSpread__default["default"](_objectSpread__default["default"]({}, overTitle), {}, {
539
+ overTitle: hasOverTitle ? overTitle : _objectSpread__default["default"](_objectSpread__default["default"]({}, overTitle), {}, {
534
540
  body: 'En vedette'
535
541
  }),
536
- authors: authors.map(function (_ref12) {
537
- var _ref12$name = _ref12.name,
538
- name = _ref12$name === void 0 ? null : _ref12$name,
539
- _ref12$url = _ref12.url,
540
- authorUrl = _ref12$url === void 0 ? null : _ref12$url,
541
- otherProps = _objectWithoutProperties__default["default"](_ref12, _excluded2);
542
-
543
- return _objectSpread__default["default"]({
544
- name: {
545
- body: "<p>".concat(name, "</p>")
546
- },
547
- url: "".concat(hostname).concat(authorUrl)
548
- }, otherProps);
549
- }),
550
- author: author,
551
- sponsor: !hasSponsor ? _objectSpread__default["default"](_objectSpread__default["default"]({}, sponsor), {}, {
542
+ author: _objectSpread__default["default"](_objectSpread__default["default"]({}, finalArticleAuthor), author),
543
+ sponsor: defaultSponsor !== null && !hasSponsorProps ? _objectSpread__default["default"](_objectSpread__default["default"]({}, sponsor), {}, {
552
544
  body: "<strong>".concat(defaultSponsor, "</strong>")
553
545
  }) : sponsor,
554
546
  sponsorPrefix: sponsorPrefix,
@@ -561,7 +553,7 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
561
553
  large: large
562
554
  }
563
555
  }),
564
- callToAction: _objectSpread__default["default"]({
556
+ callToAction: _objectSpread__default["default"](_objectSpread__default["default"]({
565
557
  active: true,
566
558
  type: 'swipe-up',
567
559
  url: canonical,
@@ -574,7 +566,9 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
574
566
  id: 'play'
575
567
  } : null,
576
568
  inWebView: true
577
- }, callToAction)
569
+ }, callToAction), hasArticle ? {
570
+ active: true
571
+ } : null)
578
572
  };
579
573
  }, [article, url, hostname, props]);
580
574
  return /*#__PURE__*/React__default["default"].createElement(UrbaniaArticle$1, Object.assign({}, props, values, {
@@ -601,10 +595,10 @@ var definition = {
601
595
  order: 10
602
596
  },
603
597
  title: reactIntl.defineMessage({
604
- id: "Oqks/j",
598
+ id: "nJgzwC",
605
599
  defaultMessage: [{
606
600
  "type": 0,
607
- "value": "Urbania article screen"
601
+ "value": "Urbania article"
608
602
  }]
609
603
  }),
610
604
  component: UrbaniaLoaderScreen,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@micromag/screen-urbania-article",
3
- "version": "0.3.73",
3
+ "version": "0.3.76",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "javascript"
@@ -51,18 +51,18 @@
51
51
  "@babel/runtime": "^7.13.10",
52
52
  "@folklore/fetch": "^0.1.15",
53
53
  "@folklore/size": "^0.1.20",
54
- "@micromag/core": "^0.3.73",
55
- "@micromag/element-background": "^0.3.73",
56
- "@micromag/element-call-to-action": "^0.3.73",
57
- "@micromag/element-closed-captions": "^0.3.73",
58
- "@micromag/element-container": "^0.3.73",
59
- "@micromag/element-heading": "^0.3.73",
60
- "@micromag/element-image": "^0.3.73",
61
- "@micromag/element-media-controls": "^0.3.73",
62
- "@micromag/element-urbania-author": "^0.3.73",
63
- "@micromag/element-video": "^0.3.73",
64
- "@micromag/element-visual": "^0.3.73",
65
- "@micromag/transforms": "^0.3.73",
54
+ "@micromag/core": "^0.3.74",
55
+ "@micromag/element-background": "^0.3.74",
56
+ "@micromag/element-call-to-action": "^0.3.76",
57
+ "@micromag/element-closed-captions": "^0.3.74",
58
+ "@micromag/element-container": "^0.3.74",
59
+ "@micromag/element-heading": "^0.3.74",
60
+ "@micromag/element-image": "^0.3.74",
61
+ "@micromag/element-media-controls": "^0.3.74",
62
+ "@micromag/element-urbania-author": "^0.3.76",
63
+ "@micromag/element-video": "^0.3.74",
64
+ "@micromag/element-visual": "^0.3.74",
65
+ "@micromag/transforms": "^0.3.74",
66
66
  "classnames": "^2.2.6",
67
67
  "lodash": "^4.17.21",
68
68
  "prop-types": "^15.7.2",
@@ -72,5 +72,5 @@
72
72
  "publishConfig": {
73
73
  "access": "public"
74
74
  },
75
- "gitHead": "88ca59e9f89a4135924ffdca6a3e977047ac03e9"
75
+ "gitHead": "c86e3ead134f626899cfdfc34fac84eb1d02864a"
76
76
  }