Release 2.0.0 (#88)

jerairrest · gor181 · commit 61caba3c66f7 · 2017-01-09T10:32:18.000+01:00
Make chart.js pearDependency Add chart.js to devDependencies Patch tests due bug in chart.js 2.4.0 (chartjs/Chart.js#3608)
diff --git a/README.md b/README.md
@@ -5,10 +5,13 @@
 
 # react-chartjs-2
 
-React wrapper for [Chart.js 2](http://www.chartjs.org/docs/#getting-started)  
+React wrapper for [Chart.js 2](http://www.chartjs.org/docs/#getting-started)
 Open for PR's and contributions!
 
-# UPDATE
+# UPDATE to 2.x
+As of 2.x we have made chart.js a peer dependency for greater flexibility. Please add chart.js as a dependency on your project to use 2.x. Currently, 2.4.x is the recommended version of chart.js to use.
+
+# Looking for Contributors!
 Actively looking for contributors as for the moment I do not have enough time to dedicate for maintaining this lib.
 All contributors can add themselves to Contributors section at the bottom of README.
 
@@ -70,7 +73,7 @@ In order for Chart.js to obey the custom size you need to set `maintainAspectRat
 />
 ```
 
-### Chart.js instance  
+### Chart.js instance
 Chart.js instance can be accessed by placing a ref to the element as:
 
 ```js
@@ -170,13 +173,13 @@ Looks for the element under the event point, then returns all elements from that
 
 To build, watch and serve the examples (which will also watch the component source), run `npm start`. If you just want to watch changes to `src` and rebuild `lib`, run `npm run watch` (this is useful if you are working with `npm link`).
 
-## Thanks  
+## Thanks
 
 Jed Watson for making react-component yo builder!
 
 ## License
 
-MIT Licensed  
+MIT Licensed
 Copyright (c) 2016 Goran Udosic
 
 ## Contributors
diff --git a/package.json b/package.json
@@ -13,7 +13,6 @@
     "url": "https://github.com/gor181/react-chartjs-2/issues"
   },
   "dependencies": {
-    "chart.js": "~2.3.0",
     "lodash.isequal": "^4.4.0"
   },
   "devDependencies": {
@@ -27,6 +26,7 @@
     "brfs": "^1.4.3",
     "canvas": "^1.6.2",
     "chai": "^3.5.0",
+    "chart.js": "^2.3.0",
     "debug": "^2.4.1",
     "enzyme": "^2.6.0",
     "eslint": "^1.6.0",
@@ -41,6 +41,7 @@
     "sinon": "^1.17.6"
   },
   "peerDependencies": {
+    "chart.js": "^2.3",
     "react": "^0.14 || ^15.0.0-rc || ^15.0",
     "react-dom": "^0.14 || ^15.0.0-rc || ^15.0"
   },
@@ -62,6 +63,8 @@
   "keywords": [
     "chart",
     "chart-js",
-    "chart.js"
+    "chart.js",
+    "react-chartjs-2",
+    "react chart.js"
   ]
 }
diff --git a/test/__tests__/Chart_spec.js b/test/__tests__/Chart_spec.js
@@ -4,7 +4,7 @@ import { expect } from 'chai';
 import { jsdom } from 'jsdom';
 import sinon from 'sinon';
 
-import Chart from '../../src/index';
+import Chart, { Chart as ChartConstructor } from '../../src/index';
 
 const noop = () => {};
 const createDOM = () => jsdom('<!doctype html><html><body><div></div></body></html>');
@@ -27,6 +27,14 @@ describe('<Chart />', () => {
     ]
   };
 
+  ChartConstructor.plugins.register({
+    afterInit: function (chartInstance) {
+      chartInstance.getDatasetAtEvent = function (e) {
+        return ChartConstructor.Interaction.modes.dataset(this, e, this.options);
+      };
+    }
+  });
+
   const mountComponent = props => mount(
     <Chart data={data} {...props} />,
     { attachTo: DOM.body.firstChild }
