Updated approach for connect

Author: timhall

d3.compose-all.js

@@ -1,5 +1,6 @@
 export {default as utils} from './src/utils';
 export {default as helpers, scaleBandSeries} from './src/helpers';
+export {default as connect} from './src/connect';
 export {default as chart, Chart} from './src/chart';
 export {default as component, Component} from './src/component';
 export {default as overlay, Overlay} from './src/overlay';

d3.compose-mixins.js

@@ -1,5 +1,6 @@
 export {default as utils} from './src/utils';
 export {default as helpers, scaleBandSeries} from './src/helpers';
+export {default as connect} from './src/connect';
 export {default as chart, Chart} from './src/chart';
 export {default as component, Component} from './src/component';
 export {default as overlay, Overlay} from './src/overlay';

d3.compose.js

@@ -1,5 +1,6 @@
 export {default as utils} from './src/utils';
 export {default as helpers, scaleBandSeries} from './src/helpers';
+export {default as connect} from './src/connect';
 export {default as chart, Chart} from './src/chart';
 export {default as component, Component} from './src/component';
 export {default as overlay, Overlay} from './src/overlay';

src/charts/bars.js

@@ -1,6 +1,5 @@
 import {assign} from '../utils';
 import {
-  connect,
   createPrepare,
   createSeriesDraw,
   getBandwidth,
@@ -17,6 +16,7 @@ import {
   defaultXValue
 } from '../mixins/xy';
 import xyValues from '../mixins/xy-values';
+import connect from '../connect';
 import chart from '../chart';
 
 // Draw vertical bars (stacked and unstacked)
@@ -177,7 +177,7 @@ export var mapState = function() {
 export var mapDispatch = function() {
   // TODO "bind" onMouseEnterBar and onMouseLeaveBar
 }
-export var connection = connect(mapState, mapDispatch);
+export var connection = connect.map(mapState, mapDispatch);
 
 /**
   bars

src/charts/lines.js

@@ -4,14 +4,14 @@ import {
   isUndefined
 } from '../utils';
 import {
-  connect,
   createPrepare,
   createSeriesDraw,
   getValue,
   types
 } from '../helpers';
 import series from '../mixins/series';
 import xy from '../mixins/xy';
+import connect from '../connect';
 import chart from '../chart';
 
 /**
@@ -115,7 +115,7 @@ Lines.properties = assign({},
 // ----------
 
 // TODO Connect to dispatch closest points
-export var connection = connect();
+export var connection = connect.map();
 
 // lines
 var lines = connection(chart(Lines));

src/connect.js

@@ -0,0 +1,19 @@
+// TODO
+
+function connection(Connectee) {
+  return Connectee;
+}
+
+const connect = {
+  map: function(/*mapStateToProps, mapDispatchToProps, mergeProps, options*/) {
+    return connection;
+  },
+  reduce: function(/*reducer*/) {
+    return connection;
+  }
+};
+
+connection.map = connect.map;
+connection.reduce = connect.reduce;
+
+export default connect;

src/helpers.js

@@ -1,6 +1,5 @@
 import alignText from './helpers/align-text';
 import checkProp from './helpers/check-prop';
-import connect from './helpers/connect';
 import createChart from './helpers/create-chart';
 import createDraw from './helpers/create-draw';
 import createPrepare from './helpers/create-prepare';
@@ -23,7 +22,6 @@ import types from './helpers/types';
 var helpers = {
   alignText: alignText,
   checkProp: checkProp,
-  connect: connect,
   createChart: createChart,
   createDraw: createDraw,
   createPrepare: createPrepare,