@sis-cc/dotstatsuite-visions 7.8.0 → 7.8.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/LICENSE +1 -1
  2. package/es/CollapsibleTree/CollapsibleTree.js +40 -22
  3. package/es/CollapsibleTree/index.js +5 -0
  4. package/es/Logo/Logo.js +8 -2
  5. package/es/Select/Select.js +1 -2
  6. package/lib/CollapsibleTree/CollapsibleTree.js +40 -22
  7. package/lib/Logo/Logo.js +11 -2
  8. package/lib/Select/Select.js +1 -3
  9. package/package.json +1 -1
package/LICENSE CHANGED
@@ -1,6 +1,6 @@
1
1
  MIT License
2
2
 
3
- Copyright © OECD 2019-2021
3
+ Copyright © OECD 2019-2022
4
4
 
5
5
  Permission is hereby granted, free of charge, to any person obtaining a copy
6
6
  of this software and associated documentation files (the "Software"), to deal
package/es/CollapsibleTree/CollapsibleTree.js CHANGED
@@ -1,5 +1,7 @@
1
1
  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; };
2
2
 
3
+ 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; }
4
+
3
5
  import React, { useState, Fragment, useEffect } from 'react';
4
6
  import * as R from 'ramda';
5
7
  import PropTypes from 'prop-types';
@@ -65,6 +67,21 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
65
67
  return setDepthLevel(defaultDepthLevel);
66
68
  };
67
69
 
70
+ var getValue = function getValue(_ref2) {
71
+ var value = _ref2.value,
72
+ _ref2$children = _ref2.children,
73
+ children = _ref2$children === undefined ? [] : _ref2$children,
74
+ handlerProps = _objectWithoutProperties(_ref2, ['value', 'children']);
75
+
76
+ if ((R.isNil(value) || R.isEmpty(value)) && R.isEmpty(children)) {
77
+ return R.prop('noValue', labels);
78
+ }
79
+ if (R.is(Function, valueHandler)) {
80
+ return valueHandler(_extends({ value: value }, handlerProps));
81
+ }
82
+ return value;
83
+ };
84
+
68
85
  var isAllOpen = depthLevel >= defaultDepthLevel;
69
86
  var buttonAllOpenLabel = isAllOpen ? R.prop('collapseAll', labels) : R.prop('expandAll', labels);
70
87
 
@@ -88,11 +105,11 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
88
105
  ),
89
106
  children
90
107
  ),
91
- R.map(function (_ref2) {
92
- var id = _ref2.id,
93
- label = _ref2.label,
94
- _ref2$children = _ref2.children,
95
- children = _ref2$children === undefined ? [] : _ref2$children;
108
+ R.map(function (_ref3) {
109
+ var id = _ref3.id,
110
+ label = _ref3.label,
111
+ _ref3$children = _ref3.children,
112
+ children = _ref3$children === undefined ? [] : _ref3$children;
96
113
 
97
114
  return React.createElement(
98
115
  Fragment,
@@ -103,28 +120,28 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
103
120
  { variant: 'h5', className: classes.title },
104
121
  label
105
122
  ),
106
- R.map(function (_ref3) {
107
- var id = _ref3.id,
108
- label = _ref3.label,
109
- children = _ref3.children,
110
- value = _ref3.value,
111
- _ref3$handlerProps = _ref3.handlerProps,
112
- handlerProps = _ref3$handlerProps === undefined ? {} : _ref3$handlerProps;
123
+ R.map(function (_ref4) {
124
+ var id = _ref4.id,
125
+ label = _ref4.label,
126
+ children = _ref4.children,
127
+ value = _ref4.value,
128
+ _ref4$handlerProps = _ref4.handlerProps,
129
+ handlerProps = _ref4$handlerProps === undefined ? {} : _ref4$handlerProps;
113
130
 
114
131
  return React.createElement(
115
132
  Collapse,
116
133
  { key: id, level: 0, label: label, isOpen: depthLevel >= 0 },
117
- value && React.createElement(
134
+ React.createElement(
118
135
  Typography,
119
136
  { className: classes.spacingValue, variant: 'body2' },
120
- R.is(Function, valueHandler) ? valueHandler(_extends({ value: value }, handlerProps)) : value
137
+ getValue(_extends({ value: value, children: children }, handlerProps))
121
138
  ),
122
- children && R.map(function (_ref4) {
123
- var id = _ref4.id,
124
- label = _ref4.label,
125
- value = _ref4.value,
126
- _ref4$handlerProps = _ref4.handlerProps,
127
- handlerProps = _ref4$handlerProps === undefined ? {} : _ref4$handlerProps;
139
+ children && R.map(function (_ref5) {
140
+ var id = _ref5.id,
141
+ label = _ref5.label,
142
+ value = _ref5.value,
143
+ _ref5$handlerProps = _ref5.handlerProps,
144
+ handlerProps = _ref5$handlerProps === undefined ? {} : _ref5$handlerProps;
128
145
 
129
146
  return React.createElement(
130
147
  Collapse,
@@ -138,7 +155,7 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
138
155
  React.createElement(
139
156
  Typography,
140
157
  { variant: 'body2' },
141
- R.is(Function, valueHandler) ? valueHandler(_extends({ value: value }, handlerProps)) : value
158
+ getValue(_extends({ value: value }, handlerProps))
142
159
  )
143
160
  );
144
161
  }, children)
@@ -168,7 +185,8 @@ CollapsibleTree.propTypes = process.env.NODE_ENV !== "production" ? {
168
185
  children: PropTypes.node,
169
186
  labels: PropTypes.shape({
170
187
  collapseAll: PropTypes.string,
171
- expandAll: PropTypes.string
188
+ expandAll: PropTypes.string,
189
+ noValue: PropTypes.string
172
190
  }),
173
191
  testId: PropTypes.string,
174
192
  valueHandler: PropTypes.func
package/es/CollapsibleTree/index.js CHANGED
@@ -23,6 +23,11 @@
23
23
  * })),
24
24
  * defaultDepthLevel: PropTypes.number,
25
25
  * testId: PropTypes.string,
26
+ * labels: PropTypes.shape({
27
+ * collapseAll: PropTypes.string,
28
+ * expandAll: PropTypes.string,
29
+ * noValue: PropTypes.string,
30
+ * }),
26
31
  *};
27
32
  * @theme
28
33
  * {
package/es/Logo/Logo.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import React from 'react';
2
2
  import PropTypes from 'prop-types';
3
+ import cx from 'classnames';
3
4
  import { makeStyles } from '@material-ui/core/styles';
4
5
 
5
6
  var useStyles = makeStyles(function () {
@@ -13,7 +14,12 @@ var useStyles = makeStyles(function () {
13
14
  maxHeight: function maxHeight(_ref) {
14
15
  var _maxHeight = _ref.maxHeight;
15
16
  return _maxHeight;
16
- }
17
+ },
18
+ imageRendering: 'crisp-edges'
19
+ },
20
+ // https://caniuse.com/mdn-css_properties_image-rendering_crisp-edges
21
+ alternativeBrowserLogo: {
22
+ imageRendering: '-webkit-optimize-contrast'
17
23
  }
18
24
  };
19
25
  });
@@ -28,7 +34,7 @@ var Logo = function Logo(_ref2) {
28
34
  return React.createElement(
29
35
  'div',
30
36
  { className: classes.container },
31
- React.createElement('img', { className: classes.logo, src: logo, alt: 'logo' }),
37
+ React.createElement('img', { className: cx(classes.logo, classes.alternativeBrowserLogo), src: logo, alt: 'logo' }),
32
38
  children
33
39
  );
34
40
  };
package/es/Select/Select.js CHANGED
@@ -6,7 +6,6 @@ import PropTypes from 'prop-types';
6
6
  import { makeStyles } from '@material-ui/core/styles';
7
7
  import TextField from '@material-ui/core/TextField';
8
8
  import MenuItem from '@material-ui/core/MenuItem';
9
- import { Tooltip } from '../';
10
9
 
11
10
  var useStyles = makeStyles(function (theme) {
12
11
  return {
@@ -55,7 +54,7 @@ var Select = function Select(_ref) {
55
54
  if (ref.current && open) {
56
55
  setWidth(ref.current.clientWidth);
57
56
  }
58
- }, [ref.current, open]);
57
+ }, [open]);
59
58
 
60
59
  var getter = function getter(key) {
61
60
  return function (accessor) {
package/lib/CollapsibleTree/CollapsibleTree.js CHANGED
@@ -58,6 +58,8 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
58
58
 
59
59
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
60
60
 
61
+ 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; }
62
+
61
63
  var useStyles = (0, _styles.makeStyles)(function (theme) {
62
64
  return {
63
65
  title: _extends({
@@ -109,6 +111,21 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
109
111
  return setDepthLevel(defaultDepthLevel);
110
112
  };
111
113
 
114
+ var getValue = function getValue(_ref2) {
115
+ var value = _ref2.value,
116
+ _ref2$children = _ref2.children,
117
+ children = _ref2$children === undefined ? [] : _ref2$children,
118
+ handlerProps = _objectWithoutProperties(_ref2, ['value', 'children']);
119
+
120
+ if ((R.isNil(value) || R.isEmpty(value)) && R.isEmpty(children)) {
121
+ return R.prop('noValue', labels);
122
+ }
123
+ if (R.is(Function, valueHandler)) {
124
+ return valueHandler(_extends({ value: value }, handlerProps));
125
+ }
126
+ return value;
127
+ };
128
+
112
129
  var isAllOpen = depthLevel >= defaultDepthLevel;
113
130
  var buttonAllOpenLabel = isAllOpen ? R.prop('collapseAll', labels) : R.prop('expandAll', labels);
114
131
 
@@ -132,11 +149,11 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
132
149
  ),
133
150
  children
134
151
  ),
135
- R.map(function (_ref2) {
136
- var id = _ref2.id,
137
- label = _ref2.label,
138
- _ref2$children = _ref2.children,
139
- children = _ref2$children === undefined ? [] : _ref2$children;
152
+ R.map(function (_ref3) {
153
+ var id = _ref3.id,
154
+ label = _ref3.label,
155
+ _ref3$children = _ref3.children,
156
+ children = _ref3$children === undefined ? [] : _ref3$children;
140
157
 
141
158
  return _react2.default.createElement(
142
159
  _react.Fragment,
@@ -147,28 +164,28 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
147
164
  { variant: 'h5', className: classes.title },
148
165
  label
149
166
  ),
150
- R.map(function (_ref3) {
151
- var id = _ref3.id,
152
- label = _ref3.label,
153
- children = _ref3.children,
154
- value = _ref3.value,
155
- _ref3$handlerProps = _ref3.handlerProps,
156
- handlerProps = _ref3$handlerProps === undefined ? {} : _ref3$handlerProps;
167
+ R.map(function (_ref4) {
168
+ var id = _ref4.id,
169
+ label = _ref4.label,
170
+ children = _ref4.children,
171
+ value = _ref4.value,
172
+ _ref4$handlerProps = _ref4.handlerProps,
173
+ handlerProps = _ref4$handlerProps === undefined ? {} : _ref4$handlerProps;
157
174
 
158
175
  return _react2.default.createElement(
159
176
  _Collapse2.default,
160
177
  { key: id, level: 0, label: label, isOpen: depthLevel >= 0 },
161
- value && _react2.default.createElement(
178
+ _react2.default.createElement(
162
179
  _Typography2.default,
163
180
  { className: classes.spacingValue, variant: 'body2' },
164
- R.is(Function, valueHandler) ? valueHandler(_extends({ value: value }, handlerProps)) : value
181
+ getValue(_extends({ value: value, children: children }, handlerProps))
165
182
  ),
166
- children && R.map(function (_ref4) {
167
- var id = _ref4.id,
168
- label = _ref4.label,
169
- value = _ref4.value,
170
- _ref4$handlerProps = _ref4.handlerProps,
171
- handlerProps = _ref4$handlerProps === undefined ? {} : _ref4$handlerProps;
183
+ children && R.map(function (_ref5) {
184
+ var id = _ref5.id,
185
+ label = _ref5.label,
186
+ value = _ref5.value,
187
+ _ref5$handlerProps = _ref5.handlerProps,
188
+ handlerProps = _ref5$handlerProps === undefined ? {} : _ref5$handlerProps;
172
189
 
173
190
  return _react2.default.createElement(
174
191
  _Collapse2.default,
@@ -182,7 +199,7 @@ var CollapsibleTree = function CollapsibleTree(_ref) {
182
199
  _react2.default.createElement(
183
200
  _Typography2.default,
184
201
  { variant: 'body2' },
185
- R.is(Function, valueHandler) ? valueHandler(_extends({ value: value }, handlerProps)) : value
202
+ getValue(_extends({ value: value }, handlerProps))
186
203
  )
187
204
  );
188
205
  }, children)
@@ -212,7 +229,8 @@ CollapsibleTree.propTypes = process.env.NODE_ENV !== "production" ? {
212
229
  children: _propTypes2.default.node,
213
230
  labels: _propTypes2.default.shape({
214
231
  collapseAll: _propTypes2.default.string,
215
- expandAll: _propTypes2.default.string
232
+ expandAll: _propTypes2.default.string,
233
+ noValue: _propTypes2.default.string
216
234
  }),
217
235
  testId: _propTypes2.default.string,
218
236
  valueHandler: _propTypes2.default.func
package/lib/Logo/Logo.js CHANGED
@@ -10,6 +10,10 @@ var _propTypes = require('prop-types');
10
10
 
11
11
  var _propTypes2 = _interopRequireDefault(_propTypes);
12
12
 
13
+ var _classnames = require('classnames');
14
+
15
+ var _classnames2 = _interopRequireDefault(_classnames);
16
+
13
17
  var _styles = require('@material-ui/core/styles');
14
18
 
15
19
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -25,7 +29,12 @@ var useStyles = (0, _styles.makeStyles)(function () {
25
29
  maxHeight: function maxHeight(_ref) {
26
30
  var _maxHeight = _ref.maxHeight;
27
31
  return _maxHeight;
28
- }
32
+ },
33
+ imageRendering: 'crisp-edges'
34
+ },
35
+ // https://caniuse.com/mdn-css_properties_image-rendering_crisp-edges
36
+ alternativeBrowserLogo: {
37
+ imageRendering: '-webkit-optimize-contrast'
29
38
  }
30
39
  };
31
40
  });
@@ -40,7 +49,7 @@ var Logo = function Logo(_ref2) {
40
49
  return _react2.default.createElement(
41
50
  'div',
42
51
  { className: classes.container },
43
- _react2.default.createElement('img', { className: classes.logo, src: logo, alt: 'logo' }),
52
+ _react2.default.createElement('img', { className: (0, _classnames2.default)(classes.logo, classes.alternativeBrowserLogo), src: logo, alt: 'logo' }),
44
53
  children
45
54
  );
46
55
  };
package/lib/Select/Select.js CHANGED
@@ -26,8 +26,6 @@ var _MenuItem = require('@material-ui/core/MenuItem');
26
26
 
27
27
  var _MenuItem2 = _interopRequireDefault(_MenuItem);
28
28
 
29
- var _ = require('../');
30
-
31
29
  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; } }
32
30
 
33
31
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -79,7 +77,7 @@ var Select = function Select(_ref) {
79
77
  if (ref.current && open) {
80
78
  setWidth(ref.current.clientWidth);
81
79
  }
82
- }, [ref.current, open]);
80
+ }, [open]);
83
81
 
84
82
  var getter = function getter(key) {
85
83
  return function (accessor) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sis-cc/dotstatsuite-visions",
3
- "version": "7.8.0",
3
+ "version": "7.8.3",
4
4
  "description": "Library of visual components",
5
5
  "author": "OECD",
6
6
  "homepage": "https://visions-qa.siscc.org/#o",