Merge pull request #42 from jinsoolim/deleteElements

fixed HTML element bugs

Author: diegovazquezny

app/src/components/main/Canvas.tsx

@@ -96,14 +96,8 @@ function Canvas() {
         return;
       }
 
-      const addingComponent = state.components.find(elem => elem.id === item.instanceTypeId);
-
-      if (checkChildren([addingComponent], currentComponent)) {
-        triedToNestIncorrectly();
-      } else {
-        // if item dropped is going to be a new instance (i.e. it came from the left panel), then create a new child component
+      const runReducers = () => {
         if (item.newInstance) {
-          console.log("still added");
           dispatch({
             type: 'ADD CHILD',
             payload: {
@@ -124,6 +118,20 @@ function Canvas() {
           });
         }
       }
+
+      const addingComponent = state.components.find(elem => elem.id === item.instanceTypeId);
+
+      if (item.instanceType === "HTML Element") {
+        return runReducers();
+      } else if (item.instanceType === 'Route Link') {
+        return runReducers();
+      } else if (checkChildren([addingComponent], currentComponent)) {
+        triedToNestIncorrectly();
+        return;
+      } else {
+        // if item dropped is going to be a new instance (i.e. it came from the left panel), then create a new child component
+        return runReducers();
+      }
     },
     collect: monitor => ({
       isOver: !!monitor.isOver()

app/src/reducers/componentReducer.ts

@@ -605,14 +605,11 @@ const reducer = (state: State, action: Action) => {
           state.HTMLTypes
         );
       })
-      let childId: null | number = ((state.canvasFocus.childId - 1) === 0) ? null : state.canvasFocus.childId - 1;
 
-      const canvasFocus = { ...state.canvasFocus, childId };
       return {
         ...state,
         HTMLTypes,
-        components,
-        canvasFocus
+        components
       };
     }