zio
/
bsky-app
2
0
Fork 0
Code Pull Requests Packages Releases Activity

Fix root sibling context issue (#1902)

zio/stable
Eric Bailey 2023-11-14 12:46:37 -06:00 committed by GitHub
parent 0a26e78dcb
commit 00f8c8b06d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/App.native.tsx
View File

@ -74,18 +74,19 @@ const InnerApp = observer(function AppImpl() {
return ( return (
<ThemeProvider theme={colorMode}> <ThemeProvider theme={colorMode}>
<RootSiblingParent> <analytics.Provider>
<analytics.Provider> <RootStoreProvider value={rootStore}>
<RootStoreProvider value={rootStore}> <I18nProvider i18n={i18n}>
<I18nProvider i18n={i18n}> {/* All components should be within this provider */}
<RootSiblingParent>
<GestureHandlerRootView style={s.h100pct}> <GestureHandlerRootView style={s.h100pct}>
<TestCtrls /> <TestCtrls />
<Shell /> <Shell />
</GestureHandlerRootView> </GestureHandlerRootView>
</I18nProvider> </RootSiblingParent>
</RootStoreProvider> </I18nProvider>
</analytics.Provider> </RootStoreProvider>
</RootSiblingParent> </analytics.Provider>
</ThemeProvider> </ThemeProvider>
) )
}) })

19
src/App.web.tsx
View File

@ -62,18 +62,19 @@ const InnerApp = observer(function AppImpl() {
return ( return (
<ThemeProvider theme={colorMode}> <ThemeProvider theme={colorMode}>
<RootSiblingParent> <analytics.Provider>
<analytics.Provider> <RootStoreProvider value={rootStore}>
<RootStoreProvider value={rootStore}> <I18nProvider i18n={i18n}>
<I18nProvider i18n={i18n}> {/* All components should be within this provider */}
<RootSiblingParent>
<SafeAreaProvider> <SafeAreaProvider>
<Shell /> <Shell />
</SafeAreaProvider> </SafeAreaProvider>
</I18nProvider> </RootSiblingParent>
<ToastContainer /> </I18nProvider>
</RootStoreProvider> <ToastContainer />
</analytics.Provider> </RootStoreProvider>
</RootSiblingParent> </analytics.Provider>
</ThemeProvider> </ThemeProvider>
) )
}) })