@codacy/ui-components 0.61.7 → 0.61.9

package/lib/Toast/Toast.js

@@ -4,6 +4,8 @@ import { StyledToastContainer } from './styles';
 import { ErrorIcon, WarningIcon, InfoIcon, SuccessIcon } from '../Icons';
 import { toast as launchToast, ToastContainer as ToastifyContainer } from 'react-toastify';
 import { Subheader, Paragraph } from '../Typography';
+import { hash } from '../utils/hash';
+import { reactNodeToText } from '../utils/reactNodeToText';
 var DEFAULT_TOAST_TYPE = 'success';
 var TypeIcons = {
   "default": /*#__PURE__*/React.createElement(SuccessIcon, null),
@@ -13,10 +15,33 @@ var TypeIcons = {
   warning: /*#__PURE__*/React.createElement(WarningIcon, null)
 };
 
+var getInnerToastText = function getInnerToastText(content) {
+  if (!content) return '';
+
+  switch (typeof content) {
+    case 'string':
+      return content;
+
+    case 'object':
+      if ('title' in content || 'description' in content) {
+        if (typeof content.description === 'object') {
+          return "".concat(content.title || '', " ").concat(reactNodeToText(content.description));
+        } else {
+          return "".concat(content.title || '', " ").concat(content.description);
+        }
+      }
+
+      return reactNodeToText(content);
+
+    default:
+      return '';
+  }
+};
+
 var ToastContentWrapper = function ToastContentWrapper(_ref) {
   var content = _ref.content;
 
-  if (typeof content === 'object' && 'description' in content) {
+  if (content && typeof content === 'object' && 'description' in content) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, content.title && /*#__PURE__*/React.createElement(Subheader, {
       size: "lg",
       mb: 2
@@ -40,6 +65,7 @@ var useToast = function useToast(defaultOptions) {
       launchToast( /*#__PURE__*/React.createElement(ToastContentWrapper, {
         content: content
       }), _objectSpread(_objectSpread({}, ops), {}, {
+        toastId: hash(getInnerToastText(content)),
         icon: TypeIcons[(ops === null || ops === void 0 ? void 0 : ops.type) || DEFAULT_TOAST_TYPE],
         autoClose: (ops === null || ops === void 0 ? void 0 : ops.duration) === null ? false : ops === null || ops === void 0 ? void 0 : ops.duration
       }));

package/lib/Toast/types.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import { ToastOptions } from 'react-toastify';
-export declare type ToastContent = React.ReactChild | {
+export declare type ToastContent = string | React.ReactNode | {
     title?: string;
-    description: React.ReactChild;
+    description: React.ReactNode;
 };
 export interface ToastConfig extends Pick<ToastOptions, 'onClose' | 'onOpen' | 'toastId' | 'type' | 'closeOnClick'> {
     duration?: number | null;

package/lib/utils/hash.d.ts

@@ -0,0 +1 @@
+export declare const hash: (s: string) => number;

package/lib/utils/hash.js

@@ -0,0 +1,9 @@
+export var hash = function hash(s) {
+  var h = 9;
+
+  for (var i = 0; i < s.length;) {
+    h = Math.imul(h ^ s.charCodeAt(i++), Math.pow(9, 9));
+  }
+
+  return h ^ h >>> 9;
+};

package/lib/utils/reactNodeToText.d.ts

@@ -0,0 +1,2 @@
+import { ReactNode } from 'react';
+export declare const reactNodeToText: (children: ReactNode | ReactNode[]) => string;

package/lib/utils/reactNodeToText.js

@@ -0,0 +1,38 @@
+// From https://github.com/fernandopasik/react-children-utilities
+import { Children, isValidElement } from 'react';
+
+var hasChildren = function hasChildren(element) {
+  return isValidElement(element) && Boolean(element.props.children);
+};
+
+var childToString = function childToString(child) {
+  if (typeof child === 'undefined' || child === null || typeof child === 'boolean') {
+    return '';
+  }
+
+  if (JSON.stringify(child) === '{}') {
+    return '';
+  }
+
+  return child.toString();
+};
+
+export var reactNodeToText = function reactNodeToText(children) {
+  if (!(children instanceof Array) && !isValidElement(children)) {
+    return childToString(children);
+  }
+
+  return Children.toArray(children).reduce(function (text, child) {
+    var newText = '';
+
+    if (isValidElement(child) && hasChildren(child)) {
+      newText = reactNodeToText(child.props.children);
+    } else if (isValidElement(child) && !hasChildren(child)) {
+      newText = '';
+    } else {
+      newText = childToString(child);
+    }
+
+    return text.concat(newText);
+  }, '');
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codacy/ui-components",
-  "version": "0.61.7",
+  "version": "0.61.9",
   "description": "",
   "license": "ISC",
   "author": "",
@@ -94,7 +94,7 @@
     "react": "^18.2.0",
     "react-docgen-typescript-loader": "^3.7.2",
     "react-dom": "^18.2.0",
-    "react-toastify": "^8.0.2",
+    "react-toastify": "8.0.2",
     "reakit": "^1.3.11",
     "rimraf": "^3.0.2",
     "styled-system": "^5.1.5",
@@ -108,9 +108,9 @@
     "@popperjs/core": "^2.5.4",
     "lodash": "^4.17.20",
     "numeral": "^2.0.6",
-    "react": "=>17.0.2",
-    "react-dom": "=>17.0.2",
-    "react-toastify": "^8.0.2",
+    "react": "^17.0.0 || ^18.0.0",
+    "react-dom": "^17.0.0 || ^18.0.0",
+    "react-toastify": "8.0.2",
     "reakit": "^1.3.11",
     "styled-system": "^5.1.5",
     "typeface-clear-sans": "0.0.44"
@@ -132,5 +132,6 @@
     "*.md": [
       "prettier --write"
     ]
-  }
+  },
+  "packageManager": "yarn@1.22.19"
 }