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

remove root sibling library (#9097)

Browse Source
This commit is contained in:
Samuel Newman
2025-09-29 22:31:55 +03:00
committed by GitHub
parent ae2c9a832f
commit 031fa95715
5 changed files with 118 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jest/test-utils.tsx
+8 -12
View File
@@ -1,22 +1,18 @@
import React from 'react'
import {render} from '@testing-library/react-native'
import {GestureHandlerRootView} from 'react-native-gesture-handler' import {GestureHandlerRootView} from 'react-native-gesture-handler'
import {RootSiblingParent} from 'react-native-root-siblings'
import {SafeAreaProvider} from 'react-native-safe-area-context' import {SafeAreaProvider} from 'react-native-safe-area-context'
import {RootStoreProvider, RootStoreModel} from '../src/state' import {render} from '@testing-library/react-native'
import {ThemeProvider} from '../src/lib/ThemeContext' import {ThemeProvider} from '../src/lib/ThemeContext'
import {type RootStoreModel, RootStoreProvider} from '../src/state'
const customRender = (ui: any, rootStore: RootStoreModel) => const customRender = (ui: any, rootStore: RootStoreModel) =>
render( render(
// eslint-disable-next-line react-native/no-inline-styles
<GestureHandlerRootView style={{flex: 1}}> <GestureHandlerRootView style={{flex: 1}}>
<RootSiblingParent> <RootStoreProvider value={rootStore}>
<RootStoreProvider value={rootStore}> <ThemeProvider theme="light">
<ThemeProvider theme="light"> <SafeAreaProvider>{ui}</SafeAreaProvider>
<SafeAreaProvider>{ui}</SafeAreaProvider> </ThemeProvider>
</ThemeProvider> </RootStoreProvider>
</RootStoreProvider>
</RootSiblingParent>
</GestureHandlerRootView>, </GestureHandlerRootView>,
) )
package.json
-1
View File
@@ -197,7 +197,6 @@
"react-native-progress": "bluesky-social/react-native-progress", "react-native-progress": "bluesky-social/react-native-progress",
"react-native-qrcode-styled": "^0.3.3", "react-native-qrcode-styled": "^0.3.3",
"react-native-reanimated": "^3.19.1", "react-native-reanimated": "^3.19.1",
"react-native-root-siblings": "^5.0.1",
"react-native-safe-area-context": "~5.6.0", "react-native-safe-area-context": "~5.6.0",
"react-native-screens": "~4.16.0", "react-native-screens": "~4.16.0",
"react-native-svg": "15.12.1", "react-native-svg": "15.12.1",
src/App.native.tsx
+56 -59
View File
@@ -4,7 +4,6 @@ import '#/view/icons'
import React, {useEffect, useState} from 'react' import React, {useEffect, useState} from 'react'
import {GestureHandlerRootView} from 'react-native-gesture-handler' import {GestureHandlerRootView} from 'react-native-gesture-handler'
import {RootSiblingParent} from 'react-native-root-siblings'
import { import {
initialWindowMetrics, initialWindowMetrics,
SafeAreaProvider, SafeAreaProvider,
@@ -137,64 +136,62 @@ function InnerApp() {
<ThemeProvider theme={theme}> <ThemeProvider theme={theme}>
<ContextMenuProvider> <ContextMenuProvider>
<Splash isReady={isReady && hasCheckedReferrer}> <Splash isReady={isReady && hasCheckedReferrer}>
<RootSiblingParent> <VideoVolumeProvider>
<VideoVolumeProvider> <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}> <QueryProvider currentDid={currentAccount?.did}>
<QueryProvider currentDid={currentAccount?.did}> <PolicyUpdateOverlayProvider>
<PolicyUpdateOverlayProvider> <StatsigProvider>
<StatsigProvider> <AgeAssuranceProvider>
<AgeAssuranceProvider> <ComposerProvider>
<ComposerProvider> <MessagesProvider>
<MessagesProvider> {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
{/* LabelDefsProvider MUST come before ModerationOptsProvider */} <LabelDefsProvider>
<LabelDefsProvider> <ModerationOptsProvider>
<ModerationOptsProvider> <LoggedOutViewProvider>
<LoggedOutViewProvider> <SelectedFeedProvider>
<SelectedFeedProvider> <HiddenRepliesProvider>
<HiddenRepliesProvider> <HomeBadgeProvider>
<HomeBadgeProvider> <UnreadNotifsProvider>
<UnreadNotifsProvider> <BackgroundNotificationPreferencesProvider>
<BackgroundNotificationPreferencesProvider> <MutedThreadsProvider>
<MutedThreadsProvider> <ProgressGuideProvider>
<ProgressGuideProvider> <ServiceAccountManager>
<ServiceAccountManager> <EmailVerificationProvider>
<EmailVerificationProvider> <HideBottomBarBorderProvider>
<HideBottomBarBorderProvider> <GestureHandlerRootView
<GestureHandlerRootView style={s.h100pct}>
style={s.h100pct}> <GlobalGestureEventsProvider>
<GlobalGestureEventsProvider> <IntentDialogProvider>
<IntentDialogProvider> <TestCtrls />
<TestCtrls /> <Shell />
<Shell /> <NuxDialogs />
<NuxDialogs /> <ToastOutlet />
<ToastOutlet /> </IntentDialogProvider>
</IntentDialogProvider> </GlobalGestureEventsProvider>
</GlobalGestureEventsProvider> </GestureHandlerRootView>
</GestureHandlerRootView> </HideBottomBarBorderProvider>
</HideBottomBarBorderProvider> </EmailVerificationProvider>
</EmailVerificationProvider> </ServiceAccountManager>
</ServiceAccountManager> </ProgressGuideProvider>
</ProgressGuideProvider> </MutedThreadsProvider>
</MutedThreadsProvider> </BackgroundNotificationPreferencesProvider>
</BackgroundNotificationPreferencesProvider> </UnreadNotifsProvider>
</UnreadNotifsProvider> </HomeBadgeProvider>
</HomeBadgeProvider> </HiddenRepliesProvider>
</HiddenRepliesProvider> </SelectedFeedProvider>
</SelectedFeedProvider> </LoggedOutViewProvider>
</LoggedOutViewProvider> </ModerationOptsProvider>
</ModerationOptsProvider> </LabelDefsProvider>
</LabelDefsProvider> </MessagesProvider>
</MessagesProvider> </ComposerProvider>
</ComposerProvider> </AgeAssuranceProvider>
</AgeAssuranceProvider> </StatsigProvider>
</StatsigProvider> </PolicyUpdateOverlayProvider>
</PolicyUpdateOverlayProvider> </QueryProvider>
</QueryProvider> </React.Fragment>
</React.Fragment> </VideoVolumeProvider>
</VideoVolumeProvider>
</RootSiblingParent>
</Splash> </Splash>
</ContextMenuProvider> </ContextMenuProvider>
</ThemeProvider> </ThemeProvider>
src/App.web.tsx
+54 -57
View File
@@ -3,7 +3,6 @@ import '#/view/icons'
import './style.css' import './style.css'
import React, {useEffect, useState} from 'react' import React, {useEffect, useState} from 'react'
import {RootSiblingParent} from 'react-native-root-siblings'
import {SafeAreaProvider} from 'react-native-safe-area-context' import {SafeAreaProvider} from 'react-native-safe-area-context'
import {msg} from '@lingui/macro' import {msg} from '@lingui/macro'
import {useLingui} from '@lingui/react' import {useLingui} from '@lingui/react'
@@ -111,62 +110,60 @@ function InnerApp() {
<Alf theme={theme}> <Alf theme={theme}>
<ThemeProvider theme={theme}> <ThemeProvider theme={theme}>
<ContextMenuProvider> <ContextMenuProvider>
<RootSiblingParent> <VideoVolumeProvider>
<VideoVolumeProvider> <ActiveVideoProvider>
<ActiveVideoProvider> <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}> <QueryProvider currentDid={currentAccount?.did}>
<QueryProvider currentDid={currentAccount?.did}> <PolicyUpdateOverlayProvider>
<PolicyUpdateOverlayProvider> <StatsigProvider>
<StatsigProvider> <AgeAssuranceProvider>
<AgeAssuranceProvider> <ComposerProvider>
<ComposerProvider> <MessagesProvider>
<MessagesProvider> {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
{/* LabelDefsProvider MUST come before ModerationOptsProvider */} <LabelDefsProvider>
<LabelDefsProvider> <ModerationOptsProvider>
<ModerationOptsProvider> <LoggedOutViewProvider>
<LoggedOutViewProvider> <SelectedFeedProvider>
<SelectedFeedProvider> <HiddenRepliesProvider>
<HiddenRepliesProvider> <HomeBadgeProvider>
<HomeBadgeProvider> <UnreadNotifsProvider>
<UnreadNotifsProvider> <BackgroundNotificationPreferencesProvider>
<BackgroundNotificationPreferencesProvider> <MutedThreadsProvider>
<MutedThreadsProvider> <SafeAreaProvider>
<SafeAreaProvider> <ProgressGuideProvider>
<ProgressGuideProvider> <ServiceConfigProvider>
<ServiceConfigProvider> <EmailVerificationProvider>
<EmailVerificationProvider> <HideBottomBarBorderProvider>
<HideBottomBarBorderProvider> <IntentDialogProvider>
<IntentDialogProvider> <Shell />
<Shell /> <NuxDialogs />
<NuxDialogs /> <ToastOutlet />
<ToastOutlet /> </IntentDialogProvider>
</IntentDialogProvider> </HideBottomBarBorderProvider>
</HideBottomBarBorderProvider> </EmailVerificationProvider>
</EmailVerificationProvider> </ServiceConfigProvider>
</ServiceConfigProvider> </ProgressGuideProvider>
</ProgressGuideProvider> </SafeAreaProvider>
</SafeAreaProvider> </MutedThreadsProvider>
</MutedThreadsProvider> </BackgroundNotificationPreferencesProvider>
</BackgroundNotificationPreferencesProvider> </UnreadNotifsProvider>
</UnreadNotifsProvider> </HomeBadgeProvider>
</HomeBadgeProvider> </HiddenRepliesProvider>
</HiddenRepliesProvider> </SelectedFeedProvider>
</SelectedFeedProvider> </LoggedOutViewProvider>
</LoggedOutViewProvider> </ModerationOptsProvider>
</ModerationOptsProvider> </LabelDefsProvider>
</LabelDefsProvider> </MessagesProvider>
</MessagesProvider> </ComposerProvider>
</ComposerProvider> </AgeAssuranceProvider>
</AgeAssuranceProvider> </StatsigProvider>
</StatsigProvider> </PolicyUpdateOverlayProvider>
</PolicyUpdateOverlayProvider> </QueryProvider>
</QueryProvider> </React.Fragment>
</React.Fragment> </ActiveVideoProvider>
</ActiveVideoProvider> </VideoVolumeProvider>
</VideoVolumeProvider>
</RootSiblingParent>
</ContextMenuProvider> </ContextMenuProvider>
</ThemeProvider> </ThemeProvider>
</Alf> </Alf>
yarn.lock
-5
View File
@@ -17071,11 +17071,6 @@ react-native-reanimated@^3.19.1:
invariant "^2.2.4" invariant "^2.2.4"
react-native-is-edge-to-edge "1.1.7" react-native-is-edge-to-edge "1.1.7"
react-native-root-siblings@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/react-native-root-siblings/-/react-native-root-siblings-5.0.1.tgz#97e050e5155228f65810fb1c466ff8e769c5272c"
integrity sha512-Ay3k/fBj6ReUkWX5WNS+oEAcgPLEGOK8n7K/L7D85mf3xvd8rm/b4spsv26E4HlFzluVx5HKbxEt9cl0wQ1u3g==
react-native-safe-area-context@~5.6.0: react-native-safe-area-context@~5.6.0:
version "5.6.1" version "5.6.1"
resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-5.6.1.tgz#cb4d249ef1a6f7e8fd0cfdfa9764838dffda26b6" resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-5.6.1.tgz#cb4d249ef1a6f7e8fd0cfdfa9764838dffda26b6"