build dist

reactchartjs · Jul 20, 2017 · e37ea56 · e37ea56
1 parent fc5c640
commit e37ea56
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/dist/react-chartjs-2.js b/dist/react-chartjs-2.js
@@ -3196,7 +3196,10 @@ var ChartComponent = function (_React$Component) {
 
       var node = this.element;
       var data = this.memoizeDataProps();
-      options.legend = legend;
+
+      if (typeof legend !== 'undefined' && !(0, _lodash2.default)(ChartComponent.defaultProps.legend, legend)) {
+        options.legend = legend;
+      }
 
       this.chart_instance = new _chart2.default(node, {
         type: type,

diff --git a/dist/react-chartjs-2.min.js b/dist/react-chartjs-2.min.js
diff --git a/lib/index.js b/lib/index.js
@@ -298,7 +298,10 @@ var ChartComponent = function (_React$Component) {
 
       var node = this.element;
       var data = this.memoizeDataProps();
-      options.legend = legend;
+
+      if (typeof legend !== 'undefined' && !(0, _lodash2.default)(ChartComponent.defaultProps.legend, legend)) {
+        options.legend = legend;
+      }
 
       this.chart_instance = new _chart2.default(node, {
         type: type,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-chartjs-2",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "description": "react-chartjs-2",
   "main": "lib/index.js",
   "author": "Goran Udosic",