Remove remaining test deep imports (#58573)

Summary:
Pull Request resolved: https://github.com/react/react-native/pull/58573

Migrate the remaining Flow-visible deep imports in React Native tests. Use public DOM globals where their types are sufficient, and use relative imports for implementation-specific helpers, observer types, and native specs that are not publicly exported.

Changelog: [Internal]

Reviewed By: javache

Differential Revision: D120537585

fbshipit-source-id: ea494dd65c68cbd556ec31bea58aee22e5cc06b3
This commit is contained in:
Rubén Norte authored and meta-codesync[bot] committed 2026-09-18 07:27:28 -07:00
1 parent ffbca04c3e
commit 4d4bb50786
16 files changed
+65 -83

No files matched your search

@@ -13,16 +13,16 @@ import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
import type {HostInstance} from 'react-native';
import type {AccessibilityProps} from 'react-native';
import accessibilityPropsSuite, {
rolePropSuite,
} from '../../../src/private/__tests__/utilities/accessibilityPropsSuite';
import {testIDPropSuite} from '../../../src/private/__tests__/utilities/commonPropsSuite';
import ensureInstance from '../../../src/private/__tests__/utilities/ensureInstance';
import * as Fantom from '@react-native/fantom';
import nullthrows from 'nullthrows';
import * as React from 'react';
import {createRef} from 'react';
import {Text} from 'react-native';
import accessibilityPropsSuite, {
rolePropSuite,
} from 'react-native/src/private/__tests__/utilities/accessibilityPropsSuite';
import {testIDPropSuite} from 'react-native/src/private/__tests__/utilities/commonPropsSuite';
const TEST_TEXT = 'the text';
@@ -10,11 +10,11 @@
import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
import {HardwareBackPressEvent} from '../HardwareBackPressEvent';
import {BackHandler, DeviceEventEmitter} from 'react-native';
import {HardwareBackPressEvent as HardwareBackPressEventClass} from 'react-native/Libraries/Utilities/HardwareBackPressEvent';
type BackPressHandler = Parameters<typeof BackHandler.addEventListener>[1];
type HardwareBackPressEvent = Parameters<BackPressHandler>[0];
type HardwareBackPressEventType = Parameters<BackPressHandler>[0];
describe('BackHandler', () => {
const subscriptions: Array<{remove: () => void, ...}> = [];
@@ -28,11 +28,11 @@ describe('BackHandler', () => {
it('calls handlers in reverse order (LIFO)', () => {
const callOrder: Array<string> = [];
const handler1 = (_event: HardwareBackPressEvent) => {
const handler1 = (_event: HardwareBackPressEventType) => {
callOrder.push('first');
return false;
};
const handler2 = (_event: HardwareBackPressEvent) => {
const handler2 = (_event: HardwareBackPressEventType) => {
callOrder.push('second');
return true;
};
@@ -51,11 +51,11 @@ describe('BackHandler', () => {
it('calls all handlers when none return true', () => {
const callOrder: Array<string> = [];
const handler1 = (_event: HardwareBackPressEvent) => {
const handler1 = (_event: HardwareBackPressEventType) => {
callOrder.push('first');
return false;
};
const handler2 = (_event: HardwareBackPressEvent) => {
const handler2 = (_event: HardwareBackPressEventType) => {
callOrder.push('second');
return false;
};
@@ -73,8 +73,8 @@ describe('BackHandler', () => {
});
it('passes HardwareBackPressEvent to handlers', () => {
let receivedEvent: ?HardwareBackPressEvent = null;
const handler = (event: HardwareBackPressEvent) => {
let receivedEvent: ?HardwareBackPressEventType = null;
const handler = (event: HardwareBackPressEventType) => {
receivedEvent = event;
return true;
};
@@ -85,12 +85,12 @@ describe('BackHandler', () => {
DeviceEventEmitter.emit('hardwareBackPress', {timeStamp: 42});
expect(receivedEvent).toBeInstanceOf(HardwareBackPressEventClass);
expect(receivedEvent).toBeInstanceOf(HardwareBackPressEvent);
});
it('event has native timestamp as timeStamp', () => {
let receivedEvent: ?HardwareBackPressEvent = null;
const handler = (event: HardwareBackPressEvent) => {
let receivedEvent: ?HardwareBackPressEventType = null;
const handler = (event: HardwareBackPressEventType) => {
receivedEvent = event;
return true;
};
@@ -105,8 +105,8 @@ describe('BackHandler', () => {
});
it('event falls back to performance.now() when no native timestamp', () => {
let receivedEvent: ?HardwareBackPressEvent = null;
const handler = (event: HardwareBackPressEvent) => {
let receivedEvent: ?HardwareBackPressEventType = null;
const handler = (event: HardwareBackPressEventType) => {
receivedEvent = event;
return true;
};
@@ -129,7 +129,7 @@ describe('BackHandler', () => {
it('removes handler on subscription.remove()', () => {
let called = false;
const handler = (_event: HardwareBackPressEvent) => {
const handler = (_event: HardwareBackPressEventType) => {
called = true;
return true;
};
@@ -10,8 +10,8 @@
import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
import {HardwareBackPressEvent} from 'react-native/Libraries/Utilities/HardwareBackPressEvent';
import {setEventInitTimeStamp} from 'react-native/src/private/webapis/dom/events/internals/EventInternals';
import {setEventInitTimeStamp} from '../../../src/private/webapis/dom/events/internals/EventInternals';
import {HardwareBackPressEvent} from '../HardwareBackPressEvent';
describe('HardwareBackPressEvent', () => {
it('extends Event', () => {
@@ -13,7 +13,7 @@ import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
import {
setEventInitTimeStamp,
setInPassiveListenerFlag,
} from 'react-native/src/private/webapis/dom/events/internals/EventInternals';
} from '../internals/EventInternals';
type EventOptions = EventInit & {
rnIsDirect?: boolean,
@@ -15,7 +15,7 @@ import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
import {
getEventHandlerAttribute,
setEventHandlerAttribute,
} from 'react-native/src/private/webapis/dom/events/EventHandlerAttributes';
} from '../EventHandlerAttributes';
type EventCallback = (event: Event) => void;
@@ -11,9 +11,9 @@
import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
import {EVENT_TARGET_GET_DECLARATIVE_LISTENER_KEY} from '../internals/EventTargetInternals';
import createEventTargetHierarchyWithDepth from './createEventTargetHierarchyWithDepth';
import {unstable_benchmark} from '@react-native/fantom';
import {EVENT_TARGET_GET_DECLARATIVE_LISTENER_KEY} from 'react-native/src/private/webapis/dom/events/internals/EventTargetInternals';
let event: Event;
let eventTarget: EventTarget;
@@ -19,8 +19,6 @@ import nullthrows from 'nullthrows';
import * as React from 'react';
import {createRef} from 'react';
import {View} from 'react-native';
import ReactNativeDocument from 'react-native/src/private/webapis/dom/nodes/ReactNativeDocument';
import ReactNativeElement from 'react-native/src/private/webapis/dom/nodes/ReactNativeElement';
describe('ReactNativeDocument', () => {
it('is connected until the surface is destroyed', () => {
@@ -32,7 +30,7 @@ describe('ReactNativeDocument', () => {
});
const element = nullthrows(nodeRef.current);
const document = ensureInstance(element.ownerDocument, ReactNativeDocument);
const document = ensureInstance(element.ownerDocument, Document);
expect(document.isConnected).toBe(true);
@@ -58,14 +56,15 @@ describe('ReactNativeDocument', () => {
});
const element = nullthrows(nodeRef.current);
const document = ensureInstance(element.ownerDocument, ReactNativeDocument);
const document = ensureInstance(element.ownerDocument, Document);
const documentElement = nullthrows(document.documentElement);
expect(document.childNodes.length).toBe(1);
expect(document.childNodes[0]).toBe(document.documentElement);
expect(document.documentElement.parentNode).toBe(document);
expect(document.documentElement.childNodes.length).toBe(1);
expect(document.documentElement.childNodes[0]).toBe(element);
expect(element.parentNode).toBe(document.documentElement);
expect(document.childNodes[0]).toBe(documentElement);
expect(documentElement.parentNode).toBe(document);
expect(documentElement.childNodes.length).toBe(1);
expect(documentElement.childNodes[0]).toBe(element);
expect(element.parentNode).toBe(documentElement);
});
it('allows traversal through document-specific methods', () => {
@@ -77,7 +76,7 @@ describe('ReactNativeDocument', () => {
});
const element = nullthrows(nodeRef.current);
const document = ensureInstance(element.ownerDocument, ReactNativeDocument);
const document = ensureInstance(element.ownerDocument, Document);
expect(document.childElementCount).toBe(1);
expect(document.firstElementChild).toBe(document.documentElement);
@@ -95,7 +94,7 @@ describe('ReactNativeDocument', () => {
});
const element = nullthrows(nodeRef.current);
const document = ensureInstance(element.ownerDocument, ReactNativeDocument);
const document = ensureInstance(element.ownerDocument, Document);
expect(document.nodeName).toBe('#document');
expect(document.nodeType).toBe(Node.DOCUMENT_NODE);
@@ -117,19 +116,19 @@ describe('ReactNativeDocument', () => {
});
const element = nullthrows(nodeRef.current);
const document = ensureInstance(element.ownerDocument, ReactNativeDocument);
const document = ensureInstance(element.ownerDocument, Document);
const documentElement = nullthrows(document.documentElement);
const {x, y, width, height} =
document.documentElement.getBoundingClientRect();
const {x, y, width, height} = documentElement.getBoundingClientRect();
expect(x).toBe(111);
expect(y).toBe(222);
expect(width).toBe(200);
expect(height).toBe(100);
expect(document.documentElement.offsetParent).toBe(null);
expect(document.documentElement.offsetTop).toBe(0);
expect(document.documentElement.offsetLeft).toBe(0);
expect(documentElement.offsetParent).toBe(null);
expect(documentElement.offsetTop).toBe(0);
expect(documentElement.offsetLeft).toBe(0);
});
it('implements compareDocumentPosition correctly', () => {
@@ -140,18 +139,14 @@ describe('ReactNativeDocument', () => {
root.render(<View ref={nodeRef} />);
});
const element = nullthrows(nodeRef.current);
const document = ensureInstance(element.ownerDocument, ReactNativeDocument);
const documentElement = document.documentElement;
const element = ensureInstance(nodeRef.current, Element);
const document = ensureInstance(element.ownerDocument, Document);
const documentElement = nullthrows(document.documentElement);
/* eslint-disable no-bitwise */
expect(document.compareDocumentPosition(document)).toBe(0);
expect(
document.documentElement.compareDocumentPosition(
document.documentElement,
),
).toBe(0);
expect(documentElement.compareDocumentPosition(documentElement)).toBe(0);
expect(document.compareDocumentPosition(documentElement)).toBe(
Node.DOCUMENT_POSITION_CONTAINED_BY | Node.DOCUMENT_POSITION_FOLLOWING,
@@ -185,10 +180,7 @@ describe('ReactNativeDocument', () => {
let maybeWeakDocument;
Fantom.runTask(() => {
maybeWeakDocument = new WeakRef(
ensureInstance(
nullthrows(nodeRef.current).ownerDocument,
ReactNativeDocument,
),
ensureInstance(nullthrows(nodeRef.current).ownerDocument, Document),
);
maybeWeakNode = new WeakRef(nullthrows(nodeRef.current));
});
@@ -250,11 +242,8 @@ describe('ReactNativeDocument', () => {
);
});
const element = ensureInstance(lastNode, ReactNativeElement);
const document = ensureInstance(
element.ownerDocument,
ReactNativeDocument,
);
const element = ensureInstance(lastNode, Element);
const document = ensureInstance(element.ownerDocument, Document);
expect(document.getElementById('foo')).toBe(fooNode);
expect(document.getElementById('bar')).toBe(barFirstNode);
@@ -17,6 +17,7 @@ import type {HostInstance} from 'react-native';
import ensureInstance from '../../../../__tests__/utilities/ensureInstance';
import TextInputState from '../../../../../../Libraries/Components/TextInput/TextInputState';
import {NativeVirtualText} from '../../../../../../Libraries/Text/TextNativeComponent';
import * as Fantom from '@react-native/fantom';
import nullthrows from 'nullthrows';
import * as React from 'react';
@@ -29,7 +30,6 @@ import {
View,
unstable_NativeText as NativeText,
} from 'react-native';
import {NativeVirtualText} from 'react-native/Libraries/Text/TextNativeComponent';
import {ReactNativeFeatureFlags} from 'react-native/react-private-interface';
// The public imperative EventTarget API is not part of the static type of this
@@ -15,6 +15,7 @@ import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
import type {HostInstance} from 'react-native';
import ensureInstance from '../../../../__tests__/utilities/ensureInstance';
import ReadOnlyText from '../ReadOnlyText';
import * as Fantom from '@react-native/fantom';
import invariant from 'invariant';
import nullthrows from 'nullthrows';
@@ -22,7 +23,6 @@ import * as React from 'react';
import {createRef} from 'react';
import {unstable_NativeText as NativeText} from 'react-native';
import {ReactNativeFeatureFlags} from 'react-native/react-private-interface';
import ReadOnlyText from 'react-native/src/private/webapis/dom/nodes/ReadOnlyText';
function ensureReadOnlyText(value: unknown): ReadOnlyText {
return ensureInstance(value, ReadOnlyText);
@@ -11,9 +11,9 @@
import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
import type IntersectionObserverType from '../IntersectionObserver';
import type {Root} from '@react-native/fantom';
import type {HostInstance} from 'react-native';
import type IntersectionObserverType from 'react-native/src/private/webapis/intersectionobserver/IntersectionObserver';
import * as Fantom from '@react-native/fantom';
import nullthrows from 'nullthrows';
@@ -11,9 +11,9 @@
import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
import type IntersectionObserverType from '../IntersectionObserver';
import type IntersectionObserverEntryType from '../IntersectionObserverEntry';
import type {HostInstance} from 'react-native';
import type IntersectionObserverType from 'react-native/src/private/webapis/intersectionobserver/IntersectionObserver';
import type IntersectionObserverEntryType from 'react-native/src/private/webapis/intersectionobserver/IntersectionObserverEntry';
import {createShadowNodeReferenceCountingRef} from '../../../__tests__/utilities/ShadowNodeReferenceCounter';
import * as Fantom from '@react-native/fantom';
@@ -4,15 +4,16 @@
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @fantom_flags enableMutationObserverByDefault:true
* @flow strict-local
* @format
*/
import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
import type MutationObserverType from '../MutationObserver';
import type MutationRecordType from '../MutationRecord';
import type {HostInstance} from 'react-native';
import type MutationObserverType from 'react-native/src/private/webapis/mutationobserver/MutationObserver';
import type MutationRecordType from 'react-native/src/private/webapis/mutationobserver/MutationRecord';
import ensureInstance from '../../../__tests__/utilities/ensureInstance';
import {createShadowNodeReferenceCountingRef} from '../../../__tests__/utilities/ShadowNodeReferenceCounter';
@@ -21,13 +22,10 @@ import nullthrows from 'nullthrows';
import * as React from 'react';
import {createRef} from 'react';
import {View} from 'react-native';
import setUpMutationObserver from 'react-native/src/private/setup/setUpMutationObserver';
declare const MutationObserver: Class<MutationObserverType>;
declare const MutationRecord: Class<MutationRecordType>;
setUpMutationObserver();
function ensureMutationRecordArray(
value: unknown,
): ReadonlyArray<MutationRecord> {
@@ -11,10 +11,10 @@
import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
import type ResizeObserverType from '../ResizeObserver';
import type ResizeObserverEntryType from '../ResizeObserverEntry';
import type ResizeObserverSizeType from '../ResizeObserverSize';
import type {HostInstance} from 'react-native';
import type ResizeObserverType from 'react-native/src/private/webapis/resizeobserver/ResizeObserver';
import type ResizeObserverEntryType from 'react-native/src/private/webapis/resizeobserver/ResizeObserverEntry';
import type ResizeObserverSizeType from 'react-native/src/private/webapis/resizeobserver/ResizeObserverSize';
import {createShadowNodeReferenceCountingRef} from '../../../__tests__/utilities/ShadowNodeReferenceCounter';
import * as Fantom from '@react-native/fantom';
@@ -22,7 +22,6 @@ import nullthrows from 'nullthrows';
import * as React from 'react';
import {createRef} from 'react';
import {View} from 'react-native';
import setUpResizeObserver from 'react-native/src/private/setup/setUpResizeObserver';
declare const ResizeObserver: Class<ResizeObserverType>;
declare const ResizeObserverEntry: Class<ResizeObserverEntryType>;
@@ -33,8 +32,6 @@ type ResizeObserverMockCallback = JestMockFn<
unknown,
>;
setUpResizeObserver();
function expectEntrySizes(
entry: ResizeObserverEntry,
expected: {
@@ -10,8 +10,8 @@
import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
import structuredClone from '../structuredClone';
import * as Fantom from '@react-native/fantom';
import structuredClone from 'react-native/src/private/webapis/structuredClone/structuredClone';
const basicArray = [1, 2, 3];
const basicObject = {a: 1, b: 2, c: 3};
@@ -5,6 +5,7 @@
* LICENSE file in the root directory of this source tree.
*
* @fantom_flags enableIntersectionObserverByDefault:true
* @fantom_flags enableMutationObserverByDefault:true
* @flow strict-local
* @format
*/
@@ -14,19 +15,16 @@ import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
import type {HostInstance} from 'react-native';
import ensureInstance from '../../../__tests__/utilities/ensureInstance';
import DOMException from '../../errors/DOMException';
import IntersectionObserver from '../../intersectionobserver/IntersectionObserver';
import IntersectionObserverEntry from '../../intersectionobserver/IntersectionObserverEntry';
import MutationObserver from '../../mutationobserver/MutationObserver';
import structuredClone from '../structuredClone';
import * as Fantom from '@react-native/fantom';
import nullthrows from 'nullthrows';
import * as React from 'react';
import {createRef} from 'react';
import {View} from 'react-native';
import setUpMutationObserver from 'react-native/src/private/setup/setUpMutationObserver';
import DOMException from 'react-native/src/private/webapis/errors/DOMException';
import IntersectionObserver from 'react-native/src/private/webapis/intersectionobserver/IntersectionObserver';
import IntersectionObserverEntry from 'react-native/src/private/webapis/intersectionobserver/IntersectionObserverEntry';
import MutationObserver from 'react-native/src/private/webapis/mutationobserver/MutationObserver';
import structuredClone from 'react-native/src/private/webapis/structuredClone/structuredClone';
setUpMutationObserver();
function expectDataCloneError(fn: () => unknown) {
try {
+1 -1
View File
@@ -13,11 +13,11 @@ import '@react-native/fantom/src/setUpDefaultReactNativeEnvironment';
import type {Root} from '@react-native/fantom';
import type {HostInstance} from 'react-native';
import NativeFantom from '../../../../packages/react-native/src/private/testing/fantom/specs/NativeFantom';
import * as Fantom from '@react-native/fantom';
import * as React from 'react';
import {createRef} from 'react';
import {LogBox, Modal, ScrollView, Text, TextInput, View} from 'react-native';
import NativeFantom from 'react-native/src/private/testing/fantom/specs/NativeFantom';
function ensureHostInstance(value: HostInstance | null): HostInstance {
if (value == null) {