@sis-cc/dotstatsuite-components 16.8.0 → 16.8.2

package/lib/viewer/src/chart.js

@@ -78,6 +78,7 @@ var ChartWrapper = function ChartWrapper() {
   }
 
   return _react2.default.createElement(Chart, (0, _extends3.default)({}, props, {
+    options: options,
     series: (0, _series2.default)(props.data.series, props.type, options) // responsive rule only display highlighted data
   }));
 };

package/lib/viewer/src/index.js

@@ -179,25 +179,26 @@ var ViewerWrapper = function ViewerWrapper(_ref5) {
       heightOffsets = _useState2[0],
       setHeightOffsets = _useState2[1];
 
-  if (type === 'table') return _react2.default.createElement(Viewer, (0, _extends3.default)({}, props, { chartOptions: chartOptions, type: type }));
-
-  var preparedChartOptions = R.pipe(R.over(R.lensPath(['base', 'width']), R.when(R.anyPass([R.isNil, isNaN]), R.always(props.size.width || 0))), R.over(R.lensPath(['base', 'height']), R.when(R.anyPass([R.isNil, isNaN]), R.always(0))), function (chartOptions) {
-    return (0, _options2.default)(chartOptions, props.chartData, type, theme, props.timeFormats, props.locale);
-  })(chartOptions);
-
-  return _react2.default.createElement(Viewer, (0, _extends3.default)({}, props, {
-    chartOptions: preparedChartOptions,
-    fixedWidth: R.path(['base', 'width'], chartOptions),
-    fixedHeight: R.path(['base', 'height'], chartOptions),
-    heightOffsets: heightOffsets,
+  var extendedProps = (0, _extends3.default)({}, props, {
+    type: type,
     setFooterOffset: function setFooterOffset(offset) {
       return setHeightOffsets(R.assoc('footer', offset));
     },
     setHeaderOffset: function setHeaderOffset(offset) {
       return setHeightOffsets(R.assoc('header', offset));
     },
-    type: type
-  }));
+    heightOffsets: heightOffsets,
+    fixedWidth: R.path(['base', 'width'], chartOptions),
+    fixedHeight: R.path(['base', 'height'], chartOptions)
+  });
+
+  if (type === 'table') return _react2.default.createElement(Viewer, (0, _extends3.default)({}, extendedProps, { chartOptions: chartOptions }));
+
+  var preparedChartOptions = R.pipe(R.over(R.lensPath(['base', 'width']), R.when(R.anyPass([R.isNil, isNaN]), R.always(props.size.width || 0))), R.over(R.lensPath(['base', 'height']), R.when(R.anyPass([R.isNil, isNaN]), R.always(0))), function (chartOptions) {
+    return (0, _options2.default)(chartOptions, props.chartData, type, theme, props.timeFormats, props.locale);
+  })(chartOptions);
+
+  return _react2.default.createElement(Viewer, (0, _extends3.default)({}, extendedProps, { chartOptions: preparedChartOptions }));
 };
 
 exports.default = (0, _reactSizeme2.default)({ noPlaceholder: true, monitorWidth: true, monitorHeight: true })(ViewerWrapper);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "16.8.0",
+  "version": "16.8.2",
   "main": "lib/index.js",
   "author": "OECD",
   "license": "MIT",

package/src/viewer/src/chart.js

@@ -46,6 +46,7 @@ const ChartWrapper = (props = {}) => {
   return (
     <Chart
       {...props}
+      options={options}
       series={filterSeriesRegardingDimensions(props.data.series, props.type, options)} // responsive rule only display highlighted data
     />
   );

package/src/viewer/src/index.js

@@ -98,7 +98,17 @@ const ViewerWrapper = ({ chartOptions, type, ...props }) => {
   const theme = useTheme();
   const [heightOffsets, setHeightOffsets] = useState({ footer: 0, header: 0 });
 
-  if (type === 'table') return <Viewer {...props} chartOptions={chartOptions} type={type} />;
+  const extendedProps = {
+    ...props,
+    type,
+    setFooterOffset: offset => setHeightOffsets(R.assoc('footer', offset)),
+    setHeaderOffset: offset => setHeightOffsets(R.assoc('header', offset)),
+    heightOffsets,
+    fixedWidth: R.path(['base', 'width'], chartOptions),
+    fixedHeight: R.path(['base', 'height'], chartOptions),
+  };
+
+  if (type === 'table') return <Viewer {...extendedProps} chartOptions={chartOptions} />;
 
   const preparedChartOptions = R.pipe(
     R.over(R.lensPath(['base', 'width']), R.when(R.anyPass([R.isNil, isNaN]), R.always(props.size.width || 0))),
@@ -106,18 +116,7 @@ const ViewerWrapper = ({ chartOptions, type, ...props }) => {
     chartOptions => getChartOptions(chartOptions, props.chartData, type, theme, props.timeFormats, props.locale),
   )(chartOptions);
 
-  return (
-    <Viewer
-      {...props}
-      chartOptions={preparedChartOptions}
-      fixedWidth={R.path(['base', 'width'], chartOptions)}
-      fixedHeight={R.path(['base', 'height'], chartOptions)}
-      heightOffsets={heightOffsets}
-      setFooterOffset={offset => setHeightOffsets(R.assoc('footer', offset))}
-      setHeaderOffset={offset => setHeightOffsets(R.assoc('header', offset))}
-      type={type}
-    />
-  );
+  return <Viewer {...extendedProps} chartOptions={preparedChartOptions} />;
 };
 
 export default sizeMe({ noPlaceholder: true, monitorWidth: true, monitorHeight: true })(ViewerWrapper);