X-Git-Url: http://git.scottworley.com/vopamoi/blobdiff_plain/9f6be65ee10f3cfd4ad55b7326e8fb35fc78151a..55a4baa82e843ccb8a0ced1c1dc75a38bfe5f70e:/vopamoi.ts?ds=inline

diff --git a/vopamoi.ts b/vopamoi.ts
index a98a29b..83354a4 100644
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -13,17 +13,97 @@ function splitN(str: string, delimiter: string, limit: number = MAX_SAFE_INTEGER
   return at === -1 ? [str] : [str.substring(0, at)].concat(splitN(str.substring(at + delimiter.length), delimiter, limit - 1));
 }
 
+// A clock that never goes backwards; monotonic.
+function Clock() {
+  var previousNow = Date.now();
+  return {
+    now: function (): number {
+      const now = Date.now();
+      if (now > previousNow) {
+        previousNow = now;
+        return now;
+      }
+      return ++previousNow;
+    },
+  };
+}
+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");
-    task.appendChild(document.createTextNode(description));
-    task.setAttribute("class", "task");
+    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;
+      }
+    }
+    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;
+      } 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 {
+      target.getElementsByClassName("desc")[0].textContent = newDescription;
+    }
+    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")!);
@@ -31,10 +111,6 @@ const Model = {
     return parseFloat(task.getAttribute("data-created")!);
   },
 
-  getState: function (task: Element): string {
-    return task.getAttribute("data-state") ?? "todo";
-  },
-
   getTask: function (createTimestamp: string) {
     for (const task of document.getElementsByClassName("task")) {
       if (task.getAttribute("data-created") === createTimestamp) {
@@ -43,6 +119,15 @@ 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;
@@ -61,9 +146,6 @@ const Model = {
     const task = this.getTask(createTimestamp);
     if (task) {
       task.setAttribute("data-state", state);
-      if (task instanceof HTMLElement) {
-        task.style.display = state == "todo" ? "block" : "none"; // Until view filtering
-      }
     }
   },
 };
@@ -76,14 +158,26 @@ function Log(prefix: string = "vp-") {
       if (command == "Create") {
         return Model.addTask(timestamp, data);
       }
-      if (command == "State") {
-        const [createTimestamp, state] = splitN(data, " ", 1);
-        return Model.setState(timestamp, createTimestamp, state);
+      if (command == "Edit") {
+        const [createTimestamp, description] = splitN(data, " ", 1);
+        return Model.edit(createTimestamp, description);
       }
       if (command == "Priority") {
         const [createTimestamp, newPriority] = splitN(data, " ", 1);
         return Model.setPriority(createTimestamp, parseFloat(newPriority));
       }
+      if (command == "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) {
@@ -109,144 +203,305 @@ function Log(prefix: string = "vp-") {
 }
 const log = Log();
 
-const undoLog: string[] = [];
+function UI() {
+  const undoLog: string[] = [];
+  return {
+    addTask: function (description: string): Element {
+      const now = clock.now();
+      undoLog.push(`State ${now} deleted`);
+      return <Element>log.recordAndApply(`${now} Create ${description}`);
+    },
+    addTag: function (createTimestamp: string, tag: string) {
+      undoLog.push(`Untag ${createTimestamp} ${tag}`);
+      return log.recordAndApply(`${clock.now()} Tag ${createTimestamp} ${tag}`);
+    },
+    edit: function (createTimestamp: string, newDescription: string, oldDescription: string) {
+      undoLog.push(`Edit ${createTimestamp} ${oldDescription}`);
+      return log.recordAndApply(`${clock.now()} Edit ${createTimestamp} ${newDescription}`);
+    },
+    removeTag: function (createTimestamp: string, tag: string) {
+      undoLog.push(`Tag ${createTimestamp} ${tag}`);
+      return log.recordAndApply(`${clock.now()} Untag ${createTimestamp} ${tag}`);
+    },
+    setPriority: function (createTimestamp: string, newPriority: number, oldPriority: number) {
+      undoLog.push(`Priority ${createTimestamp} ${oldPriority}`);
+      return log.recordAndApply(`${clock.now()} Priority ${createTimestamp} ${newPriority}`);
+    },
+    setState: function (createTimestamp: string, newState: string, oldState: string) {
+      undoLog.push(`State ${createTimestamp} ${oldState}`);
+      return log.recordAndApply(`${clock.now()} State ${createTimestamp} ${newState}`);
+    },
+    undo: function () {
+      if (undoLog.length > 0) {
+        return log.recordAndApply(`${clock.now()} ${undoLog.pop()}`);
+      }
+    },
+  };
+}
+const ui = UI();
 
-const UI = {
-  addTask: function (description: string): Element {
-    const now = Date.now();
-    undoLog.push(`State ${now} deleted`);
-    return <Element>log.recordAndApply(`${now} Create ${description}`);
-  },
-  setPriority: function (createTimestamp: string, newPriority: number, oldPriority: number) {
-    undoLog.push(`Priority ${createTimestamp} ${oldPriority}`);
-    return log.recordAndApply(`${Date.now()} Priority ${createTimestamp} ${newPriority}`);
-  },
-  setState: function (createTimestamp: string, newState: string, oldState: string) {
-    undoLog.push(`State ${createTimestamp} ${oldState}`);
-    return log.recordAndApply(`${Date.now()} State ${createTimestamp} ${newState}`);
-  },
-  undo: function () {
-    if (undoLog.length > 0) {
-      return log.recordAndApply(`${Date.now()} ${undoLog.pop()}`);
-    }
-  },
-};
+enum CommitOrAbort {
+  Commit,
+  Abort,
+}
 
-const BrowserUI = {
-  addTask: function (event: KeyboardEvent) {
-    const input = <HTMLInputElement>document.getElementById("taskName");
-    if (input.value) {
-      const task = UI.addTask(input.value);
-      if (task && task instanceof HTMLElement) task.focus();
+function BrowserUI() {
+  var currentViewState = "todo";
+  var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;
+  var lastTagNameEntered = "";
+  return {
+    addTask: function (event: KeyboardEvent) {
+      const input = <HTMLInputElement>document.getElementById("taskName");
+      if (input.value.match(/^ *$/)) return;
+      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]);
+        this.makeTopPriority(task);
       }
-    }
-  },
+    },
 
-  firstVisibleTask: function () {
-    for (const task of document.getElementsByClassName("task")) {
-      if (task instanceof HTMLElement && task.style.display !== "none") {
-        return task;
+    beginEdit: function (event: Event) {
+      const task = document.activeElement;
+      if (!task) return;
+      const input = document.createElement("input");
+      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 });
+      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();
+      input.select();
+      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);
+      task.removeChild(input);
+      task.removeAttribute("data-description");
+      task.focus();
+      if (resolution === CommitOrAbort.Abort || newDescription.match(/^ *$/) || newDescription === oldDescription) {
+        desc.textContent = oldDescription;
+      } else {
+        ui.edit(task.getAttribute("data-created")!, newDescription, oldDescription);
       }
-    }
-  },
+    },
 
-  focusTaskNameInput: function (event: Event) {
-    document.getElementById("taskName")!.focus();
-    event.preventDefault();
-  },
+    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;
+      }
+    },
 
-  visibleTaskAtOffset(task: Element, offset: number): Element {
-    var cursor: Element | null = task;
-    var valid_cursor = cursor;
-    const increment = offset / Math.abs(offset);
-    while (true) {
-      cursor = increment > 0 ? cursor.nextElementSibling : cursor.previousElementSibling;
-      if (!cursor || !(cursor instanceof HTMLElement)) break;
-      if (cursor.style.display !== "none") {
-        offset -= increment;
-        valid_cursor = cursor;
-      }
-      if (Math.abs(offset) < 0.5) break;
-    }
-    return valid_cursor;
-  },
+    firstVisibleTask: function () {
+      for (const task of document.getElementsByClassName("task")) {
+        if (task instanceof HTMLElement && task.getAttribute("data-state") === currentViewState) {
+          return task;
+        }
+      }
+    },
 
-  moveCursor: function (offset: number): boolean {
-    const active = document.activeElement;
-    if (!active) return false;
-    const dest = this.visibleTaskAtOffset(active, offset);
-    if (dest !== active && dest instanceof HTMLElement) {
-      dest.focus();
-      return true;
-    }
-    return false;
-  },
+    focusTaskNameInput: function (event: Event) {
+      if (document.activeElement instanceof HTMLElement) {
+        taskFocusedBeforeJumpingToInput = document.activeElement;
+      }
+      document.getElementById("taskName")!.focus();
+      event.preventDefault();
+    },
 
-  moveTask: function (offset: number) {
-    const active = document.activeElement;
-    if (!active) return;
-    const dest = this.visibleTaskAtOffset(active, offset);
-    if (dest === active) return; // Already extremal
-    var onePastDest: Element | null = this.visibleTaskAtOffset(dest, offset / Math.abs(offset));
-    if (onePastDest == dest) onePastDest = null; // Will become extremal
-    if (offset > 0) {
-      this.setPriority(active, dest, onePastDest);
-    } else {
-      this.setPriority(active, onePastDest, dest);
-    }
-  },
+    visibleTaskAtOffset(task: Element, offset: number): Element {
+      var cursor: Element | null = task;
+      var valid_cursor = cursor;
+      const increment = offset / Math.abs(offset);
+      while (true) {
+        cursor = increment > 0 ? cursor.nextElementSibling : cursor.previousElementSibling;
+        if (!cursor || !(cursor instanceof HTMLElement)) break;
+        if (cursor.getAttribute("data-state")! === currentViewState) {
+          offset -= increment;
+          valid_cursor = cursor;
+        }
+        if (Math.abs(offset) < 0.5) break;
+      }
+      return valid_cursor;
+    },
 
-  // 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 ? Date.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 newPriorityRounded = Math.round(newPriority);
-    const okToRound = aPriority < newPriorityRounded && newPriorityRounded < bPriority;
-    UI.setPriority(task.getAttribute("data-created")!, okToRound ? newPriorityRounded : newPriority, Model.getPriority(task));
-    task instanceof HTMLElement && task.focus();
-  },
+    makeTopPriority: function (task: Element | null = null) {
+      if (!task) task = document.activeElement;
+      if (!task) return;
+      this.setPriority(task, null, document.getElementsByClassName("task")[0]);
+    },
 
-  setState: function (state: string) {
-    const task = document.activeElement;
-    if (!task) return;
-    const createTimestamp = task.getAttribute("data-created")!;
-    this.moveCursor(1) || this.moveCursor(-1);
-    return UI.setState(createTimestamp, state, Model.getState(task));
-  },
+    moveCursor: function (offset: number): boolean {
+      const active = document.activeElement;
+      if (!active) return false;
+      const dest = this.visibleTaskAtOffset(active, offset);
+      if (dest !== active && dest instanceof HTMLElement) {
+        dest.focus();
+        return true;
+      }
+      return false;
+    },
 
-  undo: function () {
-    const ret = UI.undo();
-    if (ret && ret instanceof HTMLElement) ret.focus();
-  },
-};
+    moveTask: function (offset: number) {
+      const active = document.activeElement;
+      if (!active) return;
+      const dest = this.visibleTaskAtOffset(active, offset);
+      if (dest === active) return; // Already extremal
+      var onePastDest: Element | null = this.visibleTaskAtOffset(dest, offset / Math.abs(offset));
+      if (onePastDest == dest) onePastDest = null; // Will become extremal
+      if (offset > 0) {
+        this.setPriority(active, dest, onePastDest);
+      } else {
+        this.setPriority(active, onePastDest, dest);
+      }
+    },
+
+    removeTag: function () {
+      var target = document.activeElement;
+      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!);
+    },
+
+    returnFocusAfterInput: function (): boolean {
+      if (taskFocusedBeforeJumpingToInput) {
+        taskFocusedBeforeJumpingToInput.focus();
+        return true;
+      }
+      return false;
+    },
+
+    // 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 newPriorityRounded = Math.round(newPriority);
+      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) {
+      const task = document.activeElement;
+      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);
+      return ui.setState(createTimestamp, newState, oldState);
+    },
+
+    setView: function (state: string, color: string) {
+      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}; }`);
+      sheet.removeRule(2);
+      sheet.removeRule(2);
+      currentViewState = state;
+      if (document.activeElement?.getAttribute("data-state") !== state) {
+        this.firstVisibleTask()?.focus();
+      }
+    },
+
+    undo: function () {
+      const ret = ui.undo();
+      if (ret && ret instanceof HTMLElement) ret.focus();
+    },
+  };
+}
+const browserUI = BrowserUI();
+
+enum InputState {
+  Command,
+  View,
+}
+var inputState = InputState.Command;
 
 function handleKey(event: any) {
   if (event.target.tagName === "INPUT") {
-    if (event.key == "Enter") return BrowserUI.addTask(event);
+    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 {
-    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 == "s") return BrowserUI.setState("someday-maybe");
-    if (event.key == "w") return BrowserUI.setState("waiting");
-    if (event.key == "d") return BrowserUI.setState("done");
-    if (event.key == "c") return BrowserUI.setState("cancelled");
-    if (event.key == "X") return BrowserUI.setState("deleted");
-    if (event.key == "u") return BrowserUI.undo();
+    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 == "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 browserUI.setState("someday-maybe");
+      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 == "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 == "v") return browserUI.setView("todo", "White");
+      if (event.key == "w") return browserUI.setView("waiting", "MediumOrchid");
+      if (event.key == "x") return browserUI.setView("deleted", "Black");
+    }
   }
 }
 
 function browserInit() {
-  document.body.addEventListener("keydown", handleKey, { capture: false });
   log.replay();
-  BrowserUI.firstVisibleTask()?.focus();
+  browserUI.firstVisibleTask()?.focus();
+  document.body.addEventListener("keydown", handleKey, { capture: false });
 }