Scroll to top when entering a new task

[vopamoi] / vopamoi.ts

diff --git a/vopamoi.ts b/vopamoi.ts
index d3b2c05fbb73a118fb7ea9ee133680117491ac88..3b0b470bf80e088ad4224788cea8792f0ffd8829 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -287,8 +287,9 @@ function BrowserUI() {
     },
 
     beginEdit: function (event: Event) {
-      const task = document.activeElement;
+      var task = document.activeElement;
       if (!task) return;
+      if (task.classList.contains("tag")) task = task.parentElement!;
       const input = document.createElement("input");
       const desc = task.getElementsByClassName("desc")[0];
       const oldDescription = desc.textContent!;
@@ -358,6 +359,7 @@ function BrowserUI() {
         taskFocusedBeforeJumpingToInput = document.activeElement;
       }
       document.getElementById("taskName")!.focus();
+      window.scroll(0, 0);
       event.preventDefault();
     },
 
@@ -378,6 +380,13 @@ function BrowserUI() {
       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();
+    },
+
     makeTopPriority: function (task: Element | null = null) {
       if (!task) task = document.activeElement;
       if (!task) return;
@@ -482,6 +491,7 @@ function BrowserUI() {
 }
 const browserUI = BrowserUI();
 
+const scrollIncrement = 60;
 enum InputState {
   Root,
   S,
@@ -510,24 +520,30 @@ function handleKey(event: any) {
         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(inputCount ?? 1);
-        if (event.key == "K") return browserUI.moveTask(-(inputCount ?? 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);
+        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;
       }