@sis-cc/dotstatsuite-visions 7.20.2 → 7.20.4

package/es/Chips/CustomChip.js

@@ -2,17 +2,16 @@ import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import * as R from 'ramda';
 import cx from 'classnames';
-import { useTheme } from '@material-ui/core/styles';
+import { makeStyles, useTheme } from '@material-ui/core/styles';
 import IconButton from '@material-ui/core/IconButton';
 import Chip from '@material-ui/core/Chip';
 import Cross from '../Icons/Cross';
 import { getIsRtl } from '../utils';
 import Tooltip from '../Tooltip';
-import { useStyles } from './styles';
-import { myTooltipRenderer } from './utils';
+import makeStylesFn from './styles';
+import { myTooltipRenderer, showMultiLinedTooltip, shownTooltip } from './utils';
 
-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 useStyles = makeStyles(makeStylesFn);
 
 var CustomChip = function CustomChip(_ref) {
   var _cx;
@@ -106,4 +105,5 @@ CustomChip.propTypes = process.env.NODE_ENV !== "production" ? {
   ariaLabel: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
   items: PropTypes.array
 } : {};
+
 export default CustomChip;

package/es/Chips/DeleteChip.js

@@ -1,9 +1,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
-import { useStyles } from './styles';
+import { makeStyles } from '@material-ui/core/styles';
+import makeStylesFn from './styles';
 import CustomChip from './CustomChip';
 
+var useStyles = makeStyles(makeStylesFn);
+
 var DeleteChip = function DeleteChip(_ref) {
   var onDeleteAll = _ref.onDeleteAll,
       clearAllLabel = _ref.clearAllLabel,
@@ -19,9 +22,11 @@ var DeleteChip = function DeleteChip(_ref) {
     labelClasses: cx(classes.spaceLabel, classes.formatLabel)
   });
 };
+
 DeleteChip.propTypes = process.env.NODE_ENV !== "production" ? {
   onDeleteAll: PropTypes.func,
   ariaLabel: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
   clearAllLabel: PropTypes.oneOfType([PropTypes.string, PropTypes.element])
 } : {};
+
 export default DeleteChip;

package/es/Chips/GroupedChips.js

@@ -1,13 +1,15 @@
-import { useTheme } from '@material-ui/core/styles';
+import { makeStyles, useTheme } from '@material-ui/core/styles';
 import PropTypes from 'prop-types';
 import React, { Fragment } from 'react';
 import * as R from 'ramda';
 import cx from 'classnames';
 import { getIsRtl } from '../utils';
-import { useStyles } from './styles';
+import makeStylesFn from './styles';
 import CustomChip from './CustomChip';
 import { myTooltipRenderer } from './utils';
 
+var useStyles = makeStyles(makeStylesFn);
+
 var GroupedChips = function GroupedChips(_ref) {
   var _ref$itemProps = _ref.itemProps,
       itemProps = _ref$itemProps === undefined ? {} : _ref$itemProps,
@@ -29,6 +31,7 @@ var GroupedChips = function GroupedChips(_ref) {
   var theme = useTheme();
   var isRtl = getIsRtl(theme);
   var classes = useStyles();
+
   return React.createElement(
     Fragment,
     null,

package/es/Chips/styles.js

@@ -1,7 +1,6 @@
-import { makeStyles } from '@material-ui/core/styles';
 import * as R from 'ramda';
 
-export var useStyles = makeStyles(function (theme) {
+export default (function (theme) {
   return {
     root: {
       display: 'flex',

package/es/Chips/utils.js

@@ -8,4 +8,7 @@ export var myTooltipRenderer = function myTooltipRenderer(_ref) {
 
 export var isLast = function isLast(index, list) {
   return index + 1 === R.length(list);
-};
+};
+
+export var shownTooltip = R.pipe(R.dropLast(1), R.either(R.isEmpty, R.isNil), R.not);
+export var showMultiLinedTooltip = R.pipe(R.head, R.propOr([], 'parents'), R.isEmpty, R.not);

package/es/TableHtml5/flags.js

@@ -57,7 +57,7 @@ var Flags = function Flags(_ref) {
   }, []), R.join(','))(flags);
   var content = React.createElement(
     'ul',
-    { className: classes.content },
+    { 'data-testid': 'cell-flags-footnotes-content', className: classes.content },
     R.addIndex(R.map)(function (_ref2, index) {
       var label = _ref2.label;
       return React.createElement(
@@ -78,7 +78,10 @@ var Flags = function Flags(_ref) {
     },
     React.createElement(
       'span',
-      { className: cx(classes.flags, (_cx = {}, _cx[classes.header] = isHeader, _cx)) },
+      {
+        'data-testid': 'cell-flags-footnotes-icon',
+        className: cx(classes.flags, (_cx = {}, _cx[classes.header] = isHeader, _cx))
+      },
       R.not(R.isEmpty(codedIcons)) && codedIcons,
       R.and(R.not(R.isEmpty(codedIcons)), hasUncoded) && React.createElement(
         React.Fragment,

package/es/TableHtml5/header.js

@@ -113,6 +113,13 @@ var Header = function Header(_ref) {
           React.createElement(
             'div',
             { className: classes.cellContentCenter },
+            !R.isEmpty(hierarchySpace) && mapIndexed(function (space, idx) {
+              return React.createElement(
+                'div',
+                { key: idx },
+                space
+              );
+            })(hierarchySpace),
             React.createElement(
               Typography,
               {
@@ -123,13 +130,6 @@ var Header = function Header(_ref) {
                 },
                 variant: 'body1'
               },
-              !R.isEmpty(hierarchySpace) && mapIndexed(function (space, idx) {
-                return React.createElement(
-                  'div',
-                  { key: idx },
-                  space
-                );
-              })(hierarchySpace),
               R.prop('label', headerItem),
               React.createElement(Flags, { HTMLRenderer: HTMLRenderer, flags: flags, isHeader: true })
             )

package/es/TableHtml5/sectionHeader.js

@@ -81,7 +81,7 @@ var SectionHeader = function SectionHeader(_ref) {
       },
       React.createElement(
         Grid,
-        { container: true, alignItems: 'center', spacing: 5 },
+        { container: true, alignItems: 'center' },
         React.createElement(
           Grid,
           { item: true },
@@ -128,7 +128,7 @@ var SectionHeader = function SectionHeader(_ref) {
         ),
         !R.isNil(SideIcon) && React.createElement(
           Grid,
-          { item: true },
+          { item: true, style: { marginLeft: 40 } },
           React.createElement(SideIcon, { sideProps: R.path([0, 'sideProps'], section) })
         )
       )

package/lib/Chips/CustomChip.js

@@ -40,14 +40,15 @@ var _Tooltip2 = _interopRequireDefault(_Tooltip);
 
 var _styles2 = require('./styles');
 
+var _styles3 = _interopRequireDefault(_styles2);
+
 var _utils2 = require('./utils');
 
 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 }; }
 
-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 useStyles = (0, _styles.makeStyles)(_styles3.default);
 
 var CustomChip = function CustomChip(_ref) {
   var _cx;
@@ -70,13 +71,13 @@ var CustomChip = function CustomChip(_ref) {
   var theme = (0, _styles.useTheme)();
   var isRtl = (0, _utils.getIsRtl)(theme);
   var labelRenderer = R.prop('label');
-  var classes = (0, _styles2.useStyles)();
+  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 hasTooltip = (0, _utils2.shownTooltip)(items);
+  var hasMultiLinedTooltip = (0, _utils2.showMultiLinedTooltip)(items);
   var multiLinedTooltipRenderer = function multiLinedTooltipRenderer(arr) {
     return mapIndexed(function (item, index) {
       return _react2.default.createElement(
@@ -141,5 +142,6 @@ CustomChip.propTypes = process.env.NODE_ENV !== "production" ? {
   ariaLabel: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.element]),
   items: _propTypes2.default.array
 } : {};
+
 exports.default = CustomChip;
 module.exports = exports['default'];

package/lib/Chips/DeleteChip.js

@@ -14,7 +14,11 @@ var _classnames = require('classnames');
 
 var _classnames2 = _interopRequireDefault(_classnames);
 
-var _styles = require('./styles');
+var _styles = require('@material-ui/core/styles');
+
+var _styles2 = require('./styles');
+
+var _styles3 = _interopRequireDefault(_styles2);
 
 var _CustomChip = require('./CustomChip');
 
@@ -22,12 +26,14 @@ var _CustomChip2 = _interopRequireDefault(_CustomChip);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+var useStyles = (0, _styles.makeStyles)(_styles3.default);
+
 var DeleteChip = function DeleteChip(_ref) {
   var onDeleteAll = _ref.onDeleteAll,
       clearAllLabel = _ref.clearAllLabel,
       ariaLabel = _ref.ariaLabel;
 
-  var classes = (0, _styles.useStyles)();
+  var classes = useStyles();
   return _react2.default.createElement(_CustomChip2.default, {
     label: clearAllLabel,
     ariaLabel: ariaLabel,
@@ -37,10 +43,12 @@ var DeleteChip = function DeleteChip(_ref) {
     labelClasses: (0, _classnames2.default)(classes.spaceLabel, classes.formatLabel)
   });
 };
+
 DeleteChip.propTypes = process.env.NODE_ENV !== "production" ? {
   onDeleteAll: _propTypes2.default.func,
   ariaLabel: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.element]),
   clearAllLabel: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.element])
 } : {};
+
 exports.default = DeleteChip;
 module.exports = exports['default'];

package/lib/Chips/GroupedChips.js

@@ -24,6 +24,8 @@ var _utils = require('../utils');
 
 var _styles2 = require('./styles');
 
+var _styles3 = _interopRequireDefault(_styles2);
+
 var _CustomChip = require('./CustomChip');
 
 var _CustomChip2 = _interopRequireDefault(_CustomChip);
@@ -34,6 +36,8 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+var useStyles = (0, _styles.makeStyles)(_styles3.default);
+
 var GroupedChips = function GroupedChips(_ref) {
   var _ref$itemProps = _ref.itemProps,
       itemProps = _ref$itemProps === undefined ? {} : _ref$itemProps,
@@ -54,7 +58,8 @@ var GroupedChips = function GroupedChips(_ref) {
 
   var theme = (0, _styles.useTheme)();
   var isRtl = (0, _utils.getIsRtl)(theme);
-  var classes = (0, _styles2.useStyles)();
+  var classes = useStyles();
+
   return _react2.default.createElement(
     _react.Fragment,
     null,

package/lib/Chips/styles.js

@@ -1,9 +1,6 @@
 'use strict';
 
 exports.__esModule = true;
-exports.useStyles = undefined;
-
-var _styles = require('@material-ui/core/styles');
 
 var _ramda = require('ramda');
 
@@ -11,7 +8,7 @@ var R = _interopRequireWildcard(_ramda);
 
 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; } }
 
-var useStyles = exports.useStyles = (0, _styles.makeStyles)(function (theme) {
+exports.default = function (theme) {
   return {
     root: {
       display: 'flex',
@@ -71,4 +68,6 @@ var useStyles = exports.useStyles = (0, _styles.makeStyles)(function (theme) {
       borderBottom: '1px dotted ' + theme.palette.primary.main
     }
   };
-});
+};
+
+module.exports = exports['default'];

package/lib/Chips/utils.js

@@ -1,7 +1,7 @@
 'use strict';
 
 exports.__esModule = true;
-exports.isLast = exports.myTooltipRenderer = undefined;
+exports.showMultiLinedTooltip = exports.shownTooltip = exports.isLast = exports.myTooltipRenderer = undefined;
 
 var _ramda = require('ramda');
 
@@ -17,4 +17,7 @@ var myTooltipRenderer = exports.myTooltipRenderer = function myTooltipRenderer(_
 
 var isLast = exports.isLast = function isLast(index, list) {
   return index + 1 === R.length(list);
-};
+};
+
+var shownTooltip = exports.shownTooltip = R.pipe(R.dropLast(1), R.either(R.isEmpty, R.isNil), R.not);
+var showMultiLinedTooltip = exports.showMultiLinedTooltip = R.pipe(R.head, R.propOr([], 'parents'), R.isEmpty, R.not);

package/lib/TableHtml5/flags.js

@@ -84,7 +84,7 @@ var Flags = function Flags(_ref) {
   }, []), R.join(','))(flags);
   var content = _react2.default.createElement(
     'ul',
-    { className: classes.content },
+    { 'data-testid': 'cell-flags-footnotes-content', className: classes.content },
     R.addIndex(R.map)(function (_ref2, index) {
       var label = _ref2.label;
       return _react2.default.createElement(
@@ -105,7 +105,10 @@ var Flags = function Flags(_ref) {
     },
     _react2.default.createElement(
       'span',
-      { className: (0, _classnames2.default)(classes.flags, (_cx = {}, _cx[classes.header] = isHeader, _cx)) },
+      {
+        'data-testid': 'cell-flags-footnotes-icon',
+        className: (0, _classnames2.default)(classes.flags, (_cx = {}, _cx[classes.header] = isHeader, _cx))
+      },
       R.not(R.isEmpty(codedIcons)) && codedIcons,
       R.and(R.not(R.isEmpty(codedIcons)), hasUncoded) && _react2.default.createElement(
         _react2.default.Fragment,

package/lib/TableHtml5/header.js

@@ -146,6 +146,13 @@ var Header = function Header(_ref) {
           _react2.default.createElement(
             'div',
             { className: classes.cellContentCenter },
+            !R.isEmpty(hierarchySpace) && mapIndexed(function (space, idx) {
+              return _react2.default.createElement(
+                'div',
+                { key: idx },
+                space
+              );
+            })(hierarchySpace),
             _react2.default.createElement(
               _Typography2.default,
               {
@@ -156,13 +163,6 @@ var Header = function Header(_ref) {
                 },
                 variant: 'body1'
               },
-              !R.isEmpty(hierarchySpace) && mapIndexed(function (space, idx) {
-                return _react2.default.createElement(
-                  'div',
-                  { key: idx },
-                  space
-                );
-              })(hierarchySpace),
               R.prop('label', headerItem),
               _react2.default.createElement(_flags2.default, { HTMLRenderer: HTMLRenderer, flags: flags, isHeader: true })
             )

package/lib/TableHtml5/sectionHeader.js

@@ -117,7 +117,7 @@ var SectionHeader = function SectionHeader(_ref) {
       },
       _react2.default.createElement(
         _Grid2.default,
-        { container: true, alignItems: 'center', spacing: 5 },
+        { container: true, alignItems: 'center' },
         _react2.default.createElement(
           _Grid2.default,
           { item: true },
@@ -164,7 +164,7 @@ var SectionHeader = function SectionHeader(_ref) {
         ),
         !R.isNil(SideIcon) && _react2.default.createElement(
           _Grid2.default,
-          { item: true },
+          { item: true, style: { marginLeft: 40 } },
           _react2.default.createElement(SideIcon, { sideProps: R.path([0, 'sideProps'], section) })
         )
       )

package/package.json

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