@@ -10,8 +10,8 @@ var HistoryLocation = require('./locations/HistoryLocation');
10
10
var RefreshLocation = require ( './locations/RefreshLocation' ) ;
11
11
var StaticLocation = require ( './locations/StaticLocation' ) ;
12
12
var NavigationContext = require ( './NavigationContext' ) ;
13
+ var ScrollHistory = require ( './ScrollHistory' ) ;
13
14
var StateContext = require ( './StateContext' ) ;
14
- var Scrolling = require ( './Scrolling' ) ;
15
15
var createRoutesFromReactChildren = require ( './Routing' ) . createRoutesFromReactChildren ;
16
16
var isReactChildren = require ( './isReactChildren' ) ;
17
17
var Transition = require ( './Transition' ) ;
@@ -442,11 +442,15 @@ function createRouter(options) {
442
442
location . removeChangeListener ( Router . handleLocationChange ) ;
443
443
444
444
this . isRunning = false ;
445
+ } ,
446
+
447
+ getScrollBehavior : function ( ) {
448
+ return scrollBehavior ;
445
449
}
446
450
447
451
} ,
448
452
449
- mixins : [ NavigationContext , StateContext , Scrolling ] ,
453
+ mixins : [ NavigationContext , StateContext , ScrollHistory ] ,
450
454
451
455
propTypes : {
452
456
children : PropTypes . falsy
@@ -482,10 +486,6 @@ function createRouter(options) {
482
486
return location ;
483
487
} ,
484
488
485
- getScrollBehavior : function ( ) {
486
- return scrollBehavior ;
487
- } ,
488
-
489
489
getRouteAtDepth : function ( depth ) {
490
490
var routes = this . state . routes ;
491
491
return routes && routes [ depth ] ;
0 commit comments