From: Scott Worley <scottworley@scottworley.com>
Date: Wed, 26 Jan 2022 18:44:48 +0000 (-0800)
Subject: Fix moving focus over completed tasks
X-Git-Url: http://git.scottworley.com/vopamoi/commitdiff_plain/5fa4704c5a919a16c0d41fe1f92eaa83d236a66b?ds=sidebyside;hp=d03daa19edde54d43693dca896f6fabade18d326

Fix moving focus over completed tasks

It sure would be nice if we could just trigger whatever the browser does
for tab and shift-tab key presses, instead of doing all this.
---

diff --git a/vopamoi.ts b/vopamoi.ts
index 59c2875..b90b895 100644
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -126,15 +126,22 @@ const BrowserUI = {
   },
 
   moveCursor: function (offset: number): boolean {
-    var active = document.activeElement;
-    if (offset === 1 && active) {
-      active = active.nextElementSibling;
-    }
-    if (offset === -1 && active) {
-      active = active.previousElementSibling;
+    var initial_cursor = document.activeElement;
+    if (!initial_cursor) return false;
+    var cursor: Element | null = initial_cursor;
+    var valid_cursor = cursor;
+    const increment = offset / Math.abs(offset);
+    while (true) {
+      cursor = increment > 0 ? cursor.nextElementSibling : cursor.previousElementSibling;
+      if (!cursor || !(cursor instanceof HTMLElement)) break;
+      if (cursor.style.display !== "none") {
+        offset -= increment;
+        valid_cursor = cursor;
+      }
+      if (Math.abs(offset) < 0.5) break;
     }
-    if (active && active instanceof HTMLElement) {
-      active.focus();
+    if (valid_cursor !== initial_cursor && valid_cursor instanceof HTMLElement) {
+      valid_cursor.focus();
       return true;
     }
     return false;