chore: rebase on main

Author: mdjastrzebski

package.json

@@ -86,7 +86,9 @@
   },
   "jest": {
     "preset": "./jest-preset",
-    "setupFilesAfterEnv": ["./jest-setup.ts"],
+    "setupFilesAfterEnv": [
+      "./jest-setup.ts"
+    ],
     "testPathIgnorePatterns": [
       "timerUtils",
       "examples/"

src/queries/__tests__/text.breaking.test.tsx

@@ -510,6 +510,5 @@ test('byText support hidden option', () => {
 
 test('byText should return host component', () => {
   const { getByText } = render(<Text>hello</Text>);
-
   expect(getByText('hello').type).toBe('Text');
 });

src/queries/__tests__/text.test.tsx

@@ -8,6 +8,7 @@ import {
   TextInput,
 } from 'react-native';
 import { render, getDefaultNormalizer, within } from '../..';
+import { getConfig } from '../../config';
 
 test('byText matches simple text', () => {
   const { getByText } = render(<Text testID="text">Hello World</Text>);
@@ -504,7 +505,10 @@ test('byText support hidden option', () => {
 });
 
 test('byText should return composite Text', () => {
+  const textType = getConfig().useBreakingChanges
+    ? getHostComponentNames().text
+    : Text;
+  console.log('BB', getConfig().useBreakingChanges, textType);
   const { getByText } = render(<Text>hello</Text>);
-
   expect(getByText('hello').type).toBe(Text);
 });

src/queries/text.ts

@@ -1,14 +1,15 @@
 import type { ReactTestInstance } from 'react-test-renderer';
 import { Text } from 'react-native';
-import { findAll } from '../helpers/findAll';
-import { filterNodeByType } from '../helpers/filterNodeByType';
-import { matchTextContent } from '../helpers/matchers/matchTextContent';
-import { TextMatch, TextMatchOptions } from '../matches';
+import { getConfig, resetToDefaults } from '../config';
 import {
   getCompositeParentOfType,
   isHostElementForType,
 } from '../helpers/component-tree';
-import { getConfig } from '../config';
+import { filterNodeByType } from '../helpers/filterNodeByType';
+import { findAll } from '../helpers/findAll';
+import { getHostComponentNames } from '../helpers/host-component-names';
+import { matchTextContent } from '../helpers/matchers/matchTextContent';
+import { TextMatch, TextMatchOptions } from '../matches';
 import { makeQueries } from './makeQueries';
 import type {
   FindAllByQuery,
@@ -19,7 +20,10 @@ import type {
   QueryByQuery,
 } from './makeQueries';
 import type { CommonQueryOptions } from './options';
-import { getHostComponentNames } from '../helpers/host-component-names';
+
+beforeEach(() => {
+  resetToDefaults();
+});
 
 type ByTextOptions = CommonQueryOptions & TextMatchOptions;
 
@@ -41,21 +45,20 @@ const queryAllByText = (
 
       const results = findAll(
         baseInstance,
-        (node) => matchTextContent(node, text, options),
+        (node) =>
+          filterNodeByType(node, Text) && matchTextContent(node, text, options),
         { ...options, matchDeepestOnly: true }
       );
 
       return results;
     }
 
     // vNext version: returns host Text
-    const textType = getConfig().useBreakingChanges
-      ? getHostComponentNames().text
-      : Text;
-
     return findAll(
       instance,
-      (node) => node.type === textType && matchTextContent(node, text, options),
+      (node) =>
+        filterNodeByType(node, getHostComponentNames().text) &&
+        matchTextContent(node, text, options),
       {
         ...options,
         matchDeepestOnly: true,