From 9d6664c29d641de9cda69c23f3571519c5ddf30c Mon Sep 17 00:00:00 2001 From: Antti Lehto Date: Fri, 27 Sep 2019 22:32:01 +0300 Subject: [PATCH] Replace Hidden with React.Fragment --- .../react-jsx-highcharts/src/components/Debug/Debug.js | 5 +---- .../react-jsx-highcharts/src/components/Hidden/Hidden.js | 7 ------- .../react-jsx-highcharts/src/components/Hidden/index.js | 2 -- .../components/HighchartsSparkline/HighchartsSparkline.js | 3 +-- packages/react-jsx-highcharts/src/index.js | 1 - .../src/components/MapNavigation/MapNavigation.js | 3 +-- .../src/components/Navigator/NavigatorAxis.js | 6 +++--- .../src/components/RangeSelector/RangeSelectorInner.js | 4 ++-- .../src/components/Scrollbar/Scrollbar.js | 4 ++-- 9 files changed, 10 insertions(+), 25 deletions(-) delete mode 100644 packages/react-jsx-highcharts/src/components/Hidden/Hidden.js delete mode 100644 packages/react-jsx-highcharts/src/components/Hidden/index.js diff --git a/packages/react-jsx-highcharts/src/components/Debug/Debug.js b/packages/react-jsx-highcharts/src/components/Debug/Debug.js index 6c5e71d3..406ba9b1 100644 --- a/packages/react-jsx-highcharts/src/components/Debug/Debug.js +++ b/packages/react-jsx-highcharts/src/components/Debug/Debug.js @@ -1,6 +1,5 @@ import React, { useEffect } from 'react'; import PropTypes from 'prop-types'; -import Hidden from '../Hidden'; import useChart from '../UseChart'; const Debug = ({ varName = 'chart' }) => { @@ -13,9 +12,7 @@ const Debug = ({ varName = 'chart' }) => { return () => window[varName] = undefined; }, [varName]); - return ( - - ); + return null; } Debug.propTypes = { diff --git a/packages/react-jsx-highcharts/src/components/Hidden/Hidden.js b/packages/react-jsx-highcharts/src/components/Hidden/Hidden.js deleted file mode 100644 index cf4aa154..00000000 --- a/packages/react-jsx-highcharts/src/components/Hidden/Hidden.js +++ /dev/null @@ -1,7 +0,0 @@ -import React from 'react'; - -const Hidden = ({ children = null}) => ( - [ children ] -) - -export default Hidden; diff --git a/packages/react-jsx-highcharts/src/components/Hidden/index.js b/packages/react-jsx-highcharts/src/components/Hidden/index.js deleted file mode 100644 index 7bfd0b0e..00000000 --- a/packages/react-jsx-highcharts/src/components/Hidden/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import Hidden from './Hidden'; -export default Hidden; diff --git a/packages/react-jsx-highcharts/src/components/HighchartsSparkline/HighchartsSparkline.js b/packages/react-jsx-highcharts/src/components/HighchartsSparkline/HighchartsSparkline.js index ef2c8b29..c57339c8 100644 --- a/packages/react-jsx-highcharts/src/components/HighchartsSparkline/HighchartsSparkline.js +++ b/packages/react-jsx-highcharts/src/components/HighchartsSparkline/HighchartsSparkline.js @@ -4,7 +4,6 @@ import HighchartsChart from '../HighchartsChart'; import Chart from '../Chart'; import XAxis from '../XAxis'; import YAxis from '../YAxis'; -import Hidden from '../Hidden'; const defaultSparklinePlotOptions = { series: { @@ -81,7 +80,7 @@ const HighchartsSparkline = ({ {Series} - {hasSeriesProp && {children}} + {hasSeriesProp && <>{children}} ); }; diff --git a/packages/react-jsx-highcharts/src/index.js b/packages/react-jsx-highcharts/src/index.js index b6a1a975..0af53bd9 100644 --- a/packages/react-jsx-highcharts/src/index.js +++ b/packages/react-jsx-highcharts/src/index.js @@ -95,7 +95,6 @@ export { default as withHighcharts } from './components/WithHighcharts'; export { default as Axis } from './components/Axis'; export { default as BaseChart } from './components/BaseChart'; export { default as Debug } from './components/Debug'; -export { default as Hidden } from './components/Hidden'; export { default as Series } from './components/Series'; // Utils diff --git a/packages/react-jsx-highmaps/src/components/MapNavigation/MapNavigation.js b/packages/react-jsx-highmaps/src/components/MapNavigation/MapNavigation.js index 071aef3c..b0d1a272 100644 --- a/packages/react-jsx-highmaps/src/components/MapNavigation/MapNavigation.js +++ b/packages/react-jsx-highmaps/src/components/MapNavigation/MapNavigation.js @@ -2,7 +2,6 @@ import React, { useEffect, useState } from 'react'; import PropTypes from 'prop-types'; import { attempt } from 'lodash-es'; import { - Hidden, useModifiedProps, useChart, useHighcharts @@ -40,7 +39,7 @@ const MapNavigation = ({ children, enabled = true, ...restProps}) => { if (!children || !rendered) return null; - return {children}; + return <>{children}; }; const getMapNavigationConfig = (props, Highcharts) => { return { diff --git a/packages/react-jsx-highstock/src/components/Navigator/NavigatorAxis.js b/packages/react-jsx-highstock/src/components/Navigator/NavigatorAxis.js index 4670c556..a495dd27 100644 --- a/packages/react-jsx-highstock/src/components/Navigator/NavigatorAxis.js +++ b/packages/react-jsx-highstock/src/components/Navigator/NavigatorAxis.js @@ -1,6 +1,6 @@ import React, { useEffect, Children, cloneElement, isValidElement } from 'react'; import PropTypes from 'prop-types'; -import { Hidden, useAxis, useModifiedProps, getNonEventHandlerProps } from 'react-jsx-highcharts'; +import { useAxis, useModifiedProps, getNonEventHandlerProps } from 'react-jsx-highcharts'; const NavigatorAxis = props => { const axis = useAxis(); @@ -32,9 +32,9 @@ const NavigatorAxis = props => { }); return ( - + <> {axisChildren} - + ); } const updateNavigatorAxis = (config, axis) => { diff --git a/packages/react-jsx-highstock/src/components/RangeSelector/RangeSelectorInner.js b/packages/react-jsx-highstock/src/components/RangeSelector/RangeSelectorInner.js index 4545c3be..5e20d6ab 100644 --- a/packages/react-jsx-highstock/src/components/RangeSelector/RangeSelectorInner.js +++ b/packages/react-jsx-highstock/src/components/RangeSelector/RangeSelectorInner.js @@ -1,7 +1,7 @@ import React, { useState, useEffect } from 'react'; import PropTypes from 'prop-types'; import { attempt } from 'lodash-es'; -import { Hidden, useHighcharts, useAxis, useChart, useModifiedProps } from 'react-jsx-highcharts'; +import { useHighcharts, useAxis, useChart, useModifiedProps } from 'react-jsx-highcharts'; const RangeSelectorInner = ({ enabled = true, ...restProps }) => { const props = { enabled, ...restProps }; @@ -51,7 +51,7 @@ const RangeSelectorInner = ({ enabled = true, ...restProps }) => { if (!children || !rendered) return null; return ( - {children} + <>{children} ); } diff --git a/packages/react-jsx-highstock/src/components/Scrollbar/Scrollbar.js b/packages/react-jsx-highstock/src/components/Scrollbar/Scrollbar.js index 7e74fadc..da9dab39 100644 --- a/packages/react-jsx-highstock/src/components/Scrollbar/Scrollbar.js +++ b/packages/react-jsx-highstock/src/components/Scrollbar/Scrollbar.js @@ -1,7 +1,7 @@ import React, { useEffect } from 'react'; import PropTypes from 'prop-types'; import { attempt } from 'lodash-es'; -import { Hidden, useModifiedProps, useChart } from 'react-jsx-highcharts'; +import { useModifiedProps, useChart } from 'react-jsx-highcharts'; const Scrollbar = ({ children, enabled = true, ...restProps }) => { const chart = useChart(); @@ -23,7 +23,7 @@ const Scrollbar = ({ children, enabled = true, ...restProps }) => { if (!children) return null; return ( - {children} + <>{children} ); }