Allow 1-deep nested arrays of Scenes to support structured configurat…

…ion for larger projects (#2241) * Allow 1-deep nested arrays of Scenes to support structured configuration for larger projects * updated dist-version of the changed source
aksonov · Aug 16, 2017 · 63ab0ea · 63ab0ea
1 parent 3fbcd73
commit 63ab0ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/dist/navigationStore.js b/dist/navigationStore.js
@@ -290,7 +290,8 @@ if(drawer){
 commonProps.drawerImage=commonProps.drawerImage||_menu_burger2.default;
 }
 
-var children=!Array.isArray(parentProps.children)?[parentProps.children]:[].concat(_toConsumableArray(parentProps.children));
+
+var children=!Array.isArray(parentProps.children)?[parentProps.children]:[].concat.apply([],parentProps.children);
 
 if(!drawer&&!tabs){
 children.push.apply(children,_toConsumableArray(clones));

diff --git a/src/navigationStore.js b/src/navigationStore.js
@@ -290,7 +290,8 @@ class NavigationStore {
       commonProps.drawerImage = commonProps.drawerImage || _drawerImage;
     }
 
-    const children = !Array.isArray(parentProps.children) ? [parentProps.children] : [...parentProps.children];
+    // allow 1-deep nested arrays of Scenes to support structured configuration for larger projects
+    const children = !Array.isArray(parentProps.children) ? [parentProps.children] : [].concat.apply([], parentProps.children);
     // add clone scenes
     if (!drawer && !tabs) {
       children.push(...clones);