just pulled from upstream

Author: ShlomoPorges

src/containers/LeftContainer.jsx

@@ -75,20 +75,24 @@ class LeftContainer extends Component {
     } = this.props;
     const { componentName } = this.state;
 
-    const componentsExpansionPanel = components.map((component, i) => (
-      <LeftColExpansionPanel
-        key={component.id}
-        index={i}
-        id={component.id}
-        updateComponent={updateComponent}
-        component={component}
-        focusComponent={focusComponent}
-        addChild={addChild}
-        changeFocusComponent={changeFocusComponent}
-        changeFocusChild={changeFocusChild}
-        selectableChildren={selectableChildren}
-      />
-    ));
+    console.log(components);
+
+    const componentsExpansionPanel = components
+      .sort((a, b) => parseInt(b.id) - parseInt(a.id)) // sort by id value of comp
+      .map((component, i) => (
+        <LeftColExpansionPanel
+          key={component.id}
+          index={i}
+          id={component.id}
+          updateComponent={updateComponent}
+          component={component}
+          focusComponent={focusComponent}
+          addChild={addChild}
+          changeFocusComponent={changeFocusComponent}
+          changeFocusChild={changeFocusChild}
+          selectableChildren={selectableChildren}
+        />
+      ));
 
     return (
       <div className="column left">

src/utils/componentReducer.util.js

@@ -49,12 +49,18 @@ export const addComponent = (state, { title }) => {
   const totalComponents = state.totalComponents + 1;
   const nextId = state.nextId + 1;
 
+  let selectableChildren = state.components
+    .map(comp => comp.id)
+    .filter(id => id !== newComponent.id);
+
   return {
     ...state,
     totalComponents,
     nextId,
     components,
-    focusComponent: newComponent
+    focusComponent: newComponent,
+    ancestors: [],
+    selectableChildren: selectableChildren // new component so you everyone except yourself is available
   };
 };
 

src/utils/getSelectable.util.js

@@ -1,12 +1,8 @@
 function getSelectable(newFocusComponent, components) {
   let focusComponentId = newFocusComponent.id;
-
   let componentsToCheck = components
     .map(comp => comp.id)
     .filter(id => id !== focusComponentId);
-
-  console.log(componentsToCheck);
-
   return findAncestors(components, [focusComponentId], componentsToCheck);
 }
 
@@ -30,9 +26,12 @@ function findAncestors(
         child => child.childComponentId
       );
 
+<<<<<<< HEAD
       // console.log(components[i].id, components[i].title);
       // console.log("myChildren", myChilren);
 
+=======
+>>>>>>> fb1f985158be18ca3fc94b8978b45292fa8b1d28
       let found = currentCompArr.filter(comp => myChilren.includes(comp));
 
       if (found.length) {
@@ -47,11 +46,14 @@ function findAncestors(
       }
     }
   }
+<<<<<<< HEAD
 
   // console.log("newancestors", newAncestors);
   // console.log("comptocheck", componentsToCheck);
   // console.log("cumulativeancestors", ancestors);
 
+=======
+>>>>>>> fb1f985158be18ca3fc94b8978b45292fa8b1d28
   return findAncestors(components, newAncestors, componentsToCheck, ancestors);
 }