fix: handle deselect template nodes correctly

ktsn · Dec 2, 2018 · 8ee53ea · 8ee53ea
1 parent 5b0d868
commit 8ee53ea
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/src/view/components/PageMain.vue b/src/view/components/PageMain.vue
@@ -158,19 +158,23 @@ export default Vue.extend({
 
     ...viewportMapper.mapActions(['resize', 'zoom']),
 
-    ...guideMapper.mapActions(['selectTarget']),
-
-    onSelectNode({
-      ast,
-      element,
-      viewport
-    }: {
-      ast: TEElement
-      element: HTMLElement
-      viewport: HTMLElement
-    }): void {
-      this.select(ast)
-      this.selectTarget(element, viewport)
+    ...guideMapper.mapActions(['selectTarget', 'deselect']),
+
+    onSelectNode(
+      data:
+        | {
+            ast: TEElement
+            element: HTMLElement
+            viewport: HTMLElement
+          }
+        | undefined
+    ): void {
+      this.select(data ? data.ast : undefined)
+      if (data) {
+        this.selectTarget(data.element, data.viewport)
+      } else {
+        this.deselect()
+      }
     }
   }
 })

diff --git a/src/view/store/index.ts b/src/view/store/index.ts
@@ -31,17 +31,23 @@ store.actions.guide.init(boundsCalculator)
 
 store.subscribe(path => {
   const mayRelayout = [
+    'project.setDocument',
     'project.addElement',
     'project.addChildComponent',
     'project.setSharedStyle',
     'project.refreshScope',
+    'project.cleanScope',
     'project.updatePropValue',
     'project.updateDataValue',
     'viewport.resize',
     'viewport.zoom'
   ]
 
-  const shouldReset = ['project.setDocuments', 'project.changeDocument']
+  const shouldReset = [
+    'project.setDocuments',
+    'project.removeDocument',
+    'project.changeActiveDocument'
+  ]
 
   const pathStr = path.join('.')
   const guideActions = store.actions.guide