Revert "When creating a task while viewing a tag, the new task has that tag"

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 3b0b470bf80e088ad4224788cea8792f0ffd8829..5f759d08588cfa18d24da7f07e41df026d565c1d 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -46,7 +46,8 @@ const Model = {
     task.setAttribute("tabindex", "0");
     task.setAttribute("data-created", timestamp);
     task.setAttribute("data-state", "todo");
     task.setAttribute("tabindex", "0");
     task.setAttribute("data-created", timestamp);
     task.setAttribute("data-state", "todo");

-    document.getElementById("tasks")!.appendChild(task);
+    const tasks = document.getElementById("tasks")!;
+    tasks.insertBefore(task, tasks.firstElementChild);

     return task;
   },
 
     return task;
   },
 


@@ -66,7 +67,7 @@ const Model = {
         return tag;
       }
     }
         return tag;
       }
     }

-    task.appendChild(tag);
+    task.insertBefore(tag, task.getElementsByClassName("desc")[0]!);

     return tag;
   },
 
     return tag;
   },
 


@@ -75,7 +76,7 @@ const Model = {
     if (!target) return null;
     if (target.hasAttribute("data-description")) {
       // Oh no: An edit has arrived from a replica while a local edit is in progress.
     if (!target) return null;
     if (target.hasAttribute("data-description")) {
       // Oh no: An edit has arrived from a replica while a local edit is in progress.

-      const input = target.firstChild as HTMLInputElement;
+      const input = target.getElementsByTagName("input")[0]!;

       if (
         input.value === target.getAttribute("data-description") &&
         input.selectionStart === input.value.length &&
       if (
         input.value === target.getAttribute("data-description") &&
         input.selectionStart === input.value.length &&


@@ -119,6 +120,17 @@ const Model = {
     }
   },
 
     }
   },
 

+  insertInPriorityOrder: function (task: Element, dest: Element) {
+    const priority = this.getPriority(task);
+    for (const t of dest.children) {
+      if (t !== task && this.getPriority(t) < priority) {
+        dest.insertBefore(task, t);
+        return;
+      }
+    }
+    dest.appendChild(task);
+  },
+

   removeTag: function (createTimestamp: string, tagName: string) {
     const task = this.getTask(createTimestamp);
     if (!task) return null;
   removeTag: function (createTimestamp: string, tagName: string) {
     const task = this.getTask(createTimestamp);
     if (!task) return null;


@@ -132,13 +144,7 @@ const Model = {
     const target = this.getTask(createTimestamp);
     if (!target) return null;
     target.setAttribute("data-priority", `${priority}`);
     const target = this.getTask(createTimestamp);
     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);
-        return target;
-      }
-    }
-    document.getElementById("tasks")!.appendChild(target);
+    this.insertInPriorityOrder(target, target.parentElement!);

     return target;
   },
 
     return target;
   },
 


@@ -266,6 +272,16 @@ enum CommitOrAbort {
 }
 
 function BrowserUI() {
 }
 
 function BrowserUI() {

+  const viewColors: { [key: string]: string } = {
+    all: "Gold",
+    cancelled: "Red",
+    deleted: "Black",
+    done: "LawnGreen",
+    "someday-maybe": "DeepSkyBlue",
+    todo: "White",
+    waiting: "MediumOrchid",
+  };
+  var currentTagView: string | null = null;

   var currentViewState = "todo";
   var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;
   var lastTagNameEntered = "";
   var currentViewState = "todo";
   var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;
   var lastTagNameEntered = "";


@@ -282,14 +298,13 @@ function BrowserUI() {
       }
       input.value = "";
       if (event.getModifierState("Control")) {
       }
       input.value = "";
       if (event.getModifierState("Control")) {

-        this.makeTopPriority(task);
+        this.makeBottomPriority(task);

       }
     },
 
     beginEdit: function (event: Event) {
       }
     },
 
     beginEdit: function (event: Event) {

-      var task = document.activeElement;
+      const task = this.currentTask();

       if (!task) return;
       if (!task) return;

-      if (task.classList.contains("tag")) task = task.parentElement!;

       const input = document.createElement("input");
       const desc = task.getElementsByClassName("desc")[0];
       const oldDescription = desc.textContent!;
       const input = document.createElement("input");
       const desc = task.getElementsByClassName("desc")[0];
       const oldDescription = desc.textContent!;


@@ -303,7 +318,7 @@ function BrowserUI() {
     },
 
     beginTagEdit: function (event: Event) {
     },
 
     beginTagEdit: function (event: Event) {

-      const task = document.activeElement;
+      const task = this.currentTask();

       if (!task) return;
       const input = document.createElement("input");
       input.classList.add("tag");
       if (!task) return;
       const input = document.createElement("input");
       input.classList.add("tag");


@@ -345,19 +360,39 @@ function BrowserUI() {
       }
     },
 
       }
     },
 

+    currentTag: function (): Element | null {
+      var target = document.activeElement;
+      if (!target) return null;
+      if (target.classList.contains("task")) {
+        const tags = target.getElementsByClassName("tag");
+        target = tags[tags.length - 1];
+      }
+      if (!target || !target.classList.contains("tag")) return null;
+      return target;
+    },
+
+    currentTask: function (): HTMLElement | null {
+      var target = document.activeElement;
+      if (!target) return null;
+      if (target.classList.contains("tag")) target = target.parentElement!;
+      return target as HTMLElement;
+    },
+

     firstVisibleTask: function () {
       for (const task of document.getElementsByClassName("task")) {
         const state = task.getAttribute("data-state");
     firstVisibleTask: function () {
       for (const task of document.getElementsByClassName("task")) {
         const state = task.getAttribute("data-state");

-        if (task instanceof HTMLElement && (state === currentViewState || (currentViewState === "all" && state !== "deleted"))) {
+        if (
+          task instanceof HTMLElement &&
+          (state === currentViewState || (currentViewState === "all" && state !== "deleted")) &&
+          !task.classList.contains("hide")
+        ) {

           return task;
         }
       }
     },
 
     focusTaskNameInput: function (event: Event) {
           return task;
         }
       }
     },
 
     focusTaskNameInput: function (event: Event) {

-      if (document.activeElement instanceof HTMLElement) {
-        taskFocusedBeforeJumpingToInput = document.activeElement;
-      }
+      taskFocusedBeforeJumpingToInput = this.currentTask();

       document.getElementById("taskName")!.focus();
       window.scroll(0, 0);
       event.preventDefault();
       document.getElementById("taskName")!.focus();
       window.scroll(0, 0);
       event.preventDefault();


@@ -371,7 +406,10 @@ function BrowserUI() {
         cursor = increment > 0 ? cursor.nextElementSibling : cursor.previousElementSibling;
         if (!cursor || !(cursor instanceof HTMLElement)) break;
         const state = cursor.getAttribute("data-state")!;
         cursor = increment > 0 ? cursor.nextElementSibling : cursor.previousElementSibling;
         if (!cursor || !(cursor instanceof HTMLElement)) break;
         const state = cursor.getAttribute("data-state")!;

-        if (state === currentViewState || (currentViewState === "all" && state !== "deleted")) {
+        if (
+          (state === currentViewState || (currentViewState === "all" && state !== "deleted")) &&
+          !cursor.classList.contains("hide")
+        ) {

           offset -= increment;
           valid_cursor = cursor;
         }
           offset -= increment;
           valid_cursor = cursor;
         }


@@ -387,14 +425,33 @@ function BrowserUI() {
       if (dest instanceof HTMLElement) dest.focus();
     },
 
       if (dest instanceof HTMLElement) dest.focus();
     },
 

+    makeBottomPriority: function (task: Element | null = null) {
+      if (!task) task = this.currentTask();
+      if (!task) return;
+      this.setPriority(task, document.getElementById("tasks")!.lastElementChild, null);
+    },
+

     makeTopPriority: function (task: Element | null = null) {
     makeTopPriority: function (task: Element | null = null) {

-      if (!task) task = document.activeElement;
+      if (!task) task = this.currentTask();

       if (!task) return;
       if (!task) return;

-      this.setPriority(task, null, document.getElementsByClassName("task")[0]);
+      ui.setPriority(task.getAttribute("data-created")!, clock.now(), Model.getPriority(task));
+      task instanceof HTMLElement && task.focus();
+    },
+
+    moveCursorLeft: function () {
+      const active = this.currentTask();
+      if (!active) return false;
+      if (active.parentElement!.classList.contains("task")) {
+        active.parentElement!.focus();
+      }
+    },
+
+    moveCursorRight: function () {
+      (this.currentTask()?.getElementsByClassName("task")[0] as HTMLElement)?.focus();

     },
 
     },
 

-    moveCursor: function (offset: number): boolean {
-      const active = document.activeElement;
+    moveCursorVertically: function (offset: number): boolean {
+      const active = this.currentTask();

       if (!active) return false;
       const dest = this.visibleTaskAtOffset(active, offset);
       if (dest !== active && dest instanceof HTMLElement) {
       if (!active) return false;
       const dest = this.visibleTaskAtOffset(active, offset);
       if (dest !== active && dest instanceof HTMLElement) {


@@ -405,7 +462,7 @@ function BrowserUI() {
     },
 
     moveTask: function (offset: number) {
     },
 
     moveTask: function (offset: number) {

-      const active = document.activeElement;
+      const active = this.currentTask();

       if (!active) return;
       const dest = this.visibleTaskAtOffset(active, offset);
       if (dest === active) return; // Already extremal
       if (!active) return;
       const dest = this.visibleTaskAtOffset(active, offset);
       if (dest === active) return; // Already extremal


@@ -419,16 +476,27 @@ function BrowserUI() {
     },
 
     removeTag: function () {
     },
 
     removeTag: function () {

-      var target = document.activeElement;
+      const target = this.currentTag();

       if (!target) return;
       if (!target) return;

-      if (target.classList.contains("task")) {
-        const tags = target.getElementsByClassName("tag");
-        target = tags[tags.length - 1];
-      }
-      if (!target || !target.classList.contains("tag")) return;

       ui.removeTag(target.parentElement!.getAttribute("data-created")!, target.textContent!);
     },
 
       ui.removeTag(target.parentElement!.getAttribute("data-created")!, target.textContent!);
     },
 

+    resetTagView: function () {
+      currentTagView = null;
+      const taskList = document.getElementById("tasks")!;
+      for (const task of Array.from(document.getElementsByClassName("task"))) {
+        task.classList.remove("hide");
+        if (task.parentElement !== taskList) {
+          Model.insertInPriorityOrder(task, taskList);
+        }
+      }
+    },
+
+    resetView: function () {
+      this.setView("todo");
+      this.resetTagView();
+    },
+

     returnFocusAfterInput: function (): boolean {
       if (taskFocusedBeforeJumpingToInput) {
         taskFocusedBeforeJumpingToInput.focus();
     returnFocusAfterInput: function (): boolean {
       if (taskFocusedBeforeJumpingToInput) {
         taskFocusedBeforeJumpingToInput.focus();


@@ -439,46 +507,106 @@ function BrowserUI() {
 
     // Change task's priority to be between other tasks a and b.
     setPriority: function (task: Element, a: Element | null, b: Element | null) {
 
     // Change task's priority to be between other tasks a and b.
     setPriority: function (task: Element, a: Element | null, b: Element | null) {

-      const aPriority = a === null ? 0 : Model.getPriority(a);
-      const bPriority = b === null ? clock.now() : Model.getPriority(b);
-      console.assert(aPriority < bPriority, aPriority, "<", bPriority);
-      const span = bPriority - aPriority;
-      const newPriority = aPriority + 0.1 * span + 0.8 * span * Math.random();
-      console.assert(aPriority < newPriority && newPriority < bPriority, aPriority, "<", newPriority, "<", bPriority);
+      const aPriority = a === null ? clock.now() : Model.getPriority(a);
+      const bPriority = b === null ? 0 : Model.getPriority(b);
+      console.assert(aPriority > bPriority, aPriority, ">", bPriority);
+      const span = aPriority - bPriority;
+      const newPriority = bPriority + 0.1 * span + 0.8 * span * Math.random();
+      console.assert(aPriority > newPriority && newPriority > bPriority, aPriority, ">", newPriority, ">", bPriority);

       const newPriorityRounded = Math.round(newPriority);
       const newPriorityRounded = Math.round(newPriority);

-      const okToRound = aPriority < newPriorityRounded && newPriorityRounded < bPriority;
+      const okToRound = aPriority > newPriorityRounded && newPriorityRounded > bPriority;

       ui.setPriority(task.getAttribute("data-created")!, okToRound ? newPriorityRounded : newPriority, Model.getPriority(task));
       task instanceof HTMLElement && task.focus();
     },
 
     setState: function (newState: string) {
       ui.setPriority(task.getAttribute("data-created")!, okToRound ? newPriorityRounded : newPriority, Model.getPriority(task));
       task instanceof HTMLElement && task.focus();
     },
 
     setState: function (newState: string) {

-      const task = document.activeElement;
+      const task = this.currentTask();

       if (!task) return;
       const oldState = task.getAttribute("data-state")!;
       if (newState === oldState) return;
       const createTimestamp = task.getAttribute("data-created")!;
       if (currentViewState !== "all" || newState == "deleted") {
       if (!task) return;
       const oldState = task.getAttribute("data-state")!;
       if (newState === oldState) return;
       const createTimestamp = task.getAttribute("data-created")!;
       if (currentViewState !== "all" || newState == "deleted") {

-        this.moveCursor(1) || this.moveCursor(-1);
+        this.moveCursorVertically(1) || this.moveCursorVertically(-1);

       }
       return ui.setState(createTimestamp, newState, oldState);
     },
 
       }
       return ui.setState(createTimestamp, newState, oldState);
     },
 

-    setView: function (state: string, color: string) {
+    setTagView: function (tag: string | null = null) {
+      if (tag === null) {
+        const target = this.currentTag();
+        if (!target) return;
+        tag = target.textContent!;
+      }
+
+      if (currentTagView !== null) {
+        this.resetTagView();
+      }
+
+      const tasksWithTag = new Map();
+      for (const task of document.getElementsByClassName("task")) {
+        if (Model.hasTag(task, tag)) {
+          tasksWithTag.set(task.getElementsByClassName("desc")[0].textContent, [Model.getPriority(task), task]);
+        }
+      }
+
+      function highestPrioritySuperTask(t: Element) {
+        var maxPriority = -1;
+        var superTask = null;
+        for (const child of t.getElementsByClassName("tag")) {
+          const e = tasksWithTag.get(child.textContent);
+          if (e !== undefined && e[0] > maxPriority) {
+            maxPriority = e[0];
+            superTask = e[1];
+          }
+        }
+        return superTask;
+      }
+
+      for (const task of Array.from(document.getElementsByClassName("task"))) {
+        if (Model.hasTag(task, tag)) {
+          task.classList.remove("hide");
+        } else {
+          const superTask = highestPrioritySuperTask(task);
+          if (superTask !== null) {
+            Model.insertInPriorityOrder(task, superTask);
+          } else {
+            task.classList.add("hide");
+          }
+        }
+      }
+
+      currentTagView = tag;
+    },
+
+    setView: function (state: string) {

       const sheet = (document.getElementById("viewStyle") as HTMLStyleElement).sheet!;
       if (state === "all") {
         sheet.insertRule(`.task[data-state=deleted] { display: none }`);
       } else {
         sheet.insertRule(`.task:not([data-state=${state}]) { display: none }`);
       }
       const sheet = (document.getElementById("viewStyle") as HTMLStyleElement).sheet!;
       if (state === "all") {
         sheet.insertRule(`.task[data-state=deleted] { display: none }`);
       } else {
         sheet.insertRule(`.task:not([data-state=${state}]) { display: none }`);
       }

-      sheet.insertRule(`:root { --view-state-indicator-color: ${color}; }`);
+      sheet.insertRule(`:root { --view-state-indicator-color: ${viewColors[state]}; }`);

       sheet.removeRule(2);
       sheet.removeRule(2);
       currentViewState = state;
       sheet.removeRule(2);
       sheet.removeRule(2);
       currentViewState = state;

-      if (document.activeElement?.getAttribute("data-state") !== state) {
+      if (this.currentTask()?.getAttribute("data-state") !== state) {

         this.firstVisibleTask()?.focus();
       }
     },
 
         this.firstVisibleTask()?.focus();
       }
     },
 

+    setUntaggedView: function () {
+      if (currentTagView !== null) {
+        this.resetTagView();
+      }
+      for (const task of document.getElementsByClassName("task")) {
+        if (task.getElementsByClassName("tag").length === 0) {
+          task.classList.remove("hide");
+        } else {
+          task.classList.add("hide");
+        }
+      }
+    },
+

     undo: function () {
       const ret = ui.undo();
       if (ret && ret instanceof HTMLElement) ret.focus();
     undo: function () {
       const ret = ui.undo();
       if (ret && ret instanceof HTMLElement) ret.focus();


@@ -524,8 +652,10 @@ function handleKey(event: any) {
           if (event.key == "e") return window.scrollBy(0, (inputCount ?? 1) * scrollIncrement);
           if (event.key == "y") return window.scrollBy(0, (inputCount ?? 1) * -scrollIncrement);
         } else {
           if (event.key == "e") return window.scrollBy(0, (inputCount ?? 1) * scrollIncrement);
           if (event.key == "y") return window.scrollBy(0, (inputCount ?? 1) * -scrollIncrement);
         } else {

-          if (event.key == "j") return browserUI.moveCursor(inputCount ?? 1);
-          if (event.key == "k") return browserUI.moveCursor(-(inputCount ?? 1));
+          if (event.key == "h") return browserUI.moveCursorLeft();
+          if (event.key == "l") return browserUI.moveCursorRight();
+          if (event.key == "j") return browserUI.moveCursorVertically(inputCount ?? 1);
+          if (event.key == "k") return browserUI.moveCursorVertically(-(inputCount ?? 1));

           if (event.key == "J") return browserUI.moveTask(inputCount ?? 1);
           if (event.key == "K") return browserUI.moveTask(-(inputCount ?? 1));
           if (event.key == "G") return browserUI.jumpCursor(inputCount ?? MAX_SAFE_INTEGER);
           if (event.key == "J") return browserUI.moveTask(inputCount ?? 1);
           if (event.key == "K") return browserUI.moveTask(-(inputCount ?? 1));
           if (event.key == "G") return browserUI.jumpCursor(inputCount ?? MAX_SAFE_INTEGER);


@@ -552,17 +682,22 @@ function handleKey(event: any) {
       if (event.key == "m") return browserUI.setState("someday-maybe");
     } else if (inputState === InputState.V) {
       inputState = InputState.Root;
       if (event.key == "m") return browserUI.setState("someday-maybe");
     } else if (inputState === InputState.V) {
       inputState = InputState.Root;

-      if (event.key == "a") return browserUI.setView("all", "Gold");
-      if (event.key == "c") return browserUI.setView("cancelled", "Red");
-      if (event.key == "d") return browserUI.setView("done", "LawnGreen");
-      if (event.key == "q") return browserUI.setView("todo", "White");
+      if (event.key == "a") return browserUI.setView("all");
+      if (event.key == "c") return browserUI.setView("cancelled");
+      if (event.key == "d") return browserUI.setView("done");
+      if (event.key == "i") return browserUI.setUntaggedView();
+      if (event.key == "p") return browserUI.setTagView("Project");
+      if (event.key == "q") return browserUI.setView("todo");

       if (event.key == "s") return (inputState = InputState.VS);
       if (event.key == "s") return (inputState = InputState.VS);

-      if (event.key == "v") return browserUI.setView("todo", "White");
-      if (event.key == "w") return browserUI.setView("waiting", "MediumOrchid");
-      if (event.key == "x") return browserUI.setView("deleted", "Black");
+      if (event.key == "T") return browserUI.resetTagView();
+      if (event.key == "t") return browserUI.setTagView();
+      if (event.key == "u") return browserUI.setUntaggedView();
+      if (event.key == "v") return browserUI.resetView();
+      if (event.key == "w") return browserUI.setView("waiting");
+      if (event.key == "x") return browserUI.setView("deleted");

     } else if (inputState === InputState.VS) {
       inputState = InputState.Root;
     } else if (inputState === InputState.VS) {
       inputState = InputState.Root;

-      if (event.key == "m") return browserUI.setView("someday-maybe", "DeepSkyBlue");
+      if (event.key == "m") return browserUI.setView("someday-maybe");

     }
   }
 }
     }
   }
 }