diff --git a/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap b/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap index 45e29be907ee59..6f75087896c417 100644 --- a/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap +++ b/packages/react-native/Libraries/__tests__/__snapshots__/public-api-test.js.snap @@ -10479,53 +10479,6 @@ declare export default Spec; " `; -exports[`public API should not change unintentionally src/private/webapis/dom/geometry/DOMRect.js 1`] = ` -"declare export default class DOMRect extends DOMRectReadOnly { - get x(): number; - set x(x: ?number): void; - get y(): number; - set y(y: ?number): void; - get width(): number; - set width(width: ?number): void; - get height(): number; - set height(height: ?number): void; - static fromRect(rect?: ?DOMRectInit): DOMRect; -} -" -`; - -exports[`public API should not change unintentionally src/private/webapis/dom/geometry/DOMRectReadOnly.js 1`] = ` -"export interface DOMRectInit { - x?: ?number; - y?: ?number; - width?: ?number; - height?: ?number; -} -declare export default class DOMRectReadOnly { - constructor(x: ?number, y: ?number, width: ?number, height: ?number): void; - get x(): number; - get y(): number; - get width(): number; - get height(): number; - get top(): number; - get right(): number; - get bottom(): number; - get left(): number; - toJSON(): { - x: number, - y: number, - width: number, - height: number, - top: number, - left: number, - bottom: number, - right: number, - }; - static fromRect(rect?: ?DOMRectInit): DOMRectReadOnly; -} -" -`; - exports[`public API should not change unintentionally src/private/webapis/dom/nodes/ReactNativeDocument.js 1`] = ` "declare export default class ReactNativeDocument extends ReadOnlyNode { constructor( @@ -10683,23 +10636,6 @@ exports[`public API should not change unintentionally src/private/webapis/dom/no " `; -exports[`public API should not change unintentionally src/private/webapis/dom/oldstylecollections/ArrayLikeUtils.js 1`] = ` -"export interface ArrayLike extends Iterable { - [indexer: number]: T; - +length: number; -} -declare export function createValueIterator( - arrayLike: ArrayLike -): Iterator; -declare export function createKeyIterator( - arrayLike: ArrayLike -): Iterator; -declare export function createEntriesIterator( - arrayLike: ArrayLike -): Iterator<[number, T]>; -" -`; - exports[`public API should not change unintentionally src/private/webapis/intersectionobserver/IntersectionObserver.js 1`] = ` "export type IntersectionObserverCallback = ( entries: Array, diff --git a/packages/react-native/src/private/setup/setUpDOM.js b/packages/react-native/src/private/setup/setUpDOM.js index f4fc5552239157..a0bf36b1c45dcf 100644 --- a/packages/react-native/src/private/setup/setUpDOM.js +++ b/packages/react-native/src/private/setup/setUpDOM.js @@ -21,12 +21,12 @@ export default function setUpDOM() { polyfillGlobal( 'DOMRect', - () => require('../webapis/dom/geometry/DOMRect').default, + () => require('../webapis/geometry/DOMRect').default, ); polyfillGlobal( 'DOMRectReadOnly', - () => require('../webapis/dom/geometry/DOMRectReadOnly').default, + () => require('../webapis/geometry/DOMRectReadOnly').default, ); polyfillGlobal( diff --git a/packages/react-native/src/private/webapis/dom/nodes/ReadOnlyElement.js b/packages/react-native/src/private/webapis/dom/nodes/ReadOnlyElement.js index c5b7967f690e25..189680cf23bc66 100644 --- a/packages/react-native/src/private/webapis/dom/nodes/ReadOnlyElement.js +++ b/packages/react-native/src/private/webapis/dom/nodes/ReadOnlyElement.js @@ -12,7 +12,7 @@ import type HTMLCollection from '../oldstylecollections/HTMLCollection'; -import DOMRect from '../geometry/DOMRect'; +import DOMRect from '../../geometry/DOMRect'; import {createHTMLCollection} from '../oldstylecollections/HTMLCollection'; import { getInstanceHandle, diff --git a/packages/react-native/src/private/webapis/dom/oldstylecollections/HTMLCollection.js b/packages/react-native/src/private/webapis/dom/oldstylecollections/HTMLCollection.js index 9cf4b2dcaeebea..764767d6282fdc 100644 --- a/packages/react-native/src/private/webapis/dom/oldstylecollections/HTMLCollection.js +++ b/packages/react-native/src/private/webapis/dom/oldstylecollections/HTMLCollection.js @@ -10,9 +10,9 @@ // flowlint unsafe-getters-setters:off -import type {ArrayLike} from './ArrayLikeUtils'; +import type {ArrayLike} from '../../utils/ArrayLikeUtils'; -import {createValueIterator} from './ArrayLikeUtils'; +import {createValueIterator} from '../../utils/ArrayLikeUtils'; // IMPORTANT: The type definition for this module is defined in `HTMLCollection.js.flow` // because Flow only supports indexers in classes in declaration files. diff --git a/packages/react-native/src/private/webapis/dom/oldstylecollections/HTMLCollection.js.flow b/packages/react-native/src/private/webapis/dom/oldstylecollections/HTMLCollection.js.flow index 8f14d1d098c7ec..161ba3b17c37f3 100644 --- a/packages/react-native/src/private/webapis/dom/oldstylecollections/HTMLCollection.js.flow +++ b/packages/react-native/src/private/webapis/dom/oldstylecollections/HTMLCollection.js.flow @@ -8,7 +8,7 @@ * @flow strict */ -import type {ArrayLike} from './ArrayLikeUtils'; +import type {ArrayLike} from '../../utils/ArrayLikeUtils'; declare export default class HTMLCollection<+T> implements Iterable, ArrayLike diff --git a/packages/react-native/src/private/webapis/dom/oldstylecollections/NodeList.js b/packages/react-native/src/private/webapis/dom/oldstylecollections/NodeList.js index 2d957f24f15360..e42ad04c3f063c 100644 --- a/packages/react-native/src/private/webapis/dom/oldstylecollections/NodeList.js +++ b/packages/react-native/src/private/webapis/dom/oldstylecollections/NodeList.js @@ -10,13 +10,13 @@ // flowlint unsafe-getters-setters:off -import type {ArrayLike} from './ArrayLikeUtils'; +import type {ArrayLike} from '../../utils/ArrayLikeUtils'; import { createEntriesIterator, createKeyIterator, createValueIterator, -} from './ArrayLikeUtils'; +} from '../../utils/ArrayLikeUtils'; // IMPORTANT: The Flow type definition for this module is defined in `NodeList.js.flow` // because Flow only supports indexers in classes in declaration files. diff --git a/packages/react-native/src/private/webapis/dom/oldstylecollections/NodeList.js.flow b/packages/react-native/src/private/webapis/dom/oldstylecollections/NodeList.js.flow index 89e02eef540f91..6250cdc03517ef 100644 --- a/packages/react-native/src/private/webapis/dom/oldstylecollections/NodeList.js.flow +++ b/packages/react-native/src/private/webapis/dom/oldstylecollections/NodeList.js.flow @@ -8,7 +8,7 @@ * @flow strict */ -import type {ArrayLike} from './ArrayLikeUtils'; +import type {ArrayLike} from '../../utils/ArrayLikeUtils'; declare export default class NodeList<+T> implements Iterable, ArrayLike { // This property should've been read-only as well, but Flow doesn't handle diff --git a/packages/react-native/src/private/webapis/dom/geometry/DOMRect.js b/packages/react-native/src/private/webapis/geometry/DOMRect.js similarity index 100% rename from packages/react-native/src/private/webapis/dom/geometry/DOMRect.js rename to packages/react-native/src/private/webapis/geometry/DOMRect.js diff --git a/packages/react-native/src/private/webapis/dom/oldstylecollections/DOMRectList.js b/packages/react-native/src/private/webapis/geometry/DOMRectList.js similarity index 92% rename from packages/react-native/src/private/webapis/dom/oldstylecollections/DOMRectList.js rename to packages/react-native/src/private/webapis/geometry/DOMRectList.js index a95458f91201da..adab6ba73515b1 100644 --- a/packages/react-native/src/private/webapis/dom/oldstylecollections/DOMRectList.js +++ b/packages/react-native/src/private/webapis/geometry/DOMRectList.js @@ -10,10 +10,10 @@ // flowlint unsafe-getters-setters:off -import type DOMRectReadOnly from '../geometry/DOMRectReadOnly'; -import type {ArrayLike} from './ArrayLikeUtils'; +import type {ArrayLike} from '../utils/ArrayLikeUtils'; +import type DOMRectReadOnly from './DOMRectReadOnly'; -import {createValueIterator} from './ArrayLikeUtils'; +import {createValueIterator} from '../utils/ArrayLikeUtils'; // IMPORTANT: The Flow type definition for this module is defined in `DOMRectList.js.flow` // because Flow only supports indexers in classes in declaration files. diff --git a/packages/react-native/src/private/webapis/dom/oldstylecollections/DOMRectList.js.flow b/packages/react-native/src/private/webapis/geometry/DOMRectList.js.flow similarity index 86% rename from packages/react-native/src/private/webapis/dom/oldstylecollections/DOMRectList.js.flow rename to packages/react-native/src/private/webapis/geometry/DOMRectList.js.flow index 251c84c25f77c4..ce2451b386825e 100644 --- a/packages/react-native/src/private/webapis/dom/oldstylecollections/DOMRectList.js.flow +++ b/packages/react-native/src/private/webapis/geometry/DOMRectList.js.flow @@ -8,8 +8,8 @@ * @flow strict */ -import type DOMRectReadOnly from '../geometry/DOMRectReadOnly'; -import type {ArrayLike} from './ArrayLikeUtils'; +import type {ArrayLike} from '../utils/ArrayLikeUtils'; +import type DOMRectReadOnly from './DOMRectReadOnly'; declare export default class DOMRectList implements Iterable, ArrayLike diff --git a/packages/react-native/src/private/webapis/dom/geometry/DOMRectReadOnly.js b/packages/react-native/src/private/webapis/geometry/DOMRectReadOnly.js similarity index 100% rename from packages/react-native/src/private/webapis/dom/geometry/DOMRectReadOnly.js rename to packages/react-native/src/private/webapis/geometry/DOMRectReadOnly.js diff --git a/packages/react-native/src/private/webapis/dom/oldstylecollections/__tests__/DOMRectList-test.js b/packages/react-native/src/private/webapis/geometry/__tests__/DOMRectList-test.js similarity index 97% rename from packages/react-native/src/private/webapis/dom/oldstylecollections/__tests__/DOMRectList-test.js rename to packages/react-native/src/private/webapis/geometry/__tests__/DOMRectList-test.js index 9d6bb51e2a96e7..1142963a4225ad 100644 --- a/packages/react-native/src/private/webapis/dom/oldstylecollections/__tests__/DOMRectList-test.js +++ b/packages/react-native/src/private/webapis/geometry/__tests__/DOMRectList-test.js @@ -9,8 +9,8 @@ * @oncall react_native */ -import DOMRectReadOnly from '../../geometry/DOMRectReadOnly'; import {createDOMRectList} from '../DOMRectList'; +import DOMRectReadOnly from '../DOMRectReadOnly'; const domRectA = new DOMRectReadOnly(); const domRectB = new DOMRectReadOnly(); diff --git a/packages/react-native/src/private/webapis/intersectionobserver/IntersectionObserverEntry.js b/packages/react-native/src/private/webapis/intersectionobserver/IntersectionObserverEntry.js index ea55c66be09273..81eebeb2ac56c9 100644 --- a/packages/react-native/src/private/webapis/intersectionobserver/IntersectionObserverEntry.js +++ b/packages/react-native/src/private/webapis/intersectionobserver/IntersectionObserverEntry.js @@ -13,7 +13,7 @@ import type ReactNativeElement from '../dom/nodes/ReactNativeElement'; import type {NativeIntersectionObserverEntry} from './specs/NativeIntersectionObserver'; -import DOMRectReadOnly from '../dom/geometry/DOMRectReadOnly'; +import DOMRectReadOnly from '../geometry/DOMRectReadOnly'; /** * The [`IntersectionObserverEntry`](https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserverEntry) diff --git a/packages/react-native/src/private/webapis/intersectionobserver/__tests__/IntersectionObserver-itest.js b/packages/react-native/src/private/webapis/intersectionobserver/__tests__/IntersectionObserver-itest.js index 327594c1296def..1252ee10df4e63 100644 --- a/packages/react-native/src/private/webapis/intersectionobserver/__tests__/IntersectionObserver-itest.js +++ b/packages/react-native/src/private/webapis/intersectionobserver/__tests__/IntersectionObserver-itest.js @@ -13,7 +13,7 @@ /* eslint-disable lint/sort-imports */ import type IntersectionObserverType from '../IntersectionObserver'; -import DOMRectReadOnly from '../../dom/geometry/DOMRectReadOnly'; +import DOMRectReadOnly from '../../geometry/DOMRectReadOnly'; import Fantom from '@react-native/fantom'; import setUpIntersectionObserver from '../../../setup/setUpIntersectionObserver'; import ReactNativeElement from '../../dom/nodes/ReactNativeElement'; diff --git a/packages/react-native/src/private/webapis/dom/oldstylecollections/ArrayLikeUtils.js b/packages/react-native/src/private/webapis/utils/ArrayLikeUtils.js similarity index 100% rename from packages/react-native/src/private/webapis/dom/oldstylecollections/ArrayLikeUtils.js rename to packages/react-native/src/private/webapis/utils/ArrayLikeUtils.js diff --git a/packages/rn-tester/js/examples/MutationObserver/VisualCompletionExample/VCTrackerExample.js b/packages/rn-tester/js/examples/MutationObserver/VisualCompletionExample/VCTrackerExample.js index 99e6545c2aa86f..85171fe7a331fe 100644 --- a/packages/rn-tester/js/examples/MutationObserver/VisualCompletionExample/VCTrackerExample.js +++ b/packages/rn-tester/js/examples/MutationObserver/VisualCompletionExample/VCTrackerExample.js @@ -8,8 +8,8 @@ * @format */ -import type DOMRectReadOnly from 'react-native/src/private/webapis/dom/geometry/DOMRectReadOnly'; import type ReadOnlyNode from 'react-native/src/private/webapis/dom/nodes/ReadOnlyNode'; +import type DOMRectReadOnly from 'react-native/src/private/webapis/geometry/DOMRectReadOnly'; import ReactNativeElement from 'react-native/src/private/webapis/dom/nodes/ReactNativeElement'; import IntersectionObserver from 'react-native/src/private/webapis/intersectionobserver/IntersectionObserver';