Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/SafeArea.types.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type * as React from 'react';
import type { Component } from 'react';
import type { NativeSyntheticEvent, ViewProps } from 'react-native';
import NativeSafeAreaView from './specs/NativeSafeAreaView';

export type Edge = 'top' | 'right' | 'bottom' | 'left';
export type EdgeMode = 'off' | 'additive' | 'maximum';
Expand Down Expand Up @@ -42,6 +42,4 @@ export interface NativeSafeAreaViewProps extends ViewProps {
edges?: Edges;
}

export type NativeSafeAreaViewInstance = InstanceType<
typeof NativeSafeAreaView
>;
export type NativeSafeAreaViewInstance = Component<NativeSafeAreaViewProps>
2 changes: 1 addition & 1 deletion src/SafeAreaContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ export function SafeAreaListener({
<NativeSafeAreaProvider
{...others}
style={[styles.fill, style]}
onInsetsChange={(e) => {
onInsetsChange={(e: InsetChangedEvent) => {
onChange({
insets: e.nativeEvent.insets,
frame: e.nativeEvent.frame,
Expand Down
18 changes: 9 additions & 9 deletions src/specs/NativeSafeAreaContext.ts
Original file line number Diff line number Diff line change
@@ -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;
};
};
};
Expand Down
26 changes: 11 additions & 15 deletions src/specs/NativeSafeAreaProvider.ts
Original file line number Diff line number Diff line change
@@ -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 type { CodegenTypes, ViewProps, HostComponent } from 'react-native';
import { codegenNativeComponent } 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<Event>;
onInsetsChange?: CodegenTypes.DirectEventHandler<Event>;
}

export default codegenNativeComponent<NativeProps>(
Expand Down
5 changes: 2 additions & 3 deletions src/specs/NativeSafeAreaView.ts
Original file line number Diff line number Diff line change
@@ -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';

export interface NativeProps extends ViewProps {
mode?: WithDefault<'padding' | 'margin', 'padding'>;
mode?: 'padding' | 'margin';
edges?: Readonly<{
top: string;
right: string;
Expand Down