@neuroplastio/xterm-addon-hotty 0.1.0-next.4 → 0.1.0-next.5

package/dist/hotty-xterm.js

@@ -1384,6 +1384,9 @@ var Surface = class {
   /** The document's base URL (SPEC §7.3). */
   base = NO_BASE;
   keyboard = false;
+  /** The element the program knows has focus: the last `focus` named it,
+   * or the program's `a=focus` gave it (SPEC §10.1). */
+  told = null;
   /** Detached (SPEC §5.5): nothing in the surface reaches the program. */
   detachedState = false;
   /** A press is on something that takes no focus (SPEC §10.1): the focus
@@ -1560,6 +1563,7 @@ var Surface = class {
       this.dropDrag();
       const had = this.keyboard || this.frameFocused();
       this.keyboard = false;
+      this.told = null;
       this.focusedControl()?.blur();
       if (had) this.giveBack();
     }
@@ -1751,17 +1755,21 @@ var Surface = class {
     if (target && !el) throw new Error(target);
     this.programFocus = true;
     try {
-      this.frame.focus();
-      this.frame.contentWindow?.focus();
+      if (!this.frameFocused()) {
+        this.frame.focus();
+        this.frame.contentWindow?.focus();
+      }
       if (el) el.focus();
       else if (!this.focusedControl()) this.tabbable()[0]?.focus();
       this.keyboard = true;
+      this.told = this.focusedControl();
     } finally {
       setTimeout(() => this.programFocus = false, 0);
     }
   }
   /** `a=blur`, or the keyboard leaving: the edited control commits first. */
   blur() {
+    this.pressed = null;
     this.commit();
     if (this.keyboard) this.giveBack();
   }
@@ -1812,6 +1820,7 @@ var Surface = class {
     if (this.keyboard) {
       this.commit();
       this.keyboard = false;
+      this.told = null;
       this.emit("blur", "");
     }
     this.settle();
@@ -1839,16 +1848,24 @@ var Surface = class {
   }
   /** An element got focus: the surface takes the keyboard if the element is
    * one that takes focus, and the focus is neither the program's (no echo)
-   * nor a detached surface's. */
+   * nor a detached surface's. The program hears where the user put focus,
+   * each time it is another element than the one it knows (SPEC §10.1). */
   onFocusIn(e) {
-    if (this.programFocus || this.auxPress) return;
-    if (this.detachedState || this.pressNothing || !isElement(e.target) || !takesFocus(e.target, this.hyper)) {
+    const el = isElement(e.target) ? e.target : null;
+    if (this.programFocus) {
+      this.told = el;
+      return;
+    }
+    if (this.auxPress) return;
+    if (this.detachedState || this.pressNothing || !el || !takesFocus(el, this.hyper)) {
       this.settle();
       return;
     }
-    if (this.keyboard) return;
+    const gained = !this.keyboard;
     this.keyboard = true;
-    this.emit("focus", "");
+    if (!gained && el === this.told) return;
+    this.told = el;
+    this.emit("focus", el.closest('[id]:not([id=""])')?.id ?? "");
   }
   tabbable() {
     const all = this.doc.querySelectorAll(
@@ -2712,6 +2729,7 @@ var Surface = class {
       this.commit();
       if (this.keyboard) {
         this.keyboard = false;
+        this.told = null;
         this.emit("blur", "");
       }
     });