luna-one 3.1.492 → 3.1.494

package/dist/luna/components/CtaWithHeader/CtaWithHeader.js

@@ -113,12 +113,11 @@ var CtaWithHeader = function CtaWithHeader(_ref) {
     className: "heading",
     dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(headline)
   }), subhead && /*#__PURE__*/_react["default"].createElement("div", {
-    className: "subheading"
-  }, subhead)), content && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "subheading",
+    dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(subhead)
+  })), content && /*#__PURE__*/_react["default"].createElement("div", {
     className: "content content__bullet-theme--".concat(variantClass),
-    dangerouslySetInnerHTML: {
-      __html: content
-    }
+    dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(content)
   }), (buttons === null || buttons === void 0 ? void 0 : buttons.length) && /*#__PURE__*/_react["default"].createElement("div", {
     className: "cta-buttons ".concat(textLinks && "text-links ".concat(linksClass), " ").concat((buttons === null || buttons === void 0 ? void 0 : buttons.length) > 1 ? "cta-buttons--multiple" : "")
   }, buttons.map(function (button, index) {

package/dist/luna/components/NonTimeBasedListEntries/NonTimeBasedListEntriesMethods.js

@@ -92,8 +92,9 @@ var LongDescriptionCard = function LongDescriptionCard(_ref) {
     className: "heading",
     dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(header)
   }), subhead && /*#__PURE__*/_react["default"].createElement("div", {
-    className: "subtitle"
-  }, subhead)), summary && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "subtitle",
+    dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(subhead)
+  })), summary && /*#__PURE__*/_react["default"].createElement("div", {
     className: "body-container",
     dangerouslySetInnerHTML: {
       __html: summary
@@ -113,7 +114,7 @@ var ShortDescriptionCardWrapper = function ShortDescriptionCardWrapper(_ref2) {
   var link = _ref2.link,
       ariaLabel = _ref2.ariaLabel,
       children = _ref2.children;
-  return link ? /*#__PURE__*/_react["default"].createElement(_terraOne.LunaLink, {
+  return link && link !== null && link !== void 0 && link.url ? /*#__PURE__*/_react["default"].createElement(_terraOne.LunaLink, {
     to: link === null || link === void 0 ? void 0 : link.url,
     ariaLabel: ariaLabel,
     className: "card"
@@ -136,7 +137,7 @@ var ShortDescriptionCard = function ShortDescriptionCard(_ref3) {
   }, header && /*#__PURE__*/_react["default"].createElement("div", {
     className: "heading-container"
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "heading ".concat(link && (0, _checkForExternalLink["default"])(link === null || link === void 0 ? void 0 : link.url) ? "has-link-external" : link ? "has-link" : ""),
+    className: "heading ".concat(link && link !== null && link !== void 0 && link.url && (0, _checkForExternalLink["default"])(link === null || link === void 0 ? void 0 : link.url) ? "has-link-external" : link && link !== null && link !== void 0 && link.url ? "has-link" : ""),
     dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(header)
   })), (category || role) && /*#__PURE__*/_react["default"].createElement("div", {
     className: "subhead-container"

package/dist/luna/components/ProductSummary/ProductSummaryMethods.js

@@ -50,14 +50,16 @@ var SummaryCard = function SummaryCard(summaryCard, labels, version) {
     className: "product-summary-card--container__name-text",
     dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(name)
   }), description && /*#__PURE__*/_react["default"].createElement("p", {
-    className: "product-summary-card--container__name-description"
-  }, description)), productLine && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "product-summary-card--container__name-description",
+    dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(description)
+  })), productLine && /*#__PURE__*/_react["default"].createElement("div", {
     className: "product-summary-card--container__line"
   }, (labels === null || labels === void 0 ? void 0 : labels.productLineLabel) && /*#__PURE__*/_react["default"].createElement("h1", {
     className: "product-summary-card--container__line-label"
   }, labels === null || labels === void 0 ? void 0 : labels.productLineLabel), /*#__PURE__*/_react["default"].createElement("h4", {
-    className: "product-summary-card--container__line-text"
-  }, productLine)), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "product-summary-card--container__line-text",
+    dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(productLine)
+  })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "product-summary-card--container__regions"
   }, (labels === null || labels === void 0 ? void 0 : labels.regionsLabel) && /*#__PURE__*/_react["default"].createElement("h1", {
     className: "product-summary-card--container__regions-label"
@@ -97,8 +99,9 @@ var summaryColumn = function summaryColumn(column, i) {
     className: "product-summary-column__header",
     dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(column === null || column === void 0 ? void 0 : column.header)
   }), (column === null || column === void 0 ? void 0 : column.subheader) && /*#__PURE__*/_react["default"].createElement("h4", {
-    className: "product-summary-column__subheader"
-  }, column === null || column === void 0 ? void 0 : column.subheader), /*#__PURE__*/_react["default"].createElement("ul", {
+    className: "product-summary-column__subheader",
+    dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(column === null || column === void 0 ? void 0 : column.subheader)
+  }), /*#__PURE__*/_react["default"].createElement("ul", {
     className: "product-summary-column__bullets-container"
   }, renderBulletsOrLinks(column === null || column === void 0 ? void 0 : column.listType, column === null || column === void 0 ? void 0 : column.list)));
 };
@@ -114,8 +117,9 @@ var renderBulletsOrLinks = function renderBulletsOrLinks(type, list) {
         }, /*#__PURE__*/_react["default"].createElement("a", {
           className: external ? "product-summary-column__bullets-link-external" : "product-summary-column__bullets-link",
           target: external ? "_blank" : "_self",
-          href: item === null || item === void 0 ? void 0 : item.url
-        }, item === null || item === void 0 ? void 0 : item.text));
+          href: item === null || item === void 0 ? void 0 : item.url,
+          dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(item === null || item === void 0 ? void 0 : item.text)
+        }));
       });
     }
 
@@ -125,10 +129,12 @@ var renderBulletsOrLinks = function renderBulletsOrLinks(type, list) {
           className: "product-summary-column__bullets",
           key: i
         }, (item === null || item === void 0 ? void 0 : item.title) && /*#__PURE__*/_react["default"].createElement("h3", {
-          className: "product-summary-column__bullets-header"
-        }, item === null || item === void 0 ? void 0 : item.title), (item === null || item === void 0 ? void 0 : item.text) && /*#__PURE__*/_react["default"].createElement("p", {
-          className: "product-summary-column__bullets-text"
-        }, item === null || item === void 0 ? void 0 : item.text));
+          className: "product-summary-column__bullets-header",
+          dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(item === null || item === void 0 ? void 0 : item.title)
+        }), (item === null || item === void 0 ? void 0 : item.text) && /*#__PURE__*/_react["default"].createElement("p", {
+          className: "product-summary-column__bullets-text",
+          dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(item === null || item === void 0 ? void 0 : item.text)
+        }));
       });
     }
   }

package/dist/luna/components/UnboundedCard/UnboundedCard.js

@@ -81,9 +81,7 @@ var UnboundedCard = function UnboundedCard(_ref) {
     className: "ter-bounded-card__text"
   }, text === null || text === void 0 ? void 0 : text.data) : text && /*#__PURE__*/_react["default"].createElement("div", {
     className: "ter-bounded-card__text",
-    dangerouslySetInnerHTML: {
-      __html: text
-    }
+    dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(text)
   });
 
   var componentBody = /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, (0, _UnboundedCardMethods.renderCardImage)(image === null || image === void 0 ? void 0 : image.focalPointImage, imageSizes, modalContent, modalType, deployModal, hideModal, modalDeployed), /*#__PURE__*/_react["default"].createElement("div", {

package/dist/luna/featurettes/IconTextList/IconTextList.js

@@ -54,7 +54,7 @@ var IconTextList = function IconTextList(_ref) {
     style: {
       color: color
     }
-  }, items && items.map(function (item, index) {
+  }, items && (items === null || items === void 0 ? void 0 : items.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "ter-icon-text-list__item",
       key: index
@@ -72,11 +72,9 @@ var IconTextList = function IconTextList(_ref) {
       dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(item === null || item === void 0 ? void 0 : item.headline)
     }), /*#__PURE__*/_react["default"].createElement("div", {
       className: "ter-icon-text-list__item-text-body ter-icon-text-list__bullet-theme--".concat(themeName),
-      dangerouslySetInnerHTML: {
-        __html: item === null || item === void 0 ? void 0 : item.body
-      }
+      dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(item === null || item === void 0 ? void 0 : item.body)
     })));
-  })));
+  }))));
 };
 
 var _default = IconTextList;

package/dist/luna/featurettes/ProductsPackage/ProductsPackage.js

@@ -137,8 +137,9 @@ var ProductsPackage = function ProductsPackage(_ref) {
     className: "mxp-products-package-container__right-section--header",
     dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(header)
   }), text && /*#__PURE__*/_react["default"].createElement("p", {
-    className: "mxp-products-package-container__right-section--text"
-  }, text), cta && /*#__PURE__*/_react["default"].createElement(Button, {
+    className: "mxp-products-package-container__right-section--text",
+    dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(text)
+  }), cta && /*#__PURE__*/_react["default"].createElement(Button, {
     Link: cta === null || cta === void 0 ? void 0 : cta.Link,
     text: cta === null || cta === void 0 ? void 0 : cta.text,
     url: cta === null || cta === void 0 ? void 0 : cta.url,

package/dist/luna/featurettes/PullQuote/PullQuote.js

@@ -27,6 +27,8 @@ var _component = _interopRequireDefault(require("@loadable/component"));
 
 var _generateFocusedImageAlt = _interopRequireDefault(require("../../utils/generateFocusedImageAlt"));
 
+var _formatSpecialCharText = _interopRequireDefault(require("../../utils/formatSpecialCharText"));
+
 var VideoComponent = (0, _component["default"])(function () {
   return Promise.resolve().then(function () {
     return (0, _interopRequireWildcard2["default"])(require("../../components/Video/Video"));
@@ -263,12 +265,11 @@ var PullQuote = function PullQuote(props) {
     className: "ter-pullQuote__quote-text",
     style: {
       color: color
-    }
-  }, quoteText), quoteText && (0, _checkForDangerouslySet["default"])(quoteText) && /*#__PURE__*/_react["default"].createElement("div", {
+    },
+    dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(quoteText)
+  }), quoteText && (0, _checkForDangerouslySet["default"])(quoteText) && /*#__PURE__*/_react["default"].createElement("div", {
     className: "ter-pullQuote__quote-text-holder dangerously-set-content",
-    dangerouslySetInnerHTML: {
-      __html: quoteText
-    }
+    dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(quoteText)
   }), quoteSource && /*#__PURE__*/_react["default"].createElement("p", {
     className: "ter-pullQuote__quote-source",
     style: {

package/dist/luna/heroes/SuperHero/SuperHeroMethods.js

@@ -469,15 +469,14 @@ var renderVariantsOneToSeven = function renderVariantsOneToSeven(variant, conten
         marginBottom: "37px"
       } : {
         color: color
-      }
-    }, subHeader), text && /*#__PURE__*/_react["default"].createElement("div", {
+      },
+      dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(subHeader)
+    }), text && /*#__PURE__*/_react["default"].createElement("div", {
       className: "luna-super-hero__text luna-super-hero__text-".concat(color === null || color === void 0 ? void 0 : color.toLowerCase()),
       style: {
         color: color
       },
-      dangerouslySetInnerHTML: {
-        __html: text
-      }
+      dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(text)
     }), !ctas && cta && /*#__PURE__*/_react["default"].createElement(Button, {
       Link: Link,
       url: cta.url,

package/dist/luna/utils/checkForDangerouslySet.js

@@ -9,6 +9,8 @@ exports["default"] = exports.checkAndSet = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _formatSpecialCharText = _interopRequireDefault(require("./formatSpecialCharText"));
+
 var tags = ["<p", "<a", "<im", "<h1", "<h2", "<h3", "<h4", "<h5", "<h6", "<di", "<sp", "<ul", "<ol", "<li", "<a ", "<ta"];
 
 var checkForDangerouslySet = function checkForDangerouslySet(text) {
@@ -38,9 +40,7 @@ var checkAndSet = function checkAndSet(text, classNamePrefix, classNameSuffix, c
       style: {
         color: color || "#242D2F"
       },
-      dangerouslySetInnerHTML: {
-        __html: text
-      }
+      dangerouslySetInnerHTML: (0, _formatSpecialCharText["default"])(text)
     });
   } else {
     return /*#__PURE__*/_react["default"].createElement("p", {

package/dist/luna/utils/formatSpecialCharText.js

@@ -7,13 +7,29 @@ exports["default"] = void 0;
 
 var formatSpecialCharText = function formatSpecialCharText(text) {
   if (text && typeof window !== "undefined" && typeof document !== "undefined") {
-    var _DOMParser, _DOMParser$parseFromS, _DOMParser$parseFromS2;
+    var _formattedText, _DOMParser, _DOMParser$parseFromS, _DOMParser$parseFromS2;
 
-    var formattedText = text === null || text === void 0 ? void 0 : text.replace('©', '<sup>&copy;</sup>').replace('®', '<sup>&reg;</sup>').replace('™', '<sup>&trade;</sup>');
+    var formattedText = text === null || text === void 0 ? void 0 : text.split(/(™)|(©)|(®)/g);
+    formattedText.forEach(function (character, i) {
+      if ((character === null || character === void 0 ? void 0 : character.trim()) === "™") {
+        formattedText[i] = "<sup>&trade;</sup>";
+      }
+
+      if ((character === null || character === void 0 ? void 0 : character.trim()) === "©") {
+        formattedText[i] = "<sup>&copy;</sup>";
+      }
+
+      if ((character === null || character === void 0 ? void 0 : character.trim()) === "®") {
+        formattedText[i] = "<sup>&reg;</sup>";
+      }
+    });
+    formattedText = (_formattedText = formattedText) === null || _formattedText === void 0 ? void 0 : _formattedText.join("");
     return {
       __html: (_DOMParser = new DOMParser()) === null || _DOMParser === void 0 ? void 0 : (_DOMParser$parseFromS = _DOMParser.parseFromString(formattedText, "text/html")) === null || _DOMParser$parseFromS === void 0 ? void 0 : (_DOMParser$parseFromS2 = _DOMParser$parseFromS.body) === null || _DOMParser$parseFromS2 === void 0 ? void 0 : _DOMParser$parseFromS2.innerHTML
     };
   }
+
+  return null;
 };
 
 var _default = formatSpecialCharText;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "luna-one",
-  "version": "3.1.492",
+  "version": "3.1.494",
   "peerDependencies": {
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
@@ -51,7 +51,7 @@
     "react-scroll": "^1.8.7",
     "react-slidedown": "^2.4.7",
     "smoothscroll-polyfill": "^0.4.4",
-    "terra-one": "^3.0.166"
+    "terra-one": "^3.0.169"
   },
   "scripts": {
     "start": "start-storybook -p 9009 -s public",