Remove unnecessary container reducer and make <Subdivide> potentially controllable

src/actions/LayoutActions.js

@@ -7,7 +7,7 @@ import {
   SET_CORNER_DOWN,
   SET_DIVIDER_DOWN,
   SET_STATE
-} from '../constants/BlenderLayoutConstants';
+} from '../constants';
 
 export function setState(state) {
   return {

src/components/CornerOverlay.js

@@ -9,7 +9,7 @@ import {
   JOIN_UP_ARROW,
   JOIN_LEFT_ARROW,
   JOIN_DOWN_ARROW
-} from '../constants/BlenderLayoutConstants';
+} from '../constants';
 
 export default class CornerOverlay extends Component {
 

src/components/DividerTouch.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import {
   COL
-} from '../constants/BlenderLayoutConstants';
+} from '../constants';
 
 export default class Divider extends Component {
   constructor(props, context) {

src/components/Dividers.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import {
   COL
-} from '../constants/BlenderLayoutConstants';
+} from '../constants';
 import DividerTouch from './DividerTouch';
 
 var Rect = (props) => {

src/components/Layout.js

@@ -12,7 +12,7 @@ import {
   NE,
   SE,
   NW
-} from '../constants/BlenderLayoutConstants';
+} from '../constants';
 
 export default class Layout extends Component {
   constructor(props, context) {

src/components/Pane.js

@@ -7,7 +7,7 @@ import {
   SW,
   SE,
   NW
-} from '../constants/BlenderLayoutConstants';
+} from '../constants';
 
 function getStyles({
       width,

src/components/Triangle.js

@@ -5,7 +5,7 @@ import {
   NE,
   SE,
   NW
-} from '../constants/BlenderLayoutConstants';
+} from '../constants';
 
 @Radium
 export default class Triangle extends Component {

src/containers/Subdivide.js

@@ -1,7 +1,9 @@
 import React, { Component } from 'react';
-import { createStore } from 'redux';
+import { createStore, bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
 import reducer from '../reducers';
-import LayoutContainer from './LayoutContainer';
+import Layout from '../components/Layout';
+import * as LayoutActions from '../actions/LayoutActions';
 
 function configureStore(initialState) {
   let store = createStore(reducer, initialState);
@@ -16,16 +18,27 @@ function configureStore(initialState) {
   return store;
 }
 
+const ConnectedLayout = connect(
+  state => ({ layout: state })
+)(Layout);
+
 export default class Subdivide extends Component {
   constructor(props) {
     super(props);
-    this.store = configureStore();
+
+    const {dispatch} = props;
+    if (dispatch) {
+      this.actions = bindActionCreators(LayoutActions, dispatch);
+    } else {
+      this.store = configureStore();
+      this.actions = bindActionCreators(LayoutActions, this.store.dispatch);
+    }
   }
 
   render() {
-    const {DefaultComponent} = this.props;
-    return (
-      <LayoutContainer DefaultComponent={DefaultComponent} store={this.store} />
-    );
+    const {store, actions} = this;
+    return store ?
+      <ConnectedLayout {...this.props} store={store} actions={actions} /> :
+      <Layout {...this.props} actions={actions} />;
   }
 }

src/dev-index.js

@@ -1,18 +1,20 @@
-//import 'babel-core/polyfill';
 import React, {Component} from 'react';
 import ReactDOM from 'react-dom';
-import Subdivide from './containers/Subdivide';
+import Subdivide from './index';
 
 class IframeComponent extends Component {
   render() {
     return (
       <iframe src="index2.html" frameBorder={'0'} style={{
          width: '100%',
          height: '100%'
-      }}></iframe>
+      }} />
     );
   }
 }
 
-ReactDOM.render(<Subdivide DefaultComponent={IframeComponent}/>, document.getElementById('root'));
+ReactDOM.render(
+  <Subdivide DefaultComponent={IframeComponent} />,
+  document.getElementById('root')
+);
 

src/helpers/LayoutHelper.js

@@ -5,10 +5,10 @@ import {
   CHILD_RIGHT,
   ROW,
   COL
-} from '../constants/BlenderLayoutConstants';
+} from '../constants';
 
 import {List, Map} from 'immutable';
-import {Pane, Layout, Divider} from '../reducers/LayoutReducer';
+import {Pane, Layout, Divider} from '../reducers';
 import secondPass from './secondPass';
 
 function getNextId(state) {

src/helpers/secondPass.js

@@ -9,9 +9,9 @@ import {
   JOIN_UP_ARROW,
   JOIN_LEFT_ARROW,
   JOIN_DOWN_ARROW,
-} from '../constants/BlenderLayoutConstants';
+} from '../constants';
 
-import {Divider} from '../reducers/LayoutReducer';
+import {Divider} from '../reducers';
 import {Map} from 'immutable';
 
 function getJoinDirection({layout, pane}) {

src/index.js

@@ -1,3 +1,2 @@
-//import 'babel-core/polyfill';
-
-module.exports = require('./containers/Subdivide');
+export default from './containers/Subdivide';
+export { default as reducer } from './reducers';