hop2 0.11.60 → 0.11.61

package/hay/apps/web/src/App.tsx

@@ -21,7 +21,7 @@ import { enableMathHover } from "./utils/mathLinkProvider";
 import { getMathTip } from "./utils/mathTooltip";
 import { scanKeyboardProtocol } from "./utils/keyboardProtocol";
 import { originalPathHint, pasteableUploadPaths } from "./utils/fileDrop";
-import { claimOnAttach, claimOnClick } from "./utils/sizeClaim";
+import { claimOnAttach, claimOnClick, isPlainClick } from "./utils/sizeClaim";
 import { MobileKeyboard } from "./components/MobileKeyboard";
 import { SessionSwitcher } from "./components/SessionSwitcher";
 import { SecondaryPane } from "./components/SecondaryPane";
@@ -1356,6 +1356,9 @@ const App = () => {
   // switch, closing the wall into the session, a click, the Fit button) —
   // a reconnect is the socket healing itself, not a person.
   const deliberateAttachRef = useRef(true);
+  // Where the last press on the terminal landed, so a click can be told
+  // apart from the release of a drag.
+  const clickDownRef = useRef<{ x: number; y: number } | null>(null);
   // A canvas that was HIDDEN can come back showing a stale frame: the wall
   // covers the terminal with visibility:hidden, browsers throttle or drop
   // WebGL contexts for hidden canvases, and xterm only repaints rows it
@@ -2170,6 +2173,8 @@ const App = () => {
 
     termRef.current = terminal;
     fitRef.current = fitAddon;
+    // Debug handle for probes and the console (selection, buffer, size).
+    (window as any).__hopTerm = terminal;
     fitWhenReady();
 
     // Register OSC handlers for sequences xterm.js doesn't fully support
@@ -4603,15 +4608,20 @@ const App = () => {
               <section inert={switcherOpen} style={switcherOpen ? { visibility: "hidden" } : undefined} className={`terminal${visibleStatus === "disconnected" || visibleStatus === "ended" ? " degraded" : ""}`}>
                 <div
                   className="terminal-frame"
-                  onClick={() => {
+                  onMouseDown={(e) => { clickDownRef.current = { x: e.clientX, y: e.clientY }; }}
+                  onClick={(e) => {
                     // On mobile, don't focus terminal to prevent system keyboard
                     if (!isMobile) {
                       termRef.current?.focus();
                     }
                     // A click here is a human act on this surface, so it may
                     // take a size some other window left behind. No-op when
-                    // the session already fits this viewport.
-                    claimSizeHere();
+                    // the session already fits this viewport — and never for
+                    // the click that ends a drag: that was a text selection,
+                    // and the resize a claim brings would wipe it.
+                    if (isPlainClick(clickDownRef.current, { x: e.clientX, y: e.clientY }, !!termRef.current?.hasSelection())) {
+                      claimSizeHere();
+                    }
                   }}
                   onDragEnter={(e) => {
                     if (Array.from(e.dataTransfer?.types || []).includes("Files")) {

package/hay/apps/web/src/utils/sizeClaim.ts

@@ -39,3 +39,20 @@ export const claimOnClick = (o: {
   if (!o.active) return true;
   return o.active.cols !== o.natural.cols || o.active.rows !== o.natural.rows;
 };
+
+/**
+ * A click is a click only when the pointer stayed put between press and
+ * release and nothing is selected. A drag that ends over the terminal also
+ * fires `click` — and that drag was a text selection, which a size claim
+ * (a resize) would wipe the moment it finished.
+ */
+export const isPlainClick = (
+  down: { x: number; y: number } | null,
+  up: { x: number; y: number },
+  hasSelection: boolean,
+  slopPx = 4
+): boolean => {
+  if (hasSelection) return false;
+  if (!down) return true;
+  return Math.hypot(up.x - down.x, up.y - down.y) <= slopPx;
+};

package/hay/apps/web/test/sizeClaim.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { claimOnAttach, claimOnClick } from "../src/utils/sizeClaim";
+import { claimOnAttach, claimOnClick, isPlainClick } from "../src/utils/sizeClaim";
 
 describe("claimOnAttach — only a deliberate open takes the size", () => {
   const base = { viewMode: "fit" as const, visible: true, deliberate: true };
@@ -29,3 +29,14 @@ describe("claimOnClick — a click takes the size only when it changes something
     expect(claimOnClick({ viewMode: "fit", natural: null, active: null, owned: false })).toBe(false);
   });
 });
+
+describe("isPlainClick — the release of a drag is not a click", () => {
+  it("a press and release in the same place, nothing selected, is a click", () => {
+    expect(isPlainClick({ x: 100, y: 100 }, { x: 102, y: 101 }, false)).toBe(true);
+    expect(isPlainClick(null, { x: 5, y: 5 }, false)).toBe(true);
+  });
+  it("a drag, or any release with a selection standing, is not", () => {
+    expect(isPlainClick({ x: 100, y: 100 }, { x: 260, y: 100 }, false)).toBe(false);
+    expect(isPlainClick({ x: 100, y: 100 }, { x: 100, y: 100 }, true)).toBe(false);
+  });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hop2",
-  "version": "0.11.60",
+  "version": "0.11.61",
   "description": "🐰 Hop into your terminal from anywhere. Secure remote shell access with 2FA via Cloudflare Tunnel. Next-gen rewrite with native terminal sharing.",
   "main": "hop",
   "bin": {