Merge pull request #13 from ReacType-2-0/child-component-fix-2

Reintroduce check for circular references in LeftColExpansionPanel

Author: null267

src/components/LeftColExpansionPanel.tsx

@@ -15,14 +15,15 @@ type Props = {
   components: ComponentState[];
   deleteComponent: any;
   isFocusChild: boolean;
+  checkChild: boolean;
 };
 
 class LeftColExpansionPanel extends Component<Props> {
   render() {
-    const { classes, component, addChild, deleteChild, toggleExpansionPanel, updateComponent, components, deleteComponent, isFocusChild } = this.props;
+    const { classes, component, addChild, deleteChild, toggleExpansionPanel, updateComponent, components, deleteComponent, isFocusChild, checkChild } = this.props;
     const { title, id, color, expanded, stateful } = component;
     const addOrRemoveChildButton = () => {
-      if (expanded || components.every((comp) => !comp.expanded)) {
+      if (expanded || checkChild || components.every((comp) => !comp.expanded)) {
         return <div></div>;
       } 
       if (!isFocusChild) {

src/containers/LeftContainer.tsx

@@ -207,6 +207,7 @@ class LeftContainer extends Component<Props, State> {
             addChild={addChild}
             deleteChild={deleteChild}
             isFocusChild={!isEmpty(focusComponent) && focusComponent.children.some((child) => child.childComponentId === component.id)}
+            checkChild={component.children.some((child) => child.childComponentId === focusComponent.id)}
             changeFocusComponent={changeFocusComponent}
             changeFocusChild={changeFocusChild}
             deleteComponent={deleteComponent}