From eb0bb3c564d6da4a1d71a4af521ff541618ffb9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BA=AE?= <hiliang@outlook.com>
Date: Tue, 26 Jul 2016 00:14:31 +0800
Subject: [PATCH] add showLegend

---
 src/area_stack.jsx  | 12 ++++++++----
 src/bar.jsx         | 12 ++++++++----
 src/bar_group.jsx   | 12 ++++++++----
 src/bar_stack.jsx   | 12 ++++++++----
 src/commonProps.jsx |  6 ++++--
 src/line.jsx        | 12 ++++++++----
 src/pie.jsx         | 12 ++++++++----
 src/scatter.jsx     | 12 ++++++++----
 8 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/src/area_stack.jsx b/src/area_stack.jsx
index 4df9103..bee4403 100644
--- a/src/area_stack.jsx
+++ b/src/area_stack.jsx
@@ -27,7 +27,8 @@ export default class LineTooltip extends VoronoiEvt {
     const {
       width,
       height,
-      focus
+      focus,
+      showLegend
     } = this.props;
 
     var focusDom;
@@ -41,9 +42,12 @@ export default class LineTooltip extends VoronoiEvt {
         <Tooltip {...this.props} {...this.state}>
           {this.props.children}
         </Tooltip>
-        <Legend
-          {...this.props}
-        />
+        {showLegend?
+          <Legend
+            {...this.props}
+          />
+          : null
+        }
         <Chart
           {...this.props}
           {...this.state}
diff --git a/src/bar.jsx b/src/bar.jsx
index 4d2a4a7..011593f 100644
--- a/src/bar.jsx
+++ b/src/bar.jsx
@@ -27,7 +27,8 @@ export default class BarTooltip extends BarEvt {
 
     const {
       width,
-      height
+      height,
+      showLegend
     } = this.props;
 
     return (
@@ -35,9 +36,12 @@ export default class BarTooltip extends BarEvt {
         <Tooltip {...this.props} {...this.state}>
           {this.props.children}
         </Tooltip>
-        <Legend
-          {...this.props}
-        />
+        {showLegend?
+          <Legend
+            {...this.props}
+          />
+          : null
+        }
         <Chart
           {...this.props}
           {...this.state}
diff --git a/src/bar_group.jsx b/src/bar_group.jsx
index 35396f5..7d5f34c 100644
--- a/src/bar_group.jsx
+++ b/src/bar_group.jsx
@@ -27,7 +27,8 @@ export default class BarGroupTooltip extends BarEvt {
 
     const {
       width,
-      height
+      height,
+      showLegend
     } = this.props;
 
     return (
@@ -35,9 +36,12 @@ export default class BarGroupTooltip extends BarEvt {
         <Tooltip {...this.props} {...this.state}>
           {this.props.children}
         </Tooltip>
-        <Legend
-          {...this.props}
-        />
+        {showLegend?
+          <Legend
+            {...this.props}
+          />
+          : null
+        }
         <Chart
           {...this.props}
           {...this.state}
diff --git a/src/bar_stack.jsx b/src/bar_stack.jsx
index 0572919..7e3da7a 100644
--- a/src/bar_stack.jsx
+++ b/src/bar_stack.jsx
@@ -27,7 +27,8 @@ export default class BarGroupTooltip extends BarEvt {
 
     const {
       width,
-      height
+      height,
+      showLegend
     } = this.props;
 
     return (
@@ -35,9 +36,12 @@ export default class BarGroupTooltip extends BarEvt {
         <Tooltip {...this.props} {...this.state}>
           {this.props.children}
         </Tooltip>
-        <Legend
-          {...this.props}
-        />
+        {showLegend?
+          <Legend
+            {...this.props}
+          />
+          : null
+        }
         <Chart
           {...this.props}
           {...this.state}
diff --git a/src/commonProps.jsx b/src/commonProps.jsx
index 76f51de..dfefdef 100644
--- a/src/commonProps.jsx
+++ b/src/commonProps.jsx
@@ -15,7 +15,8 @@ export default {
   yScale: 'linear',
   focus: true,
   showXGrid: true,
-  showYGrid: true
+  showYGrid: true,
+  showLegend: true
 }
 
 export const pieProps = {
@@ -24,5 +25,6 @@ export const pieProps = {
   margins: margins,
   innerRadius: 0,
   categoricalColors: d3.scale.category10(),
-  pieSort: d3.descending
+  pieSort: d3.descending,
+  showLegend: true
 }
diff --git a/src/line.jsx b/src/line.jsx
index 3ff6989..e7d4da5 100644
--- a/src/line.jsx
+++ b/src/line.jsx
@@ -30,7 +30,8 @@ export default class LineTooltip extends VoronoiEvt {
     const {
       width,
       height,
-      focus
+      focus,
+      showLegend
     } = this.props;
 
     var focusDom;
@@ -44,9 +45,12 @@ export default class LineTooltip extends VoronoiEvt {
         <Tooltip {...this.props} {...this.state}>
           {this.props.children}
         </Tooltip>
-        <Legend
-          {...this.props}
-        />
+        {showLegend?
+          <Legend
+            {...this.props}
+          />
+          : null
+        }
         <Chart
           {...this.props}
           {...this.state}
diff --git a/src/pie.jsx b/src/pie.jsx
index c2fb328..9caa25a 100644
--- a/src/pie.jsx
+++ b/src/pie.jsx
@@ -53,7 +53,8 @@ export default class PieTooltip extends Component {
 
     const {
       width,
-      height
+      height,
+      showLegend
     } = this.props;
 
     const radius = this.props.radius || Math.min(width - 120, height - 120) / 2;
@@ -64,9 +65,12 @@ export default class PieTooltip extends Component {
         <Tooltip {...this.props} {...this.state}>
           {this.props.children}
         </Tooltip>
-        <Legend
-          {...this.props}
-        />
+        {showLegend?
+          <Legend
+            {...this.props}
+          />
+          : null
+        }
         <ChartPie
           {...this.props}
           >
diff --git a/src/scatter.jsx b/src/scatter.jsx
index ad94e7c..78ce8c3 100644
--- a/src/scatter.jsx
+++ b/src/scatter.jsx
@@ -28,7 +28,8 @@ export default class LineTooltip extends VoronoiEvt {
     const {
       width,
       height,
-      focus
+      focus,
+      showLegend
     } = this.props;
 
     var focusDom;
@@ -42,9 +43,12 @@ export default class LineTooltip extends VoronoiEvt {
         <Tooltip {...this.props} {...this.state}>
           {this.props.children}
         </Tooltip>
-        <Legend
-          {...this.props}
-        />
+        {showLegend?
+          <Legend
+            {...this.props}
+          />
+          : null
+        }
         <Chart
           {...this.props}
           {...this.state}