@sis-cc/dotstatsuite-visions 6.3.1 → 6.4.2

package/es/Icons/CopyContent.js

@@ -0,0 +1,12 @@
+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; };
+
+import React from 'react';
+import SvgIcon from '@material-ui/core/SvgIcon';
+
+export default (function (props) {
+  return React.createElement(
+    SvgIcon,
+    _extends({ viewBox: '0 0 24 24' }, props),
+    React.createElement('path', { d: 'M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z' })
+  );
+});

package/es/Icons/index.js

@@ -24,4 +24,5 @@ export { default as AccessibilityFilled } from './AccessibilityFilled';
 export { default as AccessibilityOutlined } from './AccessibilityOutlined';
 export { default as AccountFilled } from './AccountFilled';
 export { default as AccountOutlined } from './AccountOutlined';
-export { default as Warning } from './Warning';
+export { default as Warning } from './Warning';
+export { default as CopyContent } from './CopyContent';

package/es/TableHtml5/TableHtml5.js

@@ -33,19 +33,26 @@ var useStyles = makeStyles(function (theme) {
 });
 
 var mapIndexed = R.addIndex(R.map);
-var mergeHeaderCells = R.reduce(function (acc, headerCell) {
-  var previousCell = R.last(acc);
-  var cellValue = R.prop('id', headerCell);
-  var previousCellValue = R.prop('id', previousCell);
-  if (cellValue !== previousCellValue) {
-    return R.append(R.assoc('spanCount', 1, headerCell), acc);
-  }
-  return R.over(R.lensIndex(-1), R.evolve({ spanCount: R.add(1) }), acc);
-}, []);
-var getEnhancedValuesHeaderData = function getEnhancedValuesHeaderData(headerData) {
-  return R.pipe(R.pathOr([], [0, 'data']), R.length, R.times(function (index) {
-    return R.pipe(R.map(R.path(['data', index, 'value'])), mergeHeaderCells)(headerData);
-  }))(headerData);
+
+export var getEnhancedValuesHeaderData = function getEnhancedValuesHeaderData(data) {
+  var colLength = R.pipe(R.pathOr([], [0, 'data']), R.length)(data);
+  return R.pipe(R.pluck('data'),
+  // mix merge and transpose for performance
+  R.reduce(function (acc, cells) {
+    R.addIndex(R.forEach)(function (cell, rowIndex) {
+      var cellId = R.path(['value', 'id'], cell);
+      var topCell = rowIndex > 0 ? R.pipe(R.nth(rowIndex - 1), R.last)(acc) : null;
+      var cellKey = R.isNil(topCell) ? cellId : topCell.key + '-' + cellId;
+
+      var leftCell = R.pipe(R.nth(rowIndex), R.last)(acc);
+      if (R.prop('key', leftCell) === cellKey && rowIndex !== colLength - 1) {
+        acc = R.over(R.lensIndex(rowIndex), R.over(R.lensIndex(-1), R.evolve({ spanCount: R.add(1) })))(acc);
+      } else {
+        acc = R.over(R.lensIndex(rowIndex), R.append(_extends({}, R.propOr({}, 'value', cell), { key: cellKey, spanCount: 1 })))(acc);
+      }
+    })(cells);
+    return acc;
+  }, R.times(R.always([]), colLength)))(data);
 };
 
 var TableHtml5 = function TableHtml5(_ref) {

package/es/TableHtml5/section.js

@@ -1,6 +1,6 @@
 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; };
 
-import React, { Fragment } from 'react';
+import React from 'react';
 import * as R from 'ramda';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
@@ -46,6 +46,9 @@ var useStyles = makeStyles(function (theme) {
     topCell: {
       paddingTop: 0
     },
+    hierarchySpace: {
+      marginBottom: 'auto'
+    },
     highlight: theme.mixins.table.cellHighlight
   };
 });
@@ -93,7 +96,14 @@ var Section = function Section(_ref) {
 
           var flags = R.path(['value', 'flags'], cell);
           var id = rowId + '_' + index;
-          var hierarchyLength = R.pipe(R.pathOr([], ['value', 'parents']), R.when(R.isNil, R.always([])), R.length)(cell);
+
+          // special space is used for hierarchy U+2007 &#8199; &numsp;
+          var hierarchySpace = R.pipe(R.pathOr([], ['value', 'parents']), R.when(R.isNil, R.always([])), R.length,
+          // eslint-disable-next-line no-irregular-whitespace
+          R.times(function () {
+            return '·  ';
+          }))(cell);
+
           return React.createElement(
             TableCell,
             {
@@ -106,16 +116,14 @@ var Section = function Section(_ref) {
             React.createElement(
               'div',
               { className: classes.cellContent },
+              !R.isEmpty(hierarchySpace) && React.createElement(
+                'div',
+                { className: classes.hierarchySpace },
+                hierarchySpace
+              ),
               React.createElement(
                 Typography,
                 { variant: 'body1', tabIndex: 0 },
-                R.times(function (n) {
-                  return React.createElement(
-                    Fragment,
-                    { key: id + '-' + n },
-                    '\u2003'
-                  );
-                }, hierarchyLength),
                 R.path(['value', 'label'], cell),
                 React.createElement(Flags, { flags: flags })
               )

package/lib/Icons/CopyContent.js

@@ -0,0 +1,25 @@
+'use strict';
+
+exports.__esModule = true;
+
+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; };
+
+var _react = require('react');
+
+var _react2 = _interopRequireDefault(_react);
+
+var _SvgIcon = require('@material-ui/core/SvgIcon');
+
+var _SvgIcon2 = _interopRequireDefault(_SvgIcon);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+exports.default = function (props) {
+  return _react2.default.createElement(
+    _SvgIcon2.default,
+    _extends({ viewBox: '0 0 24 24' }, props),
+    _react2.default.createElement('path', { d: 'M16 1H4c-1.1 0-2 .9-2 2v14h2V3h12V1zm3 4H8c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h11c1.1 0 2-.9 2-2V7c0-1.1-.9-2-2-2zm0 16H8V7h11v14z' })
+  );
+};
+
+module.exports = exports['default'];

package/lib/Icons/index.js

@@ -143,4 +143,13 @@ Object.defineProperty(exports, 'Warning', {
   }
 });
 
+var _CopyContent = require('./CopyContent');
+
+Object.defineProperty(exports, 'CopyContent', {
+  enumerable: true,
+  get: function get() {
+    return _interopRequireDefault(_CopyContent).default;
+  }
+});
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/TableHtml5/TableHtml5.js

@@ -1,6 +1,7 @@
 'use strict';
 
 exports.__esModule = true;
+exports.getEnhancedValuesHeaderData = undefined;
 
 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; };
 
@@ -65,19 +66,26 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
 });
 
 var mapIndexed = R.addIndex(R.map);
-var mergeHeaderCells = R.reduce(function (acc, headerCell) {
-  var previousCell = R.last(acc);
-  var cellValue = R.prop('id', headerCell);
-  var previousCellValue = R.prop('id', previousCell);
-  if (cellValue !== previousCellValue) {
-    return R.append(R.assoc('spanCount', 1, headerCell), acc);
-  }
-  return R.over(R.lensIndex(-1), R.evolve({ spanCount: R.add(1) }), acc);
-}, []);
-var getEnhancedValuesHeaderData = function getEnhancedValuesHeaderData(headerData) {
-  return R.pipe(R.pathOr([], [0, 'data']), R.length, R.times(function (index) {
-    return R.pipe(R.map(R.path(['data', index, 'value'])), mergeHeaderCells)(headerData);
-  }))(headerData);
+
+var getEnhancedValuesHeaderData = exports.getEnhancedValuesHeaderData = function getEnhancedValuesHeaderData(data) {
+  var colLength = R.pipe(R.pathOr([], [0, 'data']), R.length)(data);
+  return R.pipe(R.pluck('data'),
+  // mix merge and transpose for performance
+  R.reduce(function (acc, cells) {
+    R.addIndex(R.forEach)(function (cell, rowIndex) {
+      var cellId = R.path(['value', 'id'], cell);
+      var topCell = rowIndex > 0 ? R.pipe(R.nth(rowIndex - 1), R.last)(acc) : null;
+      var cellKey = R.isNil(topCell) ? cellId : topCell.key + '-' + cellId;
+
+      var leftCell = R.pipe(R.nth(rowIndex), R.last)(acc);
+      if (R.prop('key', leftCell) === cellKey && rowIndex !== colLength - 1) {
+        acc = R.over(R.lensIndex(rowIndex), R.over(R.lensIndex(-1), R.evolve({ spanCount: R.add(1) })))(acc);
+      } else {
+        acc = R.over(R.lensIndex(rowIndex), R.append(_extends({}, R.propOr({}, 'value', cell), { key: cellKey, spanCount: 1 })))(acc);
+      }
+    })(cells);
+    return acc;
+  }, R.times(R.always([]), colLength)))(data);
 };
 
 var TableHtml5 = function TableHtml5(_ref) {
@@ -168,5 +176,4 @@ TableHtml5.propTypes = process.env.NODE_ENV !== "production" ? {
   activeCellIds: _propTypes2.default.object
 } : {};
 
-exports.default = TableHtml5;
-module.exports = exports['default'];
+exports.default = TableHtml5;

package/lib/TableHtml5/section.js

@@ -88,6 +88,9 @@ var useStyles = (0, _styles.makeStyles)(function (theme) {
     topCell: {
       paddingTop: 0
     },
+    hierarchySpace: {
+      marginBottom: 'auto'
+    },
     highlight: theme.mixins.table.cellHighlight
   };
 });
@@ -135,7 +138,14 @@ var Section = function Section(_ref) {
 
           var flags = R.path(['value', 'flags'], cell);
           var id = rowId + '_' + index;
-          var hierarchyLength = R.pipe(R.pathOr([], ['value', 'parents']), R.when(R.isNil, R.always([])), R.length)(cell);
+
+          // special space is used for hierarchy U+2007    
+          var hierarchySpace = R.pipe(R.pathOr([], ['value', 'parents']), R.when(R.isNil, R.always([])), R.length,
+          // eslint-disable-next-line no-irregular-whitespace
+          R.times(function () {
+            return '·  ';
+          }))(cell);
+
           return _react2.default.createElement(
             _TableCell2.default,
             {
@@ -148,16 +158,14 @@ var Section = function Section(_ref) {
             _react2.default.createElement(
               'div',
               { className: classes.cellContent },
+              !R.isEmpty(hierarchySpace) && _react2.default.createElement(
+                'div',
+                { className: classes.hierarchySpace },
+                hierarchySpace
+              ),
               _react2.default.createElement(
                 _Typography2.default,
                 { variant: 'body1', tabIndex: 0 },
-                R.times(function (n) {
-                  return _react2.default.createElement(
-                    _react.Fragment,
-                    { key: id + '-' + n },
-                    '\u2003'
-                  );
-                }, hierarchyLength),
                 R.path(['value', 'label'], cell),
                 _react2.default.createElement(_flags2.default, { flags: flags })
               )

package/package.json

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