Skip to content
This repository was archived by the owner on Feb 25, 2020. It is now read-only.

Commit dd559f9

Browse files
committed
Add safe-area-context
1 parent 5e2bc88 commit dd559f9

File tree

3 files changed

+20
-14
lines changed

3 files changed

+20
-14
lines changed

package.json

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,13 @@
5959
"react": "16.6.3",
6060
"react-dom": "16.3.2",
6161
"react-native": "^0.57.7",
62+
"react-native-safe-area-context": "^0.3.5",
6263
"react-navigation": "^2.11.2",
6364
"react-test-renderer": "16.6.3",
6465
"release-it": "^7.6.1"
6566
},
6667
"peerDependencies": {
67-
"@react-navigation/core": "^3.0.0",
68-
"react": "*",
69-
"react-native": "*",
70-
"react-native-gesture-handler": "*"
68+
"react-native-safe-area-context": "*"
7169
},
7270
"jest": {
7371
"preset": "react-native",
@@ -91,7 +89,7 @@
9189
},
9290
"dependencies": {
9391
"hoist-non-react-statics": "^3.0.1",
94-
"react-native-safe-area-view": "^0.14.1",
92+
"react-native-safe-area-view": "^0.14",
9593
"react-native-screens": "^1.0.0 || ^1.0.0-alpha"
9694
}
9795
}

src/createAppContainer.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
getNavigation,
88
NavigationProvider,
99
} from '@react-navigation/core';
10+
import { SafeAreaProvider } from 'react-native-safe-area-context';
1011
import invariant from './utils/invariant';
1112
import docsUrl from './utils/docsUrl';
1213

@@ -425,11 +426,13 @@ export default function createNavigationContainer(Component) {
425426
invariant(navigation, 'failed to get navigation');
426427

427428
return (
428-
<ThemeProvider value={this._getTheme()}>
429-
<NavigationProvider value={navigation}>
430-
<Component {...this.props} navigation={navigation} />
431-
</NavigationProvider>
432-
</ThemeProvider>
429+
<SafeAreaProvider>
430+
<ThemeProvider value={this._getTheme()}>
431+
<NavigationProvider value={navigation}>
432+
<Component {...this.props} navigation={navigation} />
433+
</NavigationProvider>
434+
</ThemeProvider>
435+
</SafeAreaProvider>
433436
);
434437
}
435438
}

yarn.lock

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7134,17 +7134,22 @@ [email protected]:
71347134
dependencies:
71357135
react-native-dismiss-keyboard "1.0.0"
71367136

7137+
react-native-safe-area-context@^0.3.5:
7138+
version "0.3.5"
7139+
resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-0.3.5.tgz#1bfe0d1d4f5fb3462c07e3337d2f71eb1932c570"
7140+
integrity sha512-nh3Q4mmPmaCr1q0hHsReWXL8nlYKXOtLpPNeN57V1bB/QyJ7zL0nYR6c0cDR2/wPBA/DNm4wNllUAT842xb2zw==
7141+
71377142
71387143
version "0.11.0"
71397144
resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.11.0.tgz#4f3dda43c2bace37965e7c6aef5fc83d4f19d174"
71407145
integrity sha512-N3nElaahu1Me2ltnfc9acpgt1znm6pi8DSadKy79kvdzKwvVIzw0IXueA/Hjr51eCW1BsfNw7D1SgBT9U6qEkA==
71417146
dependencies:
71427147
hoist-non-react-statics "^2.3.1"
71437148

7144-
react-native-safe-area-view@^0.14.1:
7145-
version "0.14.1"
7146-
resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.1.tgz#3981f6f8628c1769a163313bd8c8eba5edecca0f"
7147-
integrity sha512-pLAPWdirNWO/1F6IYkbayW9nDIXkM2F/NPtigYNjZj9nISCW+G2dNuI39DI8LenkxYdhiDaGMXfQHHx9TRn6Fw==
7149+
react-native-safe-area-view@^0.14:
7150+
version "0.14.8"
7151+
resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.8.tgz#ef33c46ff8164ae77acad48c3039ec9c34873e5b"
7152+
integrity sha512-MtRSIcZNstxv87Jet+UsPhEd1tpGe8cVskDXlP657x6rHpSrbrc+y13ZNXrwAgGNNhqQNX7UJT68ZIq//ZRmvw==
71487153
dependencies:
71497154
hoist-non-react-statics "^2.3.1"
71507155

0 commit comments

Comments
 (0)