Leader key "v" for selecting views

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 04c5d414be7a46190e4d5679991b0d1edc4cd38e..4280ffcf9fde5c858cc48e1794aacd2d00719524 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -13,6 +13,22 @@ 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();
+
 const Model = {
   addTask: function (timestamp: string, description: string): Element {
     const task = document.createElement("div");
@@ -143,25 +159,25 @@ const undoLog: string[] = [];
 
 const UI = {
   addTask: function (description: string): Element {
-    const now = Date.now();
+    const now = clock.now();
     undoLog.push(`State ${now} deleted`);
     return <Element>log.recordAndApply(`${now} Create ${description}`);
   },
   edit: function (createTimestamp: string, newDescription: string, oldDescription: string) {
     undoLog.push(`Edit ${createTimestamp} ${oldDescription}`);
-    return log.recordAndApply(`${Date.now()} Edit ${createTimestamp} ${newDescription}`);
+    return log.recordAndApply(`${clock.now()} Edit ${createTimestamp} ${newDescription}`);
   },
   setPriority: function (createTimestamp: string, newPriority: number, oldPriority: number) {
     undoLog.push(`Priority ${createTimestamp} ${oldPriority}`);
-    return log.recordAndApply(`${Date.now()} Priority ${createTimestamp} ${newPriority}`);
+    return log.recordAndApply(`${clock.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}`);
+    return log.recordAndApply(`${clock.now()} State ${createTimestamp} ${newState}`);
   },
   undo: function () {
     if (undoLog.length > 0) {
-      return log.recordAndApply(`${Date.now()} ${undoLog.pop()}`);
+      return log.recordAndApply(`${clock.now()} ${undoLog.pop()}`);
     }
   },
 };
@@ -267,7 +283,7 @@ const BrowserUI = {
   // 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);
+    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();
@@ -294,6 +310,12 @@ const BrowserUI = {
   },
 };
 
+enum InputState {
+  Command,
+  View,
+}
+var inputState = InputState.Command;
+
 function handleKey(event: any) {
   if (event.target.tagName === "INPUT") {
     if (event.target.id === "taskName") {
@@ -302,19 +324,24 @@ function handleKey(event: any) {
       if (event.key == "Enter") return BrowserUI.completeEdit(event);
     }
   } 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 == "t") return BrowserUI.setState("todo");
-    if (event.key == "X") return BrowserUI.setState("deleted");
-    if (event.key == "u") return BrowserUI.undo();
-    if (event.key == "e") return BrowserUI.beginEdit(event);
+    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 == "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 == "t") return BrowserUI.setState("todo");
+      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) {
+      return (inputState = InputState.Command);
+    }
   }
 }