From 9a5dd28dc318c274561c2e5ce41902705c3cba85 Mon Sep 17 00:00:00 2001 From: Antti Lehto Date: Thu, 28 Sep 2017 18:57:08 +0300 Subject: [PATCH] Add React 16 peer dependency and fix warning about defaultProps on React 16 --- package.json | 4 ++-- src/chartsFactory.jsx | 17 ++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 1c181ab..6a9b45c 100644 --- a/package.json +++ b/package.json @@ -24,8 +24,8 @@ "url": "https://github.com/kirjs/react-highcharts" }, "peerDependencies": { - "react": "~0.14 || ^15.0.0", - "react-dom": "~0.14 || ^15.0.0" + "react": "~0.14 || ^15.0.0 || ^16.0.0", + "react-dom": "~0.14 || ^15.0.0 || ^16.0.0" }, "bugs": "https://github.com/kirjs/react-highcharts/issues", "keywords": [ diff --git a/src/chartsFactory.jsx b/src/chartsFactory.jsx index 54494e3..338671d 100644 --- a/src/chartsFactory.jsx +++ b/src/chartsFactory.jsx @@ -15,12 +15,15 @@ module.exports = function (chartType, Highcharts){ callback: PropTypes.func, domProps: PropTypes.object }, - - defaultProps: { - callback: () =>{}, - domProps: {} + getDefaultProps: function() { + return { + callback: () =>{}, + domProps: {} + }; + }, + setChartRef: function(chartRef) { + this.chartRef = chartRef; }, - renderChart: function (config){ if (!config) { throw new Error('Config must be specified for the ' + displayName + ' component'); @@ -30,7 +33,7 @@ module.exports = function (chartType, Highcharts){ ...config, chart: { ...chartConfig, - renderTo: this.refs.chart + renderTo: this.chartRef } }, this.props.callback); @@ -65,7 +68,7 @@ module.exports = function (chartType, Highcharts){ }, render: function (){ - return
; + return
; } });