@sis-cc/dotstatsuite-components 14.3.5 → 14.3.6

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.3.6",
   "main": "lib/index.js",
   "author": "OECD",
   "license": "MIT",

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} />;
   }