[scm] Add check to determine which scm-widget is focused

+ Focus should be on node rather than `commitWidget` when there is no repository in the workspace. Signed-off-by: Duc Nguyen <[email protected]> Co-authored-by: Vincent Fugnitto <[email protected]>
eclipse-theia · Sep 16, 2020 · 993b7a8 · 993b7a8
1 parent 64670d7
commit 993b7a8
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/scm/src/browser/scm-widget.tsx b/packages/scm/src/browser/scm-widget.tsx
@@ -150,7 +150,11 @@ export class ScmWidget extends BaseWidget implements StatefulWidget {
     protected onActivateRequest(msg: Message): void {
         super.onActivateRequest(msg);
         this.refresh();
-        this.commitWidget.focus();
+        if (this.commitWidget.isVisible) {
+            this.commitWidget.focus();
+        } else {
+            this.node.focus();
+        }
     }
 
     protected focusInput(): void {