Change focus in BrowserUI, never in Model

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 7497e54afbda526bbe2fa47fdd2bfa8d9d93cf2e..a98a29b938bab1cf735a1d2bf9223a86b38eb6ea 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -21,17 +21,9 @@ const Model = {
     task.setAttribute("tabindex", "0");
     task.setAttribute("data-created", timestamp);
     document.getElementById("tasks")!.appendChild(task);
-    task.focus();
     return task;
   },
 
-  destroyTask: function (createTimestamp: string) {
-    const task = this.getTask(createTimestamp);
-    if (task) {
-      task.parentElement!.removeChild(task);
-    }
-  },
-
   getPriority: function (task: Element): number {
     if (task.hasAttribute("data-priority")) {
       return parseFloat(task.getAttribute("data-priority")!);
@@ -39,6 +31,10 @@ const Model = {
     return parseFloat(task.getAttribute("data-created")!);
   },
 
+  getState: function (task: Element): string {
+    return task.getAttribute("data-state") ?? "todo";
+  },
+
   getTask: function (createTimestamp: string) {
     for (const task of document.getElementsByClassName("task")) {
       if (task.getAttribute("data-created") === createTimestamp) {
@@ -47,27 +43,26 @@ const Model = {
     }
   },
 
-  setPriority: function (createTimestamp: string, priority: number) {
+  setPriority: function (createTimestamp: string, priority: number): Element | null {
     const target = this.getTask(createTimestamp);
-    if (!target) return;
+    if (!target) return null;
     target.setAttribute("data-priority", `${priority}`);
     for (const task of document.getElementsByClassName("task")) {
       if (task !== target && this.getPriority(task) > priority) {
         task.parentElement!.insertBefore(target, task);
-        target instanceof HTMLElement && target.focus();
-        return;
+        return target;
       }
     }
     document.getElementById("tasks")!.appendChild(target);
-    target instanceof HTMLElement && target.focus();
+    return target;
   },
 
   setState: function (stateTimestamp: string, createTimestamp: string, state: string) {
     const task = this.getTask(createTimestamp);
     if (task) {
-      task.setAttribute(`data-${state}`, stateTimestamp);
+      task.setAttribute("data-state", state);
       if (task instanceof HTMLElement) {
-        task.style.display = "none"; // Until view filtering
+        task.style.display = state == "todo" ? "block" : "none"; // Until view filtering
       }
     }
   },
@@ -81,9 +76,6 @@ function Log(prefix: string = "vp-") {
       if (command == "Create") {
         return Model.addTask(timestamp, data);
       }
-      if (command == "Destroy") {
-        return Model.destroyTask(data.split(" ", 1)[0]);
-      }
       if (command == "State") {
         const [createTimestamp, state] = splitN(data, " ", 1);
         return Model.setState(timestamp, createTimestamp, state);
@@ -117,18 +109,26 @@ function Log(prefix: string = "vp-") {
 }
 const log = Log();
 
+const undoLog: string[] = [];
+
 const UI = {
   addTask: function (description: string): Element {
-    return <Element>log.recordAndApply(`${Date.now()} Create ${description}`);
+    const now = Date.now();
+    undoLog.push(`State ${now} deleted`);
+    return <Element>log.recordAndApply(`${now} Create ${description}`);
   },
-  destroyTask: function (createTimestamp: string) {
-    return log.recordAndApply(`${Date.now()} Destroy ${createTimestamp} ${Model.getTask(createTimestamp)?.textContent}`);
+  setPriority: function (createTimestamp: string, newPriority: number, oldPriority: number) {
+    undoLog.push(`Priority ${createTimestamp} ${oldPriority}`);
+    return log.recordAndApply(`${Date.now()} Priority ${createTimestamp} ${newPriority}`);
   },
-  setPriority: function (createTimestamp: string, priority: number) {
-    return log.recordAndApply(`${Date.now()} Priority ${createTimestamp} ${priority}`);
+  setState: function (createTimestamp: string, newState: string, oldState: string) {
+    undoLog.push(`State ${createTimestamp} ${oldState}`);
+    return log.recordAndApply(`${Date.now()} State ${createTimestamp} ${newState}`);
   },
-  setState: function (createTimestamp: string, state: string) {
-    return log.recordAndApply(`${Date.now()} State ${createTimestamp} ${state}`);
+  undo: function () {
+    if (undoLog.length > 0) {
+      return log.recordAndApply(`${Date.now()} ${undoLog.pop()}`);
+    }
   },
 };
 
@@ -137,6 +137,7 @@ const BrowserUI = {
     const input = <HTMLInputElement>document.getElementById("taskName");
     if (input.value) {
       const task = UI.addTask(input.value);
+      if (task && task instanceof HTMLElement) task.focus();
       input.value = "";
       if (event.getModifierState("Control")) {
         this.setPriority(task, null, document.getElementsByClassName("task")[0]);
@@ -208,13 +209,21 @@ const BrowserUI = {
     console.assert(aPriority < newPriority && newPriority < bPriority, aPriority, "<", newPriority, "<", bPriority);
     const newPriorityRounded = Math.round(newPriority);
     const okToRound = aPriority < newPriorityRounded && newPriorityRounded < bPriority;
-    UI.setPriority(task.getAttribute("data-created")!, okToRound ? newPriorityRounded : newPriority);
+    UI.setPriority(task.getAttribute("data-created")!, okToRound ? newPriorityRounded : newPriority, Model.getPriority(task));
+    task instanceof HTMLElement && task.focus();
   },
 
   setState: function (state: string) {
-    const createTimestamp = document.activeElement?.getAttribute("data-created");
+    const task = document.activeElement;
+    if (!task) return;
+    const createTimestamp = task.getAttribute("data-created")!;
     this.moveCursor(1) || this.moveCursor(-1);
-    return UI.setState(createTimestamp!, state);
+    return UI.setState(createTimestamp, state, Model.getState(task));
+  },
+
+  undo: function () {
+    const ret = UI.undo();
+    if (ret && ret instanceof HTMLElement) ret.focus();
   },
 };
 
@@ -231,7 +240,8 @@ function handleKey(event: any) {
     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();
+    if (event.key == "X") return BrowserUI.setState("deleted");
+    if (event.key == "u") return BrowserUI.undo();
   }
 }