cleanup of #985

add tests force resize when changing alignYAxes rename calculateYAxisRanges add author
dc-js · Oct 31, 2015 · 2dd561f · 2dd561f
1 parent 606b218
commit 2dd561f
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 5 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -66,3 +66,4 @@ Chris Alvino <alvino.chris@gmail.com>
 Emiliano Guevara <emiliano@opoint.com>
 Wang Xuan <wangxuan927@gmail.com>
 Ethan Jewett <esjewett@gmail.com>
+Mohamed Gazal <mohamed.gazal@gmail.com>
diff --git a/spec/composite-chart-spec.js b/spec/composite-chart-spec.js
@@ -1,11 +1,13 @@
 /* global appendChartID, loadDateFixture, makeDate */
 describe('dc.compositeChart', function () {
-    var id, chart, data, dateDimension, dateValueSumGroup, dateIdSumGroup, dateGroup;
+    var id, chart, data, dateDimension, dateValueSumGroup, dateValueNegativeSumGroup,
+        dateIdSumGroup, dateGroup;
 
     beforeEach(function () {
         data = crossfilter(loadDateFixture());
         dateDimension = data.dimension(function (d) { return d3.time.day.utc(d.dd); });
         dateValueSumGroup = dateDimension.group().reduceSum(function (d) { return d.value; });
+        dateValueNegativeSumGroup = dateDimension.group().reduceSum(function (d) { return -d.value; });
         dateIdSumGroup = dateDimension.group().reduceSum(function (d) { return d.id; });
         dateGroup = dateDimension.group();
 
@@ -547,6 +549,64 @@ describe('dc.compositeChart', function () {
                 expect(chart.selectAll('.grid-line.horizontal line').size()).toBe(7);
             });
         });
+
+        describe('when composing a left axis chart with negative values', function () {
+            var leftChart, rightChart;
+            beforeEach(function () {
+                chart
+                    .compose([
+                        leftChart = dc.barChart(chart)
+                            .group(dateValueNegativeSumGroup, 'Date Value Group'),
+                        rightChart = dc.lineChart(chart)
+                            .group(dateIdSumGroup, 'Date ID Group')
+                            .useRightYAxis(true)
+                    ])
+                    .render();
+            });
+
+            it('the axis baselines shouldn\'t match', function () {
+                expect(leftChart.y()(0)).not.toEqual(rightChart.y()(0));
+            });
+
+            describe('with alignYAxes', function () {
+                beforeEach(function () {
+                    chart.alignYAxes(true)
+                        .render();
+                });
+                it('the axis baselines should match', function () {
+                    expect(leftChart.y()(0)).toEqual(rightChart.y()(0));
+                });
+            });
+        });
+
+        describe('when composing a right axis chart with negative values', function () {
+            var leftChart, rightChart;
+            beforeEach(function () {
+                chart
+                    .compose([
+                        leftChart = dc.barChart(chart)
+                            .group(dateIdSumGroup, 'Date Value Group'),
+                        rightChart = dc.lineChart(chart)
+                            .group(dateValueNegativeSumGroup, 'Date ID Group')
+                            .useRightYAxis(true)
+                    ])
+                    .render();
+            });
+
+            it('the axis baselines shouldn\'t match', function () {
+                expect(leftChart.y()(0)).not.toEqual(rightChart.y()(0));
+            });
+
+            describe('with alignYAxes', function () {
+                beforeEach(function () {
+                    chart.alignYAxes(true)
+                        .render();
+                });
+                it('the axis baselines should match', function () {
+                    expect(leftChart.y()(0)).toEqual(rightChart.y()(0));
+                });
+            });
+        });
     });
 
     describe('sub-charts with different filter types', function () {

diff --git a/src/composite-chart.js b/src/composite-chart.js
@@ -83,7 +83,7 @@ dc.compositeChart = function (parent, chartGroup) {
     _chart._prepareYAxis = function () {
         var left = (leftYAxisChildren().length !== 0);
         var right = (rightYAxisChildren().length !== 0);
-        var ranges = calculateYAxesRanges(left, right);
+        var ranges = calculateYAxisRanges(left, right);
 
         if (left) { prepareLeftYAxis(ranges); }
         if (right) { prepareRightYAxis(ranges); }
@@ -107,7 +107,7 @@ dc.compositeChart = function (parent, chartGroup) {
         }
     };
 
-    function calculateYAxesRanges (left, right) {
+    function calculateYAxisRanges (left, right) {
         var lyAxisMin, lyAxisMax, ryAxisMin, ryAxisMax;
 
         if (left) {
@@ -153,7 +153,7 @@ dc.compositeChart = function (parent, chartGroup) {
     }
 
     function prepareRightYAxis (ranges) {
-        if (_chart.rightY() === undefined || _chart.elasticY()) {
+        if (_chart.rightY() === undefined || _chart.elasticY() || _chart.resizing()) {
             if (_chart.rightY() === undefined) {
                 _chart.rightY(d3.scale.linear());
             }
@@ -167,7 +167,7 @@ dc.compositeChart = function (parent, chartGroup) {
     }
 
     function prepareLeftYAxis (ranges) {
-        if (_chart.y() === undefined || _chart.elasticY()) {
+        if (_chart.y() === undefined || _chart.elasticY() || _chart.resizing()) {
             if (_chart.y() === undefined) {
                 _chart.y(d3.scale.linear());
             }
@@ -403,6 +403,7 @@ dc.compositeChart = function (parent, chartGroup) {
             return _alignYAxes;
         }
         _alignYAxes = alignYAxes;
+        _chart.rescale();
         return _chart;
     };
 

diff --git a/src/coordinate-grid-mixin.js b/src/coordinate-grid-mixin.js
@@ -119,6 +119,10 @@ dc.coordinateGridMixin = function (_chart) {
         return _chart;
     };
 
+    _chart.resizing = function () {
+        return _resizing;
+    };
+
     /**
      * Get or set the range selection chart associated with this instance. Setting the range selection
      * chart using this function will automatically update its selection brush when the current chart