Remove context.history/location and History mixin.

dongpei021 · Apr 21, 2016 · e089426 · e089426
1 parent b3c37a8
commit e089426
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 76 deletions.
diff --git a/modules/History.js b/modules/History.js
diff --git a/modules/RouterContext.js b/modules/RouterContext.js
@@ -1,7 +1,6 @@
 import invariant from 'invariant'
 import React from 'react'
 
-import deprecateObjectProperties from './deprecateObjectProperties'
 import getRouteParams from './getRouteParams'
 import { isReactChildren } from './RouteUtils'
 import warning from './routerWarning'
@@ -15,9 +14,7 @@ const { array, func, object } = React.PropTypes
 const RouterContext = React.createClass({
 
   propTypes: {
-    history: object,
     router: object.isRequired,
-    location: object.isRequired,
     routes: array.isRequired,
     params: object.isRequired,
     components: array.isRequired,
@@ -31,13 +28,12 @@ const RouterContext = React.createClass({
   },
 
   childContextTypes: {
-    history: object,
-    location: object.isRequired,
     router: object.isRequired
   },
 
   getChildContext() {
-    let { router, history, location } = this.props
+    let { router, history } = this.props
+
     if (!router) {
       warning(false, '`<RouterContext>` expects a `router` rather than a `history`')
 
@@ -48,11 +44,7 @@ const RouterContext = React.createClass({
       delete router.listenBeforeLeavingRoute
     }
 
-    if (__DEV__) {
-      location = deprecateObjectProperties(location, '`context.location` is deprecated, please use a route component\'s `props.location` instead. http://tiny.cc/router-accessinglocation')
-    }
-
-    return { history, location, router }
+    return { router }
   },
 
   createElement(component, props) {

diff --git a/modules/__tests__/_bc-History-test.js b/modules/__tests__/_bc-History-test.js
diff --git a/modules/index.js b/modules/index.js
@@ -10,7 +10,6 @@ export Redirect from './Redirect'
 export Route from './Route'
 
 /* mixins */
-export History from './History'
 export Lifecycle from './Lifecycle'
 export RouteContext from './RouteContext'