Merge branch 'master' of github.com:gor181/react-chartjs-2

Author: gor181

dist/react-chartjs-2.js

@@ -5,7 +5,7 @@
 Object.defineProperty(exports, "__esModule", {
 	value: true
 });
-exports.Polar = exports.Radar = exports.HorizontalBar = exports.Bar = exports.Line = exports.Pie = exports.Doughnut = undefined;
+exports.Polar = exports.Radar = exports.HorizontalBar = exports.Bar = exports.Line = exports.Pie = exports.Doughnut = exports.Bubble = undefined;
 
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
@@ -46,7 +46,7 @@ var ChartComponent = _react2.default.createClass({
 		onElementsClick: _react.PropTypes.func,
 		options: _react.PropTypes.object,
 		redraw: _react.PropTypes.bool,
-		type: _react.PropTypes.oneOf(['doughnut', 'pie', 'line', 'bar', 'horizontalBar', 'radar', 'polarArea']),
+		type: _react.PropTypes.oneOf(['doughnut', 'pie', 'line', 'bar', 'horizontalBar', 'radar', 'polarArea', 'bubble']),
 		width: _react.PropTypes.number
 	},
 
@@ -332,6 +332,32 @@ var Polar = exports.Polar = function (_React$Component7) {
 	return Polar;
 }(_react2.default.Component);
 
+var Bubble = exports.Bubble = function (_React$Component8) {
+	_inherits(Bubble, _React$Component8);
+
+	function Bubble() {
+		_classCallCheck(this, Bubble);
+
+		return _possibleConstructorReturn(this, (Bubble.__proto__ || Object.getPrototypeOf(Bubble)).apply(this, arguments));
+	}
+
+	_createClass(Bubble, [{
+		key: 'render',
+		value: function render() {
+			var _this16 = this;
+
+			return _react2.default.createElement(ChartComponent, _extends({}, this.props, {
+				ref: function ref(_ref8) {
+					return _this16.chart_instance = _ref8 && _ref8.chart_instance;
+				},
+				type: 'bubble'
+			}));
+		}
+	}]);
+
+	return Bubble;
+}(_react2.default.Component);
+
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
 },{"./utils/deepEqual":2,"chart.js":undefined,"react-dom":undefined}],2:[function(require,module,exports){
 'use strict';

dist/react-chartjs-2.min.js

@@ -0,0 +1,42 @@
+import React from 'react';
+import {Bubble} from 'react-chartjs-2';
+
+const data = {
+  labels: ['January'],
+  datasets: [
+    {
+      label: 'My First dataset',
+      fill: false,
+      lineTension: 0.1,
+      backgroundColor: 'rgba(75,192,192,0.4)',
+      borderColor: 'rgba(75,192,192,1)',
+      borderCapStyle: 'butt',
+      borderDash: [],
+      borderDashOffset: 0.0,
+      borderJoinStyle: 'miter',
+      pointBorderColor: 'rgba(75,192,192,1)',
+      pointBackgroundColor: '#fff',
+      pointBorderWidth: 1,
+      pointHoverRadius: 5,
+      pointHoverBackgroundColor: 'rgba(75,192,192,1)',
+      pointHoverBorderColor: 'rgba(220,220,220,1)',
+      pointHoverBorderWidth: 2,
+      pointRadius: 1,
+      pointHitRadius: 10,
+      data: [{x:10,y:20,r:5}]
+    }
+  ]
+};
+
+export default React.createClass({
+  displayName: 'BubbleExample',
+
+  render() {
+    return (
+      <div>
+        <h2>Bubble Example</h2>
+        <Bubble data={data} />
+      </div>
+    );
+  }
+});