feat: route self-drawn move interactions

Author: Roy Lin

README.md

@@ -294,10 +294,10 @@ independently.
   exposure, published only after host commit, and discarded on rejection
 - retained resize, fractional-scale, damage, occlusion, redraw, delayed
   acknowledgement, and surface-loss replay without changing semantic identity
-- raw pointer, keyboard, Tab-focus, hover, press, cancellation, wheel, and
-  scheduled long-press routing over `PlatformElementId`; event-loop deadlines,
-  release-time fallback, stable action bubbling, and reducer rollback share one
-  staged interaction session
+- raw pointer, keyboard, Tab-focus, hover, press, cancellation, wheel,
+  scheduled long press, and incremental captured move routing over
+  `PlatformElementId`; event-loop deadlines, release-time fallback, stable
+  action bubbling, and reducer rollback share one staged interaction session
 - an identical-frame fast path that performs no layout, scene, host, or
   presentation work, plus semantic-only commits that skip pixel presentation
 - a software Graphics presenter and interactive shared
@@ -315,7 +315,7 @@ independently.
 | M3 · Layout and Scene | Current | Generic calculator rectangle slice landed; full flex, stacking, redraw scheduling, cross-platform fingerprints, and thin-host presentation remain |
 | M4 · Text and interaction cutover | Planned | Shaping, glyphs, GUI-owned input, IME, accessibility bridges, overlays, and complete calculator scenarios |
 | M5 · Default cutover | Planned | Make self-drawn content the default, then delete the three legacy widget renderers |
-| H0-H5 · Thin platform hosts | H0 complete; H1 in progress | Atomic frames, lifecycle recovery, stable-id raw input/reducers, scheduled long press, zero-toolkit firewalls, and an interactive calculator landed; the Graphics raw-surface edge remains |
+| H0-H5 · Thin platform hosts | H0 complete; H1 in progress | Atomic frames, lifecycle recovery, stable-id raw input/reducers, scheduled long press, captured move, zero-toolkit firewalls, and an interactive calculator landed; the Graphics raw-surface edge remains |
 | T0-T5 · TSX native authoring | Proposed | Automatic JSX runtime, versioned Node-to-host session, state/event runtime, self-drawn native window, packages, and stable SDK |
 | M6-M8 · React Aria components | Catalog pinned; conformance planned | 51/51 families mapped, eight public parts explicitly missing, Button scene smoke only; full software and three-OS self-drawn evidence required |
 

docs/platform-hosts.md

@@ -213,6 +213,9 @@ src/platform_runtime/
 |- input.rs             pointer capture, hover, press, and cancellation
 |- keyboard_input.rs    keyboard activation, Tab focus, and wheel routing
 |- long_press_input.rs  event-loop deadlines and terminal hold recognition
+|- move_input.rs        captured incremental pointer and keyboard movement
+|- long_press_tests.rs  scheduled hold ordering and recovery gates
+|- move_tests.rs        move capture, identity, rollback, and reconcile gates
 |- presenter.rs         raw-surface prepare/publish contract and recorder
 |- reference_presenter.rs
 |                       transactional software Graphics evidence
@@ -371,10 +374,14 @@ Landed evidence:
   deadline, cancels and restarts across pointer boundaries, falls back to
   release-time recognition, and routes the terminal action through the same
   rollback-aware reducer path
+- callback-driven and style-only move starts on the first non-zero pointer
+  delta, remains captured outside its hit region, retains incremental delta and
+  pointer identity, and ends on release, cancellation, or terminal long press;
+  arrow keys route a handled one-unit lifecycle through the same action batch
 - reducer errors restore the staged interaction state and sequence before the
   event is exposed as successful; successful frame reconciliation preserves
   focused stable ids, while rejected frames do not touch them
-- 26 focused runtime/software tests and four recursive feature/source
+- 33 focused runtime/software tests and four recursive feature/source
   firewall tests pass without any legacy renderer or OS toolkit dependency
 - `self_drawn_calculator` reproduces layout fingerprint
   `16529597026056060935`, scene fingerprint `2100550662756266801`, and

docs/react-aria-native.md

@@ -123,9 +123,9 @@ The first shared interaction milestone is available in the portable runtime:
 
 - `SelfDrawnWindowRuntime` builds its hit/focus/action index from the atomically
   committed Native IR and layout snapshot. Raw pointer, keyboard, Tab-focus,
-  hover, press, cancellation, wheel, scheduled long press, bubbling, and
-  reducer dispatch retain stable `PlatformElementId` identity without
-  importing a widget blueprint or platform content-control runtime.
+  hover, press, cancellation, wheel, scheduled long press, incremental move,
+  bubbling, and reducer dispatch retain stable `PlatformElementId` identity
+  without importing a widget blueprint or platform content-control runtime.
 - `SelfDrawnActionInvocation` carries the committed frame revision, monotonic
   event sequence, target/current-target pair, modality and input context, plus
   static action payloads. Reducer failure restores the staged interaction
@@ -135,6 +135,11 @@ The first shared interaction milestone is available in the portable runtime:
   event-loop timer without exporting a toolkit timer into portable state.
   Deadline recognition and release-time fallback share the same ordering and
   reducer rollback, while pointer leave/re-entry cancels and restarts the hold.
+- Self-drawn move routing starts on the first non-zero delta, keeps the
+  initiating pointer captured outside its original hit region, preserves
+  incremental position across keyed frames, and reference-counts concurrent
+  pointer state. Release, cancellation, and terminal long press end the move;
+  arrow keys emit a handled one-unit lifecycle before `KeyDown`.
 
 - `NativeInputModality` represents keyboard, mouse, touch, pen, virtual, and
   unknown input.
@@ -568,7 +573,7 @@ props:
 | Priority | Area | Required outcome |
 | --- | --- | --- |
 | P0 | Self-drawn component accounting | Keep all 51 React Aria 1.19.0 families in the executable matrix, implement the eight recorded public-part gaps, and require every upstream catalog delta to update code, matrix, tests, and milestones together. |
-| P0 | Shared self-drawn interaction | Extend the landed stable-id pointer, keyboard, Tab-focus, hover, press, scheduled generic long press, cancellation, wheel, bubbling, and reducer path with move/drag, collection long-press selection mode, focus-scope restoration, overlay gestures, text editing/IME, and accessibility activation. |
+| P0 | Shared self-drawn interaction | Extend the landed stable-id pointer, keyboard, Tab-focus, hover, press, scheduled generic long press, incremental captured move, cancellation, wheel, bubbling, and reducer path with drag-and-drop source/target negotiation, collection long-press selection mode, focus-scope restoration, overlay gestures, text editing/IME, and accessibility activation. |
 | P0 | Native input conformance | WinUI's complete 98-case V1 manifest passes real OS automation. Populate the AppKit and GTK4 manifests with platform-run mouse, pen, touch where applicable, keyboard, assistive activation, disabled, cancellation, and keyed-rerender fixtures for every role currently marked native; then close or retain evidence-backed menu/item exceptions. |
 | P1 | Event propagation | Add platform-run conformance fixtures for conditional `Stop`/`Continue` across nested native controls. |
 | P1 | Focus management | Add platform-run conformance fixtures for post-mount `autoFocus`, nested containment, and restoration. |

docs/roadmap.md

@@ -490,10 +490,14 @@ Landed evidence:
   callback-driven targets, resets across pointer leave/re-entry, recognizes at
   the deadline or on release as a scheduling fallback, and atomically emits
   `LongPressEnd`, `PressCancel`, then terminal `LongPress`
+- move starts only after the first non-zero pointer delta, stays captured
+  outside the original hit region, preserves initiating pointer identity and
+  incremental deltas across keyed frames, reference-counts concurrent moves,
+  and shares reducer rollback; arrow keys emit a handled one-unit lifecycle
 - the shared 410x620 calculator preserves its reviewed layout and scene
   fingerprints, routes eight fake-host events through four reducer actions,
   commits the resulting frames, and reaches display value `10`
-- 26 focused runtime/software tests plus four recursive H1 firewall tests are
+- 33 focused runtime/software tests plus four recursive H1 firewall tests are
   included in `just verify`
 
 Remaining H1 work:
@@ -502,8 +506,9 @@ Remaining H1 work:
   pinned Graphics commit `8748fab` owns only a surface-independent texture and
   readback today, so its safe host-owned surface attachment/recovery contract
   must land before GUI can implement this edge without duplicating `wgpu`
-- richer move/drag, text editing, IME, overlay gestures, and
-  component-specific interaction conformance remain explicit M4 and M6-M8 work
+- drag-and-drop source/target negotiation, text editing, IME, overlay gestures,
+  and component-specific interaction conformance remain explicit M4 and M6-M8
+  work
 
 Gates:
 

src/platform_runtime/input.rs

@@ -6,8 +6,8 @@ use crate::platform_host::{
 };
 
 use super::interaction::{
-    ActivePress, LastClick, LongPressTracking, PointerInteraction, RoutedSemanticEvent,
-    SelfDrawnEventContext, SelfDrawnInputDispatch, SelfDrawnInteractionChange,
+    ActivePress, LastClick, LongPressTracking, PointerInteraction, PointerMoveTracking,
+    RoutedSemanticEvent, SelfDrawnEventContext, SelfDrawnInputDispatch, SelfDrawnInteractionChange,
     SelfDrawnInteractionSession,
 };
 use super::interaction_tree::SelfDrawnInteractionTree;
@@ -81,6 +81,20 @@ impl SelfDrawnInteractionSession {
 
         match event.phase {
             PlatformPointerPhase::Entered | PlatformPointerPhase::Moved => {
+                if event.phase == PlatformPointerPhase::Moved {
+                    if let Some(active) = pointer.active_press.as_mut() {
+                        if self.update_active_move(
+                            active,
+                            tree,
+                            frame_revision,
+                            event_sequence,
+                            &context,
+                            &mut routed,
+                        ) {
+                            routed.target = Some(active.target.clone());
+                        }
+                    }
+                }
                 self.transition_hover(
                     &mut pointer,
                     hit_target.clone(),
@@ -161,6 +175,12 @@ impl SelfDrawnInteractionSession {
                         );
                         let long_press_threshold_micros =
                             tree.long_press_threshold_micros(&target, context.modality);
+                        let movement =
+                            tree.tracks_movement(&target)
+                                .then_some(PointerMoveTracking {
+                                    last_position: event.position,
+                                    did_move: false,
+                                });
                         let long_press = long_press_threshold_micros.map(|threshold| {
                             let mut long_press_context = context.clone();
                             long_press_context.click_count = click_count;
@@ -201,6 +221,7 @@ impl SelfDrawnInteractionSession {
                             long_press_threshold_micros,
                             long_press,
                             long_press_recognized: false,
+                            movement,
                         });
                         routed.target = Some(target);
                     }
@@ -229,6 +250,17 @@ impl SelfDrawnInteractionSession {
                                 event_sequence,
                                 &mut routed,
                             );
+                        if !recognized_now && !active.long_press_recognized {
+                            context.click_count = active.click_count;
+                            self.end_active_move(
+                                &mut active,
+                                tree,
+                                frame_revision,
+                                event_sequence,
+                                &context,
+                                &mut routed,
+                            );
+                        }
                         if !recognized_now
                             && !active.long_press_recognized
                             && over_target
@@ -494,11 +526,19 @@ impl SelfDrawnInteractionSession {
         context: &SelfDrawnEventContext,
         routed: &mut RoutedInput,
     ) {
+        let mut context = context.clone();
+        context.click_count = active.click_count;
+        self.end_active_move(
+            &mut active,
+            tree,
+            frame_revision,
+            event_sequence,
+            &context,
+            routed,
+        );
         if active.long_press_recognized {
             return;
         }
-        let mut context = context.clone();
-        context.click_count = active.click_count;
         self.end_active_long_press(
             &mut active,
             tree,

src/platform_runtime/interaction.rs

@@ -207,6 +207,7 @@ pub struct SelfDrawnElementInteraction {
     pub hovered: bool,
     pub pressed: bool,
     pub long_pressed: bool,
+    pub moving: bool,
     pub focused: bool,
     pub focus_visible: bool,
     pub focus_within: bool,
@@ -257,6 +258,7 @@ pub(super) struct SelfDrawnInteractionSession {
     pub(super) hover_counts: BTreeMap<PlatformElementId, u32>,
     pub(super) pressed_counts: BTreeMap<PlatformElementId, u32>,
     pub(super) long_pressed_counts: BTreeMap<PlatformElementId, u32>,
+    pub(super) moving_counts: BTreeMap<PlatformElementId, u32>,
     pub(super) event_sequence: u64,
 }
 
@@ -275,6 +277,7 @@ pub(super) struct ActivePress {
     pub(super) long_press_threshold_micros: Option<u64>,
     pub(super) long_press: Option<LongPressTracking>,
     pub(super) long_press_recognized: bool,
+    pub(super) movement: Option<PointerMoveTracking>,
 }
 
 #[derive(Debug, Clone)]
@@ -283,6 +286,12 @@ pub(super) struct LongPressTracking {
     pub(super) context: SelfDrawnEventContext,
 }
 
+#[derive(Debug, Clone)]
+pub(super) struct PointerMoveTracking {
+    pub(super) last_position: PlatformPoint,
+    pub(super) did_move: bool,
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub(super) struct KeyboardPressKey {
     pub(super) device: PlatformInputDeviceId,
@@ -347,6 +356,7 @@ impl SelfDrawnInteractionSession {
         self.rebuild_hover_counts();
         self.rebuild_pressed_counts();
         self.rebuild_long_pressed_counts();
+        self.rebuild_moving_counts();
         if let Some(focused) = &self.focused {
             if let Some(state) = self.states.get_mut(focused) {
                 state.focused = true;
@@ -560,6 +570,19 @@ impl SelfDrawnInteractionSession {
         }
     }
 
+    pub(super) fn begin_move(
+        &mut self,
+        id: &PlatformElementId,
+        changes: &mut Vec<SelfDrawnInteractionChange>,
+    ) {
+        let count = self.moving_counts.entry(id.clone()).or_default();
+        let was_zero = *count == 0;
+        *count = count.saturating_add(1);
+        if was_zero {
+            self.change_state(id, changes, |state| state.moving = true);
+        }
+    }
+
     pub(super) fn end_hover(
         &mut self,
         id: &PlatformElementId,
@@ -605,6 +628,21 @@ impl SelfDrawnInteractionSession {
         }
     }
 
+    pub(super) fn end_move(
+        &mut self,
+        id: &PlatformElementId,
+        changes: &mut Vec<SelfDrawnInteractionChange>,
+    ) {
+        let Some(count) = self.moving_counts.get_mut(id) else {
+            return;
+        };
+        *count = count.saturating_sub(1);
+        if *count == 0 {
+            self.moving_counts.remove(id);
+            self.change_state(id, changes, |state| state.moving = false);
+        }
+    }
+
     pub(super) fn next_interaction_deadline_micros(&self) -> Option<u64> {
         self.pointers
             .values()
@@ -701,6 +739,30 @@ impl SelfDrawnInteractionSession {
             }
         }
     }
+
+    fn rebuild_moving_counts(&mut self) {
+        self.moving_counts.clear();
+        for press in self
+            .pointers
+            .values()
+            .filter_map(|pointer| pointer.active_press.as_ref())
+            .filter(|press| {
+                press
+                    .movement
+                    .as_ref()
+                    .is_some_and(|movement| movement.did_move)
+            })
+        {
+            *self.moving_counts.entry(press.target.clone()).or_default() += 1;
+        }
+        for (id, count) in &self.moving_counts {
+            if *count > 0 {
+                if let Some(state) = self.states.get_mut(id) {
+                    state.moving = true;
+                }
+            }
+        }
+    }
 }
 
 fn is_false(value: &bool) -> bool {

src/platform_runtime/interaction_tree.rs

@@ -27,6 +27,7 @@ pub(super) struct SelfDrawnInteractionNode {
     pub(super) tab_index: i32,
     pub(super) tree_order: usize,
     tracks_pointer_interaction: bool,
+    tracks_movement: bool,
     long_press_mode: SelfDrawnLongPressMode,
     long_press_threshold_micros: u64,
 }
@@ -189,6 +190,11 @@ impl SelfDrawnInteractionTree {
         accepted.then_some(node.long_press_threshold_micros)
     }
 
+    pub(super) fn tracks_movement(&self, target: &PlatformElementId) -> bool {
+        self.node(target)
+            .is_some_and(|node| node.available && node.tracks_movement)
+    }
+
     fn interaction_target(&self, target: &PlatformElementId) -> Option<PlatformElementId> {
         self.ancestors_inclusive(target).into_iter().find(|id| {
             self.node(id).is_some_and(|node| {
@@ -224,8 +230,19 @@ impl SelfDrawnInteractionTree {
             available && !is_focus_scope(&props) && role_is_focusable(element.role, &props);
         let interaction_requirements = interaction_requirements_from_web(&props.web);
         let style_requires_long_press = interaction_requirements.long_press;
+        let has_move_event = ["onMoveStart", "onMove", "onMoveEnd"]
+            .into_iter()
+            .any(|name| {
+                props
+                    .web
+                    .events
+                    .get(name)
+                    .is_some_and(|action| !action.is_empty())
+            });
+        let tracks_movement = interaction_requirements.movement || has_move_event;
         let tracks_pointer_interaction = interaction_requirements.press
             || interaction_requirements.long_press
+            || tracks_movement
             || interaction_requirements.hover;
         let has_long_press_event = ["onLongPressStart", "onLongPressEnd", "onLongPress"]
             .into_iter()
@@ -261,6 +278,7 @@ impl SelfDrawnInteractionTree {
                 focusable,
                 tree_order,
                 tracks_pointer_interaction,
+                tracks_movement,
                 long_press_mode,
                 long_press_threshold_micros,
             },

src/platform_runtime/keyboard_input.rs

@@ -37,6 +37,15 @@ impl SelfDrawnInteractionSession {
                 let focused = self.focused.clone();
                 routed.target = focused.clone();
                 if let Some(target) = focused {
+                    self.route_keyboard_move(
+                        &target,
+                        &key,
+                        tree,
+                        frame_revision,
+                        event_sequence,
+                        &mut context,
+                        &mut routed,
+                    );
                     let tracks_press = tree
                         .source(&target)
                         .is_some_and(|source| source.tracks_press());