diff --git a/package.json b/package.json index 59b8a5d7..e17d821b 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ }, "peerDependencies": { "react": "*", - "react-native": "*" + "react-native": ">=0.82.0" }, "devDependencies": { "@commitlint/config-conventional": "^19.2.2", diff --git a/src/__tests__/InitialWindow-test.tsx b/src/__tests__/InitialWindow-test.tsx index 3097eab3..63c7ead8 100644 --- a/src/__tests__/InitialWindow-test.tsx +++ b/src/__tests__/InitialWindow-test.tsx @@ -24,7 +24,7 @@ describe('InitialWindow', () => { width: 100, }, }; - const TurboModuleRegistry = require('react-native/Libraries/TurboModule/TurboModuleRegistry'); + const { TurboModuleRegistry } = require('react-native'); TurboModuleRegistry.get = jest.fn((name) => { if (name === 'RNCSafeAreaContext') { return { diff --git a/src/specs/NativeSafeAreaContext.ts b/src/specs/NativeSafeAreaContext.ts index b384b65b..4f4aef3b 100644 --- a/src/specs/NativeSafeAreaContext.ts +++ b/src/specs/NativeSafeAreaContext.ts @@ -1,20 +1,20 @@ import { TurboModule, TurboModuleRegistry } from 'react-native'; -import type { Double } from 'react-native/Libraries/Types/CodegenTypes'; +import type { CodegenTypes } from 'react-native'; export interface Spec extends TurboModule { getConstants: () => { initialWindowMetrics?: { insets: { - top: Double; - right: Double; - bottom: Double; - left: Double; + top: CodegenTypes.Double; + right: CodegenTypes.Double; + bottom: CodegenTypes.Double; + left: CodegenTypes.Double; }; frame: { - x: Double; - y: Double; - width: Double; - height: Double; + x: CodegenTypes.Double; + y: CodegenTypes.Double; + width: CodegenTypes.Double; + height: CodegenTypes.Double; }; }; }; diff --git a/src/specs/NativeSafeAreaProvider.ts b/src/specs/NativeSafeAreaProvider.ts index 5e6974ee..523f3881 100644 --- a/src/specs/NativeSafeAreaProvider.ts +++ b/src/specs/NativeSafeAreaProvider.ts @@ -1,27 +1,23 @@ -import type { - DirectEventHandler, - Double, -} from 'react-native/Libraries/Types/CodegenTypes'; -import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent'; -import type { ViewProps, HostComponent } from 'react-native'; +import { codegenNativeComponent } from 'react-native'; +import type { CodegenTypes, ViewProps, HostComponent } from 'react-native'; export type Event = Readonly<{ insets: Readonly<{ - top: Double; - right: Double; - bottom: Double; - left: Double; + top: CodegenTypes.Double; + right: CodegenTypes.Double; + bottom: CodegenTypes.Double; + left: CodegenTypes.Double; }>; frame: Readonly<{ - x: Double; - y: Double; - width: Double; - height: Double; + x: CodegenTypes.Double; + y: CodegenTypes.Double; + width: CodegenTypes.Double; + height: CodegenTypes.Double; }>; }>; export interface NativeProps extends ViewProps { - onInsetsChange?: DirectEventHandler; + onInsetsChange?: CodegenTypes.DirectEventHandler; } export default codegenNativeComponent( diff --git a/src/specs/NativeSafeAreaView.ts b/src/specs/NativeSafeAreaView.ts index 0ab6adf8..3ebb8abd 100644 --- a/src/specs/NativeSafeAreaView.ts +++ b/src/specs/NativeSafeAreaView.ts @@ -1,9 +1,8 @@ -import codegenNativeComponent from 'react-native/Libraries/Utilities/codegenNativeComponent'; -import type { WithDefault } from 'react-native/Libraries/Types/CodegenTypes'; -import type { ViewProps, HostComponent } from 'react-native'; +import { codegenNativeComponent } from 'react-native'; +import type { CodegenTypes, ViewProps, HostComponent } from 'react-native'; export interface NativeProps extends ViewProps { - mode?: WithDefault<'padding' | 'margin', 'padding'>; + mode?: CodegenTypes.WithDefault<'padding' | 'margin', 'padding'>; edges?: Readonly<{ top: string; right: string;