Always return to command mode (leave input box) after creating a task

Even in other views, where the just-created task cannot accept focus.

diff --git a/vopamoi.ts b/vopamoi.ts
index a3b782465b64dc32ced3280178e49c069750902a..fdc47235fb62091978f809f06bf67d88b1f07bf8 100644 (file)
--- a/vopamoi.ts
+++ b/vopamoi.ts
@@ -149,7 +149,6 @@ function Log(prefix: string = "vp-") {
 }
 const log = Log();
 
 }
 const log = Log();
 

-

 function UI() {
   const undoLog: string[] = [];
   return {
 function UI() {
   const undoLog: string[] = [];
   return {


@@ -181,12 +180,18 @@ const ui = UI();
 
 function BrowserUI() {
   var currentViewState = "todo";
 
 function BrowserUI() {
   var currentViewState = "todo";

+  var taskFocusedBeforeJumpingToInput: HTMLElement | null = null;

   return {
     addTask: function (event: KeyboardEvent) {
       const input = <HTMLInputElement>document.getElementById("taskName");
       if (input.value) {
         const task = ui.addTask(input.value);
   return {
     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();
+        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]);
         input.value = "";
         if (event.getModifierState("Control")) {
           this.setPriority(task, null, document.getElementsByClassName("task")[0]);


@@ -234,6 +239,9 @@ function BrowserUI() {
     },
 
     focusTaskNameInput: function (event: Event) {
     },
 
     focusTaskNameInput: function (event: Event) {

+      if (document.activeElement instanceof HTMLElement) {
+        taskFocusedBeforeJumpingToInput = document.activeElement;
+      }

       document.getElementById("taskName")!.focus();
       event.preventDefault();
     },
       document.getElementById("taskName")!.focus();
       event.preventDefault();
     },


@@ -279,6 +287,14 @@ function BrowserUI() {
       }
     },
 
       }
     },
 

+    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);
     // 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);


@@ -331,6 +347,7 @@ function handleKey(event: any) {
   if (event.target.tagName === "INPUT") {
     if (event.target.id === "taskName") {
       if (event.key == "Enter") return browserUI.addTask(event);
   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.key == "Enter") return browserUI.completeEdit(event);
     }
     } else {
       if (event.key == "Enter") return browserUI.completeEdit(event);
     }