react-native-ai-devtools 1.4.30 → 1.4.32

package/build/core/executor.js

@@ -1523,9 +1523,28 @@ export async function getPressableElements(options = {}) {
                 return null;
             }
 
-            function collectText(fiber, d) {
+            function findHostsInSubtree(fiber, depth, hosts, limit) {
+                if (!fiber || depth > 20 || hosts.length >= limit) return;
+                if (typeof fiber.type === 'string' && getMeasurable(fiber)) {
+                    hosts.push(fiber);
+                    return;
+                }
+                var child = fiber.child;
+                while (child && hosts.length < limit) {
+                    findHostsInSubtree(child, depth + 1, hosts, limit);
+                    child = child.sibling;
+                }
+            }
+
+            function collectText(fiber, d, isRoot) {
                 if (!fiber || d > 30) return '';
                 var props = fiber.memoizedProps;
+                // Stop descent at nested pressable/input boundaries — their text belongs to them, not to the outer wrapper.
+                if (!isRoot && props && (typeof props.onPress === 'function' ||
+                                          typeof props.onChangeText === 'function' ||
+                                          typeof props.onFocus === 'function')) {
+                    return '';
+                }
                 if (props) {
                     var ch = props.children;
                     if (typeof ch === 'string') return ch;
@@ -1542,7 +1561,7 @@ export async function getPressableElements(options = {}) {
                 var parts = [];
                 var child = fiber.child;
                 while (child) {
-                    var t = collectText(child, d + 1);
+                    var t = collectText(child, d + 1, false);
                     if (t) parts.push(t);
                     child = child.sibling;
                 }
@@ -1610,22 +1629,28 @@ export async function getPressableElements(options = {}) {
                 var isInput = !isPressable && props && (typeof props.onChangeText === 'function' || typeof props.onFocus === 'function');
 
                 if (isPressable || isInput) {
-                    var host = findFirstHost(fiber, 0);
-                    if (host) {
-                        var text = collectText(fiber, 0);
+                    var hostsForThis = [];
+                    findHostsInSubtree(fiber, 0, hostsForThis, 16);
+                    if (hostsForThis.length > 0) {
+                        var text = collectText(fiber, 0, true);
                         var componentName = findMeaningfulAncestorName(fiber) || name || 'Unknown';
                         var path = buildPath(fiber);
                         var testID = (props && (props.testID || props.nativeID)) || null;
                         var accessibilityLabel = (props && props.accessibilityLabel) || null;
 
-                        hostFibers.push(host);
+                        var hostIndices = [];
+                        for (var hi = 0; hi < hostsForThis.length; hi++) {
+                            hostIndices.push(hostFibers.length);
+                            hostFibers.push(hostsForThis[hi]);
+                        }
                         fiberMeta.push({
                             component: componentName,
                             path: path,
                             text: text ? text.slice(0, 100) : '',
                             testID: testID,
                             accessibilityLabel: accessibilityLabel,
-                            isInput: !!isInput
+                            isInput: !!isInput,
+                            hostIndices: hostIndices
                         });
                     }
                 }
@@ -1641,16 +1666,18 @@ export async function getPressableElements(options = {}) {
 
             if (hostFibers.length === 0) return { error: 'No pressable elements found on screen.' };
 
-            // Also measure the root view for viewport detection
+            // Also measure the root view for viewport detection (appended; tracked by explicit index to preserve hostIndices)
             var rootHost = findFirstHost(roots[0].current, 0);
+            var rootIdx = -1;
             if (rootHost) {
-                hostFibers.unshift(rootHost);
-                fiberMeta.unshift({ component: '__root__', path: '', text: '', testID: null, accessibilityLabel: null, isInput: false });
+                rootIdx = hostFibers.length;
+                hostFibers.push(rootHost);
             }
 
             globalThis.__pressableFibers = hostFibers;
             globalThis.__pressableMeta = fiberMeta;
             globalThis.__pressableMeasurements = new Array(hostFibers.length).fill(null);
+            globalThis.__pressableRootIdx = rootIdx;
 
             for (var i = 0; i < hostFibers.length; i++) {
                 try {
@@ -1684,34 +1711,53 @@ export async function getPressableElements(options = {}) {
             var fibers = globalThis.__pressableFibers;
             var meta = globalThis.__pressableMeta;
             var measurements = globalThis.__pressableMeasurements;
+            var rootIdx = globalThis.__pressableRootIdx;
             globalThis.__pressableFibers = null;
             globalThis.__pressableMeta = null;
             globalThis.__pressableMeasurements = null;
+            globalThis.__pressableRootIdx = null;
 
             if (!fibers || !measurements || !meta) {
                 return { error: 'No measurement data. Run get_pressable_elements again.' };
             }
 
-            // Get viewport dimensions
+            // Get viewport dimensions from the explicit root measurement (fallback to scanning)
             var viewportW = 9999, viewportH = 9999;
-            for (var v = 0; v < measurements.length; v++) {
-                if (measurements[v] && measurements[v].x === 0 && measurements[v].y <= 0 &&
-                    measurements[v].width > 0 && measurements[v].height > 0) {
-                    viewportW = measurements[v].width;
-                    viewportH = measurements[v].height + measurements[v].y;
-                    break;
+            var rootM = (rootIdx != null && rootIdx >= 0) ? measurements[rootIdx] : null;
+            if (rootM && rootM.width > 0 && rootM.height > 0) {
+                viewportW = rootM.width;
+                viewportH = rootM.height + (rootM.y > 0 ? rootM.y : 0);
+            } else {
+                for (var v = 0; v < measurements.length; v++) {
+                    if (measurements[v] && measurements[v].x === 0 && measurements[v].y <= 0 &&
+                        measurements[v].width > 0 && measurements[v].height > 0) {
+                        viewportW = measurements[v].width;
+                        viewportH = measurements[v].height + measurements[v].y;
+                        break;
+                    }
                 }
             }
 
             var elements = [];
 
-            for (var i = 0; i < measurements.length; i++) {
-                var m = measurements[i];
-                if (!m) continue;
-
+            for (var i = 0; i < meta.length; i++) {
                 var info = meta[i];
-                // Skip the root viewport measurement entry
-                if (info.component === '__root__') continue;
+
+                // Union all host measurements for this pressable to get its true bounds
+                var uMinX = Infinity, uMinY = Infinity, uMaxX = -Infinity, uMaxY = -Infinity;
+                var hasValid = false;
+                var indices = info.hostIndices || [];
+                for (var hi2 = 0; hi2 < indices.length; hi2++) {
+                    var mm = measurements[indices[hi2]];
+                    if (!mm || mm.width <= 0 || mm.height <= 0) continue;
+                    hasValid = true;
+                    if (mm.x < uMinX) uMinX = mm.x;
+                    if (mm.y < uMinY) uMinY = mm.y;
+                    if (mm.x + mm.width > uMaxX) uMaxX = mm.x + mm.width;
+                    if (mm.y + mm.height > uMaxY) uMaxY = mm.y + mm.height;
+                }
+                if (!hasValid) continue;
+                var m = { x: uMinX, y: uMinY, width: uMaxX - uMinX, height: uMaxY - uMinY };
 
                 // Filter: only visible within viewport
                 if (m.width <= 0 || m.height <= 0) continue;
@@ -1742,8 +1788,19 @@ export async function getPressableElements(options = {}) {
             }
 
             // Deduplicate: multiple nested pressables (View > TouchableOpacity > TouchableOpacity)
-            // often share the same frame. Keep the one with the most meaningful component name.
+            // often share the same frame. Keep the one with the most meaningful component name,
+            // but merge text/testID/accessibilityLabel from the loser so stopping collectText
+            // at nested-pressable boundaries does not drop labels across the merge.
             var HOST_NAMES = /^(View|TouchableOpacity|TouchableHighlight|TouchableWithoutFeedback|Pressable|TouchableNativeFeedback|Text|RCTView|RCTText)$/;
+            function mergeFields(winner, loser) {
+                if (!winner.text && loser.text) {
+                    winner.text = loser.text;
+                    winner.hasLabel = winner.text.length > 0;
+                }
+                if (!winner.testID && loser.testID) winner.testID = loser.testID;
+                if (!winner.accessibilityLabel && loser.accessibilityLabel) winner.accessibilityLabel = loser.accessibilityLabel;
+                return winner;
+            }
             var deduped = {};
             for (var di = 0; di < elements.length; di++) {
                 var el = elements[di];
@@ -1752,16 +1809,20 @@ export async function getPressableElements(options = {}) {
                 if (!existing) {
                     deduped[key] = el;
                 } else {
-                    // Prefer non-host/non-primitive name
                     var existingIsGeneric = HOST_NAMES.test(existing.component);
                     var newIsGeneric = HOST_NAMES.test(el.component);
+                    var winner, loser;
                     if (existingIsGeneric && !newIsGeneric) {
-                        deduped[key] = el;
-                    } else if (existingIsGeneric && newIsGeneric) {
-                        // Both generic — prefer the one with more identifiers
-                        if (!existing.testID && el.testID) deduped[key] = el;
-                        else if (!existing.accessibilityLabel && el.accessibilityLabel) deduped[key] = el;
+                        winner = el; loser = existing;
+                    } else if (!existingIsGeneric && newIsGeneric) {
+                        winner = existing; loser = el;
+                    } else {
+                        // Both generic or both meaningful — prefer the one with more identifiers.
+                        if (!existing.testID && el.testID) { winner = el; loser = existing; }
+                        else if (!existing.accessibilityLabel && el.accessibilityLabel) { winner = el; loser = existing; }
+                        else { winner = existing; loser = el; }
                     }
+                    deduped[key] = mergeFields(winner, loser);
                 }
             }
             elements = [];
@@ -1769,6 +1830,30 @@ export async function getPressableElements(options = {}) {
                 elements.push(deduped[dk]);
             }
 
+            // Tag wrappers: pressables that cover >=50% of viewport AND geometrically contain another pressable.
+            // These are typically keyboard-dismiss/full-screen Touchable wrappers — agents should skip them.
+            var viewportArea = (viewportW > 0 && viewportH > 0 && viewportW < 9999 && viewportH < 9999)
+                ? viewportW * viewportH : 0;
+            if (viewportArea > 0) {
+                for (var wi = 0; wi < elements.length; wi++) {
+                    var we = elements[wi];
+                    var weArea = we.frame.width * we.frame.height;
+                    if (weArea < viewportArea * 0.5) continue;
+                    for (var wj = 0; wj < elements.length; wj++) {
+                        if (wj === wi) continue;
+                        var other = elements[wj];
+                        if (other.frame.x >= we.frame.x &&
+                            other.frame.y >= we.frame.y &&
+                            other.frame.x + other.frame.width <= we.frame.x + we.frame.width &&
+                            other.frame.y + other.frame.height <= we.frame.y + we.frame.height &&
+                            other.frame.width * other.frame.height < weArea) {
+                            we.isWrapper = true;
+                            break;
+                        }
+                    }
+                }
+            }
+
             // Sort top-to-bottom, left-to-right
             elements.sort(function(a, b) {
                 if (a.center.y !== b.center.y) return a.center.y - b.center.y;
@@ -1808,7 +1893,8 @@ export async function getPressableElements(options = {}) {
                     ids.push(`a11y="${el.accessibilityLabel}"`);
                 const idStr = ids.length > 0 ? ` [${ids.join(", ")}]` : "";
                 const inputStr = el.isInput ? " (input)" : "";
-                lines.push(`${num}. ${el.component} ${label} — center:(${el.center.x},${el.center.y}) frame:(${el.frame.x},${el.frame.y} ${el.frame.width}x${el.frame.height})${idStr}${inputStr}`);
+                const wrapperStr = el.isWrapper ? " [wrapper — skip unless dismissing keyboard]" : "";
+                lines.push(`${num}. ${el.component} ${label} — center:(${el.center.x},${el.center.y}) frame:(${el.frame.x},${el.frame.y} ${el.frame.width}x${el.frame.height})${idStr}${inputStr}${wrapperStr}`);
                 if (el.path)
                     lines.push(`   path: ${el.path}`);
             }
@@ -2360,6 +2446,51 @@ export async function pressElement(options) {
                 return null;
             }
 
+            var RN_PRIMITIVES = /^(Animated\\(.*|withAnimated.*|AnimatedComponent.*|ForwardRef.*|memo\\(.*|Context\\.Consumer|Context\\.Provider|RCT.*|RNS.*|RNC.*|ViewManagerAdapter_.*|VirtualizedList.*|CellRenderer.*|FrameSizeProvider.*|MaybeScreenContainer|MaybeScreen|Navigation.*|Screen$|ScreenStack|ScreenContainer|ScreenContentWrapper|SceneView|DelayedFreeze|Freeze|Suspender|DebugContainer|StaticContainer|SafeAreaProvider.*|SafeAreaFrameContext|SafeAreaInsetsContext|ExpoRoot|ExpoRootComponent|GestureHandler.*|NativeViewGestureHandler|GestureDetector|PanGestureHandler|Reanimated.*|BottomTabNavigator|TabLayout|RouteNode|Route$|KeyboardProvider|PortalProviderComponent|BottomSheetModalProviderWrapper|ThemeContext|ThemeProvider|TextAncestorContext|PressabilityDebugView|TouchableHighlightImpl|StatusBarOverlay|BottomSheetHostingContainerComponent|BottomSheetGestureHandlersProvider|BottomSheetBackdropContainerComponent|BottomSheetContainerComponent|BottomSheetDraggableViewComponent|BottomSheetHandleContainerComponent|BottomSheetBackgroundContainerComponent|DebuggingOverlay|InspectorDeferred|Inspector|InspectorOverlay|InspectorPanel|StyleInspector|BoxInspector|BoxContainer|ElementBox|BorderBox|InspectorPanelButton)$/;
+
+            function isScreenHidden(name, props) {
+                if (!props) return false;
+                if (name === 'RNSScreen' && props['aria-hidden'] === true) return true;
+                if (name === 'MaybeScreen' && props.active === 0) return true;
+                if (name === 'SceneView' && props.focused === false) return true;
+                return false;
+            }
+
+            function findMeaningfulAncestorName(fiber) {
+                var cur = fiber.return;
+                var depth = 0;
+                var fallbackName = null;
+                while (cur && depth < 20) {
+                    var aname = getComponentName(cur);
+                    if (aname && typeof cur.type !== 'string') {
+                        if (!fallbackName) fallbackName = aname;
+                        if (!RN_PRIMITIVES.test(aname)) return aname;
+                    }
+                    cur = cur.return;
+                    depth++;
+                }
+                return fallbackName;
+            }
+
+            // Walk UP collecting testID/nativeID from ancestors. Stop at screen boundaries.
+            function collectAncestorTestIDs(fiber, maxUp) {
+                var ids = [];
+                var cur = fiber.return;
+                var d = 0;
+                while (cur && d < maxUp) {
+                    var cname = getComponentName(cur);
+                    if (cname === 'RNSScreen' || cname === 'MaybeScreen' || cname === 'SceneView') break;
+                    var cp = cur.memoizedProps;
+                    if (cp) {
+                        if (typeof cp.testID === 'string' && cp.testID) ids.push(cp.testID);
+                        if (typeof cp.nativeID === 'string' && cp.nativeID) ids.push(cp.nativeID);
+                    }
+                    cur = cur.return;
+                    d++;
+                }
+                return ids;
+            }
+
             // Find the first measurable host descendant of a fiber.
             // For inputs, prefer TextInput-specific hosts over generic RCTView.
             function findFirstHost(fiber, depth, isInput) {
@@ -2402,10 +2533,7 @@ export async function pressElement(options) {
                 var name = getComponentName(fiber);
                 var props = fiber.memoizedProps;
 
-                // Skip inactive/hidden screens
-                if (name === 'RNSScreen' && props && props['aria-hidden'] === true) return;
-                if (name === 'MaybeScreen' && props && props.active === 0) return;
-                if (name === 'SceneView' && props && props.focused === false) return;
+                if (isScreenHidden(name, props)) return;
 
                 var isPressable = props && typeof props.onPress === 'function';
                 var isInput = !isPressable && props && (typeof props.onChangeText === 'function' || typeof props.onFocus === 'function');
@@ -2421,14 +2549,18 @@ export async function pressElement(options) {
                         text = extractText(fiber, 0) || val || defVal || ph;
                     }
                     var tid = props.testID || props.nativeID || null;
+                    var meaningful = findMeaningfulAncestorName(fiber);
+                    var ancestorIDs = collectAncestorTestIDs(fiber, maxTraversalUp);
 
                     var host = findFirstHost(fiber, 0, isInput);
                     if (host) {
                         hostFibers.push(host);
                         tapMeta.push({
                             name: name || '(anonymous)',
+                            meaningfulComponentName: meaningful || null,
                             text: text.substring(0, 100),
                             testID: tid,
+                            ancestorTestIDs: ancestorIDs,
                             path: path.join(' > '),
                             isInput: isInput,
                             isPressable: isPressable,
@@ -2449,21 +2581,40 @@ export async function pressElement(options) {
                 walkFiber(roots[ri].current, 0, []);
             }
 
-            // Phase 2a: testID on non-pressable wrapper — walk UP to pressable/input parent
+            // Phase 2a: testID on non-pressable wrapper — walk UP or DOWN to pressable/input.
+            // Skipped if Phase 1 already matched via own testID or ancestor testID.
             if (searchTestID !== null) {
-                var hasDirectTestIDMatch = false;
+                var hasEnrichedTestIDMatch = false;
                 for (var di = 0; di < tapMeta.length; di++) {
-                    if (tapMeta[di].testID === searchTestID) { hasDirectTestIDMatch = true; break; }
-                }
+                    if (tapMeta[di].testID === searchTestID) { hasEnrichedTestIDMatch = true; break; }
+                    var aids = tapMeta[di].ancestorTestIDs || [];
+                    for (var ai = 0; ai < aids.length; ai++) {
+                        if (aids[ai] === searchTestID) { hasEnrichedTestIDMatch = true; break; }
+                    }
+                    if (hasEnrichedTestIDMatch) break;
+                }
+
+                if (!hasEnrichedTestIDMatch) {
+                    function findDescendantPressable(fiber, d) {
+                        if (!fiber || d > 10) return null;
+                        var fp = fiber.memoizedProps;
+                        var dIsPressable = fp && typeof fp.onPress === 'function';
+                        var dIsInput = !dIsPressable && fp && (typeof fp.onChangeText === 'function' || typeof fp.onFocus === 'function');
+                        if (dIsPressable || dIsInput) return { fiber: fiber, isPressable: dIsPressable, isInput: dIsInput };
+                        var c = fiber.child;
+                        while (c) {
+                            var r = findDescendantPressable(c, d + 1);
+                            if (r) return r;
+                            c = c.sibling;
+                        }
+                        return null;
+                    }
 
-                if (!hasDirectTestIDMatch) {
                     function findByTestID2a(fiber, path) {
                         if (!fiber) return;
                         var name = getComponentName(fiber);
                         var props = fiber.memoizedProps;
-                        if (name === 'RNSScreen' && props && props['aria-hidden'] === true) return;
-                        if (name === 'MaybeScreen' && props && props.active === 0) return;
-                        if (name === 'SceneView' && props && props.focused === false) return;
+                        if (isScreenHidden(name, props)) return;
 
                         var tid = props && (props.testID || props.nativeID || null);
                         if (tid === searchTestID) {
@@ -2477,8 +2628,10 @@ export async function pressElement(options) {
                                     hostFibers.push(host);
                                     tapMeta.push({
                                         name: name || '(anonymous)',
+                                        meaningfulComponentName: findMeaningfulAncestorName(fiber) || null,
                                         text: text.substring(0, 100),
                                         testID: searchTestID,
+                                        ancestorTestIDs: [],
                                         path: path.join(' > '),
                                         isInput: nIsInput,
                                         isPressable: nIsPressable,
@@ -2486,6 +2639,7 @@ export async function pressElement(options) {
                                     });
                                 }
                             } else {
+                                var foundAncestor = false;
                                 var parent = fiber.return;
                                 var d = 0;
                                 while (parent && d < maxTraversalUp) {
@@ -2499,19 +2653,45 @@ export async function pressElement(options) {
                                             hostFibers.push(host);
                                             tapMeta.push({
                                                 name: name || '(anonymous)',
+                                                meaningfulComponentName: findMeaningfulAncestorName(parent) || null,
                                                 text: pText.substring(0, 100),
                                                 testID: pp.testID || pp.nativeID || searchTestID,
+                                                ancestorTestIDs: [],
                                                 path: path.join(' > '),
                                                 isInput: pIsInput,
                                                 isPressable: pIsPressable,
                                                 source: 'testID-ancestor'
                                             });
+                                            foundAncestor = true;
                                         }
                                         break;
                                     }
                                     parent = parent.return;
                                     d++;
                                 }
+
+                                if (!foundAncestor) {
+                                    var desc = findDescendantPressable(fiber, 0);
+                                    if (desc) {
+                                        var dp = desc.fiber.memoizedProps;
+                                        var dText = desc.isPressable ? extractText(desc.fiber, 0) : (extractText(desc.fiber, 0) || (typeof dp.value === 'string' ? dp.value : '') || (typeof dp.defaultValue === 'string' ? dp.defaultValue : '') || (typeof dp.placeholder === 'string' ? dp.placeholder : ''));
+                                        var dhost = findFirstHost(desc.fiber, 0, desc.isInput);
+                                        if (dhost) {
+                                            hostFibers.push(dhost);
+                                            tapMeta.push({
+                                                name: getComponentName(desc.fiber) || '(anonymous)',
+                                                meaningfulComponentName: findMeaningfulAncestorName(desc.fiber) || null,
+                                                text: dText.substring(0, 100),
+                                                testID: dp.testID || dp.nativeID || searchTestID,
+                                                ancestorTestIDs: [searchTestID],
+                                                path: path.join(' > '),
+                                                isInput: desc.isInput,
+                                                isPressable: desc.isPressable,
+                                                source: 'testID-descendant'
+                                            });
+                                        }
+                                    }
+                                }
                             }
                         }
                         var child = fiber.child;
@@ -2527,25 +2707,41 @@ export async function pressElement(options) {
                 }
             }
 
-            // Phase 2b: component name on non-pressable node — walk UP to pressable parent
+            // Phase 2b: component name on non-pressable node — walk UP or DOWN to pressable parent.
+            // Skipped if Phase 1 already matched via own name or meaningfulComponentName.
             if (searchComponent !== null) {
-                var hasDirectComponentMatch = false;
+                var scLower = searchComponent.toLowerCase();
+                var hasEnrichedComponentMatch = false;
                 for (var ci = 0; ci < tapMeta.length; ci++) {
-                    if (tapMeta[ci].name.toLowerCase().indexOf(searchComponent.toLowerCase()) !== -1 && tapMeta[ci].source === 'direct') {
-                        hasDirectComponentMatch = true; break;
+                    var cn = (tapMeta[ci].name || '').toLowerCase();
+                    var cm = (tapMeta[ci].meaningfulComponentName || '').toLowerCase();
+                    if (cn.indexOf(scLower) !== -1 || cm.indexOf(scLower) !== -1) {
+                        hasEnrichedComponentMatch = true; break;
                     }
                 }
 
-                if (!hasDirectComponentMatch) {
+                if (!hasEnrichedComponentMatch) {
+                    function findDescendantPressableOnly(fiber, d) {
+                        if (!fiber || d > 10) return null;
+                        var fp = fiber.memoizedProps;
+                        if (fp && typeof fp.onPress === 'function') return fiber;
+                        var c = fiber.child;
+                        while (c) {
+                            var r = findDescendantPressableOnly(c, d + 1);
+                            if (r) return r;
+                            c = c.sibling;
+                        }
+                        return null;
+                    }
+
                     function findByName2b(fiber, path) {
                         if (!fiber) return;
                         var name = getComponentName(fiber);
                         var props = fiber.memoizedProps;
-                        if (name === 'RNSScreen' && props && props['aria-hidden'] === true) return;
-                        if (name === 'MaybeScreen' && props && props.active === 0) return;
-                        if (name === 'SceneView' && props && props.focused === false) return;
+                        if (isScreenHidden(name, props)) return;
 
-                        if (name && name.toLowerCase().indexOf(searchComponent.toLowerCase()) !== -1) {
+                        if (name && name.toLowerCase().indexOf(scLower) !== -1) {
+                            var foundAncestor = false;
                             var parent = fiber.return;
                             var d = 0;
                             while (parent && d < maxTraversalUp) {
@@ -2557,19 +2753,45 @@ export async function pressElement(options) {
                                         hostFibers.push(host);
                                         tapMeta.push({
                                             name: name,
+                                            meaningfulComponentName: findMeaningfulAncestorName(parent) || null,
                                             text: text.substring(0, 100),
                                             testID: pp.testID || pp.nativeID || null,
+                                            ancestorTestIDs: [],
                                             path: path.join(' > '),
                                             isInput: false,
                                             isPressable: true,
                                             source: 'component-ancestor'
                                         });
+                                        foundAncestor = true;
                                     }
                                     break;
                                 }
                                 parent = parent.return;
                                 d++;
                             }
+
+                            if (!foundAncestor) {
+                                var descFiber = findDescendantPressableOnly(fiber, 0);
+                                if (descFiber) {
+                                    var dp = descFiber.memoizedProps;
+                                    var dText = extractText(descFiber, 0);
+                                    var dhost = findFirstHost(descFiber, 0, false);
+                                    if (dhost) {
+                                        hostFibers.push(dhost);
+                                        tapMeta.push({
+                                            name: getComponentName(descFiber) || '(anonymous)',
+                                            meaningfulComponentName: name,
+                                            text: dText.substring(0, 100),
+                                            testID: dp.testID || dp.nativeID || null,
+                                            ancestorTestIDs: [],
+                                            path: path.join(' > '),
+                                            isInput: false,
+                                            isPressable: true,
+                                            source: 'component-descendant'
+                                        });
+                                    }
+                                }
+                            }
                         }
                         var child = fiber.child;
                         while (child) {
@@ -2666,16 +2888,25 @@ export async function pressElement(options) {
 
                 var info = meta[i];
 
-                // Match by query
+                // Match by query — OR across own and enriched identifiers
                 var matched = true;
                 if (searchText !== null) {
                     matched = matched && info.text.toLowerCase().indexOf(searchText.toLowerCase()) !== -1;
                 }
                 if (searchTestID !== null) {
-                    matched = matched && (info.testID === searchTestID);
+                    var ownTidMatch = info.testID === searchTestID;
+                    var aTids = info.ancestorTestIDs || [];
+                    var ancestorTidMatch = false;
+                    for (var ti = 0; ti < aTids.length; ti++) {
+                        if (aTids[ti] === searchTestID) { ancestorTidMatch = true; break; }
+                    }
+                    matched = matched && (ownTidMatch || ancestorTidMatch);
                 }
                 if (searchComponent !== null) {
-                    matched = matched && (info.name || '').toLowerCase().indexOf(searchComponent.toLowerCase()) !== -1;
+                    var scq = searchComponent.toLowerCase();
+                    var ownNameMatch = (info.name || '').toLowerCase().indexOf(scq) !== -1;
+                    var meaningfulMatch = (info.meaningfulComponentName || '').toLowerCase().indexOf(scq) !== -1;
+                    matched = matched && (ownNameMatch || meaningfulMatch);
                 }
 
                 if (matched) {