@sis-cc/dotstatsuite-visions 7.17.6 → 7.17.8

package/es/Chips/Chips.js

@@ -12,6 +12,7 @@ import { getIsRtl, withBlank } from '../utils';
 import Tooltip from '../Tooltip';
 
 var shownTooltip = R.pipe(R.dropLast(1), R.either(R.isEmpty, R.isNil), R.not);
+var showMultiLinedTooltip = R.pipe(R.head, R.propOr([], 'parents'), R.isEmpty, R.not);
 var myTooltipRenderer = function myTooltipRenderer(_ref) {
   var isRtl = _ref.isRtl,
       labelRenderer = _ref.labelRenderer;
@@ -87,19 +88,37 @@ var CustomChip = function CustomChip(_ref2) {
       _ref2$ariaLabel = _ref2.ariaLabel,
       ariaLabel = _ref2$ariaLabel === undefined ? 'delete' : _ref2$ariaLabel;
 
+  var theme = useTheme();
+  var isRtl = getIsRtl(theme);
+  var labelRenderer = R.prop('label');
   var classes = useStyles();
+  var mapIndexed = R.addIndex(R.map);
   var onChange = R.is(Function)(onDelete) ? function () {
     return onDelete(parentId, R.isNil(id) ? [] : [id]);
   } : null;
   var hasTooltip = shownTooltip(items);
+  var hasMultiLinedTooltip = showMultiLinedTooltip(items);
+  var multiLinedTooltipRenderer = function multiLinedTooltipRenderer(arr) {
+    return mapIndexed(function (item, index) {
+      return React.createElement(
+        'div',
+        { key: index },
+        myTooltipRenderer({ isRtl: isRtl, labelRenderer: labelRenderer })(item),
+        React.createElement('br', null)
+      );
+    })(R.prop('parents')(R.head(arr)));
+  };
 
   return React.createElement(
     Tooltip,
-    { placement: 'top', title: hasTooltip ? renderer(items) : '' },
+    {
+      placement: 'top',
+      title: hasTooltip ? renderer(items) : hasMultiLinedTooltip ? multiLinedTooltipRenderer(items) : ''
+    },
     React.createElement(Chip, {
       size: 'small',
       'aria-label': label,
-      label: hasTooltip ? React.createElement(
+      label: hasTooltip || hasMultiLinedTooltip ? React.createElement(
         Fragment,
         null,
         '...',
@@ -123,7 +142,7 @@ var CustomChip = function CustomChip(_ref2) {
       ),
       clickable: true,
       onDelete: onChange,
-      className: cx(chipClasses, (_cx = {}, _cx[classes.tooltipIndicator] = hasTooltip, _cx)),
+      className: cx(chipClasses, (_cx = {}, _cx[classes.tooltipIndicator] = hasTooltip || hasMultiLinedTooltip, _cx)),
       classes: { label: labelClasses }
     })
   );
@@ -196,6 +215,7 @@ var Chips = function Chips(_ref3) {
             var id = lastItem.id,
                 isNotRemovable = lastItem.isNotRemovable;
 
+
             return React.createElement(CustomChip, {
               key: id,
               id: id,

package/es/Contact/Contact.js

@@ -90,7 +90,7 @@ var Contact = function Contact(_ref) {
       setDetailsError = _useState10[1];
 
   var checkEmail = function checkEmail(email) {
-    if (getIsValidEmail(email)) {
+    if (getIsValidEmail(email) && R.test(/^\S+@\S+\.\S+$/, email)) {
       return setEmailError(false);
     }
     return setEmailError(true);
@@ -253,7 +253,7 @@ var Contact = function Contact(_ref) {
           control: React.createElement(Checkbox, { name: 'checkedB', color: 'primary' }),
           label: React.createElement(
             Typography,
-            { variant: 'h6', className: classes.label },
+            { variant: 'h6' },
             R.prop('checkbox')(labels)
           ),
           checked: checked,

package/lib/Chips/Chips.js

@@ -52,6 +52,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var shownTooltip = R.pipe(R.dropLast(1), R.either(R.isEmpty, R.isNil), R.not);
+var showMultiLinedTooltip = R.pipe(R.head, R.propOr([], 'parents'), R.isEmpty, R.not);
 var myTooltipRenderer = function myTooltipRenderer(_ref) {
   var isRtl = _ref.isRtl,
       labelRenderer = _ref.labelRenderer;
@@ -127,19 +128,37 @@ var CustomChip = function CustomChip(_ref2) {
       _ref2$ariaLabel = _ref2.ariaLabel,
       ariaLabel = _ref2$ariaLabel === undefined ? 'delete' : _ref2$ariaLabel;
 
+  var theme = (0, _styles.useTheme)();
+  var isRtl = (0, _utils.getIsRtl)(theme);
+  var labelRenderer = R.prop('label');
   var classes = useStyles();
+  var mapIndexed = R.addIndex(R.map);
   var onChange = R.is(Function)(onDelete) ? function () {
     return onDelete(parentId, R.isNil(id) ? [] : [id]);
   } : null;
   var hasTooltip = shownTooltip(items);
+  var hasMultiLinedTooltip = showMultiLinedTooltip(items);
+  var multiLinedTooltipRenderer = function multiLinedTooltipRenderer(arr) {
+    return mapIndexed(function (item, index) {
+      return _react2.default.createElement(
+        'div',
+        { key: index },
+        myTooltipRenderer({ isRtl: isRtl, labelRenderer: labelRenderer })(item),
+        _react2.default.createElement('br', null)
+      );
+    })(R.prop('parents')(R.head(arr)));
+  };
 
   return _react2.default.createElement(
     _Tooltip2.default,
-    { placement: 'top', title: hasTooltip ? renderer(items) : '' },
+    {
+      placement: 'top',
+      title: hasTooltip ? renderer(items) : hasMultiLinedTooltip ? multiLinedTooltipRenderer(items) : ''
+    },
     _react2.default.createElement(_Chip2.default, {
       size: 'small',
       'aria-label': label,
-      label: hasTooltip ? _react2.default.createElement(
+      label: hasTooltip || hasMultiLinedTooltip ? _react2.default.createElement(
         _react.Fragment,
         null,
         '...',
@@ -163,7 +182,7 @@ var CustomChip = function CustomChip(_ref2) {
       ),
       clickable: true,
       onDelete: onChange,
-      className: (0, _classnames2.default)(chipClasses, (_cx = {}, _cx[classes.tooltipIndicator] = hasTooltip, _cx)),
+      className: (0, _classnames2.default)(chipClasses, (_cx = {}, _cx[classes.tooltipIndicator] = hasTooltip || hasMultiLinedTooltip, _cx)),
       classes: { label: labelClasses }
     })
   );
@@ -236,6 +255,7 @@ var Chips = function Chips(_ref3) {
             var id = lastItem.id,
                 isNotRemovable = lastItem.isNotRemovable;
 
+
             return _react2.default.createElement(CustomChip, {
               key: id,
               id: id,

package/lib/Contact/Contact.js

@@ -119,7 +119,7 @@ var Contact = function Contact(_ref) {
       setDetailsError = _useState10[1];
 
   var checkEmail = function checkEmail(email) {
-    if ((0, _isemail.validate)(email)) {
+    if ((0, _isemail.validate)(email) && R.test(/^\S+@\S+\.\S+$/, email)) {
       return setEmailError(false);
     }
     return setEmailError(true);
@@ -282,7 +282,7 @@ var Contact = function Contact(_ref) {
           control: _react2.default.createElement(_core.Checkbox, { name: 'checkedB', color: 'primary' }),
           label: _react2.default.createElement(
             _core.Typography,
-            { variant: 'h6', className: classes.label },
+            { variant: 'h6' },
             R.prop('checkbox')(labels)
           ),
           checked: checked,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sis-cc/dotstatsuite-visions",
-  "version": "7.17.6",
+  "version": "7.17.8",
   "description": "Library of visual components",
   "author": "OECD",
   "homepage": "https://visions-qa.siscc.org/#o",