Tag view

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 57c7686f9ba29759e1564548e5efb009263acb03..76c2d29380f1720b36d2ce8f8ef4a0749f5dba0b 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -267,6 +267,15 @@ enum CommitOrAbort {
 }
 
 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 = "";
@@ -346,10 +355,25 @@ 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;
+    },
+
     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;
         }
       }
@@ -372,7 +396,10 @@ function BrowserUI() {
         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;
         }
@@ -427,16 +454,22 @@ function BrowserUI() {
     },
 
     removeTag: function () {
-      var target = document.activeElement;
+      const target = this.currentTag();
       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!);
     },
 
+    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();
@@ -471,14 +504,27 @@ function BrowserUI() {
       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 }`);
       }
-      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;
@@ -560,17 +606,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 == "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 == "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;
-      if (event.key == "m") return browserUI.setView("someday-maybe", "DeepSkyBlue");
+      if (event.key == "m") return browserUI.setView("someday-maybe");
     }
   }
 }