Fix moving focus over completed tasks

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 3ff39184a0ec8cc6a74069eb3535ff79413699f6..b90b8956a90e80c2d01bf21635fa138ab9133dc0 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -37,26 +37,23 @@ const Model = {
 
   destroyTask: function (createTimestamp: string) {
     const task = this.getTask(createTimestamp);
 
   destroyTask: function (createTimestamp: string) {
     const task = this.getTask(createTimestamp);

-    task!.parentElement!.removeChild(task!);
+    if (task) {
+      task.parentElement!.removeChild(task);
+    }

   },
 
   },
 

-  moveCursor: function (offset: number): boolean {
-    var active = document.activeElement;
-    if (offset === 1 && active) {
-      active = active.nextElementSibling;
-    }
-    if (offset === -1 && active) {
-      active = active.previousElementSibling;
-    }
-    if (active && active instanceof HTMLElement) {
-      active.focus();
-      return true;
+  setState: function (stateTimestamp: string, createTimestamp: string, state: string) {
+    const task = this.getTask(createTimestamp);
+    if (task) {
+      task.setAttribute(`data-${state}`, stateTimestamp);
+      if (task instanceof HTMLElement) {
+        task.style.display = "none"; // Until view filtering
+      }

     }
     }

-    return false;

   },
 };
 
   },
 };
 

-const Log = (function () {
+function Log(prefix: string = "vp-") {

   var next_log_index = 0;
   return {
     apply: function (entry: string) {
   var next_log_index = 0;
   return {
     apply: function (entry: string) {


@@ -67,10 +64,14 @@ const Log = (function () {
       if (command == "Destroy") {
         Model.destroyTask(data.split(" ", 1)[0]);
       }
       if (command == "Destroy") {
         Model.destroyTask(data.split(" ", 1)[0]);
       }

+      if (command == "State") {
+        const [createTimestamp, state] = splitN(data, " ", 1);
+        Model.setState(timestamp, createTimestamp, state);
+      }

     },
 
     record: function (entry: string) {
     },
 
     record: function (entry: string) {

-      window.localStorage.setItem(`${next_log_index++}`, entry);
+      window.localStorage.setItem(`${prefix}${next_log_index++}`, entry);

     },
 
     recordAndApply: function (entry: string) {
     },
 
     recordAndApply: function (entry: string) {


@@ -80,7 +81,7 @@ const Log = (function () {
 
     replay: function () {
       while (true) {
 
     replay: function () {
       while (true) {

-        const entry = window.localStorage.getItem(`${next_log_index}`);
+        const entry = window.localStorage.getItem(`${prefix}${next_log_index}`);

         if (entry === null) {
           break;
         }
         if (entry === null) {
           break;
         }


@@ -89,14 +90,18 @@ const Log = (function () {
       }
     },
   };
       }
     },
   };

-})();
+}
+const log = Log();

 
 const UI = {
   addTask: function (description: string) {
 
 const UI = {
   addTask: function (description: string) {

-    Log.recordAndApply(`${Date.now()} Create ${description}`);
+    log.recordAndApply(`${Date.now()} Create ${description}`);

   },
   destroyTask: function (createTimestamp: string) {
   },
   destroyTask: function (createTimestamp: string) {

-    Log.recordAndApply(`${Date.now()} Destroy ${createTimestamp} ${Model.getTask(createTimestamp)?.textContent}`);
+    log.recordAndApply(`${Date.now()} Destroy ${createTimestamp} ${Model.getTask(createTimestamp)?.textContent}`);
+  },
+  setState: function (createTimestamp: string, state: string) {
+    log.recordAndApply(`${Date.now()} State ${createTimestamp} ${state}`);

   },
 };
 
   },
 };
 


@@ -108,27 +113,61 @@ const BrowserUI = {
     }
     return false;
   },
     }
     return false;
   },

+

   destroyTask: function () {
     const createTimestamp = document.activeElement?.getAttribute("data-created");
   destroyTask: function () {
     const createTimestamp = document.activeElement?.getAttribute("data-created");

-    return createTimestamp && UI.destroyTask(createTimestamp);
+    this.moveCursor(1) || this.moveCursor(-1);
+    return UI.destroyTask(createTimestamp!);

   },
   },

-};

 
 

-function focusTaskNameInput(event: any) {
-  document.getElementById("taskName")!.focus();
-  event.preventDefault();
-}
+  focusTaskNameInput: function (event: any) {
+    document.getElementById("taskName")!.focus();
+    event.preventDefault();
+  },
+
+  moveCursor: function (offset: number): boolean {
+    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 (valid_cursor !== initial_cursor && valid_cursor instanceof HTMLElement) {
+      valid_cursor.focus();
+      return true;
+    }
+    return false;
+  },
+
+  setState: function (state: string) {
+    const createTimestamp = document.activeElement?.getAttribute("data-created");
+    this.moveCursor(1) || this.moveCursor(-1);
+    return UI.setState(createTimestamp!, state);
+  },
+};

 
 function handleKey(event: any) {
   if (event.target.tagName !== "INPUT") {
 
 function handleKey(event: any) {
   if (event.target.tagName !== "INPUT") {

-    if (event.key == "j") return Model.moveCursor(1);
-    if (event.key == "k") return Model.moveCursor(-1);
-    if (event.key == "c") return focusTaskNameInput(event);
+    if (event.key == "j") return BrowserUI.moveCursor(1);
+    if (event.key == "k") return BrowserUI.moveCursor(-1);
+    if (event.key == "n") return BrowserUI.focusTaskNameInput(event);
+    if (event.key == "s") return BrowserUI.setState("someday-maybe");
+    if (event.key == "w") return BrowserUI.setState("waiting");
+    if (event.key == "d") return BrowserUI.setState("done");
+    if (event.key == "c") return BrowserUI.setState("cancelled");

     if (event.key == "X") return BrowserUI.destroyTask();
   }
 }
 
 function browserInit() {
   document.body.addEventListener("keydown", handleKey, { capture: false });
     if (event.key == "X") return BrowserUI.destroyTask();
   }
 }
 
 function browserInit() {
   document.body.addEventListener("keydown", handleKey, { capture: false });

-  Log.replay();
+  log.replay();

 }
 }