diff --git a/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js b/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js index ad275282ebc..a4c4e5fb925 100644 --- a/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js +++ b/Libraries/Components/DrawerAndroid/AndroidDrawerLayoutNativeComponent.js @@ -19,9 +19,8 @@ import type { Float, } from 'react-native/Libraries/Types/CodegenTypes'; import codegenNativeCommands from 'react-native/Libraries/Utilities/codegenNativeCommands'; -import codegenNativeComponent, { - type NativeComponentType, -} from 'react-native/Libraries/Utilities/codegenNativeComponent'; +import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from 'react-native/Libraries/Renderer/shims/ReactNativeTypes'; import * as React from 'react'; type DrawerStateEvent = $ReadOnly<{| @@ -110,7 +109,7 @@ type NativeProps = $ReadOnly<{| statusBarBackgroundColor?: ?ColorValue, |}>; -type NativeType = NativeComponentType; +type NativeType = HostComponent; interface NativeCommands { +openDrawer: (viewRef: React.ElementRef) => void; diff --git a/Libraries/Components/Switch/AndroidSwitchNativeComponent.js b/Libraries/Components/Switch/AndroidSwitchNativeComponent.js index 2bbf6f3fb3a..80d1ec86295 100644 --- a/Libraries/Components/Switch/AndroidSwitchNativeComponent.js +++ b/Libraries/Components/Switch/AndroidSwitchNativeComponent.js @@ -16,7 +16,7 @@ import type { } from 'react-native/Libraries/Types/CodegenTypes'; import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent'; -import type {NativeComponentType} from 'react-native/Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from 'react-native/Libraries/Renderer/shims/ReactNativeTypes'; import type {ColorValue} from '../../StyleSheet/StyleSheetTypes'; import type {ViewProps} from '../View/ViewPropTypes'; @@ -45,4 +45,4 @@ type NativeProps = $ReadOnly<{| export default (codegenNativeComponent( 'AndroidSwitch', -): NativeComponentType); +): HostComponent); diff --git a/Libraries/Modal/RCTModalHostViewNativeComponent.js b/Libraries/Modal/RCTModalHostViewNativeComponent.js index 0297c366622..46856033cb8 100644 --- a/Libraries/Modal/RCTModalHostViewNativeComponent.js +++ b/Libraries/Modal/RCTModalHostViewNativeComponent.js @@ -11,10 +11,9 @@ 'use strict'; import codegenNativeComponent from '../Utilities/codegenNativeComponent'; -import {type NativeComponentType} from '../Utilities/codegenNativeComponent'; +import type {HostComponent} from '../Renderer/shims/ReactNativeTypes'; import type { WithDefault, - BubblingEventHandler, DirectEventHandler, Int32, } from '../Types/CodegenTypes'; @@ -116,4 +115,4 @@ type NativeProps = $ReadOnly<{| export default (codegenNativeComponent('ModalHostView', { interfaceOnly: true, paperComponentName: 'RCTModalHostView', -}): NativeComponentType); +}): HostComponent); diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/ArrayPropsNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/ArrayPropsNativeComponent.js index 4238ed75e19..fe3c7f4b758 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/components/ArrayPropsNativeComponent.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/ArrayPropsNativeComponent.js @@ -23,7 +23,7 @@ import type { } from '../../../../../Libraries/Types/CodegenTypes'; import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; -import {type NativeComponentType} from '../../../../../Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes'; type NativeProps = $ReadOnly<{| ...ViewProps, @@ -43,4 +43,4 @@ type NativeProps = $ReadOnly<{| export default (codegenNativeComponent( 'ArrayPropsNativeComponentView', -): NativeComponentType); +): HostComponent); diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/BooleanPropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/BooleanPropNativeComponent.js index e81a8e97e07..53c6336d6a0 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/components/BooleanPropNativeComponent.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/BooleanPropNativeComponent.js @@ -13,7 +13,7 @@ import type {WithDefault} from '../../../../../Libraries/Types/CodegenTypes'; import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; -import {type NativeComponentType} from '../../../../../Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes'; type NativeProps = $ReadOnly<{| ...ViewProps, @@ -25,4 +25,4 @@ type NativeProps = $ReadOnly<{| export default (codegenNativeComponent( 'BooleanPropNativeComponentView', -): NativeComponentType); +): HostComponent); diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/ColorPropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/ColorPropNativeComponent.js index 38cd6f9b03c..68e21ac0a98 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/components/ColorPropNativeComponent.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/ColorPropNativeComponent.js @@ -13,7 +13,7 @@ import type {ColorValue} from '../../../../../Libraries/StyleSheet/StyleSheetTypes'; import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; -import {type NativeComponentType} from '../../../../../Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes'; type NativeProps = $ReadOnly<{| ...ViewProps, @@ -24,4 +24,4 @@ type NativeProps = $ReadOnly<{| export default (codegenNativeComponent( 'ColorPropNativeComponentView', -): NativeComponentType); +): HostComponent); diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/EdgeInsetsPropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/EdgeInsetsPropNativeComponent.js index 9f09a51f8f5..a55956aa17b 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/components/EdgeInsetsPropNativeComponent.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/EdgeInsetsPropNativeComponent.js @@ -13,7 +13,7 @@ import type {EdgeInsetsValue} from '../../../../../Libraries/StyleSheet/StyleSheetTypes'; import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; -import {type NativeComponentType} from '../../../../../Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes'; type NativeProps = $ReadOnly<{| ...ViewProps, @@ -24,4 +24,4 @@ type NativeProps = $ReadOnly<{| export default (codegenNativeComponent( 'EdgeInsetsPropNativeComponentView', -): NativeComponentType); +): HostComponent); diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/EnumPropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/EnumPropNativeComponent.js index ff210c01b3e..5e00de9cd8e 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/components/EnumPropNativeComponent.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/EnumPropNativeComponent.js @@ -13,7 +13,7 @@ import type {WithDefault} from '../../../../../Libraries/Types/CodegenTypes'; import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; -import {type NativeComponentType} from '../../../../../Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes'; type NativeProps = $ReadOnly<{| ...ViewProps, @@ -25,4 +25,4 @@ type NativeProps = $ReadOnly<{| export default (codegenNativeComponent( 'EnumPropNativeComponentView', -): NativeComponentType); +): HostComponent); diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/EventNestedObjectPropsNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/EventNestedObjectPropsNativeComponent.js index 63bd40e9c09..7da2e19d6ae 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/components/EventNestedObjectPropsNativeComponent.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/EventNestedObjectPropsNativeComponent.js @@ -17,7 +17,7 @@ import type { } from '../../../../../Libraries/Types/CodegenTypes'; import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; -import {type NativeComponentType} from '../../../../../Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes'; type OnChangeEvent = $ReadOnly<{| location: { @@ -41,4 +41,4 @@ type NativeProps = $ReadOnly<{| export default (codegenNativeComponent( 'EventNestedObjectPropsNativeComponentView', -): NativeComponentType); +): HostComponent); diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/EventPropsNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/EventPropsNativeComponent.js index bec60e49347..abaaf86e8c8 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/components/EventPropsNativeComponent.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/EventPropsNativeComponent.js @@ -19,7 +19,7 @@ import type { } from '../../../../../Libraries/Types/CodegenTypes'; import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; -import {type NativeComponentType} from '../../../../../Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes'; type OnChangeEvent = $ReadOnly<{| value: boolean, @@ -62,4 +62,4 @@ type NativeProps = $ReadOnly<{| export default (codegenNativeComponent( 'EventPropsNativeComponentView', -): NativeComponentType); +): HostComponent); diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/FloatPropsNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/FloatPropsNativeComponent.js index e2fc1acbfca..f4d12b74df1 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/components/FloatPropsNativeComponent.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/FloatPropsNativeComponent.js @@ -16,7 +16,7 @@ import type { } from '../../../../../Libraries/Types/CodegenTypes'; import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; -import {type NativeComponentType} from '../../../../../Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes'; type NativeProps = $ReadOnly<{| ...ViewProps, @@ -33,4 +33,4 @@ type NativeProps = $ReadOnly<{| export default (codegenNativeComponent( 'FloatPropsNativeComponentView', -): NativeComponentType); +): HostComponent); diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/ImagePropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/ImagePropNativeComponent.js index 74d794e6e0d..d3f63751abe 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/components/ImagePropNativeComponent.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/ImagePropNativeComponent.js @@ -13,7 +13,7 @@ import type {ImageSource} from '../../../../../Libraries/Image/ImageSource'; import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; -import {type NativeComponentType} from '../../../../../Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes'; type NativeProps = $ReadOnly<{| ...ViewProps, @@ -24,4 +24,4 @@ type NativeProps = $ReadOnly<{| export default (codegenNativeComponent( 'ImagePropNativeComponentView', -): NativeComponentType); +): HostComponent); diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/IntegerPropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/IntegerPropNativeComponent.js index 6eca06ff958..be0360561bb 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/components/IntegerPropNativeComponent.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/IntegerPropNativeComponent.js @@ -16,7 +16,7 @@ import type { } from '../../../../../Libraries/Types/CodegenTypes'; import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; -import {type NativeComponentType} from '../../../../../Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes'; type NativeProps = $ReadOnly<{| ...ViewProps, @@ -29,4 +29,4 @@ type NativeProps = $ReadOnly<{| export default (codegenNativeComponent( 'IntegerPropNativeComponentView', -): NativeComponentType); +): HostComponent); diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/InterfaceOnlyNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/InterfaceOnlyNativeComponent.js index 0e8756f2875..5a6de924d2a 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/components/InterfaceOnlyNativeComponent.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/InterfaceOnlyNativeComponent.js @@ -16,7 +16,7 @@ import type { } from '../../../../../Libraries/Types/CodegenTypes'; import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; -import {type NativeComponentType} from '../../../../../Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes'; type NativeProps = $ReadOnly<{| ...ViewProps, @@ -34,4 +34,4 @@ export default (codegenNativeComponent( interfaceOnly: true, paperComponentName: 'RCTInterfaceOnlyComponent', }, -): NativeComponentType); +): HostComponent); diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/MultiNativePropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/MultiNativePropNativeComponent.js index f332f60ac89..cad59b759bd 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/components/MultiNativePropNativeComponent.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/MultiNativePropNativeComponent.js @@ -17,7 +17,7 @@ import type { import type {ImageSource} from '../../../../../Libraries/Image/ImageSource'; import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; -import {type NativeComponentType} from '../../../../../Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes'; type NativeProps = $ReadOnly<{| ...ViewProps, @@ -31,4 +31,4 @@ type NativeProps = $ReadOnly<{| export default (codegenNativeComponent( 'MultiNativePropNativeComponentView', -): NativeComponentType); +): HostComponent); diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/NoPropsNoEventsNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/NoPropsNoEventsNativeComponent.js index 25d6f98a56d..8cf2f39d33b 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/components/NoPropsNoEventsNativeComponent.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/NoPropsNoEventsNativeComponent.js @@ -12,7 +12,7 @@ import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; -import {type NativeComponentType} from '../../../../../Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes'; type NativeProps = $ReadOnly<{| ...ViewProps, @@ -22,4 +22,4 @@ type NativeProps = $ReadOnly<{| export default (codegenNativeComponent( 'NoPropsNoEventsNativeComponentView', -): NativeComponentType); +): HostComponent); diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/ObjectPropsNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/ObjectPropsNativeComponent.js index 984c3c5a138..49816c3cb3e 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/components/ObjectPropsNativeComponent.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/ObjectPropsNativeComponent.js @@ -22,7 +22,7 @@ import type { WithDefault, } from '../../../../../Libraries/Types/CodegenTypes'; import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; -import type {NativeComponentType} from '../../../../../Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes'; type ObjectArrayPropType = $ReadOnly<{| array: $ReadOnlyArray, @@ -50,4 +50,4 @@ type NativeProps = $ReadOnly<{| export default (codegenNativeComponent( 'ObjectPropsNativeComponent', -): NativeComponentType); +): HostComponent); diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/PointPropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/PointPropNativeComponent.js index bbdcdc7b830..b903fa755cb 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/components/PointPropNativeComponent.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/PointPropNativeComponent.js @@ -13,7 +13,7 @@ import type {PointValue} from '../../../../../Libraries/StyleSheet/StyleSheetTypes'; import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; -import {type NativeComponentType} from '../../../../../Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes'; type NativeProps = $ReadOnly<{| ...ViewProps, @@ -24,4 +24,4 @@ type NativeProps = $ReadOnly<{| export default (codegenNativeComponent( 'PointPropNativeComponentView', -): NativeComponentType); +): HostComponent); diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/components/StringPropNativeComponent.js b/packages/react-native-codegen/e2e/__test_fixtures__/components/StringPropNativeComponent.js index 24710cbb2ee..91fd686b4c1 100644 --- a/packages/react-native-codegen/e2e/__test_fixtures__/components/StringPropNativeComponent.js +++ b/packages/react-native-codegen/e2e/__test_fixtures__/components/StringPropNativeComponent.js @@ -13,7 +13,7 @@ import type {WithDefault} from '../../../../../Libraries/Types/CodegenTypes'; import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes'; import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent'; -import {type NativeComponentType} from '../../../../../Libraries/Utilities/codegenNativeComponent'; +import type {HostComponent} from '../../../../../Libraries/Renderer/shims/ReactNativeTypes'; type NativeProps = $ReadOnly<{| ...ViewProps, @@ -25,4 +25,4 @@ type NativeProps = $ReadOnly<{| export default (codegenNativeComponent( 'StringPropNativeComponentView', -): NativeComponentType); +): HostComponent);