acetheking987/bsky-social-app
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Revert provider stacking changes (#5423)

Browse Source
This commit is contained in:
Eric Bailey
2024-09-19 11:54:29 -05:00
committed by GitHub
parent 8fde02fabc
commit 24adcb48b7
2 changed files with 84 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/App.native.tsx
+43 -40
View File
@@ -106,48 +106,51 @@ function InnerApp() {
}, [_]) }, [_])
return ( return (
<StatsigProvider <Alf theme={theme}>
// Resets the entire tree below when it changes: <ThemeProvider theme={theme}>
key={currentAccount?.did}> <Splash isReady={isReady && hasCheckedReferrer}>
<Alf theme={theme}> <RootSiblingParent>
<ThemeProvider theme={theme}> <VideoVolumeProvider>
<Splash isReady={isReady && hasCheckedReferrer}> <React.Fragment
<RootSiblingParent> // Resets the entire tree below when it changes:
<VideoVolumeProvider> key={currentAccount?.did}>
<QueryProvider currentDid={currentAccount?.did}> <QueryProvider currentDid={currentAccount?.did}>
<MessagesProvider> <StatsigProvider>
{/* LabelDefsProvider MUST come before ModerationOptsProvider */} <MessagesProvider>
<LabelDefsProvider> {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
<ModerationOptsProvider> <LabelDefsProvider>
<LoggedOutViewProvider> <ModerationOptsProvider>
<SelectedFeedProvider> <LoggedOutViewProvider>
<HiddenRepliesProvider> <SelectedFeedProvider>
<UnreadNotifsProvider> <HiddenRepliesProvider>
<BackgroundNotificationPreferencesProvider> <UnreadNotifsProvider>
<MutedThreadsProvider> <BackgroundNotificationPreferencesProvider>
<ProgressGuideProvider> <MutedThreadsProvider>
<GestureHandlerRootView style={s.h100pct}> <ProgressGuideProvider>
<TestCtrls /> <GestureHandlerRootView
<Shell /> style={s.h100pct}>
<NuxDialogs /> <TestCtrls />
</GestureHandlerRootView> <Shell />
</ProgressGuideProvider> <NuxDialogs />
</MutedThreadsProvider> </GestureHandlerRootView>
</BackgroundNotificationPreferencesProvider> </ProgressGuideProvider>
</UnreadNotifsProvider> </MutedThreadsProvider>
</HiddenRepliesProvider> </BackgroundNotificationPreferencesProvider>
</SelectedFeedProvider> </UnreadNotifsProvider>
</LoggedOutViewProvider> </HiddenRepliesProvider>
</ModerationOptsProvider> </SelectedFeedProvider>
</LabelDefsProvider> </LoggedOutViewProvider>
</MessagesProvider> </ModerationOptsProvider>
</LabelDefsProvider>
</MessagesProvider>
</StatsigProvider>
</QueryProvider> </QueryProvider>
</VideoVolumeProvider> </React.Fragment>
</RootSiblingParent> </VideoVolumeProvider>
</Splash> </RootSiblingParent>
</ThemeProvider> </Splash>
</Alf> </ThemeProvider>
</StatsigProvider> </Alf>
) )
} }
src/App.web.tsx
+41 -39
View File
@@ -96,48 +96,50 @@ function InnerApp() {
return ( return (
<KeyboardProvider enabled={false}> <KeyboardProvider enabled={false}>
<StatsigProvider <Alf theme={theme}>
// Resets the entire tree below when it changes: <ThemeProvider theme={theme}>
key={currentAccount?.did}> <RootSiblingParent>
<Alf theme={theme}> <VideoVolumeProvider>
<ThemeProvider theme={theme}> <ActiveVideoProvider>
<RootSiblingParent> <React.Fragment
<VideoVolumeProvider> // Resets the entire tree below when it changes:
<ActiveVideoProvider> key={currentAccount?.did}>
<QueryProvider currentDid={currentAccount?.did}> <QueryProvider currentDid={currentAccount?.did}>
<MessagesProvider> <StatsigProvider>
{/* LabelDefsProvider MUST come before ModerationOptsProvider */} <MessagesProvider>
<LabelDefsProvider> {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
<ModerationOptsProvider> <LabelDefsProvider>
<LoggedOutViewProvider> <ModerationOptsProvider>
<SelectedFeedProvider> <LoggedOutViewProvider>
<HiddenRepliesProvider> <SelectedFeedProvider>
<UnreadNotifsProvider> <HiddenRepliesProvider>
<BackgroundNotificationPreferencesProvider> <UnreadNotifsProvider>
<MutedThreadsProvider> <BackgroundNotificationPreferencesProvider>
<SafeAreaProvider> <MutedThreadsProvider>
<ProgressGuideProvider> <SafeAreaProvider>
<Shell /> <ProgressGuideProvider>
<NuxDialogs /> <Shell />
</ProgressGuideProvider> <NuxDialogs />
</SafeAreaProvider> </ProgressGuideProvider>
</MutedThreadsProvider> </SafeAreaProvider>
</BackgroundNotificationPreferencesProvider> </MutedThreadsProvider>
</UnreadNotifsProvider> </BackgroundNotificationPreferencesProvider>
</HiddenRepliesProvider> </UnreadNotifsProvider>
</SelectedFeedProvider> </HiddenRepliesProvider>
</LoggedOutViewProvider> </SelectedFeedProvider>
</ModerationOptsProvider> </LoggedOutViewProvider>
</LabelDefsProvider> </ModerationOptsProvider>
</MessagesProvider> </LabelDefsProvider>
</MessagesProvider>
</StatsigProvider>
</QueryProvider> </QueryProvider>
<ToastContainer /> <ToastContainer />
</ActiveVideoProvider> </React.Fragment>
</VideoVolumeProvider> </ActiveVideoProvider>
</RootSiblingParent> </VideoVolumeProvider>
</ThemeProvider> </RootSiblingParent>
</Alf> </ThemeProvider>
</StatsigProvider> </Alf>
</KeyboardProvider> </KeyboardProvider>
) )
} }