@sis-cc/dotstatsuite-components 14.3.5 → 14.4.0

package/lib/viewer/src/chart.js

@@ -4,10 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _defineProperty2 = require('babel-runtime/helpers/defineProperty');
-
-var _defineProperty3 = _interopRequireDefault(_defineProperty2);
-
 var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
@@ -18,20 +14,12 @@ var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
 
-var _classnames = require('classnames');
-
-var _classnames2 = _interopRequireDefault(_classnames);
-
-var _styles = require('@material-ui/core/styles');
-
 var _dotstatsuiteVisions = require('@sis-cc/dotstatsuite-visions');
 
 var _src = require('../../bridge-d3-react/src');
 
 var charts = _interopRequireWildcard(_src);
 
-var _constants = require('../../rules/src/constants');
-
 var _series = require('./chartUtils/series');
 
 var _series2 = _interopRequireDefault(_series);
@@ -46,35 +34,6 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var useStyles = (0, _styles.makeStyles)(function () {
-  return {
-    container: {
-      backgroundColor: 'none',
-      overflow: 'hidden',
-      position: 'relative',
-      direction: 'ltr !important'
-    },
-    chartContainer: {
-      '& .rcw-chart__chart__line--x:last-of-type': {
-        visibility: 'hidden'
-      },
-      '& .rcw-chart__chart__line--y:last-of-type': {
-        visibility: 'hidden'
-      },
-      '& .rcw-chart__chart__axis--x': {
-        '& .tick:last-of-type': {
-          visibility: 'hidden'
-        }
-      },
-      '& .rcw-chart__chart__axis--y': {
-        '& .tick:last-of-type': {
-          visibility: 'hidden'
-        }
-      }
-    }
-  };
-});
-
 var Chart = function Chart(_ref) {
   var options = _ref.options,
       series = _ref.series,
@@ -82,11 +41,10 @@ var Chart = function Chart(_ref) {
       width = _ref.width,
       getAxisOptions = _ref.getAxisOptions;
 
-  var classes = useStyles();
   var ChartClass = charts[type];
   return _react2.default.createElement(
     'div',
-    { className: (0, _classnames2.default)((0, _defineProperty3.default)({}, classes.chartContainer, !R.equals(_constants.SCATTER, type))) },
+    null,
     R.is(Number, width) && width < 370 ? null : _react2.default.createElement(_AxisLegend2.default, { axis: 'y', data: { series: series }, type: type }),
     _react2.default.createElement(ChartClass, {
       data: series,

package/lib/viewer/src/index.js

@@ -38,10 +38,6 @@ var _dotstatsuiteVisions = require('@sis-cc/dotstatsuite-visions');
 
 var _styles = require('@material-ui/core/styles');
 
-var _HourglassEmpty = require('@material-ui/icons/HourglassEmpty');
-
-var _HourglassEmpty2 = _interopRequireDefault(_HourglassEmpty);
-
 var _options = require('./chartUtils/options');
 
 var _options2 = _interopRequireDefault(_options);
@@ -104,15 +100,8 @@ var ViewContent = function ViewContent(_ref3) {
       errorMessage = _ref3.errorMessage,
       rest = (0, _objectWithoutProperties3.default)(_ref3, ['loading', 'loadingProps', 'noData', 'type', 'width', 'errorMessage']);
 
-  var theme = (0, _styles.useTheme)();
-  if (loading) return _react2.default.createElement(_dotstatsuiteVisions.NoData, {
-    message: loading,
-    icon: _react2.default.createElement(_HourglassEmpty2.default, { style: { fontSize: 50, color: loadingProps.isWarning ? theme.palette.warning.main : theme.palette.primary.main } })
-  });
-  if (!width) return _react2.default.createElement(_dotstatsuiteVisions.NoData, {
-    message: loading,
-    icon: _react2.default.createElement(_HourglassEmpty2.default, { style: { fontSize: 50, color: loadingProps.isWarning ? theme.palette.warning.main : theme.palette.primary.main } })
-  });
+  if (loading) return _react2.default.createElement(_dotstatsuiteVisions.Loading, (0, _extends3.default)({ message: loading }, loadingProps));
+  if (!width) return _react2.default.createElement(_dotstatsuiteVisions.Loading, (0, _extends3.default)({ message: loading }, loadingProps));
   if (errorMessage) return _react2.default.createElement(_dotstatsuiteVisions.NoData, { message: errorMessage });
 
   if (type === 'table') {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "14.3.5",
+  "version": "14.4.0",
   "main": "lib/index.js",
   "author": "OECD",
   "license": "MIT",
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@react-hook/size": "^2.1.1",
-    "@sis-cc/dotstatsuite-d3-charts": "^8.0.1",
+    "@sis-cc/dotstatsuite-d3-charts": "^8.1.0",
     "date-fns": "^1.30.1",
     "lodash": "^4.17.2",
     "lodash.compose": "^2.4.1",

package/src/viewer/src/chart.js

@@ -1,47 +1,16 @@
 import React from 'react';
 import { branch, compose, renderComponent, withProps } from 'recompose';
 import * as R from 'ramda';
-import cx from 'classnames';
-import { makeStyles } from '@material-ui/core/styles';
 import { NoData } from '@sis-cc/dotstatsuite-visions';
 import * as charts from '../../bridge-d3-react/src';
-import { SCATTER } from '../../rules/src/constants';
 import filterSeriesRegardingDimensions from './chartUtils/series';
 import AxisLegend from './legends/AxisLegend';
 import { isChartNoData } from './utils';
 
-const useStyles = makeStyles(() => ({
-  container: {
-    backgroundColor: 'none',
-    overflow: 'hidden',
-    position: 'relative',
-    direction: 'ltr !important',
-  },
-  chartContainer: {
-    '& .rcw-chart__chart__line--x:last-of-type': {
-      visibility: 'hidden',
-    },
-    '& .rcw-chart__chart__line--y:last-of-type': {
-      visibility: 'hidden',
-    },
-    '& .rcw-chart__chart__axis--x': {
-      '& .tick:last-of-type': {
-        visibility: 'hidden',
-      }
-    },
-    '& .rcw-chart__chart__axis--y': {
-      '& .tick:last-of-type': {
-        visibility: 'hidden',
-      }
-    },
-  }
-}));
-
 const Chart = ({ options, series, type, width, getAxisOptions }) => {
-  const classes = useStyles();
   const ChartClass = charts[type];
   return (
-    <div className={cx({ [classes.chartContainer]: !R.equals(SCATTER, type) })}>
+    <div>
       {
         (R.is(Number, width) && width < 370)
         ? null

package/src/viewer/src/index.js

@@ -3,9 +3,8 @@ import * as R from 'ramda';
 import cx from 'classnames';
 import { compose, withState, withProps } from 'recompose';
 import sizeMe from 'react-sizeme';
-import { NoData as IconMessage, TableHtml5 } from '@sis-cc/dotstatsuite-visions';
+import { Loading, NoData, TableHtml5 } from '@sis-cc/dotstatsuite-visions';
 import { useTheme, makeStyles } from '@material-ui/core/styles';
-import HourglassEmptyIcon from '@material-ui/icons/HourglassEmpty';
 import getChartOptions from './chartUtils/options';
 import Header from './header';
 import Chart from './chart';
@@ -35,21 +34,14 @@ const useStyles = makeStyles(() => ({
 }));
 
 const ViewContent = ({ loading, loadingProps={}, noData = 'No Data', type, width, errorMessage, ...rest }) => {
-  const theme = useTheme();
-  if (loading) return <IconMessage
-    message={loading}
-    icon={<HourglassEmptyIcon style={{ fontSize: 50, color: loadingProps.isWarning ? theme.palette.warning.main : theme.palette.primary.main }} />}
-  />;
-  if (!width) return <IconMessage
-    message={loading}
-    icon={<HourglassEmptyIcon style={{ fontSize: 50, color: loadingProps.isWarning ? theme.palette.warning.main : theme.palette.primary.main }} />}
-  />;
-  if (errorMessage) return <IconMessage message={errorMessage} />;
+  if (loading) return <Loading message={loading} {...loadingProps} />;
+  if (!width) return <Loading message={loading} {...loadingProps} />;
+  if (errorMessage) return <NoData message={errorMessage} />;
 
   if (type === 'table') {
     const tableProps = R.propOr({}, 'tableProps', rest);
     const hasNoObs = R.pipe(R.prop('cells'), R.anyPass([R.isNil, R.isEmpty]))(tableProps);
-    if (hasNoObs) return <IconMessage message={noData} />;
+    if (hasNoObs) return <NoData message={noData} />;
 
     return <TableHtml5 isRtl={R.prop('isRtl', rest)} {...tableProps} />;
   }