Move QueryProvider inside the key

This commit is contained in:
Dan Abramov
2024-03-21 23:30:33 +00:00
parent 57a72a1108
commit 17b014f4ae
2 changed files with 84 additions and 84 deletions
+42 -42
View File
@@ -77,25 +77,27 @@ function InnerApp() {
<React.Fragment <React.Fragment
// Resets the entire tree below when it changes: // Resets the entire tree below when it changes:
key={currentAccount?.did}> key={currentAccount?.did}>
<StatsigProvider> <QueryProvider>
<LabelDefsProvider> <StatsigProvider>
<LoggedOutViewProvider> <LabelDefsProvider>
<SelectedFeedProvider> <LoggedOutViewProvider>
<UnreadNotifsProvider> <SelectedFeedProvider>
<ThemeProvider theme={theme}> <UnreadNotifsProvider>
{/* All components should be within this provider */} <ThemeProvider theme={theme}>
<RootSiblingParent> {/* All components should be within this provider */}
<GestureHandlerRootView style={s.h100pct}> <RootSiblingParent>
<TestCtrls /> <GestureHandlerRootView style={s.h100pct}>
<Shell /> <TestCtrls />
</GestureHandlerRootView> <Shell />
</RootSiblingParent> </GestureHandlerRootView>
</ThemeProvider> </RootSiblingParent>
</UnreadNotifsProvider> </ThemeProvider>
</SelectedFeedProvider> </UnreadNotifsProvider>
</LoggedOutViewProvider> </SelectedFeedProvider>
</LabelDefsProvider> </LoggedOutViewProvider>
</StatsigProvider> </LabelDefsProvider>
</StatsigProvider>
</QueryProvider>
</React.Fragment> </React.Fragment>
</Splash> </Splash>
</Alf> </Alf>
@@ -119,29 +121,27 @@ function App() {
* that is set up in the InnerApp component above. * that is set up in the InnerApp component above.
*/ */
return ( return (
<QueryProvider> <SessionProvider>
<SessionProvider> <ShellStateProvider>
<ShellStateProvider> <PrefsStateProvider>
<PrefsStateProvider> <MutedThreadsProvider>
<MutedThreadsProvider> <InvitesStateProvider>
<InvitesStateProvider> <ModalStateProvider>
<ModalStateProvider> <DialogStateProvider>
<DialogStateProvider> <LightboxStateProvider>
<LightboxStateProvider> <I18nProvider>
<I18nProvider> <PortalProvider>
<PortalProvider> <InnerApp />
<InnerApp /> </PortalProvider>
</PortalProvider> </I18nProvider>
</I18nProvider> </LightboxStateProvider>
</LightboxStateProvider> </DialogStateProvider>
</DialogStateProvider> </ModalStateProvider>
</ModalStateProvider> </InvitesStateProvider>
</InvitesStateProvider> </MutedThreadsProvider>
</MutedThreadsProvider> </PrefsStateProvider>
</PrefsStateProvider> </ShellStateProvider>
</ShellStateProvider> </SessionProvider>
</SessionProvider>
</QueryProvider>
) )
} }
+42 -42
View File
@@ -54,25 +54,27 @@ function InnerApp() {
<React.Fragment <React.Fragment
// Resets the entire tree below when it changes: // Resets the entire tree below when it changes:
key={currentAccount?.did}> key={currentAccount?.did}>
<StatsigProvider> <QueryProvider>
<LabelDefsProvider> <StatsigProvider>
<LoggedOutViewProvider> <LabelDefsProvider>
<SelectedFeedProvider> <LoggedOutViewProvider>
<UnreadNotifsProvider> <SelectedFeedProvider>
<ThemeProvider theme={theme}> <UnreadNotifsProvider>
{/* All components should be within this provider */} <ThemeProvider theme={theme}>
<RootSiblingParent> {/* All components should be within this provider */}
<SafeAreaProvider> <RootSiblingParent>
<Shell /> <SafeAreaProvider>
</SafeAreaProvider> <Shell />
</RootSiblingParent> </SafeAreaProvider>
<ToastContainer /> </RootSiblingParent>
</ThemeProvider> <ToastContainer />
</UnreadNotifsProvider> </ThemeProvider>
</SelectedFeedProvider> </UnreadNotifsProvider>
</LoggedOutViewProvider> </SelectedFeedProvider>
</LabelDefsProvider> </LoggedOutViewProvider>
</StatsigProvider> </LabelDefsProvider>
</StatsigProvider>
</QueryProvider>
</React.Fragment> </React.Fragment>
</Alf> </Alf>
) )
@@ -94,29 +96,27 @@ function App() {
* that is set up in the InnerApp component above. * that is set up in the InnerApp component above.
*/ */
return ( return (
<QueryProvider> <SessionProvider>
<SessionProvider> <ShellStateProvider>
<ShellStateProvider> <PrefsStateProvider>
<PrefsStateProvider> <MutedThreadsProvider>
<MutedThreadsProvider> <InvitesStateProvider>
<InvitesStateProvider> <ModalStateProvider>
<ModalStateProvider> <DialogStateProvider>
<DialogStateProvider> <LightboxStateProvider>
<LightboxStateProvider> <I18nProvider>
<I18nProvider> <PortalProvider>
<PortalProvider> <InnerApp />
<InnerApp /> </PortalProvider>
</PortalProvider> </I18nProvider>
</I18nProvider> </LightboxStateProvider>
</LightboxStateProvider> </DialogStateProvider>
</DialogStateProvider> </ModalStateProvider>
</ModalStateProvider> </InvitesStateProvider>
</InvitesStateProvider> </MutedThreadsProvider>
</MutedThreadsProvider> </PrefsStateProvider>
</PrefsStateProvider> </ShellStateProvider>
</ShellStateProvider> </SessionProvider>
</SessionProvider>
</QueryProvider>
) )
} }