@shopgate/pwa-ui-shared 7.34.0-beta.2 → 7.34.0-beta.4

package/Dialog/components/HtmlContentDialog/index.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import SafeHtml from '@shopgate/engage/components/SafeHtml';
 import BasicDialog from "../BasicDialog";
 
 /**
@@ -16,10 +17,9 @@ const HtmlContentDialog = ({
 }) => /*#__PURE__*/_jsx(BasicDialog, {
   title: title,
   actions: actions,
-  children: /*#__PURE__*/_jsx("div", {
-    dangerouslySetInnerHTML: {
-      __html: message
-    }
+  children: /*#__PURE__*/_jsx(SafeHtml, {
+    profile: "html",
+    html: message
   })
 });
 HtmlContentDialog.defaultProps = {

package/Dialog/components/TextMessageDialog/index.js

@@ -1,8 +1,16 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { I18n } from '@shopgate/engage/components';
-import { i18n, nl2br } from '@shopgate/engage/core';
+import SafeHtml from '@shopgate/engage/components/SafeHtml';
+import { i18n } from '@shopgate/engage/core';
+import { makeStyles } from '@shopgate/engage/styles';
 import BasicDialog from "../BasicDialog";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const useStyles = makeStyles()({
+  message: {
+    whiteSpace: 'pre-line'
+  }
+});
 
 /**
  * Renders a simple dialog with a title and a text message.
@@ -10,22 +18,26 @@ import BasicDialog from "../BasicDialog";
  * @param {Object} props The component properties.
  * @returns {JSX} The rendered component.
  */
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const TextMessageDialog = ({
   actions,
   message,
   title,
   params,
   children
-}) => /*#__PURE__*/_jsxs(BasicDialog, {
-  title: title,
-  actions: actions,
-  children: [/*#__PURE__*/_jsx("span", {
-    dangerouslySetInnerHTML: {
-      __html: nl2br(i18n.text(message, params))
-    }
-  }), children]
-});
+}) => {
+  const {
+    classes
+  } = useStyles();
+  return /*#__PURE__*/_jsxs(BasicDialog, {
+    title: title,
+    actions: actions,
+    children: [/*#__PURE__*/_jsx(SafeHtml, {
+      as: "span",
+      className: classes.message,
+      html: String(i18n.text(message, params))
+    }), children]
+  });
+};
 TextMessageDialog.defaultProps = {
   title: BasicDialog.defaultProps.title,
   params: I18n.Text.defaultProps.params,

package/Manufacturer/index.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { makeStyles } from '@shopgate/engage/styles';
+import SafeHtml from '@shopgate/engage/components/SafeHtml';
 import { jsx as _jsx } from "react/jsx-runtime";
 const useStyles = makeStyles()(theme => ({
   root: {
@@ -25,10 +26,9 @@ const Manufacturer = ({
   } = useStyles();
   return /*#__PURE__*/_jsx("div", {
     className: cx(classes.root, className, 'ui-shared__manufacturer'),
-    children: /*#__PURE__*/_jsx("span", {
-      dangerouslySetInnerHTML: {
-        __html: text
-      }
+    children: /*#__PURE__*/_jsx(SafeHtml, {
+      as: "span",
+      html: text
     })
   });
 };

package/PriceInfo/index.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { makeStyles } from '@shopgate/engage/styles';
+import SafeHtml from '@shopgate/engage/components/SafeHtml';
 import { jsx as _jsx } from "react/jsx-runtime";
 const useStyles = makeStyles()(theme => ({
   root: {
@@ -23,14 +24,10 @@ const PriceInfo = ({
     classes,
     cx
   } = useStyles();
-  return /*#__PURE__*/_jsx("div", {
-    className: cx(classes.root, className, 'ui-shared__price-info')
-    // eslint-disable-next-line react/no-danger
-    ,
-    dangerouslySetInnerHTML: {
-      __html: text
-    },
-    "data-test-id": `priceInfo: ${text}`
+  return /*#__PURE__*/_jsx(SafeHtml, {
+    className: cx(classes.root, className, 'ui-shared__price-info'),
+    "data-test-id": `priceInfo: ${text}`,
+    html: text
   });
 };
 PriceInfo.defaultProps = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopgate/pwa-ui-shared",
-  "version": "7.34.0-beta.2",
+  "version": "7.34.0-beta.4",
   "description": "Shopgate's shared UI components.",
   "main": "index.js",
   "license": "Apache-2.0",
@@ -10,13 +10,13 @@
     "directory": "libraries/ui-shared"
   },
   "dependencies": {
-    "@shopgate/pwa-ui-ios": "7.34.0-beta.2",
-    "@shopgate/pwa-ui-material": "7.34.0-beta.2",
+    "@shopgate/pwa-ui-ios": "7.34.0-beta.4",
+    "@shopgate/pwa-ui-material": "7.34.0-beta.4",
     "css-spring": "git+https://github.com/shopgate/css-spring.git#master"
   },
   "devDependencies": {
-    "@shopgate/pwa-common": "7.34.0-beta.2",
-    "@shopgate/pwa-common-commerce": "7.34.0-beta.2",
+    "@shopgate/pwa-common": "7.34.0-beta.4",
+    "@shopgate/pwa-common-commerce": "7.34.0-beta.4",
     "classnames": "2.5.1",
     "react": "^17.0.2"
   },