From 5db43da8cdbe1c95836fbdcb54da420e7cf27b97 Mon Sep 17 00:00:00 2001 From: evenstensberg Date: Fri, 15 Apr 2016 20:35:34 +0200 Subject: [PATCH 1/4] Optimization --- modules/RouteUtils.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/RouteUtils.js b/modules/RouteUtils.js index 31c998d10d..34420b9c79 100644 --- a/modules/RouteUtils.js +++ b/modules/RouteUtils.js @@ -1,6 +1,7 @@ import React from 'react' import warning from './routerWarning' + function isValidChild(object) { return object == null || React.isValidElement(object) } @@ -10,7 +11,13 @@ export function isReactChildren(object) { } function checkPropTypes(componentName, propTypes, props) { - componentName = componentName || 'UnknownComponent' + + if(componentName !== null || undefined && typeof componentName == 'object') { + return componentName + } + else { + return 'UnknownComponent' + } for (const propName in propTypes) { if (Object.prototype.hasOwnProperty.call(propTypes, propName)) { @@ -52,7 +59,7 @@ export function createRouteFromReactElement(element) { * nested. * * import { Route, createRoutesFromReactChildren } from 'react-router' - * + * * const routes = createRoutesFromReactChildren( * * From 6a0ccb9c93b03d81bc9a19bf9661cf911971d0bb Mon Sep 17 00:00:00 2001 From: evenstensberg Date: Fri, 15 Apr 2016 20:48:26 +0200 Subject: [PATCH 2/4] Patch --- modules/RouteUtils.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/RouteUtils.js b/modules/RouteUtils.js index 34420b9c79..f8fe49bcf9 100644 --- a/modules/RouteUtils.js +++ b/modules/RouteUtils.js @@ -12,11 +12,13 @@ export function isReactChildren(object) { function checkPropTypes(componentName, propTypes, props) { + componentName = {} || '' + if(componentName !== null || undefined && typeof componentName == 'object') { return componentName } else { - return 'UnknownComponent' + return componentName === 'UnknownComponent' } for (const propName in propTypes) { From 42cb14849ef983ebd961b9a0059c9266022d877f Mon Sep 17 00:00:00 2001 From: Even Stensberg Date: Fri, 15 Apr 2016 20:59:03 +0200 Subject: [PATCH 3/4] Update RouteUtils.js --- modules/RouteUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/RouteUtils.js b/modules/RouteUtils.js index f8fe49bcf9..a66c2af282 100644 --- a/modules/RouteUtils.js +++ b/modules/RouteUtils.js @@ -14,7 +14,7 @@ function checkPropTypes(componentName, propTypes, props) { componentName = {} || '' - if(componentName !== null || undefined && typeof componentName == 'object') { + if(componentName !== null || undefined && typeof componentName === 'object') { return componentName } else { From 5f76fb1d6816a71891f3ac001572d06d8b1935ab Mon Sep 17 00:00:00 2001 From: evenstensberg Date: Fri, 15 Apr 2016 21:04:52 +0200 Subject: [PATCH 4/4] Fixes --- modules/RouteUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/RouteUtils.js b/modules/RouteUtils.js index f8fe49bcf9..307d6503be 100644 --- a/modules/RouteUtils.js +++ b/modules/RouteUtils.js @@ -14,7 +14,7 @@ function checkPropTypes(componentName, propTypes, props) { componentName = {} || '' - if(componentName !== null || undefined && typeof componentName == 'object') { + if(componentName) { return componentName } else {