update UTR to 0.7.0

Author: mdjastrzebski

.codecov.yml

@@ -8,7 +8,7 @@ coverage:
         target: 80% # Required patch coverage target
     project:
       default:
-        threshold: 0.5%  # Allowable coverage drop in percentage points
+        threshold: 0.5% # Allowable coverage drop in percentage points
 
 comment:
   behavior: default

package.json

@@ -93,7 +93,7 @@
     "release-it": "^18.0.0",
     "typescript": "^5.6.3",
     "typescript-eslint": "^8.19.1",
-    "universal-test-renderer": "0.6.0"
+    "universal-test-renderer": "0.7.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

src/__tests__/render.test.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { Pressable, Text, TextInput, View } from 'react-native';
-import { CONTAINER_TYPE } from 'universal-test-renderer';
 
 import { fireEvent, render, type RenderAPI, screen } from '..';
 
@@ -168,14 +167,6 @@ test('returns host root', () => {
   expect(screen.root?.props.testID).toBe('inner');
 });
 
-test('returns container', () => {
-  render(<View testID="inner" />);
-
-  expect(screen.container).toBeDefined();
-  expect(screen.container.type).toBe(CONTAINER_TYPE);
-  expect(screen.container.props).toEqual({});
-});
-
 test('RenderAPI type', () => {
   render(<Banana />) as RenderAPI;
   expect(true).toBeTruthy();

src/fire-event.ts

@@ -9,7 +9,7 @@ import type { HostElement } from 'universal-test-renderer';
 
 import act from './act';
 import { getEventHandler } from './event-handler';
-import { isElementMounted, isValidElement } from './helpers/component-tree';
+import { isElementMounted } from './helpers/component-tree';
 import { isHostScrollView, isHostTextInput } from './helpers/host-component-names';
 import { isPointerEventEnabled } from './helpers/pointer-events';
 import { isEditableTextInput } from './helpers/text-input';
@@ -20,10 +20,6 @@ import { EventBuilder } from './user-event/event-builder';
 type EventHandler = (...args: unknown[]) => unknown;
 
 export function isTouchResponder(element: HostElement) {
-  if (!isValidElement(element)) {
-    return false;
-  }
-
   return Boolean(element.props.onStartShouldSetResponder) || isHostTextInput(element);
 }
 

src/helpers/accessibility.ts

@@ -2,7 +2,7 @@ import type { AccessibilityRole, AccessibilityState, AccessibilityValue, Role }
 import { StyleSheet } from 'react-native';
 import type { HostElement } from 'universal-test-renderer';
 
-import { getContainerElement, getHostSiblings, isValidElement } from './component-tree';
+import { getContainerElement, getHostSiblings } from './component-tree';
 import { findAll } from './find-all';
 import { isHostImage, isHostSwitch, isHostText, isHostTextInput } from './host-component-names';
 import { getTextContent } from './text-content';
@@ -158,13 +158,9 @@ export function computeAriaLabel(element: HostElement): string | undefined {
   const labelElementId = element.props['aria-labelledby'] ?? element.props.accessibilityLabelledBy;
   if (labelElementId) {
     const rootElement = getContainerElement(element);
-    const labelElement = findAll(
-      rootElement,
-      (node) => isValidElement(node) && node.props.nativeID === labelElementId,
-      {
-        includeHiddenElements: true,
-      },
-    );
+    const labelElement = findAll(rootElement, (node) => node.props.nativeID === labelElementId, {
+      includeHiddenElements: true,
+    });
     if (labelElement.length > 0) {
       return getTextContent(labelElement[0]);
     }

src/helpers/component-tree.ts

@@ -1,16 +1,7 @@
 import type { HostElement } from 'universal-test-renderer';
-import { CONTAINER_TYPE } from 'universal-test-renderer';
 
 import { screen } from '../screen';
 
-/**
- * Checks if the given element is a host element.
- * @param element The element to check.
- */
-export function isValidElement(element?: HostElement | null): element is HostElement {
-  return typeof element?.type === 'string' && element.type !== CONTAINER_TYPE;
-}
-
 export function isElementMounted(element: HostElement) {
   return getContainerElement(element) === screen.container;
 }

src/helpers/find-all.ts

@@ -2,7 +2,6 @@ import type { HostElement } from 'universal-test-renderer';
 
 import { getConfig } from '../config';
 import { isHiddenFromAccessibility } from './accessibility';
-import { isValidElement } from './component-tree';
 
 interface FindAllOptions {
   /** Match elements hidden from accessibility */
@@ -55,7 +54,6 @@ function findAllInternal(
   if (
     // When matchDeepestOnly = true: add current element only if no descendants match
     (!options?.matchDeepestOnly || matchingDescendants.length === 0) &&
-    isValidElement(node) &&
     predicate(node)
   ) {
     results.push(node);

src/helpers/host-component-names.ts

@@ -1,7 +1,5 @@
 import type { HostElement } from 'universal-test-renderer';
 
-import { isValidElement } from './component-tree';
-
 export const HOST_TEXT_NAMES = ['Text', 'RCTText'];
 const HOST_TEXT_INPUT_NAMES = ['TextInput'];
 const HOST_IMAGE_NAMES = ['Image'];
@@ -14,45 +12,45 @@ const HOST_MODAL_NAMES = ['Modal'];
  * @param element The element to check.
  */
 export function isHostText(element: HostElement | null) {
-  return isValidElement(element) && HOST_TEXT_NAMES.includes(element.type);
+  return element != null && HOST_TEXT_NAMES.includes(element.type);
 }
 
 /**
  * Checks if the given element is a host TextInput element.
  * @param element The element to check.
  */
 export function isHostTextInput(element: HostElement | null) {
-  return isValidElement(element) && HOST_TEXT_INPUT_NAMES.includes(element.type);
+  return element != null && HOST_TEXT_INPUT_NAMES.includes(element.type);
 }
 
 /**
  * Checks if the given element is a host Image element.
  * @param element The element to check.
  */
 export function isHostImage(element: HostElement | null) {
-  return isValidElement(element) && HOST_IMAGE_NAMES.includes(element.type);
+  return element != null && HOST_IMAGE_NAMES.includes(element.type);
 }
 
 /**
  * Checks if the given element is a host Switch element.
  * @param element The element to check.
  */
 export function isHostSwitch(element: HostElement | null) {
-  return isValidElement(element) && HOST_SWITCH_NAMES.includes(element.type);
+  return element != null && HOST_SWITCH_NAMES.includes(element.type);
 }
 
 /**
  * Checks if the given element is a host ScrollView element.
  * @param element The element to check.
  */
 export function isHostScrollView(element: HostElement | null) {
-  return isValidElement(element) && HOST_SCROLL_VIEW_NAMES.includes(element.type);
+  return element != null && HOST_SCROLL_VIEW_NAMES.includes(element.type);
 }
 
 /**
  * Checks if the given element is a host Modal element.
  * @param element The element to check.
  */
 export function isHostModal(element: HostElement | null) {
-  return isValidElement(element) && HOST_MODAL_NAMES.includes(element.type);
+  return element != null && HOST_MODAL_NAMES.includes(element.type);
 }

src/matchers/utils.ts

@@ -9,8 +9,6 @@ import {
 import redent from 'redent';
 import type { HostElement } from 'universal-test-renderer';
 
-import { isValidElement } from '../helpers/component-tree';
-
 class HostElementTypeError extends Error {
   constructor(received: unknown, matcherFn: jest.CustomMatcher, context: jest.MatcherContext) {
     super();
@@ -48,7 +46,7 @@ export function checkHostElement(
   matcherFn: jest.CustomMatcher,
   context: jest.MatcherContext,
 ): asserts element is HostElement {
-  if (!isValidElement(element)) {
+  if (element == null) {
     throw new HostElementTypeError(element, matcherFn, context);
   }
 }

src/render.tsx

@@ -65,13 +65,12 @@ function buildRenderResult(
   addToCleanupQueue(unmount);
 
   const result = {
-    ...getQueriesForElement(renderer.container),
+    ...getQueriesForElement(renderer.root!),
     update,
     unmount,
     rerender: update, // alias for `update`
     toJSON: () => renderer.root?.toJSON(),
     debug: makeDebug(renderer),
-    container: renderer.container,
     get root(): HostElement | null {
       return renderer.root;
     },