From fb6d1a5797f536d474118404f37326b1bd3981f4 Mon Sep 17 00:00:00 2001 From: Ben Johnson Date: Fri, 18 Jul 2014 16:15:12 -0400 Subject: [PATCH 1/2] activeRoute actually needs to support multiple children. Much thanks to @luigy and @rpflorence. --- modules/components/Route.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/components/Route.js b/modules/components/Route.js index ba17868a2d..8402374b8c 100644 --- a/modules/components/Route.js +++ b/modules/components/Route.js @@ -447,7 +447,7 @@ function computeHandlerProps(matches, query) { } childHandler = function (props, addedProps, children) { - return route.props.handler(mergeProperties(props, addedProps), children); + return route.props.handler.apply(null, [mergeProperties(props, addedProps)].concat(children)); }.bind(this, props); match.refName = props.ref; From 51158662fe49e8a2a758b4acddf728eb010d504a Mon Sep 17 00:00:00 2001 From: Ben Johnson Date: Fri, 18 Jul 2014 16:44:32 -0400 Subject: [PATCH 2/2] Fixed activeRoute only passing a single child through. --- modules/components/Route.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/components/Route.js b/modules/components/Route.js index 8402374b8c..36a8dfce04 100644 --- a/modules/components/Route.js +++ b/modules/components/Route.js @@ -446,7 +446,8 @@ function computeHandlerProps(matches, query) { props.activeRoute = null; } - childHandler = function (props, addedProps, children) { + childHandler = function (props, addedProps) { + var children = Array.prototype.slice.call(arguments, 2); return route.props.handler.apply(null, [mergeProperties(props, addedProps)].concat(children)); }.bind(this, props);