Make sure transitions are skipped completely when axisTransitionLength=0

lucified · May 4, 2016 · 3e83c5f · 3e83c5f
1 parent 2c7db3c
commit 3e83c5f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/example.jsx b/src/example.jsx
@@ -29,15 +29,22 @@ export default class Example extends React.Component {
     if (this.state.checked) {
       return this.data1;
     }
-
     return this.data2;
   }
 
+  getMaxY() {
+    if (!this.state.checked) {
+      return 10;
+    } else {
+      return 6;
+    }
+  }
+
   getCharts() {
     return _.range(0, 40).map(index => (
       <LineChart
         key={index}
-        maxY={10}
+        maxY={this.getMaxY()}
         width={200}
         aspectRatio={0.8}
         data={this.getData()}

diff --git a/src/line-chart.jsx b/src/line-chart.jsx
@@ -323,9 +323,11 @@ export default class LineChart extends React.Component {
       .tickSize(-this.getScaleWidth())
       .tickFormat(this.getYTickFormat());
 
-    d3.select(React.findDOMNode(this.refs.yAxis))
-      .transition(this.props.axisTransitionLength)
-      .call(yAxis);
+    const sel = d3.select(React.findDOMNode(this.refs.yAxis));
+    if (this.props.axisTransitionLength > 0) {
+      sel.transition(this.props.axisTransitionLength);
+    }
+    sel.call(yAxis);
   }