vi-style count-prefix for cursor movement

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index 6519cbfc4367a1f2290a5598b07f9f001d9a87c4..3ccc5625e085fa44e6cde1fb2daef9cc515fd37f 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -119,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;
   setPriority: function (createTimestamp: string, priority: number): Element | null {
     const target = this.getTask(createTimestamp);
     if (!target) return null;


@@ -135,9 +144,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")}`;

   },
 };
 
   },
 };
 


@@ -165,6 +185,10 @@ function Log(prefix: string = "vp-") {
         const [createTimestamp, tag] = splitN(data, " ", 1);
         return Model.addTag(createTimestamp, 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) {


@@ -191,32 +215,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}`);
     },
     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}`);
+    },
+    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]}`);

       }
     },
   };
       }
     },
   };


@@ -237,7 +274,7 @@ function BrowserUI() {
       const input = <HTMLInputElement>document.getElementById("taskName");
       if (input.value.match(/^ *$/)) return;
       const task = ui.addTask(input.value);
       const input = <HTMLInputElement>document.getElementById("taskName");
       if (input.value.match(/^ *$/)) return;
       const task = ui.addTask(input.value);

-      if (currentViewState === "todo") {
+      if (currentViewState === "todo" || currentViewState === "all") {

         task instanceof HTMLElement && task.focus();
       } else if (this.returnFocusAfterInput()) {
       } else {
         task instanceof HTMLElement && task.focus();
       } else if (this.returnFocusAfterInput()) {
       } else {


@@ -245,7 +282,7 @@ function BrowserUI() {
       }
       input.value = "";
       if (event.getModifierState("Control")) {
       }
       input.value = "";
       if (event.getModifierState("Control")) {

-        this.setPriority(task, null, document.getElementsByClassName("task")[0]);
+        this.makeTopPriority(task);

       }
     },
 
       }
     },
 


@@ -309,7 +346,8 @@ function BrowserUI() {
 
     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;
         }
       }


@@ -330,7 +368,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;
         }


@@ -339,6 +378,12 @@ function BrowserUI() {
       return valid_cursor;
     },
 
       return valid_cursor;
     },
 

+    makeTopPriority: function (task: Element | null = null) {
+      if (!task) task = document.activeElement;
+      if (!task) return;
+      this.setPriority(task, null, document.getElementsByClassName("task")[0]);
+    },
+

     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;


@@ -364,6 +409,17 @@ function BrowserUI() {
       }
     },
 
       }
     },
 

+    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();
     returnFocusAfterInput: function (): boolean {
       if (taskFocusedBeforeJumpingToInput) {
         taskFocusedBeforeJumpingToInput.focus();


@@ -392,13 +448,19 @@ 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, color: string) {
       const sheet = (document.getElementById("viewStyle") as HTMLStyleElement).sheet!;
       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 }`);
+      if (state === "all") {
+        sheet.insertRule(`.task[data-state=deleted] { display: none }`);
+      } else {
+        sheet.insertRule(`.task:not([data-state=${state}]) { display: none }`);
+      }

       sheet.insertRule(`:root { --view-state-indicator-color: ${color}; }`);
       sheet.removeRule(2);
       sheet.removeRule(2);
       sheet.insertRule(`:root { --view-state-indicator-color: ${color}; }`);
       sheet.removeRule(2);
       sheet.removeRule(2);


@@ -412,15 +474,22 @@ 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();
 
 enum InputState {
   };
 }
 const browserUI = BrowserUI();
 
 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) {
   if (event.target.tagName === "INPUT") {
 
 function handleKey(event: any) {
   if (event.target.tagName === "INPUT") {


@@ -435,30 +504,48 @@ 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 (inputState === InputState.Root) {
+      if ("0" <= event.key && event.key <= "9") {
+        return (inputCount = (inputCount ?? 0) * 10 + parseInt(event.key));
+      }
+      try {
+        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(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 (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", "Gold");

       if (event.key == "c") return browserUI.setView("cancelled", "Red");
       if (event.key == "d") return browserUI.setView("done", "LawnGreen");
       if (event.key == "q") return browserUI.setView("todo", "White");
       if (event.key == "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 == "s") return (inputState = InputState.VS);
+      if (event.key == "v") return browserUI.setView("todo", "White");

       if (event.key == "w") return browserUI.setView("waiting", "MediumOrchid");
       if (event.key == "x") return browserUI.setView("deleted", "Black");
       if (event.key == "w") return browserUI.setView("waiting", "MediumOrchid");
       if (event.key == "x") return browserUI.setView("deleted", "Black");

+    } else if (inputState === InputState.VS) {
+      inputState = InputState.Root;
+      if (event.key == "m") return browserUI.setView("someday-maybe", "DeepSkyBlue");

     }
   }
 }
     }
   }
 }