@sis-cc/dotstatsuite-visions 7.8.0 → 7.8.1

package/es/CollapsibleTree/CollapsibleTree.js

@@ -1,5 +1,7 @@
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
+function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+
 import React, { useState, Fragment, useEffect } from 'react';
 import * as R from 'ramda';
 import PropTypes from 'prop-types';
@@ -65,6 +67,17 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
     return setDepthLevel(defaultDepthLevel);
   };
 
+  var getValue = function getValue(_ref2) {
+    var value = _ref2.value,
+        handlerProps = _objectWithoutProperties(_ref2, ['value']);
+
+    if (R.isNil(value) || R.isEmpty(value)) return R.prop('noValue', labels);
+    if (R.is(Function, valueHandler)) {
+      return valueHandler(_extends({ value: value }, handlerProps));
+    }
+    return value;
+  };
+
   var isAllOpen = depthLevel >= defaultDepthLevel;
   var buttonAllOpenLabel = isAllOpen ? R.prop('collapseAll', labels) : R.prop('expandAll', labels);
 
@@ -88,11 +101,11 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
       ),
       children
     ),
-    R.map(function (_ref2) {
-      var id = _ref2.id,
-          label = _ref2.label,
-          _ref2$children = _ref2.children,
-          children = _ref2$children === undefined ? [] : _ref2$children;
+    R.map(function (_ref3) {
+      var id = _ref3.id,
+          label = _ref3.label,
+          _ref3$children = _ref3.children,
+          children = _ref3$children === undefined ? [] : _ref3$children;
 
       return React.createElement(
         Fragment,
@@ -103,28 +116,28 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
           { variant: 'h5', className: classes.title },
           label
         ),
-        R.map(function (_ref3) {
-          var id = _ref3.id,
-              label = _ref3.label,
-              children = _ref3.children,
-              value = _ref3.value,
-              _ref3$handlerProps = _ref3.handlerProps,
-              handlerProps = _ref3$handlerProps === undefined ? {} : _ref3$handlerProps;
+        R.map(function (_ref4) {
+          var id = _ref4.id,
+              label = _ref4.label,
+              children = _ref4.children,
+              value = _ref4.value,
+              _ref4$handlerProps = _ref4.handlerProps,
+              handlerProps = _ref4$handlerProps === undefined ? {} : _ref4$handlerProps;
 
           return React.createElement(
             Collapse,
             { key: id, level: 0, label: label, isOpen: depthLevel >= 0 },
-            value && React.createElement(
+            React.createElement(
               Typography,
               { className: classes.spacingValue, variant: 'body2' },
-              R.is(Function, valueHandler) ? valueHandler(_extends({ value: value }, handlerProps)) : value
+              getValue(_extends({ value: value }, handlerProps))
             ),
-            children && R.map(function (_ref4) {
-              var id = _ref4.id,
-                  label = _ref4.label,
-                  value = _ref4.value,
-                  _ref4$handlerProps = _ref4.handlerProps,
-                  handlerProps = _ref4$handlerProps === undefined ? {} : _ref4$handlerProps;
+            children && R.map(function (_ref5) {
+              var id = _ref5.id,
+                  label = _ref5.label,
+                  value = _ref5.value,
+                  _ref5$handlerProps = _ref5.handlerProps,
+                  handlerProps = _ref5$handlerProps === undefined ? {} : _ref5$handlerProps;
 
               return React.createElement(
                 Collapse,
@@ -138,7 +151,7 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
                 React.createElement(
                   Typography,
                   { variant: 'body2' },
-                  R.is(Function, valueHandler) ? valueHandler(_extends({ value: value }, handlerProps)) : value
+                  getValue(_extends({ value: value }, handlerProps))
                 )
               );
             }, children)
@@ -168,7 +181,8 @@ CollapsibleTree.propTypes = process.env.NODE_ENV !== "production" ? {
   children: PropTypes.node,
   labels: PropTypes.shape({
     collapseAll: PropTypes.string,
-    expandAll: PropTypes.string
+    expandAll: PropTypes.string,
+    noValue: PropTypes.string
   }),
   testId: PropTypes.string,
   valueHandler: PropTypes.func

package/es/CollapsibleTree/index.js

@@ -23,6 +23,11 @@
  *  })),
  *  defaultDepthLevel: PropTypes.number,
  *  testId: PropTypes.string,
+ *  labels: PropTypes.shape({
+ *    collapseAll: PropTypes.string,
+ *    expandAll: PropTypes.string,
+ *    noValue: PropTypes.string,
+ *  }),
  *};
  * @theme
  * {

package/es/Select/Select.js

@@ -6,7 +6,6 @@ import PropTypes from 'prop-types';
 import { makeStyles } from '@material-ui/core/styles';
 import TextField from '@material-ui/core/TextField';
 import MenuItem from '@material-ui/core/MenuItem';
-import { Tooltip } from '../';
 
 var useStyles = makeStyles(function (theme) {
   return {
@@ -55,7 +54,7 @@ var Select = function Select(_ref) {
     if (ref.current && open) {
       setWidth(ref.current.clientWidth);
     }
-  }, [ref.current, open]);
+  }, [open]);
 
   var getter = function getter(key) {
     return function (accessor) {

package/lib/CollapsibleTree/CollapsibleTree.js

@@ -58,6 +58,8 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+
 var useStyles = (0, _styles.makeStyles)(function (theme) {
   return {
     title: _extends({
@@ -109,6 +111,17 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
     return setDepthLevel(defaultDepthLevel);
   };
 
+  var getValue = function getValue(_ref2) {
+    var value = _ref2.value,
+        handlerProps = _objectWithoutProperties(_ref2, ['value']);
+
+    if (R.isNil(value) || R.isEmpty(value)) return R.prop('noValue', labels);
+    if (R.is(Function, valueHandler)) {
+      return valueHandler(_extends({ value: value }, handlerProps));
+    }
+    return value;
+  };
+
   var isAllOpen = depthLevel >= defaultDepthLevel;
   var buttonAllOpenLabel = isAllOpen ? R.prop('collapseAll', labels) : R.prop('expandAll', labels);
 
@@ -132,11 +145,11 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
       ),
       children
     ),
-    R.map(function (_ref2) {
-      var id = _ref2.id,
-          label = _ref2.label,
-          _ref2$children = _ref2.children,
-          children = _ref2$children === undefined ? [] : _ref2$children;
+    R.map(function (_ref3) {
+      var id = _ref3.id,
+          label = _ref3.label,
+          _ref3$children = _ref3.children,
+          children = _ref3$children === undefined ? [] : _ref3$children;
 
       return _react2.default.createElement(
         _react.Fragment,
@@ -147,28 +160,28 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
           { variant: 'h5', className: classes.title },
           label
         ),
-        R.map(function (_ref3) {
-          var id = _ref3.id,
-              label = _ref3.label,
-              children = _ref3.children,
-              value = _ref3.value,
-              _ref3$handlerProps = _ref3.handlerProps,
-              handlerProps = _ref3$handlerProps === undefined ? {} : _ref3$handlerProps;
+        R.map(function (_ref4) {
+          var id = _ref4.id,
+              label = _ref4.label,
+              children = _ref4.children,
+              value = _ref4.value,
+              _ref4$handlerProps = _ref4.handlerProps,
+              handlerProps = _ref4$handlerProps === undefined ? {} : _ref4$handlerProps;
 
           return _react2.default.createElement(
             _Collapse2.default,
             { key: id, level: 0, label: label, isOpen: depthLevel >= 0 },
-            value && _react2.default.createElement(
+            _react2.default.createElement(
               _Typography2.default,
               { className: classes.spacingValue, variant: 'body2' },
-              R.is(Function, valueHandler) ? valueHandler(_extends({ value: value }, handlerProps)) : value
+              getValue(_extends({ value: value }, handlerProps))
             ),
-            children && R.map(function (_ref4) {
-              var id = _ref4.id,
-                  label = _ref4.label,
-                  value = _ref4.value,
-                  _ref4$handlerProps = _ref4.handlerProps,
-                  handlerProps = _ref4$handlerProps === undefined ? {} : _ref4$handlerProps;
+            children && R.map(function (_ref5) {
+              var id = _ref5.id,
+                  label = _ref5.label,
+                  value = _ref5.value,
+                  _ref5$handlerProps = _ref5.handlerProps,
+                  handlerProps = _ref5$handlerProps === undefined ? {} : _ref5$handlerProps;
 
               return _react2.default.createElement(
                 _Collapse2.default,
@@ -182,7 +195,7 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
                 _react2.default.createElement(
                   _Typography2.default,
                   { variant: 'body2' },
-                  R.is(Function, valueHandler) ? valueHandler(_extends({ value: value }, handlerProps)) : value
+                  getValue(_extends({ value: value }, handlerProps))
                 )
               );
             }, children)
@@ -212,7 +225,8 @@ CollapsibleTree.propTypes = process.env.NODE_ENV !== "production" ? {
   children: _propTypes2.default.node,
   labels: _propTypes2.default.shape({
     collapseAll: _propTypes2.default.string,
-    expandAll: _propTypes2.default.string
+    expandAll: _propTypes2.default.string,
+    noValue: _propTypes2.default.string
   }),
   testId: _propTypes2.default.string,
   valueHandler: _propTypes2.default.func

package/lib/Select/Select.js

@@ -26,8 +26,6 @@ var _MenuItem = require('@material-ui/core/MenuItem');
 
 var _MenuItem2 = _interopRequireDefault(_MenuItem);
 
-var _ = require('../');
-
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -79,7 +77,7 @@ var Select = function Select(_ref) {
     if (ref.current && open) {
       setWidth(ref.current.clientWidth);
     }
-  }, [ref.current, open]);
+  }, [open]);
 
   var getter = function getter(key) {
     return function (accessor) {

package/package.json

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