refactor: code review changes

Author: mdjastrzebski

src/helpers/matchers/matchLabelText.ts

@@ -42,9 +42,10 @@ function matchAccessibilityLabelledBy(
   return (
     findAll(
       root,
-      (element) =>
-        element.props?.nativeID === nativeId &&
-        matchTextContent(element, text, options)
+      (node) =>
+        typeof node.type === 'string' &&
+        node.props?.nativeID === nativeId &&
+        matchTextContent(node, text, options)
     ).length > 0
   );
 }

src/matches.ts

@@ -8,7 +8,7 @@ export type TextMatchOptions = {
 
 export function matches(
   matcher: TextMatch,
-  text: string | undefined,
+  text: string,
   normalizer: NormalizerFn = getDefaultNormalizer(),
   exact: boolean = true
 ): boolean {

src/queries/__tests__/labelText.test.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { View, Text, TouchableOpacity, TextInput } from 'react-native';
+import { View, Text, TextInput, TouchableOpacity } from 'react-native';
 import { render } from '../..';
 
 const BUTTON_LABEL = 'cool button';
@@ -173,8 +173,9 @@ test('getByLabelText supports accessibilityLabelledBy', async () => {
       <TextInput testID="textInput" accessibilityLabelledBy="label" />
     </>
   );
-  expect(getByLabelText('Label for input')).toEqual(getByTestId('textInput'));
-  expect(getByLabelText(/input/)).toEqual(getByTestId('textInput'));
+
+  expect(getByLabelText('Label for input')).toBe(getByTestId('textInput'));
+  expect(getByLabelText(/input/)).toBe(getByTestId('textInput'));
 });
 
 test('getByLabelText supports nested accessibilityLabelledBy', async () => {
@@ -187,6 +188,6 @@ test('getByLabelText supports nested accessibilityLabelledBy', async () => {
     </>
   );
 
-  expect(getByLabelText('Label for input')).toEqual(getByTestId('textInput'));
-  expect(getByLabelText(/input/)).toEqual(getByTestId('textInput'));
+  expect(getByLabelText('Label for input')).toBe(getByTestId('textInput'));
+  expect(getByLabelText(/input/)).toBe(getByTestId('textInput'));
 });

src/queries/testId.ts

@@ -20,7 +20,7 @@ const getNodeByTestId = (
   options: TextMatchOptions = {}
 ) => {
   const { exact, normalizer } = options;
-  return matches(testID, node.props?.testID, normalizer, exact);
+  return matches(testID, node.props.testID, normalizer, exact);
 };
 
 const queryAllByTestId = (
@@ -30,13 +30,13 @@ const queryAllByTestId = (
   queryOptions?: ByTestIdOptions
 ) => Array<ReactTestInstance>) =>
   function queryAllByTestIdFn(testId, queryOptions) {
-    const results = findAll(
+    return findAll(
       instance,
-      (node) => getNodeByTestId(node, testId, queryOptions),
+      (node) =>
+        typeof node.type === 'string' &&
+        getNodeByTestId(node, testId, queryOptions),
       queryOptions
     );
-
-    return results.filter((element) => typeof element.type === 'string');
   };
 
 const getMultipleError = (testId: TextMatch) =>