currentTag helper

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 6cee2a175c0f51748f5940f31bfd66fec660a11e..8cdc71f9804523f9d9db9257d907bc7351ba47ac 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -29,24 +29,54 @@ function Clock() {
 }
 const clock = Clock();
 
 }
 const clock = Clock();
 

+// Returns a promise for a hue based on a hash of the string
+function hashHue(str: string) {
+  // Using crypto for this is overkill
+  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 Model = {
   addTask: function (timestamp: string, description: string): Element {
     const task = document.createElement("div");

-    task.appendChild(document.createTextNode(description));
+    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");
     task.classList.add("task");
     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;
   },
 

+  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.
   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.children[0] as HTMLInputElement;
+      const input = target.firstChild as HTMLInputElement;

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


@@ -61,11 +91,20 @@ const Model = {
         target.setAttribute("data-description", newDescription);
       }
     } else {
         target.setAttribute("data-description", newDescription);
       }
     } else {

-      target.textContent = newDescription;
+      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;
+      }
+    }
+    return null;
+  },
+

   getPriority: function (task: Element): number {
     if (task.hasAttribute("data-priority")) {
       return parseFloat(task.getAttribute("data-priority")!);
   getPriority: function (task: Element): number {
     if (task.hasAttribute("data-priority")) {
       return parseFloat(task.getAttribute("data-priority")!);


@@ -81,12 +120,21 @@ const Model = {
     }
   },
 
     }
   },
 

+  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}`);
     for (const task of document.getElementsByClassName("task")) {
   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) {
+      if (task !== target && this.getPriority(task) < priority) {

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


@@ -97,9 +145,20 @@ const Model = {
 
   setState: function (stateTimestamp: string, createTimestamp: string, state: string) {
     const task = this.getTask(createTimestamp);
 
   setState: function (stateTimestamp: string, createTimestamp: string, state: string) {
     const task = this.getTask(createTimestamp);

-    if (task) {
-      task.setAttribute("data-state", state);
+    if (!task) return;
+    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")}`;

   },
 };
 
   },
 };
 


@@ -123,6 +182,14 @@ function Log(prefix: string = "vp-") {
         const [createTimestamp, state] = splitN(data, " ", 1);
         return Model.setState(timestamp, createTimestamp, state);
       }
         const [createTimestamp, state] = splitN(data, " ", 1);
         return Model.setState(timestamp, createTimestamp, state);
       }

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

     },
 
     record: function (entry: string) {
     },
 
     record: function (entry: string) {


@@ -149,28 +216,45 @@ function Log(prefix: string = "vp-") {
 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}`);
     },
       return <Element>log.recordAndApply(`${now} Create ${description}`);
     },

+    addTag: function (createTimestamp: string, tag: string) {
+      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}`);
+    },
+    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]}`);

       }
     },
   };
       }
     },
   };


@@ -183,59 +267,109 @@ 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 currentViewState = "todo";
   var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;

+  var lastTagNameEntered = "";

   return {
     addTask: function (event: KeyboardEvent) {
       const input = <HTMLInputElement>document.getElementById("taskName");
   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;
+      var task = document.activeElement;

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

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

       const input = document.createElement("input");
       const input = document.createElement("input");

-      const oldDescription = task.textContent!;
+      const desc = task.getElementsByClassName("desc")[0];
+      const oldDescription = desc.textContent!;

       task.setAttribute("data-description", oldDescription);
       input.value = oldDescription;
       input.addEventListener("blur", this.completeEdit, { once: true });
       task.setAttribute("data-description", oldDescription);
       input.value = oldDescription;
       input.addEventListener("blur", this.completeEdit, { once: true });

-      task.textContent = "";
+      desc.textContent = "";
+      task.insertBefore(input, task.firstChild);
+      input.focus();
+      event.preventDefault();
+    },
+
+    beginTagEdit: function (event: Event) {
+      const task = document.activeElement;
+      if (!task) return;
+      const input = document.createElement("input");
+      input.classList.add("tag");
+      input.addEventListener("blur", this.completeTagEdit, { once: true });
+      input.value = lastTagNameEntered;

       task.appendChild(input);
       input.focus();
       task.appendChild(input);
       input.focus();

+      input.select();

       event.preventDefault();
     },
 
     completeEdit: function (event: Event, resolution: CommitOrAbort = CommitOrAbort.Commit) {
       const input = event.target as HTMLInputElement;
       const task = input.parentElement!;
       event.preventDefault();
     },
 
     completeEdit: function (event: Event, resolution: CommitOrAbort = CommitOrAbort.Commit) {
       const input = event.target as HTMLInputElement;
       const task = input.parentElement!;

+      const desc = task.getElementsByClassName("desc")[0];

       const oldDescription = task.getAttribute("data-description")!;
       const newDescription = input.value;
       input.removeEventListener("blur", this.completeEdit);
       const oldDescription = task.getAttribute("data-description")!;
       const newDescription = input.value;
       input.removeEventListener("blur", this.completeEdit);

-      task.removeChild(task.children[0]);
+      task.removeChild(input);

       task.removeAttribute("data-description");
       task.focus();
       task.removeAttribute("data-description");
       task.focus();

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

       } else {
         ui.edit(task.getAttribute("data-created")!, newDescription, oldDescription);
       }
     },
 
       } else {
         ui.edit(task.getAttribute("data-created")!, newDescription, oldDescription);
       }
     },
 

+    completeTagEdit: function (event: Event, resolution: CommitOrAbort = CommitOrAbort.Commit) {
+      const input = event.target as HTMLInputElement;
+      const task = input.parentElement!;
+      const newTagName = input.value;
+      input.removeEventListener("blur", this.completeTagEdit);
+      task.removeChild(input);
+      task.focus();
+      if (resolution === CommitOrAbort.Commit && !newTagName.match(/^ *$/) && !Model.hasTag(task, newTagName)) {
+        ui.addTag(task.getAttribute("data-created")!, newTagName);
+        lastTagNameEntered = newTagName;
+      }
+    },
+
+    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")) {
     firstVisibleTask: function () {
       for (const task of document.getElementsByClassName("task")) {

-        if (task instanceof HTMLElement && task.getAttribute("data-state") === currentViewState) {
+        const state = task.getAttribute("data-state");
+        if (task instanceof HTMLElement && (state === currentViewState || (currentViewState === "all" && state !== "deleted"))) {

           return task;
         }
       }
           return task;
         }
       }


@@ -246,6 +380,7 @@ function BrowserUI() {
         taskFocusedBeforeJumpingToInput = document.activeElement;
       }
       document.getElementById("taskName")!.focus();
         taskFocusedBeforeJumpingToInput = document.activeElement;
       }
       document.getElementById("taskName")!.focus();

+      window.scroll(0, 0);

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


@@ -256,7 +391,8 @@ 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")) {

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


@@ -265,6 +401,26 @@ function BrowserUI() {
       return valid_cursor;
     },
 
       return valid_cursor;
     },
 

+    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 = document.activeElement;
+      if (!task) return;
+      this.setPriority(task, document.getElementById("tasks")!.lastElementChild, null);
+    },
+
+    makeTopPriority: function (task: Element | null = null) {
+      if (!task) task = document.activeElement;
+      if (!task) return;
+      ui.setPriority(task.getAttribute("data-created")!, clock.now(), Model.getPriority(task));
+      task instanceof HTMLElement && task.focus();
+    },
+

     moveCursor: function (offset: number): boolean {
       const active = document.activeElement;
       if (!active) return false;
     moveCursor: function (offset: number): boolean {
       const active = document.activeElement;
       if (!active) return false;


@@ -290,6 +446,12 @@ function BrowserUI() {
       }
     },
 
       }
     },
 

+    removeTag: function () {
+      const target = this.currentTag();
+      if (!target) return;
+      ui.removeTag(target.parentElement!.getAttribute("data-created")!, target.textContent!);
+    },
+

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


@@ -300,14 +462,14 @@ 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();
     },
       ui.setPriority(task.getAttribute("data-created")!, okToRound ? newPriorityRounded : newPriority, Model.getPriority(task));
       task instanceof HTMLElement && task.focus();
     },


@@ -318,14 +480,22 @@ function BrowserUI() {
       const oldState = task.getAttribute("data-state")!;
       if (newState === oldState) return;
       const createTimestamp = task.getAttribute("data-created")!;
       const oldState = task.getAttribute("data-state")!;
       if (newState === oldState) return;
       const createTimestamp = task.getAttribute("data-created")!;

-      this.moveCursor(1) || this.moveCursor(-1);
+      if (currentViewState !== "all" || newState == "deleted") {
+        this.moveCursor(1) || this.moveCursor(-1);
+      }

       return ui.setState(createTimestamp, newState, oldState);
     },
 
     setView: function (state: string) {
       const sheet = (document.getElementById("viewStyle") as HTMLStyleElement).sheet!;
       return ui.setState(createTimestamp, newState, oldState);
     },
 
     setView: function (state: string) {
       const sheet = (document.getElementById("viewStyle") as HTMLStyleElement).sheet!;

-      sheet.insertRule(`.task:not([data-state=${state}]) { display: none }`);
-      sheet.removeRule(1);
+      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;
       if (document.activeElement?.getAttribute("data-state") !== state) {
         this.firstVisibleTask()?.focus();
       currentViewState = state;
       if (document.activeElement?.getAttribute("data-state") !== state) {
         this.firstVisibleTask()?.focus();


@@ -336,55 +506,92 @@ function BrowserUI() {
       const ret = ui.undo();
       if (ret && ret instanceof HTMLElement) ret.focus();
     },
       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 (["Alt", "Control", "Meta", "Shift"].includes(event.key)) return;

   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.tagName === "INPUT") {
     if (event.target.id === "taskName") {
       if (event.key == "Enter") return browserUI.addTask(event);
       if (event.key == "Escape") return browserUI.returnFocusAfterInput();

+    } else if (event.target.classList.contains("tag")) {
+      if (event.key == "Enter") return browserUI.completeTagEdit(event);
+      if (event.key == "Escape") return browserUI.completeTagEdit(event, CommitOrAbort.Abort);

     } else {
       if (event.key == "Enter") return browserUI.completeEdit(event);
       if (event.key == "Escape") return browserUI.completeEdit(event, CommitOrAbort.Abort);
     }
   } else {
     } else {
       if (event.key == "Enter") return browserUI.completeEdit(event);
       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 == "v") return (inputState = InputState.View);
-    } else if (inputState === InputState.View) {
-      inputState = InputState.Command;
+    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 == "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;
+      }
+    } 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 == "d") return browserUI.setView("done");
       if (event.key == "q") return browserUI.setView("todo");
       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 browserUI.setView("someday-maybe");
+      if (event.key == "s") return (inputState = InputState.VS);
+      if (event.key == "v") return browserUI.setView("todo");

       if (event.key == "w") return browserUI.setView("waiting");
       if (event.key == "x") return browserUI.setView("deleted");
       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");

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

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

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

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

 }
 }