WIP: remove view tree

emberjs · Apr 17, 2019 · d27088f · d27088f
1 parent 412dc4b
commit d27088f
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 756 deletions.
diff --git a/app/components/view-item.js b/app/components/view-item.js
diff --git a/app/controllers/view-tree.js b/app/controllers/view-tree.js
diff --git a/app/router.js b/app/router.js
@@ -9,7 +9,6 @@ const Router = EmberRouter.extend({
 Router.map(function() {
   this.route('app-detected', { path: '/', resetNamespace: true }, function() {
     this.route('launch', { path: '/', resetNamespace: true });
-    this.route('view-tree', { resetNamespace: true });
     this.route('component-tree', { resetNamespace: true });
     this.route('route-tree', { resetNamespace: true });
 

diff --git a/app/routes/component-tree.js b/app/routes/component-tree.js
@@ -1,12 +1,35 @@
-import ViewTree from "ember-inspector/routes/view-tree";
+import TabRoute from "ember-inspector/routes/tab";
 
-export default ViewTree.extend({
+export default TabRoute.extend({
   queryParams: {
     pinnedObjectId: {
       replace: true
     }
   },
 
+  model() {
+    return [];
+  },
+
+  setupController() {
+    this._super(...arguments);
+    this.get('port').on('view:viewTree', this, this.setViewTree);
+    this.get('port').on('view:stopInspecting', this, this.stopInspecting);
+    this.get('port').on('view:startInspecting', this, this.startInspecting);
+    this.get('port').on('view:inspectDOMElement', this, this.inspectDOMElement);
+
+    this.set('controller.viewTreeLoaded', false);
+    this.get('port').send('view:setOptions', { options: this.get('controller.options') });
+    this.get('port').send('view:getTree');
+  },
+
+  deactivate() {
+    this.get('port').off('view:viewTree', this, this.setViewTree);
+    this.get('port').off('view:stopInspecting', this, this.stopInspecting);
+    this.get('port').off('view:startInspecting', this, this.startInspecting);
+    this.get('port').off('view:inspectDOMElement', this, this.inspectDOMElement);
+  },
+
   setViewTree(options) {
     this.set('controller.viewTree', options.tree);
     this.set('controller.viewTreeLoaded', true);
@@ -26,6 +49,18 @@ export default ViewTree.extend({
     this.get('controller').send('inspect', viewId);
   },
 
+  startInspecting() {
+    this.set('controller.inspectingViews', true);
+  },
+
+  stopInspecting() {
+    this.set('controller.inspectingViews', false);
+  },
+
+  inspectDOMElement({ elementSelector }) {
+    this.get('port.adapter').inspectDOMElement(elementSelector);
+  },
+
   actions: {
     queryParamsDidChange(params) {
       const { pinnedObjectId } = params;

diff --git a/app/routes/view-tree.js b/app/routes/view-tree.js
diff --git a/app/schemas/view-tree.js b/app/schemas/view-tree.js
diff --git a/app/templates/components/side-nav.hbs b/app/templates/components/side-nav.hbs
@@ -6,12 +6,6 @@
         <span class="nav__item-label">Components</span>
       {{/link-to}}
     </li>
-    <li>
-      {{#link-to "view-tree" class="nav__item"}}
-        {{svg-jar "nav-view-tree" width="20px" height="20px" class="nav__item-icon"}}
-        <span class="nav__item-label">View Tree</span>
-      {{/link-to}}
-    </li>
     <li>
       {{#link-to "route-tree" class="nav__item"}}
         {{svg-jar "nav-route-tree" width="20px" height="20px" class="nav__item-icon"}}

diff --git a/app/templates/components/view-item.hbs b/app/templates/components/view-item.hbs