diff --git a/packages/react-native/Libraries/ReactNative/RendererImplementation.js b/packages/react-native/Libraries/ReactNative/RendererImplementation.js index f3259ae7738..34613c645b6 100644 --- a/packages/react-native/Libraries/ReactNative/RendererImplementation.js +++ b/packages/react-native/Libraries/ReactNative/RendererImplementation.js @@ -8,13 +8,11 @@ * @flow strict-local */ -import type {HostComponent} from '../../src/private/types/HostComponent'; import type {HostInstance} from '../../src/private/types/HostInstance'; import type { InternalInstanceHandle, Node, } from '../Renderer/shims/ReactNativeTypes'; -import type ReactFabricHostComponent from './ReactFabricPublicInstance/ReactFabricHostComponent'; import type {ElementRef, ElementType} from 'react'; import { @@ -136,8 +134,8 @@ export function isProfilingRenderer(): boolean { } export function isChildPublicInstance( - parentInstance: ReactFabricHostComponent | HostComponent, - childInstance: ReactFabricHostComponent | HostComponent, + parentInstance: HostInstance, + childInstance: HostInstance, ): boolean { return require('../Renderer/shims/ReactNative').default.isChildPublicInstance( parentInstance, diff --git a/packages/react-native/Libraries/ReactPrivate/ReactNativePrivateInterface.js b/packages/react-native/Libraries/ReactPrivate/ReactNativePrivateInterface.js index 4b78b97dead..c05b40e7a25 100644 --- a/packages/react-native/Libraries/ReactPrivate/ReactNativePrivateInterface.js +++ b/packages/react-native/Libraries/ReactPrivate/ReactNativePrivateInterface.js @@ -36,7 +36,19 @@ import typeof deepFreezeAndThrowOnMutationInDev from '../Utilities/deepFreezeAnd import typeof deepDiffer from '../Utilities/differ/deepDiffer'; import typeof Platform from '../Utilities/Platform'; +// Expose these types to the React renderer +export type { + HostInstance as PublicInstance, + + // These types are only necessary for Paper + INativeMethods as LegacyPublicInstance, + MeasureOnSuccessCallback, + MeasureInWindowOnSuccessCallback, + MeasureLayoutOnSuccessCallback, +} from '../../src/private/types/HostInstance'; + export type {PublicRootInstance} from '../ReactNative/ReactFabricPublicInstance/ReactFabricPublicInstance'; +export type PublicTextInstance = ReturnType; // flowlint unsafe-getters-setters:off module.exports = { 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 5f9dd727446..6b6f24472e8 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 @@ -6976,8 +6976,8 @@ declare export function unstable_batchedUpdates( ): void; declare export function isProfilingRenderer(): boolean; declare export function isChildPublicInstance( - parentInstance: ReactFabricHostComponent | HostComponent, - childInstance: ReactFabricHostComponent | HostComponent + parentInstance: HostInstance, + childInstance: HostInstance ): boolean; declare export function getNodeFromInternalInstanceHandle( internalInstanceHandle: InternalInstanceHandle