Cascade composite rescale() to children

Author: dahlbyk

spec/composite-chart-spec.js

@@ -778,4 +778,49 @@ describe('dc.compositeChart', function () {
             });
         });
     });
+
+    describe('rescale', function () {
+        beforeEach(function () {
+            expect(chart.resizing()).toBe(true);
+            chart.children().forEach(function (child) {
+                expect(child.resizing()).toBe(true);
+            });
+
+            chart.render();
+
+            expect(chart.resizing()).toBe(false);
+            chart.children().forEach(function (child) {
+                expect(child.resizing()).toBe(false);
+            });
+
+            chart.rescale();
+        });
+
+        it('should rescale child charts', function () {
+            expect(chart.resizing()).toBe(true);
+
+            chart.children().forEach(function (child) {
+                expect(child.resizing()).toBe(true);
+            });
+        });
+    });
+
+    describe('re-compose rendered chart', function() {
+        beforeEach(function () {
+            chart.render();
+            expect(chart.resizing()).toBe(false);
+
+            chart.compose([
+                dc.lineChart(chart).group(dateGroup)
+            ]);
+        });
+
+        it('should rescale child charts', function () {
+            expect(chart.resizing()).toBe(true);
+
+            chart.children().forEach(function (child) {
+                expect(child.resizing()).toBe(true);
+            });
+        });
+    });
 });

spec/coordinate-grid-chart-spec.js

@@ -538,7 +538,10 @@ describe('dc.coordinateGridChart', function () {
     describe('rescaling', function () {
         var originalUnitCount;
         beforeEach(function () {
+            expect(chart.resizing()).toBe(true);
             chart.render();
+            expect(chart.resizing()).toBe(false);
+
             originalUnitCount = chart.xUnitCount();
             chart.x().domain([makeDate(2012, 4, 20), makeDate(2012, 6, 15)]);
             chart.rescale();
@@ -547,6 +550,12 @@ describe('dc.coordinateGridChart', function () {
         it('should reset x unit count to reflect updated x domain', function () {
             expect(chart.xUnitCount()).not.toEqual(originalUnitCount);
         });
+
+        it('should be resizing until render', function() {
+            expect(chart.resizing()).toBe(true);
+            chart.render();
+            expect(chart.resizing()).toBe(false);
+        });
     });
 
     describe('range chart setup', function () {

src/composite-chart.js

@@ -68,6 +68,31 @@ dc.compositeChart = function (parent, chartGroup) {
         return g;
     });
 
+    dc.override(_chart, 'rescale', function () {
+        _chart._rescale();
+
+        var _children = _chart.children();
+        _children.forEach(function (child) {
+            child.rescale();
+        });
+
+        return _chart;
+    });
+
+    dc.override(_chart, 'resizing', function (resizing) {
+        if (!arguments.length) {
+            return _chart._resizing();
+        }
+        _chart._resizing(resizing);
+
+        var _children = _chart.children();
+        _children.forEach(function (child) {
+            child.resizing(resizing);
+        });
+
+        return _chart;
+    });
+
     _chart._brushing = function () {
         // Avoids infinite recursion (mutual recursion between range and focus operations)
         // Source Event will be null when brush.move is called programmatically (see below as well).
@@ -349,6 +374,8 @@ dc.compositeChart = function (parent, chartGroup) {
 
             child.options(_childOptions);
         });
+
+        _chart.rescale();
         return _chart;
     };
 

src/coordinate-grid-mixin.js

@@ -91,8 +91,12 @@ dc.coordinateGridMixin = function (_chart) {
         return _chart;
     };
 
-    _chart.resizing = function () {
-        return _resizing;
+    _chart.resizing = function (resizing) {
+        if (!arguments.length) {
+            return _resizing;
+        }
+        _resizing = resizing;
+        return _chart;
     };
 
     /**
@@ -1220,7 +1224,7 @@ dc.coordinateGridMixin = function (_chart) {
             _chart.redrawBrush(_chart.filter());
         }
         _chart.fadeDeselectedArea(_chart.filter());
-        _resizing = false;
+        _chart.resizing(false);
     }
 
     function configureMouseZoom () {