Add app:focusfollowscursor setting (off/on/term) for hover-based block focus

docs/docs/config.mdx

@@ -43,6 +43,7 @@ wsh editconfig
 | app:hideaibutton <VersionBadge version="v0.14" />                    | bool     | Set to true to hide the AI button in the tab bar (defaults to false)                                                                                                                                                                                          |
 | app:disablectrlshiftarrows <VersionBadge version="v0.14" />          | bool     | Set to true to disable Ctrl+Shift+Arrow keybindings for block navigation (defaults to false)                                                                                                                                                                  |
 | app:disablectrlshiftdisplay <VersionBadge version="v0.14" />         | bool     | Set to true to disable the Ctrl+Shift visual indicator display (defaults to false)                                                                                                                                                                            |
+| app:focusfollowscursor <VersionBadge version="v0.14" />              | string   | Controls whether block focus follows cursor movement: `"off"` (default), `"on"` (all blocks), or `"term"` (terminal blocks only)                                                                                                                             |
 | ai:preset                            | string   | the default AI preset to use                                                                                                                                                                                                                                  |
 | ai:baseurl                           | string   | Set the AI Base Url (must be OpenAI compatible)                                                                                                                                                                                                               |
 | ai:apitoken                          | string   | your AI api token                                                                                                                                                                                                                                             |
@@ -122,6 +123,7 @@ For reference, this is the current default configuration (v0.14.0):
     "app:hideaibutton": false,
     "app:disablectrlshiftarrows": false,
     "app:disablectrlshiftdisplay": false,
+    "app:focusfollowscursor": "off",
     "autoupdate:enabled": true,
     "autoupdate:installonquit": true,
     "autoupdate:intervalms": 3600000,

frontend/app/block/block.tsx

@@ -20,7 +20,9 @@ import { CenteredDiv } from "@/element/quickelems";
 import { useDebouncedNodeInnerRect } from "@/layout/index";
 import { counterInc } from "@/store/counters";
 import {
+    atoms,
     getBlockComponentModel,
+    getSettingsKeyAtom,
     registerBlockComponentModel,
     unregisterBlockComponentModel,
 } from "@/store/global";
@@ -147,6 +149,9 @@ const BlockFull = memo(({ nodeModel, viewModel }: FullBlockProps) => {
     const [blockData] = useWaveObjectValue<Block>(makeORef("block", nodeModel.blockId));
     const isFocused = useAtomValue(nodeModel.isFocused);
     const disablePointerEvents = useAtomValue(nodeModel.disablePointerEvents);
+    const isResizing = useAtomValue(nodeModel.isResizing);
+    const modalOpen = useAtomValue(atoms.modalOpen);
+    const focusFollowsCursorMode = useAtomValue(getSettingsKeyAtom("app:focusfollowscursor")) ?? "off";
     const innerRect = useDebouncedNodeInnerRect(nodeModel);
     const noPadding = useAtomValueSafe(viewModel.noPadding);
 
@@ -220,10 +225,42 @@ const BlockFull = memo(({ nodeModel, viewModel }: FullBlockProps) => {
             return;
         }
         focusElemRef.current?.focus({ preventScroll: true });
-    }, []);
+    }, [viewModel]);
+
+    const focusFromPointerEnter = useCallback(
+        (event: React.PointerEvent<HTMLDivElement>) => {
+            const focusFollowsCursorEnabled =
+                focusFollowsCursorMode === "on" ||
+                (focusFollowsCursorMode === "term" && blockData?.meta?.view === "term");
+            if (!focusFollowsCursorEnabled || event.pointerType === "touch" || event.buttons > 0) {
+                return;
+            }
+            if (modalOpen || disablePointerEvents || isResizing) {
+                return;
+            }
+            if (isFocused && focusedBlockId() === nodeModel.blockId) {
+                return;
+            }
+            setFocusTarget();
+            if (!isFocused) {
+                nodeModel.focusNode();
+            }
+        },
+        [
+            focusFollowsCursorMode,
+            blockData?.meta?.view,
+            modalOpen,
+            disablePointerEvents,
+            isResizing,
+            isFocused,
+            nodeModel,
+            setFocusTarget,
+        ]
+    );
 
     const blockModel: BlockComponentModel2 = {
         onClick: setBlockClickedTrue,
+        onPointerEnter: focusFromPointerEnter,
         onFocusCapture: handleChildFocus,
         blockRef: blockRef,
     };

frontend/app/block/blockframe.tsx

@@ -163,6 +163,7 @@ const BlockFrame_Default_Component = (props: BlockFrameProps) => {
             })}
             data-blockid={nodeModel.blockId}
             onClick={blockModel?.onClick}
+            onPointerEnter={blockModel?.onPointerEnter}
             onFocusCapture={blockModel?.onFocusCapture}
             ref={blockModel?.blockRef}
             style={

frontend/app/block/blocktypes.ts

@@ -35,6 +35,7 @@ export interface SubBlockProps {
 
 export interface BlockComponentModel2 {
     onClick?: () => void;
+    onPointerEnter?: React.PointerEventHandler<HTMLDivElement>;
     onFocusCapture?: React.FocusEventHandler<HTMLDivElement>;
     blockRef?: React.RefObject<HTMLDivElement>;
 }

frontend/types/gotypes.d.ts

@@ -1256,6 +1256,7 @@ declare global {
         "app:hideaibutton"?: boolean;
         "app:disablectrlshiftarrows"?: boolean;
         "app:disablectrlshiftdisplay"?: boolean;
+        "app:focusfollowscursor"?: string;
         "feature:waveappbuilder"?: boolean;
         "ai:*"?: boolean;
         "ai:preset"?: string;

pkg/wconfig/defaultconfig/settings.json

@@ -8,6 +8,7 @@
     "app:hideaibutton": false,
     "app:disablectrlshiftarrows": false,
     "app:disablectrlshiftdisplay": false,
+    "app:focusfollowscursor": "off",
     "autoupdate:enabled": true,
     "autoupdate:installonquit": true,
     "autoupdate:intervalms": 3600000,

pkg/wconfig/metaconsts.go

@@ -16,6 +16,7 @@ const (
 	ConfigKey_AppHideAiButton                = "app:hideaibutton"
 	ConfigKey_AppDisableCtrlShiftArrows      = "app:disablectrlshiftarrows"
 	ConfigKey_AppDisableCtrlShiftDisplay     = "app:disablectrlshiftdisplay"
+	ConfigKey_AppFocusFollowsCursor          = "app:focusfollowscursor"
 
 	ConfigKey_FeatureWaveAppBuilder          = "feature:waveappbuilder"
 

pkg/wconfig/settingsconfig.go

@@ -63,6 +63,7 @@ type SettingsType struct {
 	AppHideAiButton               bool   `json:"app:hideaibutton,omitempty"`
 	AppDisableCtrlShiftArrows     bool   `json:"app:disablectrlshiftarrows,omitempty"`
 	AppDisableCtrlShiftDisplay    bool   `json:"app:disablectrlshiftdisplay,omitempty"`
+	AppFocusFollowsCursor         string `json:"app:focusfollowscursor,omitempty" jsonschema:"enum=off,enum=on,enum=term"`
 
 	FeatureWaveAppBuilder bool `json:"feature:waveappbuilder,omitempty"`
 

schema/settings.json

@@ -35,6 +35,14 @@
         "app:disablectrlshiftdisplay": {
           "type": "boolean"
         },
+        "app:focusfollowscursor": {
+          "type": "string",
+          "enum": [
+            "off",
+            "on",
+            "term"
+          ]
+        },
         "feature:waveappbuilder": {
           "type": "boolean"
         },