Merge branch 'routeDeletion' into routeDeletion3

Author: AP

src/components/ComponentDisplay.vue

@@ -91,7 +91,6 @@ export default {
       testOptions: ["parent", "child", "grandchild"],
       testModel: [],
       mockImg: false,
-      // counter: 6,
       initialPosition:{x:0, y:0,},
       initialSize:{w:0,h:0,},
     };

src/components/Routes.vue

@@ -33,9 +33,9 @@ export default {
       this.setActiveRoute(route)
     },
     deleteSelectedRoute (route) {
-      this.setActiveRoute(route)
+      // this.setActiveRoute(route)
       this.deleteRoute(route)
-      this.setActiveRoute('')
+      // this.setActiveRoute('')
     }
   }
 }

src/components/Tree.vue

@@ -22,6 +22,7 @@ export default {
   computed: {
     ...mapState(['componentMap']),
     computedTree () {
+      console.log('buildtree', this.buildTree())
       return this.buildTree()
     }
   },

src/store/mutations.js

@@ -122,6 +122,14 @@ const mutations = {
       id: payload.date,
       children: []
     })
+    if (state.activeElement.length) {
+      console.log('activeelement')
+      state.componentMap[componentName].htmlList.push({
+        text: elementName,
+        children: []
+      });
+    } else state.componentMap[componentName].children.push(elementName);
+    // state.activeElement.push(state.componentMap[componentName].children.length - 1, elementName);
   },
 
   [types.ADD_NESTED_HTML]: (state, payload) => {
@@ -379,10 +387,25 @@ const mutations = {
     state.parentSelected = payload
   },
   [types.DELETE_ROUTE]: (state, payload) => {
-    const stateCopy = state
-    delete stateCopy.routes[payload]
-    delete stateCopy.componentMap[payload]
-    state = stateCopy
+    const deleteChildren = (child) => {
+        if (state.componentMap[child.componentName].children.length) {
+          child.children.forEach((grandchild) => {
+            deleteChildren(grandchild)
+          })
+        }
+        delete state.componentMap[child.componentName]
+    }
+    state.routes[payload].forEach((child => {
+      deleteChildren(child)
+    }))
+
+    delete state.routes[payload]
+    delete state.componentMap[payload]
+
+    state.componentMap.App.children = state.componentMap.App.children.filter((route) => {
+      return route !== payload;
+    })
+    if (!state.routes[state.activeRoute]) state.activeRoute = 'HomeView'
   },
   [types.DELETE_COMPONENT]: (state, payload) => {
     const stateCopy = state

src/store/state/index.js

@@ -22,7 +22,7 @@ let hardA = {
     text: "div",
     id:1
   }],
-  children: [],
+  children: ["div"],
   parent: {},
   isActive: false
 }
@@ -63,12 +63,8 @@ const newState = {
 
   activeRoute: 'HomeView',
   activeComponent: '',
-  activeHTML: '',
-  activeLayer: {
-    id:'',
-    lineage:[]
-  },
-
+  // on click, push name and index into active element
+  activeElement: [0, 'div'],
   selectedElementList: [],
   projectNumber: 2,
   activeTab: 0,