From cd85e329edee3ac5b196f29c4bd65c763340a347 Mon Sep 17 00:00:00 2001
From: Akos Kitta <a.kitta@arduino.cc>
Date: Fri, 24 Mar 2023 10:42:17 +0100
Subject: [PATCH] fix: the focus in the sketchbook widget

Ref: arduino/arduino-ide#1720

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
---
 .../browser/library/library-list-widget.ts    | 13 +------
 .../src/browser/utils/dom.ts                  | 37 +++++++++++++++++++
 .../sketchbook-composite-widget.tsx           | 11 ++++--
 .../widgets/sketchbook/sketchbook-widget.tsx  |  8 +---
 4 files changed, 47 insertions(+), 22 deletions(-)
 create mode 100644 arduino-ide-extension/src/browser/utils/dom.ts

diff --git a/arduino-ide-extension/src/browser/library/library-list-widget.ts b/arduino-ide-extension/src/browser/library/library-list-widget.ts
index 050783816..25480de95 100644
--- a/arduino-ide-extension/src/browser/library/library-list-widget.ts
+++ b/arduino-ide-extension/src/browser/library/library-list-widget.ts
@@ -20,6 +20,7 @@ import { Installable } from '../../common/protocol';
 import { ListItemRenderer } from '../widgets/component-list/list-item-renderer';
 import { nls } from '@theia/core/lib/common';
 import { LibraryFilterRenderer } from '../widgets/component-list/filter-renderer';
+import { findChildTheiaButton } from '../utils/dom';
 
 @injectable()
 export class LibraryListWidget extends ListWidget<
@@ -243,17 +244,7 @@ class MessageBoxDialog extends AbstractDialog<MessageBoxDialog.Result> {
 
   protected override onAfterAttach(message: Message): void {
     super.onAfterAttach(message);
-    let buttonToFocus: HTMLButtonElement | undefined = undefined;
-    for (const child of Array.from(this.controlPanel.children)) {
-      if (child instanceof HTMLButtonElement) {
-        if (child.classList.contains('main')) {
-          buttonToFocus = child;
-          break;
-        }
-        buttonToFocus = child;
-      }
-    }
-    buttonToFocus?.focus();
+    findChildTheiaButton(this.controlPanel)?.focus();
   }
 }
 export namespace MessageBoxDialog {
diff --git a/arduino-ide-extension/src/browser/utils/dom.ts b/arduino-ide-extension/src/browser/utils/dom.ts
new file mode 100644
index 000000000..5d6e65d3c
--- /dev/null
+++ b/arduino-ide-extension/src/browser/utils/dom.ts
@@ -0,0 +1,37 @@
+import { notEmpty } from '@theia/core';
+
+/**
+ * Finds the closest child HTMLButtonElement representing a Theia button.
+ * A button is a Theia button if it's a `<button>` element and has the `"theia-button"` class.
+ * If an element has multiple Theia button children, this function prefers `"main"` over `"secondary"` button.
+ */
+export function findChildTheiaButton(
+  element: HTMLElement,
+  recursive = false
+): HTMLButtonElement | undefined {
+  let button: HTMLButtonElement | undefined = undefined;
+  const children = Array.from(element.children);
+  for (const child of children) {
+    if (
+      child instanceof HTMLButtonElement &&
+      child.classList.contains('theia-button')
+    ) {
+      if (child.classList.contains('main')) {
+        return child;
+      }
+      button = child;
+    }
+  }
+  if (!button && recursive) {
+    button = children
+      .filter(isHTMLElement)
+      .map((childElement) => findChildTheiaButton(childElement, true))
+      .filter(notEmpty)
+      .shift();
+  }
+  return button;
+}
+
+function isHTMLElement(element: Element): element is HTMLElement {
+  return element instanceof HTMLElement;
+}
diff --git a/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-composite-widget.tsx b/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-composite-widget.tsx
index b0ba780be..897ce61fb 100644
--- a/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-composite-widget.tsx
+++ b/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-composite-widget.tsx
@@ -9,6 +9,7 @@ import { BaseWidget } from '@theia/core/lib/browser/widgets/widget';
 import { CommandService } from '@theia/core/lib/common/command';
 import { SketchbookTreeWidget } from './sketchbook-tree-widget';
 import { CreateNew } from '../sketchbook/create-new';
+import { findChildTheiaButton } from '../../utils/dom';
 
 @injectable()
 export abstract class BaseSketchbookCompositeWidget<
@@ -18,16 +19,17 @@ export abstract class BaseSketchbookCompositeWidget<
   protected readonly commandService: CommandService;
 
   private readonly compositeNode: HTMLElement;
+  private readonly footerNode: HTMLElement;
   private readonly footerRoot: Root;
 
   constructor() {
     super();
     this.compositeNode = document.createElement('div');
     this.compositeNode.classList.add('composite-node');
-    const footerNode = document.createElement('div');
-    footerNode.classList.add('footer-node');
-    this.compositeNode.appendChild(footerNode);
-    this.footerRoot = createRoot(footerNode);
+    this.footerNode = document.createElement('div');
+    this.footerNode.classList.add('footer-node');
+    this.compositeNode.appendChild(this.footerNode);
+    this.footerRoot = createRoot(this.footerNode);
     this.node.appendChild(this.compositeNode);
     this.title.closable = false;
   }
@@ -51,6 +53,7 @@ export abstract class BaseSketchbookCompositeWidget<
     super.onActivateRequest(message);
     // Sending a resize message is needed because otherwise the tree widget would render empty
     this.onResize(Widget.ResizeMessage.UnknownSize);
+    findChildTheiaButton(this.footerNode, true)?.focus();
   }
 
   protected override onResize(message: Widget.ResizeMessage): void {
diff --git a/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-widget.tsx b/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-widget.tsx
index 93533e37e..2d99f97b7 100644
--- a/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-widget.tsx
+++ b/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-widget.tsx
@@ -128,13 +128,7 @@ export class SketchbookWidget extends BaseWidget {
 
   protected override onActivateRequest(message: Message): void {
     super.onActivateRequest(message);
-
-    // TODO: focus the active sketchbook
-    // if (this.editor) {
-    //     this.editor.focus();
-    // } else {
-    // }
-    this.node.focus();
+    this.sketchbookCompositeWidget.activate();
   }
 
   protected override onResize(message: Widget.ResizeMessage): void {