diff --git a/packages/react-native/Libraries/Core/InitializeCore.js b/packages/react-native/Libraries/Core/InitializeCore.js index 25377f6890cb90..8224a1c53f7ba6 100644 --- a/packages/react-native/Libraries/Core/InitializeCore.js +++ b/packages/react-native/Libraries/Core/InitializeCore.js @@ -27,7 +27,7 @@ const start = Date.now(); require('./setUpGlobals'); -require('./setUpDOM'); +require('../../src/private/core/setUpDOM'); require('./setUpPerformance'); require('./setUpErrorHandling'); require('./polyfillPromise'); diff --git a/packages/react-native/Libraries/Debugging/DebuggingOverlayRegistry.js b/packages/react-native/Libraries/Debugging/DebuggingOverlayRegistry.js index bfd89b1dc8e4ba..11560ebc3943ab 100644 --- a/packages/react-native/Libraries/Debugging/DebuggingOverlayRegistry.js +++ b/packages/react-native/Libraries/Debugging/DebuggingOverlayRegistry.js @@ -9,8 +9,8 @@ * @oncall react_native */ -import type ReactNativeElement from '../DOM/Nodes/ReactNativeElement'; -import type ReadOnlyElement from '../DOM/Nodes/ReadOnlyElement'; +import type ReactNativeElement from '../../src/private/dom/nodes/ReactNativeElement'; +import type ReadOnlyElement from '../../src/private/dom/nodes/ReadOnlyElement'; import type { AppContainerRootViewRef, DebuggingOverlayRef, @@ -230,7 +230,7 @@ class DebuggingOverlayRegistry { // Lazy import to avoid dependency cycle. const ReactNativeElementClass = - require('../DOM/Nodes/ReactNativeElement').default; + require('../../src/private/dom/nodes/ReactNativeElement').default; if (publicInstance instanceof ReactNativeElementClass) { modernNodesUpdates.push({ id: instanceReactTag, @@ -371,7 +371,7 @@ class DebuggingOverlayRegistry { // Lazy import to avoid dependency cycle. const ReactNativeElementClass = - require('../DOM/Nodes/ReactNativeElement').default; + require('../../src/private/dom/nodes/ReactNativeElement').default; const reactNativeElements: Array = []; const legacyPublicInstances: Array = []; diff --git a/packages/react-native/Libraries/IntersectionObserver/IntersectionObserver.js b/packages/react-native/Libraries/IntersectionObserver/IntersectionObserver.js index 23d2c158569c0b..15b83f68b6f222 100644 --- a/packages/react-native/Libraries/IntersectionObserver/IntersectionObserver.js +++ b/packages/react-native/Libraries/IntersectionObserver/IntersectionObserver.js @@ -13,7 +13,7 @@ import type IntersectionObserverEntry from './IntersectionObserverEntry'; import type {IntersectionObserverId} from './IntersectionObserverManager'; -import ReactNativeElement from '../DOM/Nodes/ReactNativeElement'; +import ReactNativeElement from '../../src/private/dom/nodes/ReactNativeElement'; import * as IntersectionObserverManager from './IntersectionObserverManager'; export type IntersectionObserverCallback = ( diff --git a/packages/react-native/Libraries/IntersectionObserver/IntersectionObserverEntry.js b/packages/react-native/Libraries/IntersectionObserver/IntersectionObserverEntry.js index 23833face664a9..e6648190ec8b00 100644 --- a/packages/react-native/Libraries/IntersectionObserver/IntersectionObserverEntry.js +++ b/packages/react-native/Libraries/IntersectionObserver/IntersectionObserverEntry.js @@ -10,10 +10,10 @@ // flowlint unsafe-getters-setters:off -import type ReactNativeElement from '../DOM/Nodes/ReactNativeElement'; +import type ReactNativeElement from '../../src/private/dom/nodes/ReactNativeElement'; import type {NativeIntersectionObserverEntry} from './NativeIntersectionObserver'; -import DOMRectReadOnly from '../DOM/Geometry/DOMRectReadOnly'; +import DOMRectReadOnly from '../../src/private/dom/geometry/DOMRectReadOnly'; /** * The [`IntersectionObserverEntry`](https://developer.mozilla.org/en-US/docs/Web/API/IntersectionObserverEntry) diff --git a/packages/react-native/Libraries/IntersectionObserver/IntersectionObserverManager.js b/packages/react-native/Libraries/IntersectionObserver/IntersectionObserverManager.js index 892fce941c1020..c2e9e0fff7aacc 100644 --- a/packages/react-native/Libraries/IntersectionObserver/IntersectionObserverManager.js +++ b/packages/react-native/Libraries/IntersectionObserver/IntersectionObserverManager.js @@ -18,13 +18,16 @@ * the notifications together. */ -import type ReactNativeElement from '../DOM/Nodes/ReactNativeElement'; +import type ReactNativeElement from '../../src/private/dom/nodes/ReactNativeElement'; import type IntersectionObserver, { IntersectionObserverCallback, } from './IntersectionObserver'; import type IntersectionObserverEntry from './IntersectionObserverEntry'; -import {getInstanceHandle, getShadowNode} from '../DOM/Nodes/ReadOnlyNode'; +import { + getInstanceHandle, + getShadowNode, +} from '../../src/private/dom/nodes/ReadOnlyNode'; import * as Systrace from '../Performance/Systrace'; import warnOnce from '../Utilities/warnOnce'; import {createIntersectionObserverEntry} from './IntersectionObserverEntry'; diff --git a/packages/react-native/Libraries/IntersectionObserver/__mocks__/NativeIntersectionObserver.js b/packages/react-native/Libraries/IntersectionObserver/__mocks__/NativeIntersectionObserver.js index cb3d7fd9d87a0b..5d98ff8458980b 100644 --- a/packages/react-native/Libraries/IntersectionObserver/__mocks__/NativeIntersectionObserver.js +++ b/packages/react-native/Libraries/IntersectionObserver/__mocks__/NativeIntersectionObserver.js @@ -8,7 +8,7 @@ * @format */ -import type ReactNativeElement from '../../DOM/Nodes/ReactNativeElement'; +import type ReactNativeElement from '../../../src/private/dom/nodes/ReactNativeElement'; import type IntersectionObserver from '../IntersectionObserver'; import type { NativeIntersectionObserverEntry, @@ -16,7 +16,7 @@ import type { Spec, } from '../NativeIntersectionObserver'; -import {getShadowNode} from '../../DOM/Nodes/ReadOnlyNode'; +import {getShadowNode} from '../../../src/private/dom/nodes/ReadOnlyNode'; import {getFabricUIManager} from '../../ReactNative/__mocks__/FabricUIManager'; import invariant from 'invariant'; import nullthrows from 'nullthrows'; diff --git a/packages/react-native/Libraries/MutationObserver/MutationObserver.js b/packages/react-native/Libraries/MutationObserver/MutationObserver.js index 4c6c4ef2294aee..1d92c77de4d90d 100644 --- a/packages/react-native/Libraries/MutationObserver/MutationObserver.js +++ b/packages/react-native/Libraries/MutationObserver/MutationObserver.js @@ -13,7 +13,7 @@ import type {MutationObserverId} from './MutationObserverManager'; import type MutationRecord from './MutationRecord'; -import ReactNativeElement from '../DOM/Nodes/ReactNativeElement'; +import ReactNativeElement from '../../src/private/dom/nodes/ReactNativeElement'; import * as MutationObserverManager from './MutationObserverManager'; export type MutationObserverCallback = ( diff --git a/packages/react-native/Libraries/MutationObserver/MutationObserverManager.js b/packages/react-native/Libraries/MutationObserver/MutationObserverManager.js index 9cdf56f0c5dbad..d04af028063cd4 100644 --- a/packages/react-native/Libraries/MutationObserver/MutationObserverManager.js +++ b/packages/react-native/Libraries/MutationObserver/MutationObserverManager.js @@ -18,7 +18,7 @@ * the notifications together. */ -import type ReactNativeElement from '../DOM/Nodes/ReactNativeElement'; +import type ReactNativeElement from '../../src/private/dom/nodes/ReactNativeElement'; import type MutationObserver, { MutationObserverCallback, } from './MutationObserver'; @@ -27,7 +27,7 @@ import type MutationRecord from './MutationRecord'; import { getPublicInstanceFromInternalInstanceHandle, getShadowNode, -} from '../DOM/Nodes/ReadOnlyNode'; +} from '../../src/private/dom/nodes/ReadOnlyNode'; import * as Systrace from '../Performance/Systrace'; import warnOnce from '../Utilities/warnOnce'; import {createMutationRecord} from './MutationRecord'; diff --git a/packages/react-native/Libraries/MutationObserver/MutationRecord.js b/packages/react-native/Libraries/MutationObserver/MutationRecord.js index 18cce2d1fda14d..321698b1b1843c 100644 --- a/packages/react-native/Libraries/MutationObserver/MutationRecord.js +++ b/packages/react-native/Libraries/MutationObserver/MutationRecord.js @@ -10,11 +10,13 @@ // flowlint unsafe-getters-setters:off -import type ReactNativeElement from '../DOM/Nodes/ReactNativeElement'; -import type ReadOnlyNode from '../DOM/Nodes/ReadOnlyNode'; +import type ReactNativeElement from '../../src/private/dom/nodes/ReactNativeElement'; +import type ReadOnlyNode from '../../src/private/dom/nodes/ReadOnlyNode'; import type {NativeMutationRecord} from './NativeMutationObserver'; -import NodeList, {createNodeList} from '../DOM/OldStyleCollections/NodeList'; +import NodeList, { + createNodeList, +} from '../../src/private/dom/oldstylecollections/NodeList'; export type MutationType = 'attributes' | 'characterData' | 'childList'; diff --git a/packages/react-native/Libraries/MutationObserver/__mocks__/NativeMutationObserver.js b/packages/react-native/Libraries/MutationObserver/__mocks__/NativeMutationObserver.js index d7ffb65520d827..b3f048492fc7c4 100644 --- a/packages/react-native/Libraries/MutationObserver/__mocks__/NativeMutationObserver.js +++ b/packages/react-native/Libraries/MutationObserver/__mocks__/NativeMutationObserver.js @@ -28,7 +28,7 @@ import type { Spec, } from '../NativeMutationObserver'; -import ReadOnlyNode from '../../DOM/Nodes/ReadOnlyNode'; +import ReadOnlyNode from '../../../src/private/dom/nodes/ReadOnlyNode'; import { type NodeMock, type UIManagerCommitHook, diff --git a/packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance.js b/packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance.js index 54d8368ff2b8c6..7ef1fe05092d7a 100644 --- a/packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance.js +++ b/packages/react-native/Libraries/ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance.js @@ -13,8 +13,8 @@ * instances and get some data from them (like their instance handle / fiber). */ -import type ReactNativeElement from '../../DOM/Nodes/ReactNativeElement'; -import type ReadOnlyText from '../../DOM/Nodes/ReadOnlyText'; +import type ReactNativeElement from '../../../src/private/dom/nodes/ReactNativeElement'; +import type ReadOnlyText from '../../../src/private/dom/nodes/ReadOnlyText'; import typeof ReactFabricType from '../../Renderer/shims/ReactFabric'; import type { InternalInstanceHandle, @@ -44,7 +44,7 @@ export function createPublicInstance( // the right module to avoid eagerly loading both. if (ReactNativeFeatureFlags.enableAccessToHostTreeInFabric()) { PublicInstanceClass = - require('../../DOM/Nodes/ReactNativeElement').default; + require('../../../src/private/dom/nodes/ReactNativeElement').default; } else { PublicInstanceClass = require('./ReactFabricHostComponent').default; } @@ -57,7 +57,8 @@ export function createPublicTextInstance( internalInstanceHandle: InternalInstanceHandle, ): ReadOnlyText { if (ReadOnlyTextClass == null) { - ReadOnlyTextClass = require('../../DOM/Nodes/ReadOnlyText').default; + ReadOnlyTextClass = + require('../../../src/private/dom/nodes/ReadOnlyText').default; } return new ReadOnlyTextClass(internalInstanceHandle); diff --git a/packages/react-native/Libraries/ReactNative/__mocks__/FabricUIManager.js b/packages/react-native/Libraries/ReactNative/__mocks__/FabricUIManager.js index 83727b345374b2..3aa395231a3a57 100644 --- a/packages/react-native/Libraries/ReactNative/__mocks__/FabricUIManager.js +++ b/packages/react-native/Libraries/ReactNative/__mocks__/FabricUIManager.js @@ -394,7 +394,8 @@ const FabricUIManagerMock: IFabricUIManagerMock = { compareDocumentPosition: jest.fn((node: Node, otherNode: Node): number => { /* eslint-disable no-bitwise */ - const ReadOnlyNode = require('../../DOM/Nodes/ReadOnlyNode').default; + const ReadOnlyNode = + require('../../../src/private/dom/nodes/ReadOnlyNode').default; // Quick check for node vs. itself if (fromNode(node).reactTag === fromNode(otherNode).reactTag) { 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 1298282e9a116c..1025a942ecf374 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 @@ -4433,8 +4433,6 @@ exports[`public API should not change unintentionally Libraries/Core/setUpAlert. exports[`public API should not change unintentionally Libraries/Core/setUpBatchedBridge.js 1`] = `""`; -exports[`public API should not change unintentionally Libraries/Core/setUpDOM.js 1`] = `""`; - exports[`public API should not change unintentionally Libraries/Core/setUpDeveloperTools.js 1`] = `""`; exports[`public API should not change unintentionally Libraries/Core/setUpErrorHandling.js 1`] = `""`; @@ -4475,280 +4473,6 @@ exports[`public API should not change unintentionally Libraries/Core/setUpTimers exports[`public API should not change unintentionally Libraries/Core/setUpXHR.js 1`] = `""`; -exports[`public API should not change unintentionally Libraries/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?: ?DOMRectLike): DOMRect; -} -" -`; - -exports[`public API should not change unintentionally Libraries/DOM/Geometry/DOMRectReadOnly.js 1`] = ` -"export interface DOMRectLike { - x?: ?number; - y?: ?number; - width?: ?number; - height?: ?number; -} -declare export default class DOMRectReadOnly { - _x: number; - _y: number; - _width: number; - _height: number; - 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?: ?DOMRectLike): DOMRectReadOnly; - __getInternalX(): number; - __getInternalY(): number; - __getInternalWidth(): number; - __getInternalHeight(): number; - __setInternalX(x: ?number): void; - __setInternalY(y: ?number): void; - __setInternalWidth(width: ?number): void; - __setInternalHeight(height: ?number): void; -} -" -`; - -exports[`public API should not change unintentionally Libraries/DOM/Nodes/ReactNativeElement.js 1`] = ` -"declare export default class ReactNativeElement - extends ReadOnlyElement - implements INativeMethods -{ - __nativeTag: number; - __internalInstanceHandle: InternalInstanceHandle; - _viewConfig: ViewConfig; - constructor( - tag: number, - viewConfig: ViewConfig, - internalInstanceHandle: InternalInstanceHandle - ): void; - get offsetHeight(): number; - get offsetLeft(): number; - get offsetParent(): ReadOnlyElement | null; - get offsetTop(): number; - get offsetWidth(): number; - blur(): void; - focus(): void; - measure(callback: MeasureOnSuccessCallback): void; - measureInWindow(callback: MeasureInWindowOnSuccessCallback): void; - measureLayout( - relativeToNativeNode: number | ElementRef>, - onSuccess: MeasureLayoutOnSuccessCallback, - onFail?: () => void - ): void; - setNativeProps(nativeProps: { ... }): void; -} -" -`; - -exports[`public API should not change unintentionally Libraries/DOM/Nodes/ReadOnlyCharacterData.js 1`] = ` -"declare export default class ReadOnlyCharacterData extends ReadOnlyNode { - get nextElementSibling(): ReadOnlyElement | null; - get previousElementSibling(): ReadOnlyElement | null; - get data(): string; - get length(): number; - get textContent(): string | null; - get nodeValue(): string; - substringData(offset: number, count: number): string; -} -" -`; - -exports[`public API should not change unintentionally Libraries/DOM/Nodes/ReadOnlyElement.js 1`] = ` -"declare export default class ReadOnlyElement extends ReadOnlyNode { - get childElementCount(): number; - get children(): HTMLCollection; - get clientHeight(): number; - get clientLeft(): number; - get clientTop(): number; - get clientWidth(): number; - get firstElementChild(): ReadOnlyElement | null; - get id(): string; - get lastElementChild(): ReadOnlyElement | null; - get nextElementSibling(): ReadOnlyElement | null; - get nodeName(): string; - get nodeType(): number; - get nodeValue(): string | null; - set nodeValue(value: string): void; - get previousElementSibling(): ReadOnlyElement | null; - get scrollHeight(): number; - get scrollLeft(): number; - get scrollTop(): number; - get scrollWidth(): number; - get tagName(): string; - get textContent(): string | null; - getBoundingClientRect(): DOMRect; - hasPointerCapture(pointerId: number): boolean; - setPointerCapture(pointerId: number): void; - releasePointerCapture(pointerId: number): void; -} -declare export function getBoundingClientRect( - node: ReadOnlyElement, - { includeTransform: boolean } -): DOMRect; -" -`; - -exports[`public API should not change unintentionally Libraries/DOM/Nodes/ReadOnlyNode.js 1`] = ` -"declare export default class ReadOnlyNode { - constructor(internalInstanceHandle: InternalInstanceHandle): void; - get childNodes(): NodeList; - get firstChild(): ReadOnlyNode | null; - get isConnected(): boolean; - get lastChild(): ReadOnlyNode | null; - get nextSibling(): ReadOnlyNode | null; - get nodeName(): string; - get nodeType(): number; - get nodeValue(): string | null; - get parentElement(): ReadOnlyElement | null; - get parentNode(): ReadOnlyNode | null; - get previousSibling(): ReadOnlyNode | null; - get textContent(): string | null; - compareDocumentPosition(otherNode: ReadOnlyNode): number; - contains(otherNode: ReadOnlyNode): boolean; - getRootNode(): ReadOnlyNode; - hasChildNodes(): boolean; - static ELEMENT_NODE: number; - static ATTRIBUTE_NODE: number; - static TEXT_NODE: number; - static CDATA_SECTION_NODE: number; - static ENTITY_REFERENCE_NODE: number; - static ENTITY_NODE: number; - static PROCESSING_INSTRUCTION_NODE: number; - static COMMENT_NODE: number; - static DOCUMENT_NODE: number; - static DOCUMENT_TYPE_NODE: number; - static DOCUMENT_FRAGMENT_NODE: number; - static NOTATION_NODE: number; - static DOCUMENT_POSITION_DISCONNECTED: number; - static DOCUMENT_POSITION_PRECEDING: number; - static DOCUMENT_POSITION_FOLLOWING: number; - static DOCUMENT_POSITION_CONTAINS: number; - static DOCUMENT_POSITION_CONTAINED_BY: number; - static DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: number; -} -declare export function getInstanceHandle( - node: ReadOnlyNode -): InternalInstanceHandle; -declare export function getShadowNode(node: ReadOnlyNode): ?ShadowNode; -declare export function getChildNodes( - node: ReadOnlyNode -): $ReadOnlyArray; -declare export function getPublicInstanceFromInternalInstanceHandle( - instanceHandle: InternalInstanceHandle -): ?ReadOnlyNode; -" -`; - -exports[`public API should not change unintentionally Libraries/DOM/Nodes/ReadOnlyText.js 1`] = ` -"declare export default class ReadOnlyText extends ReadOnlyCharacterData { - get nodeName(): string; - get nodeType(): number; -} -" -`; - -exports[`public API should not change unintentionally Libraries/DOM/Nodes/Utilities/Traversal.js 1`] = ` -"declare export function getElementSibling( - node: ReadOnlyNode, - direction: \\"next\\" | \\"previous\\" -): ReadOnlyElement | null; -" -`; - -exports[`public API should not change unintentionally Libraries/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 Libraries/DOM/OldStyleCollections/DOMRectList.js.flow 1`] = ` -"declare export default class DOMRectList - implements Iterable, ArrayLike -{ - [index: number]: DOMRectReadOnly; - +length: number; - item(index: number): DOMRectReadOnly | null; - @@iterator(): Iterator; -} -declare export function createDOMRectList( - domRects: $ReadOnlyArray -): DOMRectList; -" -`; - -exports[`public API should not change unintentionally Libraries/DOM/OldStyleCollections/HTMLCollection.js.flow 1`] = ` -"declare export default class HTMLCollection<+T> - implements Iterable, ArrayLike -{ - [index: number]: T; - +length: number; - item(index: number): T | null; - namedItem(name: string): T | null; - @@iterator(): Iterator; -} -declare export function createHTMLCollection( - elements: $ReadOnlyArray -): HTMLCollection; -" -`; - -exports[`public API should not change unintentionally Libraries/DOM/OldStyleCollections/NodeList.js.flow 1`] = ` -"declare export default class NodeList<+T> implements Iterable, ArrayLike { - [index: number]: T; - +length: number; - item(index: number): T | null; - entries(): Iterator<[number, T]>; - forEach( - callbackFn: (value: T, index: number, array: NodeList) => mixed, - thisArg?: ThisType - ): void; - keys(): Iterator; - values(): Iterator; - @@iterator(): Iterator; -} -declare export function createNodeList( - elements: $ReadOnlyArray -): NodeList; -" -`; - exports[`public API should not change unintentionally Libraries/Debugging/DebuggingOverlay.js 1`] = ` "type DebuggingOverlayHandle = { highlightTraceUpdates(updates: TraceUpdate[]): void, diff --git a/packages/react-native/Libraries/__tests__/public-api-test.js b/packages/react-native/Libraries/__tests__/public-api-test.js index 3e54a4d09c94ca..7e1316e2daab5f 100644 --- a/packages/react-native/Libraries/__tests__/public-api-test.js +++ b/packages/react-native/Libraries/__tests__/public-api-test.js @@ -44,9 +44,6 @@ const FILES_WITH_KNOWN_ERRORS = new Set([ 'Libraries/Components/UnimplementedViews/UnimplementedView.js', 'Libraries/Core/ReactNativeVersion.js', 'Libraries/Core/ReactNativeVersionCheck.js', - 'Libraries/DOM/OldStyleCollections/DOMRectList.js', - 'Libraries/DOM/OldStyleCollections/HTMLCollection.js', - 'Libraries/DOM/OldStyleCollections/NodeList.js', 'Libraries/Image/ImageBackground.js', 'Libraries/Inspector/ElementProperties.js', 'Libraries/Inspector/BorderBox.js', diff --git a/packages/react-native/Libraries/Core/setUpDOM.js b/packages/react-native/src/private/core/setUpDOM.js similarity index 81% rename from packages/react-native/Libraries/Core/setUpDOM.js rename to packages/react-native/src/private/core/setUpDOM.js index e25aa01371329c..a5fd5e31082a26 100644 --- a/packages/react-native/Libraries/Core/setUpDOM.js +++ b/packages/react-native/src/private/core/setUpDOM.js @@ -8,8 +8,8 @@ * @format */ -import DOMRect from '../DOM/Geometry/DOMRect'; -import DOMRectReadOnly from '../DOM/Geometry/DOMRectReadOnly'; +import DOMRect from '../dom/geometry/DOMRect'; +import DOMRectReadOnly from '../dom/geometry/DOMRectReadOnly'; // $FlowExpectedError[cannot-write] The global isn't writable anywhere but here, where we define it global.DOMRect = DOMRect; diff --git a/packages/react-native/Libraries/DOM/Geometry/DOMRect.js b/packages/react-native/src/private/dom/geometry/DOMRect.js similarity index 100% rename from packages/react-native/Libraries/DOM/Geometry/DOMRect.js rename to packages/react-native/src/private/dom/geometry/DOMRect.js diff --git a/packages/react-native/Libraries/DOM/Geometry/DOMRectReadOnly.js b/packages/react-native/src/private/dom/geometry/DOMRectReadOnly.js similarity index 100% rename from packages/react-native/Libraries/DOM/Geometry/DOMRectReadOnly.js rename to packages/react-native/src/private/dom/geometry/DOMRectReadOnly.js diff --git a/packages/react-native/Libraries/DOM/Nodes/ReactNativeElement.js b/packages/react-native/src/private/dom/nodes/ReactNativeElement.js similarity index 91% rename from packages/react-native/Libraries/DOM/Nodes/ReactNativeElement.js rename to packages/react-native/src/private/dom/nodes/ReactNativeElement.js index 366a4532a7c939..d19790e5f0a7ae 100644 --- a/packages/react-native/Libraries/DOM/Nodes/ReactNativeElement.js +++ b/packages/react-native/src/private/dom/nodes/ReactNativeElement.js @@ -18,13 +18,13 @@ import type { MeasureLayoutOnSuccessCallback, MeasureOnSuccessCallback, ViewConfig, -} from '../../Renderer/shims/ReactNativeTypes'; +} from '../../../../Libraries//Renderer/shims/ReactNativeTypes'; import type {ElementRef} from 'react'; -import TextInputState from '../../Components/TextInput/TextInputState'; -import {getFabricUIManager} from '../../ReactNative/FabricUIManager'; -import {create as createAttributePayload} from '../../ReactNative/ReactFabricPublicInstance/ReactNativeAttributePayload'; -import warnForStyleProps from '../../ReactNative/ReactFabricPublicInstance/warnForStyleProps'; +import TextInputState from '../../../../Libraries//Components/TextInput/TextInputState'; +import {getFabricUIManager} from '../../../../Libraries//ReactNative/FabricUIManager'; +import {create as createAttributePayload} from '../../../../Libraries//ReactNative/ReactFabricPublicInstance/ReactNativeAttributePayload'; +import warnForStyleProps from '../../../../Libraries//ReactNative/ReactFabricPublicInstance/warnForStyleProps'; import ReadOnlyElement, {getBoundingClientRect} from './ReadOnlyElement'; import ReadOnlyNode from './ReadOnlyNode'; import { diff --git a/packages/react-native/Libraries/DOM/Nodes/ReadOnlyCharacterData.js b/packages/react-native/src/private/dom/nodes/ReadOnlyCharacterData.js similarity index 92% rename from packages/react-native/Libraries/DOM/Nodes/ReadOnlyCharacterData.js rename to packages/react-native/src/private/dom/nodes/ReadOnlyCharacterData.js index 6c9f87b43200b1..7f5047a6dfe76a 100644 --- a/packages/react-native/Libraries/DOM/Nodes/ReadOnlyCharacterData.js +++ b/packages/react-native/src/private/dom/nodes/ReadOnlyCharacterData.js @@ -12,9 +12,9 @@ import type ReadOnlyElement from './ReadOnlyElement'; -import {getFabricUIManager} from '../../ReactNative/FabricUIManager'; +import {getFabricUIManager} from '../../../../Libraries//ReactNative/FabricUIManager'; import ReadOnlyNode, {getShadowNode} from './ReadOnlyNode'; -import {getElementSibling} from './Utilities/Traversal'; +import {getElementSibling} from './utilities/Traversal'; import nullthrows from 'nullthrows'; export default class ReadOnlyCharacterData extends ReadOnlyNode { diff --git a/packages/react-native/Libraries/DOM/Nodes/ReadOnlyElement.js b/packages/react-native/src/private/dom/nodes/ReadOnlyElement.js similarity index 95% rename from packages/react-native/Libraries/DOM/Nodes/ReadOnlyElement.js rename to packages/react-native/src/private/dom/nodes/ReadOnlyElement.js index 03cf37949b3b2c..9e9c6a2550bcb1 100644 --- a/packages/react-native/Libraries/DOM/Nodes/ReadOnlyElement.js +++ b/packages/react-native/src/private/dom/nodes/ReadOnlyElement.js @@ -10,17 +10,17 @@ // flowlint unsafe-getters-setters:off -import type HTMLCollection from '../OldStyleCollections/HTMLCollection'; +import type HTMLCollection from '../oldstylecollections/HTMLCollection'; -import {getFabricUIManager} from '../../ReactNative/FabricUIManager'; -import DOMRect from '../Geometry/DOMRect'; -import {createHTMLCollection} from '../OldStyleCollections/HTMLCollection'; +import {getFabricUIManager} from '../../../../Libraries//ReactNative/FabricUIManager'; +import DOMRect from '../geometry/DOMRect'; +import {createHTMLCollection} from '../oldstylecollections/HTMLCollection'; import ReadOnlyNode, { getChildNodes, getInstanceHandle, getShadowNode, } from './ReadOnlyNode'; -import {getElementSibling} from './Utilities/Traversal'; +import {getElementSibling} from './utilities/Traversal'; import nullthrows from 'nullthrows'; export default class ReadOnlyElement extends ReadOnlyNode { diff --git a/packages/react-native/Libraries/DOM/Nodes/ReadOnlyNode.js b/packages/react-native/src/private/dom/nodes/ReadOnlyNode.js similarity index 95% rename from packages/react-native/Libraries/DOM/Nodes/ReadOnlyNode.js rename to packages/react-native/src/private/dom/nodes/ReadOnlyNode.js index 01720a2ecae4ab..f0df8373c4f27d 100644 --- a/packages/react-native/Libraries/DOM/Nodes/ReadOnlyNode.js +++ b/packages/react-native/src/private/dom/nodes/ReadOnlyNode.js @@ -13,12 +13,12 @@ import type { InternalInstanceHandle, Node as ShadowNode, -} from '../../Renderer/shims/ReactNativeTypes'; -import type NodeList from '../OldStyleCollections/NodeList'; +} from '../../../../Libraries/Renderer/shims/ReactNativeTypes'; +import type NodeList from '../oldstylecollections/NodeList'; import type ReadOnlyElement from './ReadOnlyElement'; -import {getFabricUIManager} from '../../ReactNative/FabricUIManager'; -import {createNodeList} from '../OldStyleCollections/NodeList'; +import {getFabricUIManager} from '../../../../Libraries//ReactNative/FabricUIManager'; +import {createNodeList} from '../oldstylecollections/NodeList'; import nullthrows from 'nullthrows'; // We initialize this lazily to avoid a require cycle @@ -310,7 +310,7 @@ function setInstanceHandle( export function getShadowNode(node: ReadOnlyNode): ?ShadowNode { // Lazy import Fabric here to avoid DOM Node APIs classes from having side-effects. // With a static import we can't use these classes for Paper-only variants. - const ReactFabric = require('../../Renderer/shims/ReactFabric'); + const ReactFabric = require('../../../../Libraries/Renderer/shims/ReactFabric'); return ReactFabric.getNodeFromInternalInstanceHandle(getInstanceHandle(node)); } @@ -357,7 +357,7 @@ export function getPublicInstanceFromInternalInstanceHandle( ): ?ReadOnlyNode { // Lazy import Fabric here to avoid DOM Node APIs classes from having side-effects. // With a static import we can't use these classes for Paper-only variants. - const ReactFabric = require('../../Renderer/shims/ReactFabric'); + const ReactFabric = require('../../../../Libraries/Renderer/shims/ReactFabric'); const mixedPublicInstance = ReactFabric.getPublicInstanceFromInternalInstanceHandle(instanceHandle); // $FlowExpectedError[incompatible-return] React defines public instances as "mixed" because it can't access the definition from React Native. diff --git a/packages/react-native/Libraries/DOM/Nodes/ReadOnlyText.js b/packages/react-native/src/private/dom/nodes/ReadOnlyText.js similarity index 100% rename from packages/react-native/Libraries/DOM/Nodes/ReadOnlyText.js rename to packages/react-native/src/private/dom/nodes/ReadOnlyText.js diff --git a/packages/react-native/Libraries/DOM/Nodes/Utilities/Traversal.js b/packages/react-native/src/private/dom/nodes/utilities/Traversal.js similarity index 100% rename from packages/react-native/Libraries/DOM/Nodes/Utilities/Traversal.js rename to packages/react-native/src/private/dom/nodes/utilities/Traversal.js diff --git a/packages/react-native/Libraries/DOM/OldStyleCollections/ArrayLikeUtils.js b/packages/react-native/src/private/dom/oldstylecollections/ArrayLikeUtils.js similarity index 100% rename from packages/react-native/Libraries/DOM/OldStyleCollections/ArrayLikeUtils.js rename to packages/react-native/src/private/dom/oldstylecollections/ArrayLikeUtils.js diff --git a/packages/react-native/Libraries/DOM/OldStyleCollections/DOMRectList.js b/packages/react-native/src/private/dom/oldstylecollections/DOMRectList.js similarity index 97% rename from packages/react-native/Libraries/DOM/OldStyleCollections/DOMRectList.js rename to packages/react-native/src/private/dom/oldstylecollections/DOMRectList.js index 9365a9a5a29f7b..5705bcf4c0e09c 100644 --- a/packages/react-native/Libraries/DOM/OldStyleCollections/DOMRectList.js +++ b/packages/react-native/src/private/dom/oldstylecollections/DOMRectList.js @@ -10,7 +10,7 @@ // flowlint unsafe-getters-setters:off -import type DOMRectReadOnly from '../Geometry/DOMRectReadOnly'; +import type DOMRectReadOnly from '../geometry/DOMRectReadOnly'; import type {ArrayLike} from './ArrayLikeUtils'; import {createValueIterator} from './ArrayLikeUtils'; diff --git a/packages/react-native/Libraries/DOM/OldStyleCollections/DOMRectList.js.flow b/packages/react-native/src/private/dom/oldstylecollections/DOMRectList.js.flow similarity index 92% rename from packages/react-native/Libraries/DOM/OldStyleCollections/DOMRectList.js.flow rename to packages/react-native/src/private/dom/oldstylecollections/DOMRectList.js.flow index 8edfd68e96888f..251c84c25f77c4 100644 --- a/packages/react-native/Libraries/DOM/OldStyleCollections/DOMRectList.js.flow +++ b/packages/react-native/src/private/dom/oldstylecollections/DOMRectList.js.flow @@ -8,7 +8,7 @@ * @flow strict */ -import type DOMRectReadOnly from '../Geometry/DOMRectReadOnly'; +import type DOMRectReadOnly from '../geometry/DOMRectReadOnly'; import type {ArrayLike} from './ArrayLikeUtils'; declare export default class DOMRectList diff --git a/packages/react-native/Libraries/DOM/OldStyleCollections/HTMLCollection.js b/packages/react-native/src/private/dom/oldstylecollections/HTMLCollection.js similarity index 100% rename from packages/react-native/Libraries/DOM/OldStyleCollections/HTMLCollection.js rename to packages/react-native/src/private/dom/oldstylecollections/HTMLCollection.js diff --git a/packages/react-native/Libraries/DOM/OldStyleCollections/HTMLCollection.js.flow b/packages/react-native/src/private/dom/oldstylecollections/HTMLCollection.js.flow similarity index 100% rename from packages/react-native/Libraries/DOM/OldStyleCollections/HTMLCollection.js.flow rename to packages/react-native/src/private/dom/oldstylecollections/HTMLCollection.js.flow diff --git a/packages/react-native/Libraries/DOM/OldStyleCollections/NodeList.js b/packages/react-native/src/private/dom/oldstylecollections/NodeList.js similarity index 100% rename from packages/react-native/Libraries/DOM/OldStyleCollections/NodeList.js rename to packages/react-native/src/private/dom/oldstylecollections/NodeList.js diff --git a/packages/react-native/Libraries/DOM/OldStyleCollections/NodeList.js.flow b/packages/react-native/src/private/dom/oldstylecollections/NodeList.js.flow similarity index 100% rename from packages/react-native/Libraries/DOM/OldStyleCollections/NodeList.js.flow rename to packages/react-native/src/private/dom/oldstylecollections/NodeList.js.flow diff --git a/packages/react-native/Libraries/DOM/OldStyleCollections/__tests__/DOMRectList-test.js b/packages/react-native/src/private/dom/oldstylecollections/__tests__/DOMRectList-test.js similarity index 97% rename from packages/react-native/Libraries/DOM/OldStyleCollections/__tests__/DOMRectList-test.js rename to packages/react-native/src/private/dom/oldstylecollections/__tests__/DOMRectList-test.js index c91abc26947367..9d6bb51e2a96e7 100644 --- a/packages/react-native/Libraries/DOM/OldStyleCollections/__tests__/DOMRectList-test.js +++ b/packages/react-native/src/private/dom/oldstylecollections/__tests__/DOMRectList-test.js @@ -9,7 +9,7 @@ * @oncall react_native */ -import DOMRectReadOnly from '../../Geometry/DOMRectReadOnly'; +import DOMRectReadOnly from '../../geometry/DOMRectReadOnly'; import {createDOMRectList} from '../DOMRectList'; const domRectA = new DOMRectReadOnly(); diff --git a/packages/react-native/Libraries/DOM/OldStyleCollections/__tests__/HTMLCollection-test.js b/packages/react-native/src/private/dom/oldstylecollections/__tests__/HTMLCollection-test.js similarity index 100% rename from packages/react-native/Libraries/DOM/OldStyleCollections/__tests__/HTMLCollection-test.js rename to packages/react-native/src/private/dom/oldstylecollections/__tests__/HTMLCollection-test.js diff --git a/packages/react-native/Libraries/DOM/OldStyleCollections/__tests__/NodeList-test.js b/packages/react-native/src/private/dom/oldstylecollections/__tests__/NodeList-test.js similarity index 100% rename from packages/react-native/Libraries/DOM/OldStyleCollections/__tests__/NodeList-test.js rename to packages/react-native/src/private/dom/oldstylecollections/__tests__/NodeList-test.js diff --git a/packages/rn-tester/js/examples/MutationObserver/MutationObserverExample.js b/packages/rn-tester/js/examples/MutationObserver/MutationObserverExample.js index 804a021fca859e..609617899228e7 100644 --- a/packages/rn-tester/js/examples/MutationObserver/MutationObserverExample.js +++ b/packages/rn-tester/js/examples/MutationObserver/MutationObserverExample.js @@ -8,15 +8,15 @@ * @flow strict-local */ -import type ReadOnlyNode from 'react-native/Libraries/DOM/Nodes/ReadOnlyNode'; -import type NodeList from 'react-native/Libraries/DOM/OldStyleCollections/NodeList'; +import type ReadOnlyNode from 'react-native/src/private/dom/nodes/ReadOnlyNode'; +import type NodeList from 'react-native/src/private/dom/oldstylecollections/NodeList'; import {RNTesterThemeContext} from '../../components/RNTesterTheme'; import * as React from 'react'; import {type ElementRef, useContext, useEffect, useRef, useState} from 'react'; import {Pressable, ScrollView, StyleSheet, Text, View} from 'react-native'; -import ReadOnlyElement from 'react-native/Libraries/DOM/Nodes/ReadOnlyElement'; import MutationObserver from 'react-native/Libraries/MutationObserver/MutationObserver'; +import ReadOnlyElement from 'react-native/src/private/dom/nodes/ReadOnlyElement'; export const name = 'MutationObserver Example'; export const title = name; diff --git a/packages/rn-tester/js/examples/MutationObserver/VisualCompletionExample/VCTrackerExample.js b/packages/rn-tester/js/examples/MutationObserver/VisualCompletionExample/VCTrackerExample.js index 414eed58b2ac6b..665c0f74fbafef 100644 --- a/packages/rn-tester/js/examples/MutationObserver/VisualCompletionExample/VCTrackerExample.js +++ b/packages/rn-tester/js/examples/MutationObserver/VisualCompletionExample/VCTrackerExample.js @@ -8,12 +8,12 @@ * @format */ -import type DOMRectReadOnly from 'react-native/Libraries/DOM/Geometry/DOMRectReadOnly'; -import type ReadOnlyNode from 'react-native/Libraries/DOM/Nodes/ReadOnlyNode'; +import type DOMRectReadOnly from 'react-native/src/private/dom/geometry/DOMRectReadOnly'; +import type ReadOnlyNode from 'react-native/src/private/dom/nodes/ReadOnlyNode'; -import ReactNativeElement from 'react-native/Libraries/DOM/Nodes/ReactNativeElement'; import IntersectionObserver from 'react-native/Libraries/IntersectionObserver/IntersectionObserver'; import MutationObserver from 'react-native/Libraries/MutationObserver/MutationObserver'; +import ReactNativeElement from 'react-native/src/private/dom/nodes/ReactNativeElement'; export type VisualElement = { time: number, diff --git a/packages/rn-tester/js/examples/MutationObserver/VisualCompletionExample/VisualCompletionExample.js b/packages/rn-tester/js/examples/MutationObserver/VisualCompletionExample/VisualCompletionExample.js index f187082948f326..4190dc93ecc6aa 100644 --- a/packages/rn-tester/js/examples/MutationObserver/VisualCompletionExample/VisualCompletionExample.js +++ b/packages/rn-tester/js/examples/MutationObserver/VisualCompletionExample/VisualCompletionExample.js @@ -21,7 +21,7 @@ import { Text, View, } from 'react-native'; -import ReactNativeElement from 'react-native/Libraries/DOM/Nodes/ReactNativeElement'; +import ReactNativeElement from 'react-native/src/private/dom/nodes/ReactNativeElement'; export const name = 'Visual Completion Example'; export const title = name;