From c8a93e9dd708f2af4fb0d6aa4c4c93f12ed8ea8d Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 3 Jul 2020 14:49:25 +0100
Subject: [PATCH] clean-up

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/structures/LeftPanel2.tsx | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/components/structures/LeftPanel2.tsx b/src/components/structures/LeftPanel2.tsx
index f5a946f964..23a9e74646 100644
--- a/src/components/structures/LeftPanel2.tsx
+++ b/src/components/structures/LeftPanel2.tsx
@@ -166,20 +166,18 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
         switch (ev.key) {
             case Key.ARROW_UP:
             case Key.ARROW_DOWN:
-                this.onMoveFocus(ev, ev.key === Key.ARROW_UP);
+                ev.stopPropagation();
+                ev.preventDefault();
+                this.onMoveFocus(ev.key === Key.ARROW_UP);
                 break;
         }
     };
 
-    private onMoveFocus = (ev: React.KeyboardEvent, up: boolean) => {
+    private onMoveFocus = (up: boolean) => {
         let element = this.focusedElement;
 
-        // unclear why this isn't needed
-        // var descending = (up == this.focusDirection) ? this.focusDescending : !this.focusDescending;
-        // this.focusDirection = up;
-
         let descending = false; // are we currently descending or ascending through the DOM tree?
-        let classes;
+        let classes: DOMTokenList;
 
         do {
             const child = up ? element.lastElementChild : element.firstElementChild;
@@ -212,14 +210,8 @@ export default class LeftPanel2 extends React.Component<IProps, IState> {
             classes.contains("mx_RoomSearch_input")));
 
         if (element) {
-            ev.stopPropagation();
-            ev.preventDefault();
             element.focus();
             this.focusedElement = element;
-        } else {
-            // if navigation is via up/down arrow-keys, trap in the widget so it doesn't send to composer
-            ev.stopPropagation();
-            ev.preventDefault();
         }
     };