From da3183460c16650131ad94f29f501fd2e0e81aad Mon Sep 17 00:00:00 2001
From: Matthew Traynham <skitch@dsws013.digitalsmiths.com>
Date: Tue, 9 Jun 2015 20:34:12 -0400
Subject: [PATCH 1/2] Data function doesn't return the group accessor. 
 Composite chart should be extendable.

---
 dcjs/dc.d.ts | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/dcjs/dc.d.ts b/dcjs/dc.d.ts
index 62739e16a6..bf31738019 100644
--- a/dcjs/dc.d.ts
+++ b/dcjs/dc.d.ts
@@ -20,6 +20,11 @@ declare module DC {
         (t: T, r?: R): V;
     }
 
+    export interface IGetSetComputed<T, R, V> {
+        (): R;
+        (t: T): V;
+    }
+
     export interface Scale<T> {
         (x: any): T;
 
@@ -118,7 +123,7 @@ declare module DC {
         minWidth: IGetSet<number, T>;
         minHeight: IGetSet<number, T>;
         dimension: IGetSet<any, T>;
-        data: IGetSet<(group: any) => Array<any>, T>;
+        data: IGetSetComputed<(group: any) => Array<any>, Array<any>, T>;
         group: IGetSet<any, T>;
         ordering: IGetSet<Accessor<any, any>, T>;
         filterAll(): void;
@@ -297,19 +302,21 @@ declare module DC {
         elasticRadius: IGetSet<boolean, BubbleChart>;
     }
 
-    export interface CompositeChart extends CoordinateGridMixin<CompositeChart> {
-        useRightAxisGridLines: IGetSet<boolean, CompositeChart>;
-        childOptions: IGetSet<any, CompositeChart>;
-        rightYAxisLabel: IGetSet<string, CompositeChart>;
-        compose: IGetSet<Array<BaseMixin<any>>, CompositeChart>;
+    export interface ICompositeChart<T> extends CoordinateGridMixin<T> {
+        useRightAxisGridLines: IGetSet<boolean, ICompositeChart<T>>;
+        childOptions: IGetSet<any, ICompositeChart<T>>;
+        rightYAxisLabel: IGetSet<string, ICompositeChart<T>>;
+        compose: IGetSet<Array<BaseMixin<any>>, ICompositeChart<T>>;
         children(): Array<BaseMixin<any>>;
-        shareColors: IGetSet<boolean, CompositeChart>;
-        shareTitle: IGetSet<boolean, CompositeChart>;
-        rightY: IGetSet<(n: any) => any, CompositeChart>;
-        rightYAxis: IGetSet<d3.svg.Axis, CompositeChart>;
+        shareColors: IGetSet<boolean, ICompositeChart<T>>;
+        shareTitle: IGetSet<boolean, ICompositeChart<T>>;
+        rightY: IGetSet<(n: any) => any, ICompositeChart<T>>;
+        rightYAxis: IGetSet<d3.svg.Axis, ICompositeChart<T>>;
     }
 
-    export interface SeriesChart extends CompositeChart {
+    export interface CompositeChart extends ICompositeChart<CompositeChart> {}
+
+    export interface SeriesChart extends ICompositeChart<SeriesChart> {
         chart: IGetSet<(c: any) => BaseMixin<any>, SeriesChart>;
         seriesAccessor: IGetSet<Accessor<any, any>, SeriesChart>;
         seriesSort: IGetSet<(a: any, b: any) => number, SeriesChart>;

From e7d05ef700ef36cb3a57b2a58effd2d12be120b4 Mon Sep 17 00:00:00 2001
From: Matt Traynham <mrt6467@alum.uncw.edu>
Date: Wed, 10 Jun 2015 15:46:06 -0400
Subject: [PATCH 2/2] Fixes coordinate grid mixin

---
 dcjs/dc.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dcjs/dc.d.ts b/dcjs/dc.d.ts
index bf31738019..9a7cda23a3 100644
--- a/dcjs/dc.d.ts
+++ b/dcjs/dc.d.ts
@@ -185,7 +185,7 @@ declare module DC {
         colorCalculator: IGetSet<Accessor<any, string>, T>;
     }
 
-    export interface CoordinateGridMixin<T> extends BaseMixin<T>, MarginMixin<T>, BaseMixin<T> {
+    export interface CoordinateGridMixin<T> extends BaseMixin<T>, MarginMixin<T>, ColorMixin<T> {
         rangeChart: IGetSet<BaseMixin<any>, T>;
         zoomScale: IGetSet<Array<any>, T>;
         zoomOutRestrict: IGetSet<boolean, T>;