From 46c80279cb4c4f2f9b9ba4083f76df09c4d543ce Mon Sep 17 00:00:00 2001 From: jphamilton Date: Wed, 19 Apr 2017 14:40:05 -0500 Subject: [PATCH 1/2] Updated to React 15.5.4 --- package.json | 7 ++++--- src/RedrawOnPrint.jsx | 3 ++- src/chartsFactory.jsx | 14 ++++++++------ test/unit/nonbundleSpec.js | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index bed8213..4f4c2b8 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "babel-preset-es2015": "^6.18.0", "babel-preset-react": "^6.16.0", "babel-preset-stage-2": "^6.18.0", + "create-react-class": "^15.5.2", "exports-loader": "^0.6.2", "file-loader": "^0.10.1", "highlight.js": "^9.10.0", @@ -49,10 +50,10 @@ "mocha": "^3.2.0", "mock-require": "^2.0.1", "nightwatch": "^0.9.6", + "prop-types": "^15.5.8", "raw-loader": "^0.5.1", - "react": "^15.4.2", - "react-addons-test-utils": "^15.4.2", - "react-dom": "^15.4.2", + "react": "^15.5.4", + "react-dom": "^15.5.4", "react-highlight": "^0.9.0", "sinon": "^2.0.0", "webpack": "^2.2.1", diff --git a/src/RedrawOnPrint.jsx b/src/RedrawOnPrint.jsx index 7c4657e..25a7455 100644 --- a/src/RedrawOnPrint.jsx +++ b/src/RedrawOnPrint.jsx @@ -1,6 +1,7 @@ var React = require('react'); +var createReactClass = require('create-react-class'); -var RedrawOnPrint = React.createClass({ +var RedrawOnPrint = createReactClass({ componentDidMount() { // This is a listiner bind to the print media query // it call reflow since highcharts doesn't reflow upon print diff --git a/src/chartsFactory.jsx b/src/chartsFactory.jsx index 6edee4f..6d7f475 100644 --- a/src/chartsFactory.jsx +++ b/src/chartsFactory.jsx @@ -1,17 +1,19 @@ var React = require('react'); +var createReactClass = require('create-react-class'); +var PropTypes = require('prop-types'); var win = typeof global === 'undefined' ? window : global; module.exports = function (chartType, Highcharts){ var displayName = 'Highcharts' + chartType; - var result = React.createClass({ + var result = createReactClass({ displayName: displayName, propTypes: { - config: React.PropTypes.object.isRequired, - isPureConfig: React.PropTypes.bool, - neverReflow: React.PropTypes.bool, - callback: React.PropTypes.func, - domProps: React.PropTypes.object + config: PropTypes.object.isRequired, + isPureConfig: PropTypes.bool, + neverReflow: PropTypes.bool, + callback: PropTypes.func, + domProps: PropTypes.object }, defaultProps: { diff --git a/test/unit/nonbundleSpec.js b/test/unit/nonbundleSpec.js index 89cac22..96f3f14 100644 --- a/test/unit/nonbundleSpec.js +++ b/test/unit/nonbundleSpec.js @@ -1,6 +1,6 @@ var React = require('react'); var assert = require('assert'); -var TestUtils = require('react-addons-test-utils'); +var TestUtils = require('react-dom/test-utils'); var mock = require('mock-require'); var sinon = require('sinon'); From 259d6934b69eb4c13e3962f6dc1cffd3b67e7cd0 Mon Sep 17 00:00:00 2001 From: "J.P. Hamilton" Date: Thu, 20 Apr 2017 09:22:47 -0500 Subject: [PATCH 2/2] Update chartsFactory.jsx Missed one props validator --- src/chartsFactory.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chartsFactory.jsx b/src/chartsFactory.jsx index 6d7f475..54494e3 100644 --- a/src/chartsFactory.jsx +++ b/src/chartsFactory.jsx @@ -9,7 +9,7 @@ module.exports = function (chartType, Highcharts){ displayName: displayName, propTypes: { - config: PropTypes.object.isRequired, + config: PropTypes.object, isPureConfig: PropTypes.bool, neverReflow: PropTypes.bool, callback: PropTypes.func,