@sis-cc/dotstatsuite-visions 8.5.0 → 8.6.0

package/es/TableHtml5/TableHtml5.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, { useRef, useState, useEffect } from 'react';
+import React, { useRef, useState, useEffect, useMemo, useCallback } from 'react';
 import { makeStyles } from '@material-ui/core/styles';
 import PropTypes from 'prop-types';
 import * as R from 'ramda';
@@ -10,8 +10,6 @@ import SubHeader from './subHeader';
 import Section from './section';
 import Cell from './cell';
 import { defaultLabelAccessor } from './utils';
-import { useMemo } from 'react';
-import { useCallback } from 'react';
 
 /*
  *  Accessibility.
@@ -77,9 +75,12 @@ var TableHtml5 = function TableHtml5(_ref) {
       _ref$testId = _ref.testId,
       testId = _ref$testId === undefined ? 'vis-table' : _ref$testId,
       HTMLRenderer = _ref.HTMLRenderer,
+      _ref$cellValueAccesso = _ref.cellValueAccessor,
+      cellValueAccessor = _ref$cellValueAccesso === undefined ? R.identity : _ref$cellValueAccesso,
       _ref$labelAccessor = _ref.labelAccessor,
       labelAccessor = _ref$labelAccessor === undefined ? defaultLabelAccessor : _ref$labelAccessor,
-      isNoWrap = _ref.isNoWrap;
+      _ref$isNoWrap = _ref.isNoWrap,
+      isNoWrap = _ref$isNoWrap === undefined ? R.always(false) : _ref$isNoWrap;
 
   var classes = useStyles();
 
@@ -94,7 +95,7 @@ var TableHtml5 = function TableHtml5(_ref) {
   var headerRef = useRef(null);
   var subHeadCellsRef = useRef([]);
 
-  var labelAccessorhandler = useCallback(labelAccessor, []);
+  var cellValueAccessorHandler = useCallback(cellValueAccessor, []);
 
   useEffect(function () {
     setHeaderHeight(R.pathOr(0, ['current', 'clientHeight'], headerRef));
@@ -148,7 +149,7 @@ var TableHtml5 = function TableHtml5(_ref) {
         xLayoutDataLength: xLayoutDataLength,
         subHeadCellsWidth: subHeadCellsWidth,
         HTMLRenderer: HTMLRenderer,
-        labelAccessor: labelAccessorhandler
+        labelAccessor: labelAccessor
       }),
       React.createElement(SubHeader, {
         headerData: headerData,
@@ -158,7 +159,7 @@ var TableHtml5 = function TableHtml5(_ref) {
         ref: subHeadCellsRef,
         subHeadCellsWidth: subHeadCellsWidth,
         HTMLRenderer: HTMLRenderer,
-        labelAccessor: labelAccessorhandler
+        labelAccessor: labelAccessor
       })
     ),
     mapIndexed(function (section, index) {
@@ -177,7 +178,8 @@ var TableHtml5 = function TableHtml5(_ref) {
         SideIcon: SideIcon,
         subHeadCellsWidth: subHeadCellsWidth,
         HTMLRenderer: HTMLRenderer,
-        labelAccessor: labelAccessorhandler,
+        cellValueAccessor: cellValueAccessorHandler,
+        labelAccessor: labelAccessor,
         isNoWrap: isNoWrap
       });
     }, sectionsData)
@@ -195,6 +197,7 @@ TableHtml5.propTypes = process.env.NODE_ENV !== "production" ? {
   testId: PropTypes.string,
   HTMLRenderer: PropTypes.func,
   labelAccessor: PropTypes.func,
+  cellValueAccessor: PropTypes.func,
   isNoWrap: PropTypes.func
 } : {};
 

package/es/TableHtml5/cell.js

@@ -103,7 +103,7 @@ Cell.propTypes = process.env.NODE_ENV !== "production" ? {
   intValue: PropTypes.number,
   flags: PropTypes.array,
   isOne: PropTypes.bool,
-  value: PropTypes.string,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.element]),
   headers: PropTypes.string,
   indexedDimValIds: PropTypes.object,
   cellHandler: PropTypes.func,

package/es/TableHtml5/section.js

@@ -80,6 +80,7 @@ var Section = function Section(_ref) {
       subHeadCellsWidth = _ref.subHeadCellsWidth,
       HTMLRenderer = _ref.HTMLRenderer,
       labelAccessor = _ref.labelAccessor,
+      cellValueAccessor = _ref.cellValueAccessor,
       isNoWrap = _ref.isNoWrap;
 
   var classes = useStyles();
@@ -182,7 +183,9 @@ var Section = function Section(_ref) {
 
           var intersectionCellId = rowId + '/' + columnIndex;
           var isActive = R.pipe(R.propOr({}, 'intersectionCellId'), R.equals(intersectionCellId))(activeCellIds);
-          return React.createElement(Cell, _extends({}, R.pathOr({ value: '..' }, [item.key, currentSection, sectionbody.key, 0], cells), {
+          return React.createElement(Cell, _extends({}, R.pipe(R.pathOr({ value: null }, [item.key, currentSection, sectionbody.key, 0]), R.over(R.lensProp('value'), function (val) {
+            return R.isNil(val) ? '..' : cellValueAccessor(val);
+          }))(cells), {
             key: intersectionCellId,
             headers: rowIds + ' ' + columnIds + ' ' + currentSection,
             cellHandler: cellHandler,
@@ -220,6 +223,7 @@ Section.propTypes = process.env.NODE_ENV !== "production" ? {
   subHeadCellsWidth: PropTypes.arrayOf(PropTypes.number),
   HTMLRenderer: PropTypes.func,
   labelAccessor: PropTypes.func,
+  cellValueAccessor: PropTypes.func,
   isNoWrap: PropTypes.func
 } : {};
 

package/lib/TableHtml5/TableHtml5.js

@@ -109,9 +109,12 @@ var TableHtml5 = function TableHtml5(_ref) {
       _ref$testId = _ref.testId,
       testId = _ref$testId === undefined ? 'vis-table' : _ref$testId,
       HTMLRenderer = _ref.HTMLRenderer,
+      _ref$cellValueAccesso = _ref.cellValueAccessor,
+      cellValueAccessor = _ref$cellValueAccesso === undefined ? R.identity : _ref$cellValueAccesso,
       _ref$labelAccessor = _ref.labelAccessor,
       labelAccessor = _ref$labelAccessor === undefined ? _utils.defaultLabelAccessor : _ref$labelAccessor,
-      isNoWrap = _ref.isNoWrap;
+      _ref$isNoWrap = _ref.isNoWrap,
+      isNoWrap = _ref$isNoWrap === undefined ? R.always(false) : _ref$isNoWrap;
 
   var classes = useStyles();
 
@@ -126,7 +129,7 @@ var TableHtml5 = function TableHtml5(_ref) {
   var headerRef = (0, _react.useRef)(null);
   var subHeadCellsRef = (0, _react.useRef)([]);
 
-  var labelAccessorhandler = (0, _react.useCallback)(labelAccessor, []);
+  var cellValueAccessorHandler = (0, _react.useCallback)(cellValueAccessor, []);
 
   (0, _react.useEffect)(function () {
     setHeaderHeight(R.pathOr(0, ['current', 'clientHeight'], headerRef));
@@ -180,7 +183,7 @@ var TableHtml5 = function TableHtml5(_ref) {
         xLayoutDataLength: xLayoutDataLength,
         subHeadCellsWidth: subHeadCellsWidth,
         HTMLRenderer: HTMLRenderer,
-        labelAccessor: labelAccessorhandler
+        labelAccessor: labelAccessor
       }),
       _react2.default.createElement(_subHeader2.default, {
         headerData: headerData,
@@ -190,7 +193,7 @@ var TableHtml5 = function TableHtml5(_ref) {
         ref: subHeadCellsRef,
         subHeadCellsWidth: subHeadCellsWidth,
         HTMLRenderer: HTMLRenderer,
-        labelAccessor: labelAccessorhandler
+        labelAccessor: labelAccessor
       })
     ),
     mapIndexed(function (section, index) {
@@ -209,7 +212,8 @@ var TableHtml5 = function TableHtml5(_ref) {
         SideIcon: SideIcon,
         subHeadCellsWidth: subHeadCellsWidth,
         HTMLRenderer: HTMLRenderer,
-        labelAccessor: labelAccessorhandler,
+        cellValueAccessor: cellValueAccessorHandler,
+        labelAccessor: labelAccessor,
         isNoWrap: isNoWrap
       });
     }, sectionsData)
@@ -227,6 +231,7 @@ TableHtml5.propTypes = process.env.NODE_ENV !== "production" ? {
   testId: _propTypes2.default.string,
   HTMLRenderer: _propTypes2.default.func,
   labelAccessor: _propTypes2.default.func,
+  cellValueAccessor: _propTypes2.default.func,
   isNoWrap: _propTypes2.default.func
 } : {};
 

package/lib/TableHtml5/cell.js

@@ -133,7 +133,7 @@ Cell.propTypes = process.env.NODE_ENV !== "production" ? {
   intValue: _propTypes2.default.number,
   flags: _propTypes2.default.array,
   isOne: _propTypes2.default.bool,
-  value: _propTypes2.default.string,
+  value: _propTypes2.default.oneOfType([_propTypes2.default.string, _propTypes2.default.element]),
   headers: _propTypes2.default.string,
   indexedDimValIds: _propTypes2.default.object,
   cellHandler: _propTypes2.default.func,

package/lib/TableHtml5/section.js

@@ -122,6 +122,7 @@ var Section = function Section(_ref) {
       subHeadCellsWidth = _ref.subHeadCellsWidth,
       HTMLRenderer = _ref.HTMLRenderer,
       labelAccessor = _ref.labelAccessor,
+      cellValueAccessor = _ref.cellValueAccessor,
       isNoWrap = _ref.isNoWrap;
 
   var classes = useStyles();
@@ -224,7 +225,9 @@ var Section = function Section(_ref) {
 
           var intersectionCellId = rowId + '/' + columnIndex;
           var isActive = R.pipe(R.propOr({}, 'intersectionCellId'), R.equals(intersectionCellId))(activeCellIds);
-          return _react2.default.createElement(_cell2.default, _extends({}, R.pathOr({ value: '..' }, [item.key, currentSection, sectionbody.key, 0], cells), {
+          return _react2.default.createElement(_cell2.default, _extends({}, R.pipe(R.pathOr({ value: null }, [item.key, currentSection, sectionbody.key, 0]), R.over(R.lensProp('value'), function (val) {
+            return R.isNil(val) ? '..' : cellValueAccessor(val);
+          }))(cells), {
             key: intersectionCellId,
             headers: rowIds + ' ' + columnIds + ' ' + currentSection,
             cellHandler: cellHandler,
@@ -262,6 +265,7 @@ Section.propTypes = process.env.NODE_ENV !== "production" ? {
   subHeadCellsWidth: _propTypes2.default.arrayOf(_propTypes2.default.number),
   HTMLRenderer: _propTypes2.default.func,
   labelAccessor: _propTypes2.default.func,
+  cellValueAccessor: _propTypes2.default.func,
   isNoWrap: _propTypes2.default.func
 } : {};
 

package/package.json

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