From 09e075cab487a2286d05d36d5facbfa3b07710f4 Mon Sep 17 00:00:00 2001
From: Aran-Fey <rawing7@gmail.com>
Date: Sun, 23 Jun 2024 19:27:09 +0200
Subject: [PATCH] improve component picker

---
 frontend/code/components/componentTree.ts | 20 ++++++++++++++------
 frontend/code/rpc.ts                      |  7 -------
 frontend/css/style.scss                   |  9 ++++-----
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/frontend/code/components/componentTree.ts b/frontend/code/components/componentTree.ts
index 45798911..ed2d6954 100644
--- a/frontend/code/components/componentTree.ts
+++ b/frontend/code/components/componentTree.ts
@@ -95,6 +95,13 @@ export class ComponentTreeComponent extends ComponentBase {
             component_id: component.id,
         });
 
+        // Expand all parent nodes
+        let parent = component.parent;
+        while (parent !== null) {
+            this.setNodeExpanded(parent, true, false);
+            parent = parent.parent;
+        }
+
         // Highlight the tree item
         this.highlightSelectedComponent();
 
@@ -415,11 +422,14 @@ export class ComponentTreeComponent extends ComponentBase {
     /// Lets the user select a component in the `ComponentTree` by clicking on
     /// it in the DOM.
     public async pickComponent(): Promise<void> {
+        // Make a Promise that will resolve once the user has clicked something
         let resolvePromise: (value: any) => void;
         let donePicking = new Promise<void>((resolve) => {
             resolvePromise = resolve;
         });
 
+        // Whenever the mouse moves over a different component, move the
+        // highlighter there
         let lastHoveredComponent: ComponentBase | null = null;
 
         let onMouseMove = (event: MouseEvent) => {
@@ -436,12 +446,13 @@ export class ComponentTreeComponent extends ComponentBase {
                 componentUnderMouse !== null &&
                 this.componentCanBeSelected(componentUnderMouse)
             ) {
-                this.highlighter.moveTo(componentUnderMouse.outerElement);
+                this.highlighter.moveTo(componentUnderMouse.element);
             } else {
                 this.highlighter.moveTo(null);
             }
         };
 
+        // On click, select the component under the cursor
         let onClick = (event: MouseEvent) => {
             markEventAsHandled(event);
 
@@ -457,7 +468,7 @@ export class ComponentTreeComponent extends ComponentBase {
             document.documentElement.style.removeProperty('pointer');
             this.highlighter.moveTo(null);
 
-            delete document.documentElement.dataset.cursor;
+            document.documentElement.classList.remove('picking-component');
             window.removeEventListener('mousemove', onMouseMove, true);
             window.removeEventListener('click', onClick, true);
             window.removeEventListener('mousedown', markEventAsHandled, true);
@@ -466,10 +477,7 @@ export class ComponentTreeComponent extends ComponentBase {
             resolvePromise(undefined);
         };
 
-        // Setting `cursor` on the documentElement itself doesn't work. It must
-        // be applied to *every single element* (like `:root *`).
-        document.documentElement.dataset.cursor = 'crosshair';
-
+        document.documentElement.classList.add('picking-component');
         window.addEventListener('mousemove', onMouseMove, true);
         window.addEventListener('click', onClick, true);
         window.addEventListener('mousedown', markEventAsHandled, true);
diff --git a/frontend/code/rpc.ts b/frontend/code/rpc.ts
index 37baf3ce..a330c00b 100644
--- a/frontend/code/rpc.ts
+++ b/frontend/code/rpc.ts
@@ -470,13 +470,6 @@ export async function processMessageReturnResponse(
             response = getUnittestClientLayoutInfo();
             break;
 
-        case 'pickComponent':
-            if (devToolsConnector !== null) {
-                devToolsConnector.pickComponent();
-            }
-            response = null;
-            break;
-
         default:
             // Invalid method
             throw `Encountered unknown RPC method: ${message.method}`;
diff --git a/frontend/css/style.scss b/frontend/css/style.scss
index de525ff1..eb65e0f8 100644
--- a/frontend/css/style.scss
+++ b/frontend/css/style.scss
@@ -74,11 +74,6 @@ html[data-theme='dark'] {
 //
 // JavaScript sets global theming variables, of the form `--rio-global-...`.
 
-// Global cursor overrides
-html[data-cursor='crosshair'] * {
-    cursor: crosshair !important;
-}
-
 // Z-indices for components which are expected to show up on top.
 //
 // - `popup` MUST be above `dev-tools` in order for dropdowns in the dev tools
@@ -2739,6 +2734,10 @@ $rio-input-box-text-distance-from-bottom: 0.4rem; // To be aligned with the <inp
     background: var(--rio-local-bg-active);
 }
 
+html.picking-component * {
+    cursor: crosshair !important;
+}
+
 // Switcher
 .rio-switcher {
     // This is not a single-container because it can briefly have two children