Reconcile router configuration on containers

lipp · Jan 25, 2016 · eab1162 · eab1162
1 parent 9747168
commit eab1162
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/examples/real-world/containers/App.js b/examples/real-world/containers/App.js
@@ -1,6 +1,6 @@
 import React, { Component, PropTypes } from 'react'
 import { connect } from 'react-redux'
-import { pushState } from 'redux-router'
+import { push } from 'react-router-redux'
 import Explore from '../components/Explore'
 import { resetErrorMessage } from '../actions'
 
@@ -17,7 +17,7 @@ class App extends Component {
   }
 
   handleChange(nextValue) {
-    this.props.pushState(null, `/${nextValue}`)
+    this.props.push(`/${nextValue}`)
   }
 
   renderErrorMessage() {
@@ -56,7 +56,7 @@ App.propTypes = {
   // Injected by React Redux
   errorMessage: PropTypes.string,
   resetErrorMessage: PropTypes.func.isRequired,
-  pushState: PropTypes.func.isRequired,
+  push: PropTypes.func.isRequired,
   inputValue: PropTypes.string.isRequired,
   // Injected by React Router
   children: PropTypes.node
@@ -65,11 +65,11 @@ App.propTypes = {
 function mapStateToProps(state) {
   return {
     errorMessage: state.errorMessage,
-    inputValue: state.router.location.pathname.substring(1)
+    inputValue: state.routing.location.pathname.substring(1)
   }
 }
 
 export default connect(mapStateToProps, {
   resetErrorMessage,
-  pushState
+  push
 })(App)
diff --git a/examples/real-world/containers/RepoPage.js b/examples/real-world/containers/RepoPage.js
@@ -72,8 +72,8 @@ RepoPage.propTypes = {
   loadStargazers: PropTypes.func.isRequired
 }
 
-function mapStateToProps(state) {
-  const { login, name } = state.router.params
+function mapStateToProps(state, props) {
+  const { login, name } = props.params
   const {
     pagination: { stargazersByRepo },
     entities: { users, repos }

diff --git a/examples/real-world/containers/Root.dev.js b/examples/real-world/containers/Root.dev.js
@@ -1,6 +1,6 @@
 import React, { Component, PropTypes } from 'react'
 import { Provider } from 'react-redux'
-import { ReduxRouter } from 'redux-router'
+import Routes from '../routes'
 import DevTools from './DevTools'
 
 export default class Root extends Component {
@@ -9,7 +9,7 @@ export default class Root extends Component {
     return (
       <Provider store={store}>
         <div>
-          <ReduxRouter />
+          <Routes />
           <DevTools />
         </div>
       </Provider>

diff --git a/examples/real-world/containers/Root.prod.js b/examples/real-world/containers/Root.prod.js
@@ -1,13 +1,14 @@
 import React, { Component, PropTypes } from 'react'
 import { Provider } from 'react-redux'
-import { ReduxRouter } from 'redux-router'
+
+import Routes from '../routes'
 
 export default class Root extends Component {
   render() {
     const { store } = this.props
     return (
       <Provider store={store}>
-        <ReduxRouter />
+        <Routes />
       </Provider>
     )
   }

diff --git a/examples/real-world/containers/UserPage.js b/examples/real-world/containers/UserPage.js
@@ -72,8 +72,8 @@ UserPage.propTypes = {
   loadStarred: PropTypes.func.isRequired
 }
 
-function mapStateToProps(state) {
-  const { login } = state.router.params
+function mapStateToProps(state, props) {
+  const { login } = props.params
   const {
     pagination: { starredByUser },
     entities: { users, repos }