@mobileai/react-native 0.9.3 → 0.9.5

package/lib/module/tools/typeTool.js

@@ -3,39 +3,44 @@
 /**
  * Type Tool — Reliable multi-strategy text input.
  *
- * Strategy chain (tried in order, first success wins):
+ * For uncontrolled TextInputs (defaultValue, no onChangeText):
+ *   1. Walk fiber subtree (BFS) to find the native host view whose
+ *      memoizedProps has `onChange` — this is RN's internal `_onChange`.
+ *   2. ALSO walk to find the native stateNode with `setNativeProps` to
+ *      update the VISUAL text in the native view.
  *
- * 1. onChangeText (controlled) — developer wired up React state. Most common.
- *    → calls props.onChangeText(text) directly.
+ * Both steps are needed:
+ *   - `onChange` → updates React's internal lastNativeText state
+ *   - `setNativeProps` → updates what the user sees on screen
  *
- * 2. onChange (controlled, lower-level) — some forms use onChange instead of
- *    onChangeText. RN's TextInput fires onChange before calling onChangeText.
- *    → calls props.onChange({ nativeEvent: { text, eventCount: 1 } })
- *
- * 3. setNativeProps (uncontrolled, Old Arch) — for TextInputs with defaultValue
- *    only. React doesn't manage the native value after initial render for
- *    uncontrolled inputs, so setNativeProps is stable (no re-render wipe).
- *    Also focuses the input first so the native layer treats it as user input.
- *    → stateNode.focus() + stateNode.setNativeProps({ text })
- *
- * Why no 100% reliable cross-arch pure-JS solution for uncontrolled inputs:
- *  React's reconciliation model intentionally prevents external mutation of
- *  controlled values. For uncontrolled inputs, setNativeProps is the
- *  industry-standard JS approach (used by React Native's own test utils).
- *  True cross-arch reliability requires native keyboard injection (Detox/Appium).
+ * No hardcoded fiber tag numbers. Detection is purely behavior-based.
  */
 
-import { findNodeHandle } from 'react-native';
 import { walkFiberTree } from "../core/FiberTreeWalker.js";
-/** Build a synthetic RN-style text change event object */
-function makeSyntheticChangeEvent(text, nodeHandle) {
-  return {
-    nativeEvent: {
-      text,
-      eventCount: 1,
-      target: nodeHandle ?? 0
-    }
-  };
+/** BFS through fiber children. Returns first node where predicate matches. */
+function findFiberNode(rootFiber, predicate, maxDepth = 10) {
+  if (!rootFiber?.child) return null;
+  const queue = [{
+    node: rootFiber.child,
+    depth: 0
+  }];
+  while (queue.length > 0) {
+    const {
+      node,
+      depth
+    } = queue.shift();
+    if (!node || depth > maxDepth) continue;
+    if (predicate(node)) return node;
+    if (node.child) queue.push({
+      node: node.child,
+      depth: depth + 1
+    });
+    if (node.sibling) queue.push({
+      node: node.sibling,
+      depth: depth + 1
+    });
+  }
+  return null;
 }
 export function createTypeTool(context) {
   return {
@@ -62,9 +67,8 @@ export function createTypeTool(context) {
         return `❌ Element with index ${args.index} not found.`;
       }
       const props = element.props;
-      const stateNode = element.fiberNode?.stateNode;
-      const nodeHandle = stateNode ? findNodeHandle(stateNode) ?? null : null;
       const label = element.label || `[${element.type}]`;
+      const fiberNode = element.fiberNode;
 
       // ── Strategy 1: controlled via onChangeText ───────────────────────────
       if (typeof props.onChangeText === 'function') {
@@ -77,37 +81,46 @@ export function createTypeTool(context) {
         }
       }
 
-      // ── Strategy 2: controlled via onChange (lower-level event) ───────────
-      if (typeof props.onChange === 'function') {
-        try {
-          props.onChange(makeSyntheticChangeEvent(args.text, nodeHandle));
-          await new Promise(resolve => setTimeout(resolve, 300));
-          return `✅ Typed "${args.text}" into [${args.index}] "${label}"`;
-        } catch (err) {
-          return `❌ onChange failed: ${err.message}`;
-        }
-      }
+      // ── Strategy 2: uncontrolled — find native onChange + setNativeProps ──
+      // For TextInputs with defaultValue only.
+      // We need BOTH:
+      //   a) find the onChange handler (RN's internal _onChange) to update React state
+      //   b) find the native stateNode to call setNativeProps to update visual display
+      if (fiberNode) {
+        // Find native onChange handler (behavior-based, no tag numbers)
+        const nativeOnChangeFiber = fiberNode.memoizedProps?.onChange ? fiberNode : findFiberNode(fiberNode, n => typeof n.memoizedProps?.onChange === 'function');
 
-      // ── Strategy 3: uncontrolled — focus + setNativeProps ─────────────────
-      // For defaultValue-only TextInputs, React doesn't own the native value
-      // after initial render, so setNativeProps is stable across re-renders.
-      if (stateNode && typeof stateNode.setNativeProps === 'function') {
-        try {
-          // Focus first so the native layer treats this as active input
-          if (typeof stateNode.focus === 'function') {
-            stateNode.focus();
-            await new Promise(resolve => setTimeout(resolve, 200));
+        // Find native stateNode (host component with setNativeProps)
+        const nativeStateFiber = fiberNode.stateNode?.setNativeProps ? fiberNode : findFiberNode(fiberNode, n => n.stateNode && typeof n.stateNode.setNativeProps === 'function');
+        const onChange = nativeOnChangeFiber?.memoizedProps?.onChange;
+        const nativeInstance = nativeStateFiber?.stateNode;
+        if (onChange || nativeInstance) {
+          try {
+            // Step 1: Update visual text in native view
+            if (nativeInstance && typeof nativeInstance.setNativeProps === 'function') {
+              nativeInstance.setNativeProps({
+                text: args.text
+              });
+            }
+
+            // Step 2: Notify React's internal onChange so lastNativeText stays in sync
+            if (typeof onChange === 'function') {
+              onChange({
+                nativeEvent: {
+                  text: args.text,
+                  eventCount: 1,
+                  target: 0
+                }
+              });
+            }
+            await new Promise(resolve => setTimeout(resolve, 300));
+            return `✅ Typed "${args.text}" into [${args.index}] "${label}"`;
+          } catch (err) {
+            return `❌ Type failed: ${err.message}`;
           }
-          stateNode.setNativeProps({
-            text: args.text
-          });
-          await new Promise(resolve => setTimeout(resolve, 300));
-          return `✅ Typed "${args.text}" into [${args.index}] "${label}"`;
-        } catch (err) {
-          return `❌ setNativeProps failed: ${err.message}`;
         }
       }
-      return `❌ Element [${args.index}] "${label}" is not a typeable text input.`;
+      return `❌ Element [${args.index}] "${label}" is not a typeable text input. No onChange or native stateNode found in fiber tree.`;
     }
   };
 }

package/lib/module/tools/typeTool.js.map

@@ -1 +1 @@
-{"version":3,"names":["findNodeHandle","walkFiberTree","makeSyntheticChangeEvent","text","nodeHandle","nativeEvent","eventCount","target","createTypeTool","context","name","description","parameters","index","type","required","execute","args","interactives","elements","getRootRef","getWalkConfig","element","find","el","props","stateNode","fiberNode","label","onChangeText","Promise","resolve","setTimeout","err","message","onChange","setNativeProps","focus"],"sourceRoot":"../../../src","sources":["tools/typeTool.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["walkFiberTree","findFiberNode","rootFiber","predicate","maxDepth","child","queue","node","depth","length","shift","push","sibling","createTypeTool","context","name","description","parameters","index","type","required","text","execute","args","interactives","elements","getRootRef","getWalkConfig","element","find","el","props","label","fiberNode","onChangeText","Promise","resolve","setTimeout","err","message","nativeOnChangeFiber","memoizedProps","onChange","n","nativeStateFiber","stateNode","setNativeProps","nativeInstance","nativeEvent","eventCount","target"],"sourceRoot":"../../../src","sources":["tools/typeTool.ts"],"mappings":"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","ignoreList":[]}

package/lib/typescript/src/tools/typeTool.d.ts

@@ -1,26 +1,17 @@
 /**
  * Type Tool — Reliable multi-strategy text input.
  *
- * Strategy chain (tried in order, first success wins):
+ * For uncontrolled TextInputs (defaultValue, no onChangeText):
+ *   1. Walk fiber subtree (BFS) to find the native host view whose
+ *      memoizedProps has `onChange` — this is RN's internal `_onChange`.
+ *   2. ALSO walk to find the native stateNode with `setNativeProps` to
+ *      update the VISUAL text in the native view.
  *
- * 1. onChangeText (controlled) — developer wired up React state. Most common.
- *    → calls props.onChangeText(text) directly.
+ * Both steps are needed:
+ *   - `onChange` → updates React's internal lastNativeText state
+ *   - `setNativeProps` → updates what the user sees on screen
  *
- * 2. onChange (controlled, lower-level) — some forms use onChange instead of
- *    onChangeText. RN's TextInput fires onChange before calling onChangeText.
- *    → calls props.onChange({ nativeEvent: { text, eventCount: 1 } })
- *
- * 3. setNativeProps (uncontrolled, Old Arch) — for TextInputs with defaultValue
- *    only. React doesn't manage the native value after initial render for
- *    uncontrolled inputs, so setNativeProps is stable (no re-render wipe).
- *    Also focuses the input first so the native layer treats it as user input.
- *    → stateNode.focus() + stateNode.setNativeProps({ text })
- *
- * Why no 100% reliable cross-arch pure-JS solution for uncontrolled inputs:
- *  React's reconciliation model intentionally prevents external mutation of
- *  controlled values. For uncontrolled inputs, setNativeProps is the
- *  industry-standard JS approach (used by React Native's own test utils).
- *  True cross-arch reliability requires native keyboard injection (Detox/Appium).
+ * No hardcoded fiber tag numbers. Detection is purely behavior-based.
  */
 import type { AgentTool, ToolContext } from './types';
 export declare function createTypeTool(context: ToolContext): AgentTool;

package/lib/typescript/src/tools/typeTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typeTool.d.ts","sourceRoot":"","sources":["../../../../src/tools/typeTool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAIH,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAatD,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,CAgE9D"}
+{"version":3,"file":"typeTool.d.ts","sourceRoot":"","sources":["../../../../src/tools/typeTool.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAgBtD,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,CA+E9D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mobileai/react-native",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "description": "Build autonomous AI agents for React Native and Expo apps. Provides AI-native UI traversal, tool calling, and structured reasoning.",
   "main": "./lib/module/index.js",
   "source": "./src/index.ts",

package/src/tools/typeTool.ts

@@ -1,41 +1,34 @@
 /**
  * Type Tool — Reliable multi-strategy text input.
  *
- * Strategy chain (tried in order, first success wins):
+ * For uncontrolled TextInputs (defaultValue, no onChangeText):
+ *   1. Walk fiber subtree (BFS) to find the native host view whose
+ *      memoizedProps has `onChange` — this is RN's internal `_onChange`.
+ *   2. ALSO walk to find the native stateNode with `setNativeProps` to
+ *      update the VISUAL text in the native view.
  *
- * 1. onChangeText (controlled) — developer wired up React state. Most common.
- *    → calls props.onChangeText(text) directly.
+ * Both steps are needed:
+ *   - `onChange` → updates React's internal lastNativeText state
+ *   - `setNativeProps` → updates what the user sees on screen
  *
- * 2. onChange (controlled, lower-level) — some forms use onChange instead of
- *    onChangeText. RN's TextInput fires onChange before calling onChangeText.
- *    → calls props.onChange({ nativeEvent: { text, eventCount: 1 } })
- *
- * 3. setNativeProps (uncontrolled, Old Arch) — for TextInputs with defaultValue
- *    only. React doesn't manage the native value after initial render for
- *    uncontrolled inputs, so setNativeProps is stable (no re-render wipe).
- *    Also focuses the input first so the native layer treats it as user input.
- *    → stateNode.focus() + stateNode.setNativeProps({ text })
- *
- * Why no 100% reliable cross-arch pure-JS solution for uncontrolled inputs:
- *  React's reconciliation model intentionally prevents external mutation of
- *  controlled values. For uncontrolled inputs, setNativeProps is the
- *  industry-standard JS approach (used by React Native's own test utils).
- *  True cross-arch reliability requires native keyboard injection (Detox/Appium).
+ * No hardcoded fiber tag numbers. Detection is purely behavior-based.
  */
 
-import { findNodeHandle } from 'react-native';
 import { walkFiberTree } from '../core/FiberTreeWalker';
 import type { AgentTool, ToolContext } from './types';
 
-/** Build a synthetic RN-style text change event object */
-function makeSyntheticChangeEvent(text: string, nodeHandle: number | null) {
-  return {
-    nativeEvent: {
-      text,
-      eventCount: 1,
-      target: nodeHandle ?? 0,
-    },
-  };
+/** BFS through fiber children. Returns first node where predicate matches. */
+function findFiberNode(rootFiber: any, predicate: (node: any) => boolean, maxDepth = 10): any | null {
+  if (!rootFiber?.child) return null;
+  const queue: { node: any; depth: number }[] = [{ node: rootFiber.child, depth: 0 }];
+  while (queue.length > 0) {
+    const { node, depth } = queue.shift()!;
+    if (!node || depth > maxDepth) continue;
+    if (predicate(node)) return node;
+    if (node.child) queue.push({ node: node.child, depth: depth + 1 });
+    if (node.sibling) queue.push({ node: node.sibling, depth: depth + 1 });
+  }
+  return null;
 }
 
 export function createTypeTool(context: ToolContext): AgentTool {
@@ -55,9 +48,8 @@ export function createTypeTool(context: ToolContext): AgentTool {
       }
 
       const props = element.props;
-      const stateNode = element.fiberNode?.stateNode;
-      const nodeHandle: number | null = stateNode ? (findNodeHandle(stateNode) ?? null) : null;
       const label = element.label || `[${element.type}]`;
+      const fiberNode = element.fiberNode;
 
       // ── Strategy 1: controlled via onChangeText ───────────────────────────
       if (typeof props.onChangeText === 'function') {
@@ -70,36 +62,52 @@ export function createTypeTool(context: ToolContext): AgentTool {
         }
       }
 
-      // ── Strategy 2: controlled via onChange (lower-level event) ───────────
-      if (typeof props.onChange === 'function') {
-        try {
-          props.onChange(makeSyntheticChangeEvent(args.text, nodeHandle));
-          await new Promise(resolve => setTimeout(resolve, 300));
-          return `✅ Typed "${args.text}" into [${args.index}] "${label}"`;
-        } catch (err: any) {
-          return `❌ onChange failed: ${err.message}`;
-        }
-      }
+      // ── Strategy 2: uncontrolled — find native onChange + setNativeProps ──
+      // For TextInputs with defaultValue only.
+      // We need BOTH:
+      //   a) find the onChange handler (RN's internal _onChange) to update React state
+      //   b) find the native stateNode to call setNativeProps to update visual display
+      if (fiberNode) {
+        // Find native onChange handler (behavior-based, no tag numbers)
+        const nativeOnChangeFiber = fiberNode.memoizedProps?.onChange
+          ? fiberNode
+          : findFiberNode(fiberNode, n => typeof n.memoizedProps?.onChange === 'function');
 
-      // ── Strategy 3: uncontrolled — focus + setNativeProps ─────────────────
-      // For defaultValue-only TextInputs, React doesn't own the native value
-      // after initial render, so setNativeProps is stable across re-renders.
-      if (stateNode && typeof stateNode.setNativeProps === 'function') {
-        try {
-          // Focus first so the native layer treats this as active input
-          if (typeof stateNode.focus === 'function') {
-            stateNode.focus();
-            await new Promise(resolve => setTimeout(resolve, 200));
+        // Find native stateNode (host component with setNativeProps)
+        const nativeStateFiber = fiberNode.stateNode?.setNativeProps
+          ? fiberNode
+          : findFiberNode(fiberNode, n => n.stateNode && typeof n.stateNode.setNativeProps === 'function');
+
+        const onChange = nativeOnChangeFiber?.memoizedProps?.onChange;
+        const nativeInstance = nativeStateFiber?.stateNode;
+
+        if (onChange || nativeInstance) {
+          try {
+            // Step 1: Update visual text in native view
+            if (nativeInstance && typeof nativeInstance.setNativeProps === 'function') {
+              nativeInstance.setNativeProps({ text: args.text });
+            }
+
+            // Step 2: Notify React's internal onChange so lastNativeText stays in sync
+            if (typeof onChange === 'function') {
+              onChange({
+                nativeEvent: {
+                  text: args.text,
+                  eventCount: 1,
+                  target: 0,
+                },
+              });
+            }
+
+            await new Promise(resolve => setTimeout(resolve, 300));
+            return `✅ Typed "${args.text}" into [${args.index}] "${label}"`;
+          } catch (err: any) {
+            return `❌ Type failed: ${err.message}`;
           }
-          stateNode.setNativeProps({ text: args.text });
-          await new Promise(resolve => setTimeout(resolve, 300));
-          return `✅ Typed "${args.text}" into [${args.index}] "${label}"`;
-        } catch (err: any) {
-          return `❌ setNativeProps failed: ${err.message}`;
         }
       }
 
-      return `❌ Element [${args.index}] "${label}" is not a typeable text input.`;
+      return `❌ Element [${args.index}] "${label}" is not a typeable text input. No onChange or native stateNode found in fiber tree.`;
     },
   };
 }