README

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index e99777c6e986c91235060b22630b74b007808efc..17ace05eaf8a79ff22deaa4801291905d6a56d9e 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -1,3 +1,19 @@
+// vopamoi: vi-flavored todo organizer
+// Copyright (C) 2023  Scott Worley <scottworley@scottworley.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 3.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+

 // Typescript doesn't know about MAX_SAFE_INTEGER??  This was supposed to be
 // fixed in typescript 2.0.1 in 2016, but is not working for me in typescript
 // 4.2.4 in 2022.  :( https://github.com/microsoft/TypeScript/issues/9937
 // Typescript doesn't know about MAX_SAFE_INTEGER??  This was supposed to be
 // fixed in typescript 2.0.1 in 2016, but is not working for me in typescript
 // 4.2.4 in 2022.  :( https://github.com/microsoft/TypeScript/issues/9937


@@ -35,111 +51,167 @@ function hashHue(str: string) {
   return crypto.subtle.digest("SHA-256", new TextEncoder().encode(str)).then((buf) => (new Uint16Array(buf)[0] * 360) / 2 ** 16);
 }
 
   return crypto.subtle.digest("SHA-256", new TextEncoder().encode(str)).then((buf) => (new Uint16Array(buf)[0] * 360) / 2 ** 16);
 }
 

-const Model = {
-  addTask: function (timestamp: string, description: string): Element {
-    const task = document.createElement("div");
-    const desc = document.createElement("span");
-    desc.textContent = description;
-    desc.classList.add("desc");
-    task.appendChild(desc);
-    task.classList.add("task");
-    task.setAttribute("tabindex", "0");
-    task.setAttribute("data-created", timestamp);
-    task.setAttribute("data-state", "todo");
-    document.getElementById("tasks")!.appendChild(task);
-    return task;
-  },
-
-  addTag: function (createTimestamp: string, tagName: string): Element | null {
-    const task = this.getTask(createTimestamp);
-    if (!task) return null;
-    const existingTag = this.hasTag(task, tagName);
-    if (existingTag) return existingTag;
-    const tag = document.createElement("span");
-    tag.appendChild(document.createTextNode(tagName));
-    tag.classList.add("tag");
-    tag.setAttribute("tabindex", "0");
-    hashHue(tagName).then((hue) => (tag.style.backgroundColor = `hsl(${hue},90%,45%)`));
-    for (const child of task.getElementsByClassName("tag")) {
-      if (tagName > child.textContent!) {
-        task.insertBefore(tag, child);
-        return tag;
+function Model() {
+  return {
+    addTask: function (timestamp: string, description: string): Element {
+      const task = document.createElement("div");
+      const desc = document.createElement("span");
+      desc.textContent = description;
+      desc.classList.add("desc");
+      task.appendChild(desc);
+      task.classList.add("task");
+      task.setAttribute("tabindex", "0");
+      task.setAttribute("id", timestamp);
+      task.setAttribute("data-state", "todo");
+      const tasks = document.getElementById("tasks")!;
+      tasks.insertBefore(task, tasks.firstElementChild);
+      return task;
+    },
+
+    addTag: function (createTimestamp: string, tagName: string): Element | null {
+      const task = this.getTask(createTimestamp);
+      if (!task) return null;
+      const existingTag = this.hasTag(task, tagName);
+      if (existingTag) return existingTag;
+      const tag = document.createElement("span");
+      tag.appendChild(document.createTextNode(tagName));
+      tag.classList.add("tag");
+      tag.setAttribute("tabindex", "0");
+      hashHue(tagName).then((hue) => (tag.style.backgroundColor = `hsl(${hue},90%,45%)`));
+      for (const child of task.getElementsByClassName("tag")) {
+        if (tagName > child.textContent!) {
+          task.insertBefore(tag, child);
+          return tag;
+        }

       }
       }

-    }
-    task.appendChild(tag);
-    return tag;
-  },
-
-  edit: function (createTimestamp: string, newDescription: string): Element | null {
-    const target = this.getTask(createTimestamp);
-    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;
-      if (
-        input.value === target.getAttribute("data-description") &&
-        input.selectionStart === input.value.length &&
-        input.selectionEnd === input.value.length
-      ) {
-        // No local changes have actually been made yet.  Change the contents of the edit box!
-        input.value = newDescription;
+      task.insertBefore(tag, task.getElementsByClassName("desc")[0]!);
+      return tag;
+    },
+
+    edit: function (createTimestamp: string, newDescription: string): Element | null {
+      const target = this.getTask(createTimestamp);
+      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.getElementsByTagName("input")[0]!;
+        if (
+          input.value === target.getAttribute("data-description") &&
+          input.selectionStart === input.value.length &&
+          input.selectionEnd === input.value.length
+        ) {
+          // No local changes have actually been made yet.  Change the contents of the edit box!
+          input.value = newDescription;
+        } else {
+          // No great options.
+          // Prefer not to interrupt the local user's edit.
+          // The remote edit is mostly lost; this mostly becomes last-write-wins.
+          target.setAttribute("data-description", newDescription);
+        }

       } else {
       } else {

-        // No great options.
-        // Prefer not to interrupt the local user's edit.
-        // The remote edit is mostly lost; this mostly becomes last-write-wins.
-        target.setAttribute("data-description", newDescription);
+        target.getElementsByClassName("desc")[0].textContent = newDescription;

       }
       }

-    } else {
-      target.getElementsByClassName("desc")[0].textContent = newDescription;
-    }
-    return target;
-  },
+      return target;
+    },

 
 

-  hasTag: function (task: Element, tag: string): Element | null {
-    for (const child of task.getElementsByClassName("tag")) {
-      if (child.textContent === tag) {
-        return child;
+    editContent: function (createTimestamp: string, newContent: string): Element | null {
+      const target = this.getTask(createTimestamp);
+      if (!target) return null;
+      if (target.hasAttribute("data-content")) {
+        // Oh no: An edit has arrived from a replica while a local edit is in progress.
+        const input = target.getElementsByTagName("textarea")[0]!;
+        if (
+          input.value === target.getAttribute("data-content") &&
+          input.selectionStart === input.value.length &&
+          input.selectionEnd === input.value.length
+        ) {
+          // No local changes have actually been made yet.  Change the contents of the edit box!
+          input.value = newContent;
+        } else {
+          // No great options.
+          // Prefer not to interrupt the local user's edit.
+          // The remote edit is mostly lost; this mostly becomes last-write-wins.
+          target.setAttribute("data-content", newContent);
+        }
+      } else {
+        var content = target.getElementsByClassName("content")[0];
+        if (!content) {
+          content = document.createElement("div");
+          content.classList.add("content");
+          target.appendChild(content);
+        }
+        content.textContent = newContent;

       }
       }

-    }
-    return null;
-  },
+      return target;
+    },

 
 

-  getPriority: function (task: Element): number {
-    if (task.hasAttribute("data-priority")) {
-      return parseFloat(task.getAttribute("data-priority")!);
-    }
-    return parseFloat(task.getAttribute("data-created")!);
-  },
+    hasTag: function (task: Element, tag: string): Element | null {
+      for (const child of task.getElementsByClassName("tag")) {
+        if (child.textContent === tag) {
+          return child;
+        }
+      }
+      return null;
+    },

 
 

-  getTask: function (createTimestamp: string) {
-    for (const task of document.getElementsByClassName("task")) {
-      if (task.getAttribute("data-created") === createTimestamp) {
-        return task;
+    getPriority: function (task: Element): number {
+      if (task.hasAttribute("data-priority")) {
+        return parseFloat(task.getAttribute("data-priority")!);

       }
       }

-    }
-  },
+      return parseFloat(task.getAttribute("id")!);
+    },
+
+    getTask: function (createTimestamp: string) {
+      return document.getElementById(createTimestamp);
+    },

 
 

-  setPriority: function (createTimestamp: string, priority: number): Element | null {
-    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;
+    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;
+        }

       }
       }

-    }
-    document.getElementById("tasks")!.appendChild(target);
-    return target;
-  },
+      dest.appendChild(task);
+    },

 
 

-  setState: function (stateTimestamp: string, createTimestamp: string, state: string) {
-    const task = this.getTask(createTimestamp);
-    if (task) {
+    removeTag: function (createTimestamp: string, tagName: string) {
+      const task = this.getTask(createTimestamp);
+      if (!task) return null;
+      const tag = this.hasTag(task, tagName);
+      if (!tag) return;
+      task.removeChild(tag);
+      if (task instanceof HTMLElement) task.focus();
+    },
+
+    setPriority: function (createTimestamp: string, priority: number): Element | null {
+      const target = this.getTask(createTimestamp);
+      if (!target) return null;
+      target.setAttribute("data-priority", `${priority}`);
+      this.insertInPriorityOrder(target, target.parentElement!);
+      return target;
+    },
+
+    setState: function (stateTimestamp: string, createTimestamp: string, state: string) {
+      const task = this.getTask(createTimestamp);
+      if (!task) return;

       task.setAttribute("data-state", state);
       task.setAttribute("data-state", state);

-    }
-  },
-};
+      var date = task.getElementsByClassName("statedate")[0];
+      if (state === "todo") {
+        task.removeChild(date);
+        return;
+      }
+      if (!date) {
+        date = document.createElement("span");
+        date.classList.add("statedate");
+        task.insertBefore(date, task.firstChild);
+      }
+      const d = new Date(parseInt(stateTimestamp));
+      date.textContent = `${d.getFullYear()}-${`${d.getMonth() + 1}`.padStart(2, "0")}-${`${d.getDate()}`.padStart(2, "0")}`;
+    },
+  };
+}
+const model = Model();

 
 function Log(prefix: string = "vp-") {
   var next_log_index = 0;
 
 function Log(prefix: string = "vp-") {
   var next_log_index = 0;


@@ -147,23 +219,31 @@ function Log(prefix: string = "vp-") {
     apply: function (entry: string) {
       const [timestamp, command, data] = splitN(entry, " ", 2);
       if (command == "Create") {
     apply: function (entry: string) {
       const [timestamp, command, data] = splitN(entry, " ", 2);
       if (command == "Create") {

-        return Model.addTask(timestamp, data);
+        return model.addTask(timestamp, data);

       }
       if (command == "Edit") {
         const [createTimestamp, description] = splitN(data, " ", 1);
       }
       if (command == "Edit") {
         const [createTimestamp, description] = splitN(data, " ", 1);

-        return Model.edit(createTimestamp, description);
+        return model.edit(createTimestamp, description);
+      }
+      if (command == "EditContent") {
+        const [createTimestamp, content] = splitN(data, " ", 1);
+        return model.editContent(createTimestamp, content);

       }
       if (command == "Priority") {
         const [createTimestamp, newPriority] = splitN(data, " ", 1);
       }
       if (command == "Priority") {
         const [createTimestamp, newPriority] = splitN(data, " ", 1);

-        return Model.setPriority(createTimestamp, parseFloat(newPriority));
+        return model.setPriority(createTimestamp, parseFloat(newPriority));

       }
       if (command == "State") {
         const [createTimestamp, state] = splitN(data, " ", 1);
       }
       if (command == "State") {
         const [createTimestamp, state] = splitN(data, " ", 1);

-        return Model.setState(timestamp, createTimestamp, state);
+        return model.setState(timestamp, createTimestamp, state);

       }
       if (command == "Tag") {
         const [createTimestamp, tag] = splitN(data, " ", 1);
       }
       if (command == "Tag") {
         const [createTimestamp, tag] = splitN(data, " ", 1);

-        return Model.addTag(createTimestamp, tag);
+        return model.addTag(createTimestamp, tag);
+      }
+      if (command == "Untag") {
+        const [createTimestamp, tag] = splitN(data, " ", 1);
+        return model.removeTag(createTimestamp, tag);

       }
     },
 
       }
     },
 


@@ -177,6 +257,7 @@ function Log(prefix: string = "vp-") {
     },
 
     replay: function () {
     },
 
     replay: function () {

+      document.getElementById("tasks")!.style.display = "none";

       while (true) {
         const entry = window.localStorage.getItem(`${prefix}${next_log_index}`);
         if (entry === null) {
       while (true) {
         const entry = window.localStorage.getItem(`${prefix}${next_log_index}`);
         if (entry === null) {


@@ -185,38 +266,55 @@ function Log(prefix: string = "vp-") {
         this.apply(entry);
         next_log_index++;
       }
         this.apply(entry);
         next_log_index++;
       }

+      document.getElementById("tasks")!.style.display = "";

     },
   };
 }
 const log = Log();
 
 function UI() {
     },
   };
 }
 const log = Log();
 
 function UI() {

-  const undoLog: string[] = [];
+  const undoLog: string[][] = [];
+  const redoLog: string[][] = [];
+  function perform(forward: string, reverse: string) {
+    undoLog.push([reverse, forward]);
+    return log.recordAndApply(`${clock.now()} ${forward}`);
+  }

   return {
     addTask: function (description: string): Element {
       const now = clock.now();
   return {
     addTask: function (description: string): Element {
       const now = clock.now();

-      undoLog.push(`State ${now} deleted`);
+      undoLog.push([`State ${now} deleted`, `State ${now} todo`]);

       return <Element>log.recordAndApply(`${now} Create ${description}`);
     },
     addTag: function (createTimestamp: string, tag: string) {
       return <Element>log.recordAndApply(`${now} Create ${description}`);
     },
     addTag: function (createTimestamp: string, tag: string) {

-      // TODO: undo
-      return log.recordAndApply(`${clock.now()} Tag ${createTimestamp} ${tag}`);
+      return perform(`Tag ${createTimestamp} ${tag}`, `Untag ${createTimestamp} ${tag}`);

     },
     edit: function (createTimestamp: string, newDescription: string, oldDescription: string) {
     },
     edit: function (createTimestamp: string, newDescription: string, oldDescription: string) {

-      undoLog.push(`Edit ${createTimestamp} ${oldDescription}`);
-      return log.recordAndApply(`${clock.now()} Edit ${createTimestamp} ${newDescription}`);
+      return perform(`Edit ${createTimestamp} ${newDescription}`, `Edit ${createTimestamp} ${oldDescription}`);
+    },
+    editContent: function (createTimestamp: string, newContent: string, oldContent: string) {
+      return perform(`EditContent ${createTimestamp} ${newContent}`, `EditContent ${createTimestamp} ${oldContent}`);
+    },
+    removeTag: function (createTimestamp: string, tag: string) {
+      return perform(`Untag ${createTimestamp} ${tag}`, `Tag ${createTimestamp} ${tag}`);

     },
     setPriority: function (createTimestamp: string, newPriority: number, oldPriority: number) {
     },
     setPriority: function (createTimestamp: string, newPriority: number, oldPriority: number) {

-      undoLog.push(`Priority ${createTimestamp} ${oldPriority}`);
-      return log.recordAndApply(`${clock.now()} Priority ${createTimestamp} ${newPriority}`);
+      return perform(`Priority ${createTimestamp} ${newPriority}`, `Priority ${createTimestamp} ${oldPriority}`);

     },
     setState: function (createTimestamp: string, newState: string, oldState: string) {
     },
     setState: function (createTimestamp: string, newState: string, oldState: string) {

-      undoLog.push(`State ${createTimestamp} ${oldState}`);
-      return log.recordAndApply(`${clock.now()} State ${createTimestamp} ${newState}`);
+      return perform(`State ${createTimestamp} ${newState}`, `State ${createTimestamp} ${oldState}`);

     },
     undo: function () {
     },
     undo: function () {

-      if (undoLog.length > 0) {
-        return log.recordAndApply(`${clock.now()} ${undoLog.pop()}`);
+      const entry = undoLog.pop();
+      if (entry) {
+        redoLog.push(entry);
+        return log.recordAndApply(`${clock.now()} ${entry[0]}`);
+      }
+    },
+    redo: function () {
+      const entry = redoLog.pop();
+      if (entry) {
+        undoLog.push(entry);
+        return log.recordAndApply(`${clock.now()} ${entry[1]}`);

       }
     },
   };
       }
     },
   };


@@ -228,30 +326,44 @@ enum CommitOrAbort {
   Abort,
 }
 
   Abort,
 }
 

+interface TagFilter {
+  description: string;
+  include: (task: Element) => boolean;
+}
+

 function BrowserUI() {
 function BrowserUI() {

+  const viewColors: { [key: string]: string } = {
+    all: "Gold",
+    cancelled: "Red",
+    deleted: "Black",
+    done: "LawnGreen",
+    "someday-maybe": "DeepSkyBlue",
+    todo: "rgb(0 0 0 / 0)",
+    waiting: "MediumOrchid",
+  };
+  var currentTagFilter: TagFilter | null = null;

   var currentViewState = "todo";
   var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;
   var lastTagNameEntered = "";
   return {
     addTask: function (event: KeyboardEvent) {
       const input = <HTMLInputElement>document.getElementById("taskName");
   var currentViewState = "todo";
   var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;
   var lastTagNameEntered = "";
   return {
     addTask: function (event: KeyboardEvent) {
       const input = <HTMLInputElement>document.getElementById("taskName");

-      if (input.value) {
-        const task = ui.addTask(input.value);
-        if (currentViewState === "todo") {
-          task instanceof HTMLElement && task.focus();
-        } else if (this.returnFocusAfterInput()) {
-        } else {
-          this.firstVisibleTask()?.focus();
-        }
-        input.value = "";
-        if (event.getModifierState("Control")) {
-          this.setPriority(task, null, document.getElementsByClassName("task")[0]);
-        }
+      if (input.value.match(/^ *$/)) return;
+      const task = ui.addTask(input.value);
+      if (currentViewState === "todo" || currentViewState === "all") {
+        task instanceof HTMLElement && task.focus();
+      } else if (this.returnFocusAfterInput()) {
+      } else {
+        this.firstVisibleTask()?.focus();
+      }
+      input.value = "";
+      if (event.getModifierState("Control")) {
+        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];


@@ -265,8 +377,23 @@ function BrowserUI() {
       event.preventDefault();
     },
 
       event.preventDefault();
     },
 

+    beginEditContent: function (event: Event) {
+      const task = this.currentTask();
+      if (!task) return;
+      const input = document.createElement("textarea");
+      const content = task.getElementsByClassName("content")[0];
+      const oldContent = content?.textContent ?? "";
+      task.setAttribute("data-content", oldContent);
+      input.value = oldContent;
+      input.addEventListener("blur", this.completeContentEdit, { once: true });
+      if (content) content.textContent = "";
+      task.appendChild(input);
+      input.focus();
+      event.preventDefault();
+    },
+

     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");


@@ -288,10 +415,27 @@ function BrowserUI() {
       task.removeChild(input);
       task.removeAttribute("data-description");
       task.focus();
       task.removeChild(input);
       task.removeAttribute("data-description");
       task.focus();

-      if (newDescription === oldDescription || resolution === CommitOrAbort.Abort) {
+      if (resolution === CommitOrAbort.Abort || newDescription.match(/^ *$/) || newDescription === oldDescription) {

         desc.textContent = oldDescription;
       } else {
         desc.textContent = oldDescription;
       } else {

-        ui.edit(task.getAttribute("data-created")!, newDescription, oldDescription);
+        ui.edit(task.getAttribute("id")!, newDescription, oldDescription);
+      }
+    },
+
+    completeContentEdit: function (event: Event, resolution: CommitOrAbort = CommitOrAbort.Commit) {
+      const input = event.target as HTMLInputElement;
+      const task = input.parentElement!;
+      const content = task.getElementsByClassName("content")[0];
+      const oldContent = task.getAttribute("data-content")!;
+      const newContent = input.value;
+      input.removeEventListener("blur", this.completeContentEdit);
+      task.removeChild(input);
+      task.removeAttribute("data-content");
+      task.focus();
+      if (resolution === CommitOrAbort.Abort || newContent === oldContent) {
+        if (content) content.textContent = oldContent;
+      } else {
+        ui.editContent(task.getAttribute("id")!, newContent, oldContent);

       }
     },
 
       }
     },
 


@@ -302,25 +446,49 @@ function BrowserUI() {
       input.removeEventListener("blur", this.completeTagEdit);
       task.removeChild(input);
       task.focus();
       input.removeEventListener("blur", this.completeTagEdit);
       task.removeChild(input);
       task.focus();

-      if (resolution === CommitOrAbort.Commit && newTagName && !Model.hasTag(task, newTagName)) {
-        ui.addTag(task.getAttribute("data-created")!, newTagName);
+      if (resolution === CommitOrAbort.Commit && !newTagName.match(/^ *$/) && !model.hasTag(task, newTagName)) {
+        ui.addTag(task.getAttribute("id")!, newTagName);

         lastTagNameEntered = newTagName;
       }
     },
 
         lastTagNameEntered = newTagName;
       }
     },
 

-    firstVisibleTask: function () {
-      for (const task of document.getElementsByClassName("task")) {
-        if (task instanceof HTMLElement && task.getAttribute("data-state") === currentViewState) {
+    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!;
+      if (!target.classList.contains("task")) return null;
+      return target as HTMLElement;
+    },
+
+    firstVisibleTask: function (root: Element | null = null) {
+      if (root === null) root = document.body;
+      for (const task of root.getElementsByClassName("task")) {
+        const state = task.getAttribute("data-state");
+        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();
     },
 


@@ -331,7 +499,11 @@ function BrowserUI() {
       while (true) {
         cursor = increment > 0 ? cursor.nextElementSibling : cursor.previousElementSibling;
         if (!cursor || !(cursor instanceof HTMLElement)) break;
       while (true) {
         cursor = increment > 0 ? cursor.nextElementSibling : cursor.previousElementSibling;
         if (!cursor || !(cursor instanceof HTMLElement)) break;

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

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


@@ -340,8 +512,46 @@ function BrowserUI() {
       return valid_cursor;
     },
 
       return valid_cursor;
     },
 

-    moveCursor: function (offset: number): boolean {
-      const active = document.activeElement;
+    jumpCursor: function (position: number) {
+      const first = this.firstVisibleTask();
+      if (!first) return;
+      const dest = this.visibleTaskAtOffset(first, position - 1);
+      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) {
+      if (!task) task = this.currentTask();
+      if (!task) return;
+      ui.setPriority(task.getAttribute("id")!, 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 () {
+      const active = this.currentTask();
+      if (!active) return false;
+      (this.firstVisibleTask(active) as HTMLElement | null)?.focus();
+    },
+
+    moveCursorVertically: function (offset: number): boolean {
+      let active = this.currentTask();
+      if (!active) {
+        this.firstVisibleTask()?.focus();
+        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) {


@@ -352,7 +562,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


@@ -365,6 +575,29 @@ function BrowserUI() {
       }
     },
 
       }
     },
 

+    removeTag: function () {
+      const target = this.currentTag();
+      if (!target) return;
+      ui.removeTag(target.parentElement!.getAttribute("id")!, target.textContent!);
+    },
+
+    resetTagView: function () {
+      currentTagFilter = null;
+      this.setTitle();
+      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();


@@ -375,56 +608,139 @@ 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;
-      ui.setPriority(task.getAttribute("data-created")!, okToRound ? newPriorityRounded : newPriority, Model.getPriority(task));
+      const okToRound = aPriority > newPriorityRounded && newPriorityRounded > bPriority;
+      ui.setPriority(task.getAttribute("id")!, okToRound ? newPriorityRounded : newPriority, model.getPriority(task));

       task instanceof HTMLElement && task.focus();
     },
 
     setState: function (newState: string) {
       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;

-      const createTimestamp = task.getAttribute("data-created")!;
-      this.moveCursor(1) || this.moveCursor(-1);
+      const createTimestamp = task.getAttribute("id")!;
+      if (currentViewState !== "all" || newState == "deleted") {
+        this.moveCursorVertically(1) || this.moveCursorVertically(-1);
+      }

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

-    setView: function (state: string, color: string) {
+    setTagFilter: function (filter: TagFilter) {
+      if (currentTagFilter !== null) {
+        this.resetTagView();
+      }
+
+      const tasksWithTag = new Map();
+      for (const task of document.getElementsByClassName("task")) {
+        if (filter.include(task)) {
+          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 (filter.include(task)) {
+          task.classList.remove("hide");
+        } else {
+          const superTask = highestPrioritySuperTask(task);
+          if (superTask !== null) {
+            model.insertInPriorityOrder(task, superTask);
+          } else {
+            task.classList.add("hide");
+          }
+        }
+      }
+
+      currentTagFilter = filter;
+      this.setTitle();
+    },
+
+    setTagView: function (tag: string | null = null) {
+      if (tag === null) {
+        const target = this.currentTag();
+        if (!target) return;
+        tag = target.textContent!;
+      }
+      this.setTagFilter({description: tag, include: task => !!model.hasTag(task, tag!)});
+    },
+
+    setTitle: function () {
+      document.title = "Vopamoi: " + currentViewState + (currentTagFilter ? ": " + currentTagFilter.description : "");
+    },
+
+    setView: function (state: string) {

       const sheet = (document.getElementById("viewStyle") as HTMLStyleElement).sheet!;
       const sheet = (document.getElementById("viewStyle") as HTMLStyleElement).sheet!;

-      sheet.insertRule(`.task:not([data-state=${state}]) { display: none }`);
-      sheet.insertRule(`:root { --view-state-indicator-color: ${color}; }`);
+      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: ${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) {
+      this.setTitle();
+      if (this.currentTask()?.getAttribute("data-state") !== state) {

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

+    setUntaggedView: function () {
+      this.setTagFilter({description: "(untagged)", include: task => task.getElementsByClassName("tag").length === 0});
+    },
+
+    toggleDark: function () {
+      document.body.classList.toggle("dark");
+      this.setView(currentViewState);
+    },
+

     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();
     },

+    redo: function () {
+      const ret = ui.redo();
+      if (ret && ret instanceof HTMLElement) ret.focus();
+    },

   };
 }
 const browserUI = BrowserUI();
 
   };
 }
 const browserUI = BrowserUI();
 

+const scrollIncrement = 60;

 enum InputState {
 enum InputState {

-  Command,
-  View,
+  Root,
+  S,
+  V,
+  VS,

 }
 }

-var inputState = InputState.Command;
+var inputState = InputState.Root;
+var inputCount: number | null = null;

 
 function handleKey(event: any) {
 
 function handleKey(event: any) {

-  if (event.target.tagName === "INPUT") {
+  if (["Alt", "Control", "Meta", "Shift"].includes(event.key)) return;
+  if (event.target.tagName === "TEXTAREA") {
+    if (event.key == "Enter" && event.ctrlKey) return browserUI.completeContentEdit(event);
+    if (event.key == "Escape") return browserUI.completeContentEdit(event, CommitOrAbort.Abort);
+  } else if (event.target.tagName === "INPUT") {

     if (event.target.id === "taskName") {
       if (event.key == "Enter") return browserUI.addTask(event);
       if (event.key == "Escape") return browserUI.returnFocusAfterInput();
     if (event.target.id === "taskName") {
       if (event.key == "Enter") return browserUI.addTask(event);
       if (event.key == "Escape") return browserUI.returnFocusAfterInput();


@@ -436,36 +752,74 @@ 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 (inputState === InputState.Command) {
-      if (event.key == "j") return browserUI.moveCursor(1);
-      if (event.key == "k") return browserUI.moveCursor(-1);
-      if (event.key == "J") return browserUI.moveTask(1);
-      if (event.key == "K") return browserUI.moveTask(-1);
-      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 browserUI.setState("someday-maybe");
-      if (event.key == "w") return browserUI.setState("waiting");
-      if (event.key == "X") return browserUI.setState("deleted");
-      if (event.key == "u") return browserUI.undo();
-      if (event.key == "e") return browserUI.beginEdit(event);
-      if (event.key == "t") return browserUI.beginTagEdit(event);
-      if (event.key == "v") return (inputState = InputState.View);
-    } else if (inputState === InputState.View) {
-      inputState = InputState.Command;
-      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 == "s") return browserUI.setView("someday-maybe", "DeepSkyBlue");
-      if (event.key == "w") return browserUI.setView("waiting", "MediumOrchid");
-      if (event.key == "x") return browserUI.setView("deleted", "Black");
+    if (inputState === InputState.Root) {
+      if ("0" <= event.key && event.key <= "9") {
+        return (inputCount = (inputCount ?? 0) * 10 + parseInt(event.key));
+      }
+      try {
+        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 == "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 == "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.beginEditContent(event);
+          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;
+      }
+    } else if (inputState === InputState.S) {
+      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");
+      if (event.key == "C") return browserUI.setView("cancelled");
+      if (event.key == "c") return browserUI.setTagView("comp");
+      if (event.key == "D") return browserUI.toggleDark();
+      if (event.key == "d") return browserUI.setView("done");
+      if (event.key == "e") return browserUI.setTagView("errand");
+      if (event.key == "h") return browserUI.setTagView("home");
+      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 == "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");
+      if (event.key == "z") return browserUI.setTagView("zombie");
+    } else if (inputState === InputState.VS) {
+      inputState = InputState.Root;
+      if (event.key == "m") return browserUI.setView("someday-maybe");

     }
   }
 }
 
 function browserInit() {
     }
   }
 }
 
 function browserInit() {

-  document.body.addEventListener("keydown", handleKey, { capture: false });

   log.replay();
   log.replay();

+  browserUI.setTitle();

   browserUI.firstVisibleTask()?.focus();
   browserUI.firstVisibleTask()?.focus();

+  document.body.addEventListener("keydown", handleKey, { capture: false });

 }
 }