Skip to content

Commit aee5336

Browse files
authored
Merge pull request #152 from acailly/enable-snapshot
Replaced findDomNode with ref in order to use react-test-renderer for snapshot testing with storybook
2 parents fd5c5f3 + a9b2d1c commit aee5336

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

dist/react-chartjs-2.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2965,6 +2965,8 @@ var ChartComponent = function (_React$Component) {
29652965
getElementAtEvent && getElementAtEvent(instance.getElementAtEvent(event), event);
29662966
getElementsAtEvent && getElementsAtEvent(instance.getElementsAtEvent(event), event);
29672967
onElementsClick && onElementsClick(instance.getElementsAtEvent(event), event); // Backward compatibility
2968+
}, _this.ref = function (element) {
2969+
_this.element = element;
29682970
}, _temp), _possibleConstructorReturn(_this, _ret);
29692971
}
29702972

@@ -3041,7 +3043,7 @@ var ChartComponent = function (_React$Component) {
30413043
var data = props.data;
30423044

30433045
if (typeof data == 'function') {
3044-
var node = _reactDom2.default.findDOMNode(this);
3046+
var node = this.element;
30453047
return data(node);
30463048
} else {
30473049
return data;
@@ -3151,7 +3153,7 @@ var ChartComponent = function (_React$Component) {
31513153
redraw = _props2.redraw,
31523154
plugins = _props2.plugins;
31533155

3154-
var node = _reactDom2.default.findDOMNode(this);
3156+
var node = this.element;
31553157
var data = this.memoizeDataProps();
31563158

31573159
this.chart_instance = new _chart2.default(node, {
@@ -3171,6 +3173,7 @@ var ChartComponent = function (_React$Component) {
31713173

31723174

31733175
return _react2.default.createElement('canvas', {
3176+
ref: this.ref,
31743177
height: height,
31753178
width: width,
31763179
onClick: this.handleOnClick

dist/react-chartjs-2.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/index.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ var ChartComponent = function (_React$Component) {
6767
getElementAtEvent && getElementAtEvent(instance.getElementAtEvent(event), event);
6868
getElementsAtEvent && getElementsAtEvent(instance.getElementsAtEvent(event), event);
6969
onElementsClick && onElementsClick(instance.getElementsAtEvent(event), event); // Backward compatibility
70+
}, _this.ref = function (element) {
71+
_this.element = element;
7072
}, _temp), _possibleConstructorReturn(_this, _ret);
7173
}
7274

@@ -143,7 +145,7 @@ var ChartComponent = function (_React$Component) {
143145
var data = props.data;
144146

145147
if (typeof data == 'function') {
146-
var node = _reactDom2.default.findDOMNode(this);
148+
var node = this.element;
147149
return data(node);
148150
} else {
149151
return data;
@@ -253,7 +255,7 @@ var ChartComponent = function (_React$Component) {
253255
redraw = _props2.redraw,
254256
plugins = _props2.plugins;
255257

256-
var node = _reactDom2.default.findDOMNode(this);
258+
var node = this.element;
257259
var data = this.memoizeDataProps();
258260

259261
this.chart_instance = new _chart2.default(node, {
@@ -273,6 +275,7 @@ var ChartComponent = function (_React$Component) {
273275

274276

275277
return _react2.default.createElement('canvas', {
278+
ref: this.ref,
276279
height: height,
277280
width: width,
278281
onClick: this.handleOnClick

src/index.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class ChartComponent extends React.Component {
113113
transformDataProp(props) {
114114
const { data } = props;
115115
if (typeof(data) == 'function') {
116-
const node = ReactDOM.findDOMNode(this);
116+
const node = this.element;
117117
return data(node);
118118
} else {
119119
return data;
@@ -201,7 +201,7 @@ class ChartComponent extends React.Component {
201201

202202
renderChart() {
203203
const {options, legend, type, redraw, plugins} = this.props;
204-
const node = ReactDOM.findDOMNode(this);
204+
const node = this.element;
205205
const data = this.memoizeDataProps();
206206

207207
this.chart_instance = new Chart(node, {
@@ -228,11 +228,16 @@ class ChartComponent extends React.Component {
228228
onElementsClick && onElementsClick(instance.getElementsAtEvent(event), event); // Backward compatibility
229229
}
230230

231+
ref = (element) => {
232+
this.element = element
233+
}
234+
231235
render() {
232236
const {height, width, onElementsClick} = this.props;
233237

234238
return (
235239
<canvas
240+
ref={this.ref}
236241
height={height}
237242
width={width}
238243
onClick={this.handleOnClick}

0 commit comments

Comments
 (0)