Fix moving focus over completed tasks

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 6cfdbf2d2f645a4ac24afd3554ea7455ce179ba3..b90b8956a90e80c2d01bf21635fa138ab9133dc0 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -14,61 +14,160 @@ function splitN(str: string, delimiter: string, limit: number = MAX_SAFE_INTEGER
 }
 
 const Model = {
-  createTask: function (description: string) {
+  createTask: function (timestamp: string, description: string) {
     const task = document.createElement("div");
     task.appendChild(document.createTextNode(description));
+    task.setAttribute("class", "task");
     task.setAttribute("tabindex", "0");
+    task.setAttribute("data-created", timestamp);
     return task;
   },
 
-  addTask: function (description: string) {
-    document.body.appendChild(this.createTask(description)).focus();
+  addTask: function (timestamp: string, description: string) {
+    document.body.appendChild(this.createTask(timestamp, description)).focus();
   },
 
-  moveCursor: function (offset: number) {
-    var active = document.activeElement;
-    if (offset === 1 && active) {
-      active = active.nextElementSibling;
+  getTask: function (createTimestamp: string) {
+    for (const task of document.getElementsByClassName("task")) {
+      if (task.getAttribute("data-created") === createTimestamp) {
+        return task;
+      }
     }
-    if (offset === -1 && active) {
-      active = active.previousElementSibling;
+  },
+
+  destroyTask: function (createTimestamp: string) {
+    const task = this.getTask(createTimestamp);
+    if (task) {
+      task.parentElement!.removeChild(task);
+    }
+  },
+
+  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
+      }
     }
-    if (active && active instanceof HTMLElement) active.focus();
   },
 };
 
-const Log = {
+function Log(prefix: string = "vp-") {
+  var next_log_index = 0;
+  return {
+    apply: function (entry: string) {
+      const [timestamp, command, data] = splitN(entry, " ", 2);
+      if (command == "Create") {
+        Model.addTask(timestamp, data);
+      }
+      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) {
+      window.localStorage.setItem(`${prefix}${next_log_index++}`, entry);
+    },
+
+    recordAndApply: function (entry: string) {
+      this.record(entry);
+      this.apply(entry);
+    },
+
+    replay: function () {
+      while (true) {
+        const entry = window.localStorage.getItem(`${prefix}${next_log_index}`);
+        if (entry === null) {
+          break;
+        }
+        this.apply(entry);
+        next_log_index++;
+      }
+    },
+  };
+}
+const log = Log();
+
+const UI = {
   addTask: function (description: string) {
-    this.applyLogEntry(`${Date.now()} Create ${description}`);
+    log.recordAndApply(`${Date.now()} Create ${description}`);
+  },
+  destroyTask: function (createTimestamp: string) {
+    log.recordAndApply(`${Date.now()} Destroy ${createTimestamp} ${Model.getTask(createTimestamp)?.textContent}`);
+  },
+  setState: function (createTimestamp: string, state: string) {
+    log.recordAndApply(`${Date.now()} State ${createTimestamp} ${state}`);
+  },
+};
+
+const BrowserUI = {
+  addTask: function (form: any) {
+    if (form.taskName.value) {
+      UI.addTask(form.taskName.value);
+      form.taskName.value = "";
+    }
+    return false;
+  },
+
+  destroyTask: function () {
+    const createTimestamp = document.activeElement?.getAttribute("data-created");
+    this.moveCursor(1) || this.moveCursor(-1);
+    return UI.destroyTask(createTimestamp!);
+  },
+
+  focusTaskNameInput: function (event: any) {
+    document.getElementById("taskName")!.focus();
+    event.preventDefault();
   },
 
-  applyLogEntry: function (entry: string) {
-    const [timestamp, command, data] = splitN(entry, " ", 2);
-    if (command == "Create") {
-      Model.addTask(data);
+  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") {
-    if (event.key == "j") Model.moveCursor(1);
-    if (event.key == "k") Model.moveCursor(-1);
-    if (event.key == "c") {
-      document.getElementById("taskName")!.focus();
-      event.preventDefault();
-    }
-  }
-}
-
-function browserCreateTask(form: any) {
-  if (form.taskName.value) {
-    Log.addTask(form.taskName.value);
+    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();
   }
-  form.taskName.value = "";
-  return false;
 }
 
 function browserInit() {
   document.body.addEventListener("keydown", handleKey, { capture: false });
+  log.replay();
 }