Rewrite to simpler API

Author: gaearon

examples/counter/package.json

@@ -26,10 +26,10 @@
     "babel-core": "^5.6.18",
     "babel-loader": "^5.1.4",
     "node-libs-browser": "^0.5.2",
-    "react-dock": "^0.2.1",
     "react-hot-loader": "^1.3.0",
-    "redux-devtools": "^3.0.0-alpha-8",
-    "redux-devtools-log-monitor": "^1.0.0-alpha-8",
+    "redux-devtools": "^3.0.0-beta-1",
+    "redux-devtools-log-monitor": "^1.0.0-beta-1",
+    "redux-devtools-dock-monitor": "^1.0.0-beta-1",
     "webpack": "^1.9.11",
     "webpack-dev-server": "^1.9.0"
   }

examples/counter/src/containers/DevTools.js

@@ -1,10 +1,11 @@
 import React from 'react';
 import { createDevTools } from 'redux-devtools';
 import LogMonitor from 'redux-devtools-log-monitor';
-import DockMonitor from '../dock/DockMonitor';
+import DockMonitor from 'redux-devtools-dock-monitor';
 
 export default createDevTools(
-  <DockMonitor>
-    <LogMonitor theme='ocean' />
+  <DockMonitor toggleVisibilityKey='H'
+               changePositionKey='Q'>
+    <LogMonitor />
   </DockMonitor>
 );

examples/counter/src/dock/DockMonitor.js

@@ -1,6 +1,6 @@
 {
   "name": "redux-devtools",
-  "version": "3.0.0-alpha-8",
+  "version": "3.0.0-beta-1",
   "description": "Redux DevTools with hot reloading and time travel",
   "main": "lib/index.js",
   "scripts": {
@@ -43,17 +43,18 @@
     "jsdom": "^6.5.1",
     "mocha": "^2.2.5",
     "mocha-jsdom": "^1.0.0",
-    "react": "^0.14.0-rc1",
-    "react-addons-test-utils": "^0.14.0-rc1",
-    "react-dom": "^0.14.0-rc1",
+    "react": "^0.14.0",
+    "react-addons-test-utils": "^0.14.0",
+    "react-dom": "^0.14.0",
     "rimraf": "^2.3.4",
     "webpack": "^1.11.0"
   },
   "peerDependencies": {
-    "redux": "^3.0.0"
+    "redux": "^3.0.0",
+    "react": "^0.14.0"
   },
   "dependencies": {
-    "react-redux": "^3.0.0",
+    "react-redux": "^4.0.0",
     "redux": "^3.0.0"
   }
 }

examples/counter/src/dock/actions.js

@@ -6,19 +6,11 @@ export default function createDevTools(children) {
   const monitorElement = Children.only(children);
   const monitorProps = monitorElement.props;
   const Monitor = monitorElement.type;
-
+  const ConnectedMonitor = connect(state => state)(Monitor);
   const enhancer = instrument((state, action) =>
     Monitor.reducer(state, action, monitorProps)
   );
 
-  function mapStateToProps(state) {
-    return {
-      ...state.historyState,
-      monitorState: state.monitorState
-    };
-  }
-  const ConnectedMonitor = connect(mapStateToProps)(Monitor);
-
   return class DevTools extends Component {
     static contextTypes = {
       store: PropTypes.object.isRequired
@@ -28,13 +20,13 @@ export default function createDevTools(children) {
 
     constructor(props, context) {
       super(props, context);
-      this.instrumentedStore = context.store.instrumentedStore;
+      this.liftedStore = context.store.liftedStore;
     }
 
     render() {
       return (
         <ConnectedMonitor {...monitorProps}
-                          store={this.instrumentedStore} />
+                          store={this.liftedStore} />
       );
     }
   };