From c59fc80e99b003b411ad80dfbf3219dc8f462fab Mon Sep 17 00:00:00 2001 From: Eze Livinsky Date: Fri, 6 Oct 2017 15:21:46 -0300 Subject: [PATCH 1/2] Enhance nested navigators Allow for nested navigators and enhance accordingly. --- src/enhance.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/enhance.js b/src/enhance.js index 0da0c97..5dbdfd5 100644 --- a/src/enhance.js +++ b/src/enhance.js @@ -12,9 +12,17 @@ export default function(Navigator: *) { const nextScreens = {}; for (const screen in screens) { + let enhancedScreen; + + if(typeof screens[screen].screen.router !== 'undefined') { + enhancedScreen = enhanceNavigator(screens[screen].screen); + } else { + enhancedScreen = enhanceScreen(screens[screen].screen); + } + nextScreens[screen] = { ...screens[screen], - screen: enhanceScreen(screens[screen].screen), + screen: enhancedScreen, }; } From 1cbd855b57b7906e92dd290c6b0b8939575e79c7 Mon Sep 17 00:00:00 2001 From: Eze Livinsky Date: Fri, 6 Oct 2017 16:06:09 -0300 Subject: [PATCH 2/2] Nesting didn't work in a nested Nav --- src/enhance.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/enhance.js b/src/enhance.js index 5dbdfd5..1b1d30d 100644 --- a/src/enhance.js +++ b/src/enhance.js @@ -12,12 +12,10 @@ export default function(Navigator: *) { const nextScreens = {}; for (const screen in screens) { - let enhancedScreen; + let enhancedScreen = screens[screen].screen; - if(typeof screens[screen].screen.router !== 'undefined') { - enhancedScreen = enhanceNavigator(screens[screen].screen); - } else { - enhancedScreen = enhanceScreen(screens[screen].screen); + if(typeof screens[screen].screen.router === 'undefined') { + enhancedScreen = enhanceScreen(enhancedScreen); } nextScreens[screen] = {