|
@@ -1,5 +1,5 @@
|
1
|
1
|
import * as React from 'react';
|
2
|
|
-import { StyleSheet } from 'react-native';
|
|
2
|
+import { StyleSheet, View } from 'react-native';
|
3
|
3
|
import { EdgeInsets, InsetChangedEvent } from './SafeArea.types';
|
4
|
4
|
import NativeSafeAreaView from './NativeSafeAreaView';
|
5
|
5
|
|
|
@@ -10,20 +10,27 @@ export interface SafeAreaViewProps {
|
10
|
10
|
}
|
11
|
11
|
|
12
|
12
|
export function SafeAreaProvider({ children }: SafeAreaViewProps) {
|
|
13
|
+ let parentInsets = useParentSafeArea();
|
13
|
14
|
const [insets, setInsets] = React.useState<EdgeInsets | null>(null);
|
14
|
15
|
const onInsetsChange = React.useCallback((event: InsetChangedEvent) => {
|
15
|
16
|
setInsets(event.nativeEvent.insets);
|
16
|
17
|
}, []);
|
17
|
18
|
|
18
|
|
- return (
|
19
|
|
- <NativeSafeAreaView style={styles.fill} onInsetsChange={onInsetsChange}>
|
20
|
|
- {insets !== null ? (
|
21
|
|
- <SafeAreaContext.Provider value={insets}>
|
22
|
|
- {children}
|
23
|
|
- </SafeAreaContext.Provider>
|
24
|
|
- ) : null}
|
25
|
|
- </NativeSafeAreaView>
|
26
|
|
- );
|
|
19
|
+ // If a provider is nested inside of another provider then we can just use
|
|
20
|
+ // the parent insets, without rendering another native safe area view
|
|
21
|
+ if (parentInsets) {
|
|
22
|
+ return <View style={styles.fill}>{children}</View>;
|
|
23
|
+ } else {
|
|
24
|
+ return (
|
|
25
|
+ <NativeSafeAreaView style={styles.fill} onInsetsChange={onInsetsChange}>
|
|
26
|
+ {insets !== null ? (
|
|
27
|
+ <SafeAreaContext.Provider value={insets}>
|
|
28
|
+ {children}
|
|
29
|
+ </SafeAreaContext.Provider>
|
|
30
|
+ ) : null}
|
|
31
|
+ </NativeSafeAreaView>
|
|
32
|
+ );
|
|
33
|
+ }
|
27
|
34
|
}
|
28
|
35
|
|
29
|
36
|
const styles = StyleSheet.create({
|
|
@@ -32,6 +39,10 @@ const styles = StyleSheet.create({
|
32
|
39
|
|
33
|
40
|
export const SafeAreaConsumer = SafeAreaContext.Consumer;
|
34
|
41
|
|
|
42
|
+function useParentSafeArea(): React.ContextType<typeof SafeAreaContext> {
|
|
43
|
+ return React.useContext(SafeAreaContext);
|
|
44
|
+}
|
|
45
|
+
|
35
|
46
|
export function useSafeArea(): EdgeInsets {
|
36
|
47
|
const safeArea = React.useContext(SafeAreaContext);
|
37
|
48
|
if (safeArea == null) {
|