@micromag/screen-urbania-article 0.3.71 → 0.3.75

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 +49 -63
  2. package/lib/index.js +49 -63
  3. package/package.json +14 -14
package/es/index.js CHANGED
@@ -446,79 +446,74 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
446
446
  _ref3$callToAction = _ref3.callToAction,
447
447
  callToAction = _ref3$callToAction === void 0 ? null : _ref3$callToAction;
448
448
 
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
449
+ var _ref4 = image || {},
450
+ _ref4$url = _ref4.url,
451
+ imageUrl = _ref4$url === void 0 ? null : _ref4$url; // Straight from article
452
+
453
+
454
+ var _ref5 = article || {},
455
+ _ref5$type = _ref5.type,
456
+ type = _ref5$type === void 0 ? null : _ref5$type,
457
+ _ref5$title = _ref5.title,
458
+ articleTitle = _ref5$title === void 0 ? null : _ref5$title,
459
+ _ref5$image = _ref5.image,
460
+ articleImage = _ref5$image === void 0 ? null : _ref5$image,
461
+ _ref5$metadata = _ref5.metadata,
462
+ metadata = _ref5$metadata === void 0 ? {} : _ref5$metadata;
463
+
464
+ var _ref6 = metadata || {},
465
+ _ref6$authors = _ref6.authors,
466
+ authors = _ref6$authors === void 0 ? [] : _ref6$authors,
467
+ _ref6$sponsors = _ref6.sponsors,
468
+ sponsors = _ref6$sponsors === void 0 ? [] : _ref6$sponsors,
469
+ _ref6$site = _ref6.site,
470
+ site = _ref6$site === void 0 ? null : _ref6$site,
471
+ _ref6$canonical = _ref6.canonical,
472
+ canonical = _ref6$canonical === void 0 ? null : _ref6$canonical;
473
+
474
+ var _ref7 = articleImage || {},
475
+ _ref7$sizes = _ref7.sizes,
476
+ sizes = _ref7$sizes === void 0 ? {} : _ref7$sizes;
477
+
478
+ var _ref8 = sizes || {},
479
+ medium = _ref8.medium,
480
+ large = _ref8.large; // Type
489
481
 
490
482
 
491
483
  var defaultType = articleType || type; // Sponsors
492
484
 
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;
485
+ var defaultSponsor = (sponsors || []).length > 0 ? (sponsors || []).map(function (_ref9) {
486
+ var _ref9$name = _ref9.name,
487
+ name = _ref9$name === void 0 ? null : _ref9$name;
496
488
  return name;
497
489
  }).filter(function (name) {
498
490
  return name !== null;
499
491
  }).join(', ').trim() : null;
500
- var hasSponsor = isTextFilled(sponsor);
501
- var sponsorPrefix = !hasSponsor && defaultSponsor === null ? /*#__PURE__*/React.createElement(FormattedMessage, {
492
+ var hasTitle = isTextFilled(title);
493
+ var hasOverTitle = isTextFilled(overTitle);
494
+ var hasSponsorProps = isTextFilled(sponsor);
495
+ var sponsorPrefix = !hasSponsorProps && defaultSponsor !== null ? /*#__PURE__*/React.createElement(FormattedMessage, {
502
496
  id: "+TPjd4",
503
497
  defaultMessage: [{
504
498
  "type": 0,
505
499
  "value": "Presented by"
506
500
  }]
507
501
  }) : null;
502
+ console.log('lol');
508
503
  return {
509
504
  type: defaultType,
510
- title: titleBody !== null ? title : _objectSpread(_objectSpread({}, title), {}, {
505
+ title: hasTitle ? title : _objectSpread(_objectSpread({}, title), {}, {
511
506
  body: articleTitle
512
507
  }),
513
- overTitle: overTitleBody !== null ? overTitle : _objectSpread(_objectSpread({}, overTitle), {}, {
508
+ overTitle: hasOverTitle ? overTitle : _objectSpread(_objectSpread({}, overTitle), {}, {
514
509
  body: 'En vedette'
515
510
  }),
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);
511
+ authors: authors.map(function (_ref10) {
512
+ var _ref10$name = _ref10.name,
513
+ name = _ref10$name === void 0 ? null : _ref10$name,
514
+ _ref10$url = _ref10.url,
515
+ authorUrl = _ref10$url === void 0 ? null : _ref10$url,
516
+ otherProps = _objectWithoutProperties(_ref10, _excluded2);
522
517
 
523
518
  return _objectSpread({
524
519
  name: {
@@ -528,7 +523,7 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
528
523
  }, otherProps);
529
524
  }),
530
525
  author: author,
531
- sponsor: !hasSponsor ? _objectSpread(_objectSpread({}, sponsor), {}, {
526
+ sponsor: defaultSponsor !== null && !hasSponsorProps ? _objectSpread(_objectSpread({}, sponsor), {}, {
532
527
  body: "<strong>".concat(defaultSponsor, "</strong>")
533
528
  }) : sponsor,
534
529
  sponsorPrefix: sponsorPrefix,
@@ -630,9 +625,6 @@ var definition = {
630
625
  }, {
631
626
  name: 'overTitle',
632
627
  type: 'heading-element',
633
- theme: {
634
- textStyle: 'heading2'
635
- },
636
628
  defaultValue: {
637
629
  body: 'En vedette'
638
630
  },
@@ -646,9 +638,6 @@ var definition = {
646
638
  }, {
647
639
  name: 'title',
648
640
  type: 'heading-element',
649
- theme: {
650
- textStyle: 'heading1'
651
- },
652
641
  label: defineMessage({
653
642
  id: "N25iDO",
654
643
  defaultMessage: [{
@@ -659,9 +648,6 @@ var definition = {
659
648
  }, {
660
649
  name: 'author',
661
650
  type: 'author-element',
662
- theme: {
663
- textStyle: 'text'
664
- },
665
651
  label: defineMessage({
666
652
  id: "73hxYw",
667
653
  defaultMessage: [{
package/lib/index.js CHANGED
@@ -466,79 +466,74 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
466
466
  _ref3$callToAction = _ref3.callToAction,
467
467
  callToAction = _ref3$callToAction === void 0 ? null : _ref3$callToAction;
468
468
 
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
469
+ var _ref4 = image || {},
470
+ _ref4$url = _ref4.url,
471
+ imageUrl = _ref4$url === void 0 ? null : _ref4$url; // Straight from article
472
+
473
+
474
+ var _ref5 = article || {},
475
+ _ref5$type = _ref5.type,
476
+ type = _ref5$type === void 0 ? null : _ref5$type,
477
+ _ref5$title = _ref5.title,
478
+ articleTitle = _ref5$title === void 0 ? null : _ref5$title,
479
+ _ref5$image = _ref5.image,
480
+ articleImage = _ref5$image === void 0 ? null : _ref5$image,
481
+ _ref5$metadata = _ref5.metadata,
482
+ metadata = _ref5$metadata === void 0 ? {} : _ref5$metadata;
483
+
484
+ var _ref6 = metadata || {},
485
+ _ref6$authors = _ref6.authors,
486
+ authors = _ref6$authors === void 0 ? [] : _ref6$authors,
487
+ _ref6$sponsors = _ref6.sponsors,
488
+ sponsors = _ref6$sponsors === void 0 ? [] : _ref6$sponsors,
489
+ _ref6$site = _ref6.site,
490
+ site = _ref6$site === void 0 ? null : _ref6$site,
491
+ _ref6$canonical = _ref6.canonical,
492
+ canonical = _ref6$canonical === void 0 ? null : _ref6$canonical;
493
+
494
+ var _ref7 = articleImage || {},
495
+ _ref7$sizes = _ref7.sizes,
496
+ sizes = _ref7$sizes === void 0 ? {} : _ref7$sizes;
497
+
498
+ var _ref8 = sizes || {},
499
+ medium = _ref8.medium,
500
+ large = _ref8.large; // Type
509
501
 
510
502
 
511
503
  var defaultType = articleType || type; // Sponsors
512
504
 
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;
505
+ var defaultSponsor = (sponsors || []).length > 0 ? (sponsors || []).map(function (_ref9) {
506
+ var _ref9$name = _ref9.name,
507
+ name = _ref9$name === void 0 ? null : _ref9$name;
516
508
  return name;
517
509
  }).filter(function (name) {
518
510
  return name !== null;
519
511
  }).join(', ').trim() : null;
520
- var hasSponsor = utils.isTextFilled(sponsor);
521
- var sponsorPrefix = !hasSponsor && defaultSponsor === null ? /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
512
+ var hasTitle = utils.isTextFilled(title);
513
+ var hasOverTitle = utils.isTextFilled(overTitle);
514
+ var hasSponsorProps = utils.isTextFilled(sponsor);
515
+ var sponsorPrefix = !hasSponsorProps && defaultSponsor !== null ? /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
522
516
  id: "+TPjd4",
523
517
  defaultMessage: [{
524
518
  "type": 0,
525
519
  "value": "Presented by"
526
520
  }]
527
521
  }) : null;
522
+ console.log('lol');
528
523
  return {
529
524
  type: defaultType,
530
- title: titleBody !== null ? title : _objectSpread__default["default"](_objectSpread__default["default"]({}, title), {}, {
525
+ title: hasTitle ? title : _objectSpread__default["default"](_objectSpread__default["default"]({}, title), {}, {
531
526
  body: articleTitle
532
527
  }),
533
- overTitle: overTitleBody !== null ? overTitle : _objectSpread__default["default"](_objectSpread__default["default"]({}, overTitle), {}, {
528
+ overTitle: hasOverTitle ? overTitle : _objectSpread__default["default"](_objectSpread__default["default"]({}, overTitle), {}, {
534
529
  body: 'En vedette'
535
530
  }),
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);
531
+ authors: authors.map(function (_ref10) {
532
+ var _ref10$name = _ref10.name,
533
+ name = _ref10$name === void 0 ? null : _ref10$name,
534
+ _ref10$url = _ref10.url,
535
+ authorUrl = _ref10$url === void 0 ? null : _ref10$url,
536
+ otherProps = _objectWithoutProperties__default["default"](_ref10, _excluded2);
542
537
 
543
538
  return _objectSpread__default["default"]({
544
539
  name: {
@@ -548,7 +543,7 @@ var UrbaniaLoader = function UrbaniaLoader(_ref) {
548
543
  }, otherProps);
549
544
  }),
550
545
  author: author,
551
- sponsor: !hasSponsor ? _objectSpread__default["default"](_objectSpread__default["default"]({}, sponsor), {}, {
546
+ sponsor: defaultSponsor !== null && !hasSponsorProps ? _objectSpread__default["default"](_objectSpread__default["default"]({}, sponsor), {}, {
552
547
  body: "<strong>".concat(defaultSponsor, "</strong>")
553
548
  }) : sponsor,
554
549
  sponsorPrefix: sponsorPrefix,
@@ -650,9 +645,6 @@ var definition = {
650
645
  }, {
651
646
  name: 'overTitle',
652
647
  type: 'heading-element',
653
- theme: {
654
- textStyle: 'heading2'
655
- },
656
648
  defaultValue: {
657
649
  body: 'En vedette'
658
650
  },
@@ -666,9 +658,6 @@ var definition = {
666
658
  }, {
667
659
  name: 'title',
668
660
  type: 'heading-element',
669
- theme: {
670
- textStyle: 'heading1'
671
- },
672
661
  label: reactIntl.defineMessage({
673
662
  id: "N25iDO",
674
663
  defaultMessage: [{
@@ -679,9 +668,6 @@ var definition = {
679
668
  }, {
680
669
  name: 'author',
681
670
  type: 'author-element',
682
- theme: {
683
- textStyle: 'text'
684
- },
685
671
  label: reactIntl.defineMessage({
686
672
  id: "73hxYw",
687
673
  defaultMessage: [{
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@micromag/screen-urbania-article",
3
- "version": "0.3.71",
3
+ "version": "0.3.75",
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.71",
55
- "@micromag/element-background": "^0.3.71",
56
- "@micromag/element-call-to-action": "^0.3.71",
57
- "@micromag/element-closed-captions": "^0.3.71",
58
- "@micromag/element-container": "^0.3.71",
59
- "@micromag/element-heading": "^0.3.71",
60
- "@micromag/element-image": "^0.3.71",
61
- "@micromag/element-media-controls": "^0.3.71",
62
- "@micromag/element-urbania-author": "^0.3.71",
63
- "@micromag/element-video": "^0.3.71",
64
- "@micromag/element-visual": "^0.3.71",
65
- "@micromag/transforms": "^0.3.71",
54
+ "@micromag/core": "^0.3.74",
55
+ "@micromag/element-background": "^0.3.74",
56
+ "@micromag/element-call-to-action": "^0.3.74",
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.74",
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": "50093d0adc731dfb58656015179c4ac0b1c6765f"
75
+ "gitHead": "ab692045b86265c7f2b3c8287cb3ab6a4b407d64"
76
76
  }