addRouteLeaveHook -> setRouteLeaveHook

CHANGES.md

@@ -131,7 +131,7 @@ const RouteComponent = React.createClass({
 const RouteComponent = React.createClass({
   componentDidMount() {
     const { router, route } = this.props
-    router.addRouteLeaveHook(route, this.routerWillLeave)
+    router.setRouteLeaveHook(route, this.routerWillLeave)
   }
 })
 
@@ -171,7 +171,7 @@ const DeepComponent = React.createClass({
 
   componentDidMount() {
     const { router, route } = this.context
-    router.addRouteLeaveHook(route, this.routerWillLeave)
+    router.setRouteLeaveHook(route, this.routerWillLeave)
   }
 })
 
@@ -187,7 +187,7 @@ const Lifecycle = {
   componentDidMount() {
     const router = this.context.router
     const route = this.props.route || this.context.route
-    router.addRouteLeaveHook(route, this.routerWillLeave)
+    router.setRouteLeaveHook(route, this.routerWillLeave)
   }
 }
 ```

examples/transitions/app.js

@@ -25,7 +25,7 @@ const Dashboard = React.createClass({
 const Form = React.createClass({
 
   componentWillMount() {
-    this.props.router.addRouteLeaveHook(
+    this.props.router.setRouteLeaveHook(
       this.props.route,
       this.routerWillLeave
     )

modules/Lifecycle.js

@@ -35,7 +35,7 @@ const Lifecycle = {
   },
 
   componentDidMount() {
-    warning(false, 'the `Lifecycle` mixin is deprecated, please use `this.props.router.addRouteLeaveHook(this.props.route, hook)` from a route component, see https://github.com/rackt/react-router/blob/v1.1.0/CHANGES.md#v110 for more details.')
+    warning(false, 'the `Lifecycle` mixin is deprecated, please use `this.props.router.setRouteLeaveHook(this.props.route, hook)` from a route component, see https://github.com/rackt/react-router/blob/v1.1.0/CHANGES.md#v110 for more details.')
     invariant(
       this.routerWillLeave,
       'The Lifecycle mixin requires you to define a routerWillLeave method'

modules/RouterContext.js

@@ -43,7 +43,7 @@ const RouterContext = React.createClass({
 
       router = {
         ...history,
-        addRouteLeaveHook: history.listenBeforeLeavingRoute
+        setRouteLeaveHook: history.listenBeforeLeavingRoute
       }
       delete router.listenBeforeLeavingRoute
     }

modules/RouterUtils.js

@@ -3,7 +3,7 @@ import deprecateObjectProperties from './deprecateObjectProperties'
 export function createRouterObject(history, transitionManager) {
   return {
     ...history,
-    addRouteLeaveHook: transitionManager.listenBeforeLeavingRoute,
+    setRouteLeaveHook: transitionManager.listenBeforeLeavingRoute,
     isActive: transitionManager.isActive
   }
 }

modules/__tests__/RouterContext-test.js

@@ -86,10 +86,10 @@ describe('RouterContext', () => {
       })
     })
 
-    it('proxies calls to `addRouteLeaveHook` to `props.transitionManager`', (done) => {
+    it('proxies calls to `setRouteLeaveHook` to `props.transitionManager`', (done) => {
       const args = [ 1, 2, 3 ]
       renderTest(() => {
-        const remove = context.router.addRouteLeaveHook(...args)
+        const remove = context.router.setRouteLeaveHook(...args)
         expect(transitionManager.listenBeforeLeavingRoute).toHaveBeenCalledWith(...args)
         expect(remove).toBe(listenBeforeLeavingRouteSentinel)
         done()

modules/__tests__/transitionHooks-test.js

@@ -29,7 +29,7 @@ describe('When a router enters a branch', function () {
 
     class NewsFeed extends Component {
       componentWillMount() {
-        removeLeaveHook = this.context.router.addRouteLeaveHook(
+        removeLeaveHook = this.context.router.setRouteLeaveHook(
           this.props.route,
           () => leaveHookSpy() // Break reference equality.
         )

modules/createTransitionManager.js

@@ -218,8 +218,15 @@ export default function createTransitionManager(history, routes) {
         if (history.listenBeforeUnload)
           unlistenBeforeUnload = history.listenBeforeUnload(beforeUnloadHook)
       }
-    } else if (hooks.indexOf(hook) === -1) {
-      hooks.push(hook)
+    } else {
+      warning(
+        false,
+        'adding multiple leave hooks for the same route is deprecated; manage multiple confirmations in your own code instead'
+      )
+
+      if (hooks.indexOf(hook) === -1) {
+        hooks.push(hook)
+      }
     }
 
     return function () {