@sis-cc/dotstatsuite-visions 7.8.1 → 7.8.4

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright © OECD 2019-2021
+Copyright © OECD 2019-2022
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/es/CollapsibleTree/CollapsibleTree.js

@@ -69,9 +69,13 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
 
   var getValue = function getValue(_ref2) {
     var value = _ref2.value,
-        handlerProps = _objectWithoutProperties(_ref2, ['value']);
+        _ref2$children = _ref2.children,
+        children = _ref2$children === undefined ? [] : _ref2$children,
+        handlerProps = _objectWithoutProperties(_ref2, ['value', 'children']);
 
-    if (R.isNil(value) || R.isEmpty(value)) return R.prop('noValue', labels);
+    if ((R.isNil(value) || R.isEmpty(value)) && R.isEmpty(children)) {
+      return R.prop('noValue', labels);
+    }
     if (R.is(Function, valueHandler)) {
       return valueHandler(_extends({ value: value }, handlerProps));
     }
@@ -130,7 +134,7 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
             React.createElement(
               Typography,
               { className: classes.spacingValue, variant: 'body2' },
-              getValue(_extends({ value: value }, handlerProps))
+              getValue(_extends({ value: value, children: children }, handlerProps))
             ),
             children && R.map(function (_ref5) {
               var id = _ref5.id,

package/es/Dataflow/Dataflow.js

@@ -148,7 +148,8 @@ var Dataflow = function Dataflow(_ref2) {
       categories = _ref2$categories === undefined ? [] : _ref2$categories,
       children = _ref2.children,
       _ref2$HTMLRenderer = _ref2.HTMLRenderer,
-      HTMLRenderer = _ref2$HTMLRenderer === undefined ? BasicHTMLRenderer : _ref2$HTMLRenderer;
+      HTMLRenderer = _ref2$HTMLRenderer === undefined ? BasicHTMLRenderer : _ref2$HTMLRenderer,
+      id = _ref2.id;
 
   var classes = useStyles();
 
@@ -235,7 +236,7 @@ var Dataflow = function Dataflow(_ref2) {
           { className: classes.cardContent },
           R.map(function (_ref3) {
             var field = _ref3[0],
-                highlight = _ref3[1];
+                fieldHighlights = _ref3[1];
             return React.createElement(
               Typography,
               {
@@ -251,8 +252,9 @@ var Dataflow = function Dataflow(_ref2) {
                 field,
                 ':\xA0'
               ),
-              ' ',
-              React.createElement(HTMLRenderer, { html: highlight })
+              R.map(function (fieldHighlight) {
+                return React.createElement(HTMLRenderer, { key: id + '-' + field, html: fieldHighlight });
+              }, fieldHighlights)
             );
           })(highlights),
           React.createElement(
@@ -356,6 +358,7 @@ var Dataflow = function Dataflow(_ref2) {
 
 Dataflow.propTypes = process.env.NODE_ENV !== "production" ? {
   testId: PropTypes.string,
+  id: PropTypes.string,
   title: PropTypes.string,
   body: PropTypes.shape({
     description: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),

package/es/Dataflow/index.js

@@ -10,6 +10,7 @@
  * @api public
  * @props
  * Dataflow.propTypes = {
+ *   id: PropTypes.string,
  *   testId: PropTypes.string,
  *   title: PropTypes.string,
  *   body: PropTypes.shape({

package/es/Logo/Logo.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import cx from 'classnames';
 import { makeStyles } from '@material-ui/core/styles';
 
 var useStyles = makeStyles(function () {
@@ -13,7 +14,12 @@ var useStyles = makeStyles(function () {
       maxHeight: function maxHeight(_ref) {
         var _maxHeight = _ref.maxHeight;
         return _maxHeight;
-      }
+      },
+      imageRendering: 'crisp-edges'
+    },
+    // https://caniuse.com/mdn-css_properties_image-rendering_crisp-edges
+    alternativeBrowserLogo: {
+      imageRendering: '-webkit-optimize-contrast'
     }
   };
 });
@@ -28,7 +34,7 @@ var Logo = function Logo(_ref2) {
   return React.createElement(
     'div',
     { className: classes.container },
-    React.createElement('img', { className: classes.logo, src: logo, alt: 'logo' }),
+    React.createElement('img', { className: cx(classes.logo, classes.alternativeBrowserLogo), src: logo, alt: 'logo' }),
     children
   );
 };

package/lib/CollapsibleTree/CollapsibleTree.js

@@ -113,9 +113,13 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
 
   var getValue = function getValue(_ref2) {
     var value = _ref2.value,
-        handlerProps = _objectWithoutProperties(_ref2, ['value']);
+        _ref2$children = _ref2.children,
+        children = _ref2$children === undefined ? [] : _ref2$children,
+        handlerProps = _objectWithoutProperties(_ref2, ['value', 'children']);
 
-    if (R.isNil(value) || R.isEmpty(value)) return R.prop('noValue', labels);
+    if ((R.isNil(value) || R.isEmpty(value)) && R.isEmpty(children)) {
+      return R.prop('noValue', labels);
+    }
     if (R.is(Function, valueHandler)) {
       return valueHandler(_extends({ value: value }, handlerProps));
     }
@@ -174,7 +178,7 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
             _react2.default.createElement(
               _Typography2.default,
               { className: classes.spacingValue, variant: 'body2' },
-              getValue(_extends({ value: value }, handlerProps))
+              getValue(_extends({ value: value, children: children }, handlerProps))
             ),
             children && R.map(function (_ref5) {
               var id = _ref5.id,

package/lib/Dataflow/Dataflow.js

@@ -202,7 +202,8 @@ var Dataflow = function Dataflow(_ref2) {
       categories = _ref2$categories === undefined ? [] : _ref2$categories,
       children = _ref2.children,
       _ref2$HTMLRenderer = _ref2.HTMLRenderer,
-      HTMLRenderer = _ref2$HTMLRenderer === undefined ? BasicHTMLRenderer : _ref2$HTMLRenderer;
+      HTMLRenderer = _ref2$HTMLRenderer === undefined ? BasicHTMLRenderer : _ref2$HTMLRenderer,
+      id = _ref2.id;
 
   var classes = useStyles();
 
@@ -289,7 +290,7 @@ var Dataflow = function Dataflow(_ref2) {
           { className: classes.cardContent },
           R.map(function (_ref3) {
             var field = _ref3[0],
-                highlight = _ref3[1];
+                fieldHighlights = _ref3[1];
             return _react2.default.createElement(
               _Typography2.default,
               {
@@ -305,8 +306,9 @@ var Dataflow = function Dataflow(_ref2) {
                 field,
                 ':\xA0'
               ),
-              ' ',
-              _react2.default.createElement(HTMLRenderer, { html: highlight })
+              R.map(function (fieldHighlight) {
+                return _react2.default.createElement(HTMLRenderer, { key: id + '-' + field, html: fieldHighlight });
+              }, fieldHighlights)
             );
           })(highlights),
           _react2.default.createElement(
@@ -410,6 +412,7 @@ var Dataflow = function Dataflow(_ref2) {
 
 Dataflow.propTypes = process.env.NODE_ENV !== "production" ? {
   testId: _propTypes2.default.string,
+  id: _propTypes2.default.string,
   title: _propTypes2.default.string,
   body: _propTypes2.default.shape({
     description: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.element]),

package/lib/Logo/Logo.js

@@ -10,6 +10,10 @@ var _propTypes = require('prop-types');
 
 var _propTypes2 = _interopRequireDefault(_propTypes);
 
+var _classnames = require('classnames');
+
+var _classnames2 = _interopRequireDefault(_classnames);
+
 var _styles = require('@material-ui/core/styles');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -25,7 +29,12 @@ var useStyles = (0, _styles.makeStyles)(function () {
       maxHeight: function maxHeight(_ref) {
         var _maxHeight = _ref.maxHeight;
         return _maxHeight;
-      }
+      },
+      imageRendering: 'crisp-edges'
+    },
+    // https://caniuse.com/mdn-css_properties_image-rendering_crisp-edges
+    alternativeBrowserLogo: {
+      imageRendering: '-webkit-optimize-contrast'
     }
   };
 });
@@ -40,7 +49,7 @@ var Logo = function Logo(_ref2) {
   return _react2.default.createElement(
     'div',
     { className: classes.container },
-    _react2.default.createElement('img', { className: classes.logo, src: logo, alt: 'logo' }),
+    _react2.default.createElement('img', { className: (0, _classnames2.default)(classes.logo, classes.alternativeBrowserLogo), src: logo, alt: 'logo' }),
     children
   );
 };

package/package.json

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