refactor: self code review

Author: mdjastrzebski

src/helpers/__tests__/component-tree.test.tsx

@@ -228,8 +228,4 @@ describe('getUnsafeRootElement()', () => {
     const view = screen.getByTestId('view');
     expect(getUnsafeRootElement(view)).toEqual(screen.UNSAFE_root);
   });
-
-  it('returns null for null', () => {
-    expect(getUnsafeRootElement(null)).toEqual(null);
-  });
 });

src/helpers/accessibility.ts

@@ -5,8 +5,9 @@ import {
   Role,
   StyleSheet,
 } from 'react-native';
-import { ReactTestInstance } from 'react-test-renderer';
-import { getHostSiblings, getUnsafeRootElement } from './component-tree';
+import type { ReactTestInstance } from 'react-test-renderer';
+import { getHostSiblings, getUnsafeRootElement, isHostElement } from './component-tree';
+import { findAll } from './find-all';
 import {
   getHostComponentNames,
   isHostImage,
@@ -172,9 +173,13 @@ export function computeAriaLabel(element: ReactTestInstance): string | undefined
   const labelElementId = element.props['aria-labelledby'] ?? element.props.accessibilityLabelledBy;
   if (labelElementId) {
     const rootElement = getUnsafeRootElement(element);
-    const labelElement = rootElement?.findByProps({ nativeID: labelElementId });
-    if (labelElement) {
-      return getTextContent(labelElement);
+    const labelElement = findAll(
+      rootElement,
+      (node) => isHostElement(node) && node.props.nativeID === labelElementId,
+      { includeHiddenElements: true },
+    );
+    if (labelElement.length > 0) {
+      return getTextContent(labelElement[0]);
     }
   }
 

src/helpers/component-tree.ts

@@ -87,11 +87,7 @@ export function getHostSiblings(element: ReactTestInstance | null): HostTestInst
  * @param element The element start traversing from.
  * @returns The root element of the tree (host or composite).
  */
-export function getUnsafeRootElement(element: ReactTestInstance | null) {
-  if (element == null) {
-    return null;
-  }
-
+export function getUnsafeRootElement(element: ReactTestInstance) {
   let current = element;
   while (current.parent) {
     current = current.parent;