Task-level operations should work even when a tag is focused

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 9137ff55b60ff26c142e317f17de247e9deb01c7..a1149595bb86c84ab22b48546dd29b67023ac813 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;
   },
 


@@ -133,7 +134,7 @@ const Model = {
     if (!target) return null;
     target.setAttribute("data-priority", `${priority}`);
     for (const task of document.getElementsByClassName("task")) {
     if (!target) return null;
     target.setAttribute("data-priority", `${priority}`);
     for (const task of document.getElementsByClassName("task")) {

-      if (task !== target && this.getPriority(task) > priority) {
+      if (task !== target && this.getPriority(task) < priority) {

         task.parentElement!.insertBefore(target, task);
         return target;
       }
         task.parentElement!.insertBefore(target, task);
         return target;
       }


@@ -266,6 +267,15 @@ 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 currentViewState = "todo";
   var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;
   var lastTagNameEntered = "";
   var currentViewState = "todo";
   var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;
   var lastTagNameEntered = "";


@@ -282,12 +292,12 @@ 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) {

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

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


@@ -302,7 +312,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");


@@ -344,20 +354,41 @@ 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();
       document.getElementById("taskName")!.focus();

+      window.scroll(0, 0);

       event.preventDefault();
     },
 
       event.preventDefault();
     },
 


@@ -369,7 +400,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;
         }


@@ -385,14 +419,21 @@ 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();

     },
 
     moveCursor: function (offset: number): boolean {
     },
 
     moveCursor: function (offset: number): boolean {

-      const active = document.activeElement;
+      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) {


@@ -403,7 +444,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


@@ -417,16 +458,22 @@ 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 () {
+      for (const task of document.getElementsByClassName("task")) {
+        task.classList.remove("hide");
+      }
+    },
+
+    resetView: function () {
+      this.setView("todo");
+      this.resetTagView();
+    },
+

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


@@ -437,20 +484,20 @@ 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;
       if (!task) return;
       const oldState = task.getAttribute("data-state")!;
       if (newState === oldState) return;


@@ -461,18 +508,31 @@ function BrowserUI() {
       return ui.setState(createTimestamp, newState, oldState);
     },
 
       return ui.setState(createTimestamp, newState, oldState);
     },
 

-    setView: function (state: string, color: string) {
+    setTagView: function () {
+      const target = this.currentTag();
+      if (!target) return;
+      const tag = target.textContent!;
+      for (const task of document.getElementsByClassName("task")) {
+        if (Model.hasTag(task, tag)) {
+          task.classList.remove("hide");
+        } else {
+          task.classList.add("hide");
+        }
+      }
+    },
+
+    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();
       }
     },


@@ -489,6 +549,7 @@ function BrowserUI() {
 }
 const browserUI = BrowserUI();
 
 }
 const browserUI = BrowserUI();
 

+const scrollIncrement = 60;

 enum InputState {
   Root,
   S,
 enum InputState {
   Root,
   S,


@@ -512,31 +573,35 @@ function handleKey(event: any) {
       if (event.key == "Escape") return browserUI.completeEdit(event, CommitOrAbort.Abort);
     }
   } else {
       if (event.key == "Escape") return browserUI.completeEdit(event, CommitOrAbort.Abort);
     }
   } else {

-    if (event.ctrlKey) return; // eg: Don't redo when user refreshes the page with ctrl-R

     if (inputState === InputState.Root) {
       if ("0" <= event.key && event.key <= "9") {
         return (inputCount = (inputCount ?? 0) * 10 + parseInt(event.key));
       }
       try {
     if (inputState === InputState.Root) {
       if ("0" <= event.key && event.key <= "9") {
         return (inputCount = (inputCount ?? 0) * 10 + parseInt(event.key));
       }
       try {

-        if (event.key == "j") return browserUI.moveCursor(inputCount ?? 1);
-        if (event.key == "k") return browserUI.moveCursor(-(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 == "T") return browserUI.makeTopPriority();
-        if (event.key == "n") return browserUI.focusTaskNameInput(event);
-        if (event.key == "c") return browserUI.setState("cancelled");
-        if (event.key == "d") return browserUI.setState("done");
-        if (event.key == "q") return browserUI.setState("todo");
-        if (event.key == "s") return (inputState = InputState.S);
-        if (event.key == "w") return browserUI.setState("waiting");
-        if (event.key == "X") return browserUI.setState("deleted");
-        if (event.key == "x") return browserUI.removeTag();
-        if (event.key == "u") return browserUI.undo();
-        if (event.key == "r") return browserUI.redo();
-        if (event.key == "e") return browserUI.beginEdit(event);
-        if (event.key == "t") return browserUI.beginTagEdit(event);
-        if (event.key == "v") return (inputState = InputState.V);
+        if (event.ctrlKey) {
+          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 == "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 == "T") return browserUI.makeTopPriority();
+          if (event.key == "n") return browserUI.focusTaskNameInput(event);
+          if (event.key == "c") return browserUI.setState("cancelled");
+          if (event.key == "d") return browserUI.setState("done");
+          if (event.key == "q") return browserUI.setState("todo");
+          if (event.key == "s") return (inputState = InputState.S);
+          if (event.key == "w") return browserUI.setState("waiting");
+          if (event.key == "X") return browserUI.setState("deleted");
+          if (event.key == "x") return browserUI.removeTag();
+          if (event.key == "u") return browserUI.undo();
+          if (event.key == "r") return browserUI.redo();
+          if (event.key == "e") return browserUI.beginEdit(event);
+          if (event.key == "t") return browserUI.beginTagEdit(event);
+          if (event.key == "v") return (inputState = InputState.V);
+        }

       } finally {
         inputCount = null;
       }
       } finally {
         inputCount = null;
       }


@@ -545,17 +610,19 @@ 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 == "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 == "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");

     }
   }
 }
     }
   }
 }