Bluesky app fork with some witchin' additions 💫
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Revert "Move dialog outputs inside navigation context (#8511)" (#8531)

authored by

Eric Bailey and committed by
GitHub
04a2a227 42510c05

+28 -22
+2
src/App.native.tsx
··· 64 64 import {ThemeProvider as Alf} from '#/alf' 65 65 import {useColorModeTheme} from '#/alf/util/useColorModeTheme' 66 66 import {Provider as ContextMenuProvider} from '#/components/ContextMenu' 67 + import {NuxDialogs} from '#/components/dialogs/nuxs' 67 68 import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry' 68 69 import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs' 69 70 import {Provider as PortalProvider} from '#/components/Portal' ··· 156 157 <IntentDialogProvider> 157 158 <TestCtrls /> 158 159 <Shell /> 160 + <NuxDialogs /> 159 161 </IntentDialogProvider> 160 162 </GestureHandlerRootView> 161 163 </HideBottomBarBorderProvider>
+2
src/App.web.tsx
··· 54 54 import {ThemeProvider as Alf} from '#/alf' 55 55 import {useColorModeTheme} from '#/alf/util/useColorModeTheme' 56 56 import {Provider as ContextMenuProvider} from '#/components/ContextMenu' 57 + import {NuxDialogs} from '#/components/dialogs/nuxs' 57 58 import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry' 58 59 import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs' 59 60 import {Provider as PortalProvider} from '#/components/Portal' ··· 134 135 <HideBottomBarBorderProvider> 135 136 <IntentDialogProvider> 136 137 <Shell /> 138 + <NuxDialogs /> 137 139 </IntentDialogProvider> 138 140 </HideBottomBarBorderProvider> 139 141 </ServiceConfigProvider>
-22
src/view/shell/createNativeStackNavigatorWithAuth.tsx
··· 40 40 import {SignupQueued} from '#/screens/SignupQueued' 41 41 import {Takendown} from '#/screens/Takendown' 42 42 import {atoms as a, useLayoutBreakpoints} from '#/alf' 43 - import {EmailDialog} from '#/components/dialogs/EmailDialog' 44 - import {InAppBrowserConsentDialog} from '#/components/dialogs/InAppBrowserConsent' 45 - import {LinkWarningDialog} from '#/components/dialogs/LinkWarning' 46 - import {MutedWordsDialog} from '#/components/dialogs/MutedWords' 47 - import {NuxDialogs} from '#/components/dialogs/nuxs' 48 - import {SigninDialog} from '#/components/dialogs/Signin' 49 - import {Outlet as PortalOutlet} from '#/components/Portal' 50 - import {BottomSheetOutlet} from '#/../modules/bottom-sheet' 51 43 import {BottomBarWeb} from './bottom-bar/BottomBarWeb' 52 44 import {DesktopLeftNav} from './desktop/LeftNav' 53 45 import {DesktopRightNav} from './desktop/RightNav' ··· 175 167 {!isMobile && <DesktopRightNav routeName={activeRoute.name} />} 176 168 </> 177 169 )} 178 - 179 - {/* Start: individual dialogs and outlets */} 180 - <MutedWordsDialog /> 181 - <SigninDialog /> 182 - <EmailDialog /> 183 - <LinkWarningDialog /> 184 - {!isWeb && <InAppBrowserConsentDialog />} 185 - <PortalOutlet /> 186 - <BottomSheetOutlet /> 187 - {/* End: individual dialogs and outlets */} 188 - 189 - {/* Start: dialog controllers */} 190 - <NuxDialogs /> 191 - {/* End: dialog controllers */} 192 170 </NavigationContent> 193 171 ) 194 172 }
+14
src/view/shell/index.tsx
··· 25 25 import {ErrorBoundary} from '#/view/com/util/ErrorBoundary' 26 26 import {atoms as a, select, useTheme} from '#/alf' 27 27 import {setSystemUITheme} from '#/alf/util/systemUI' 28 + import {EmailDialog} from '#/components/dialogs/EmailDialog' 29 + import {InAppBrowserConsentDialog} from '#/components/dialogs/InAppBrowserConsent' 30 + import {LinkWarningDialog} from '#/components/dialogs/LinkWarning' 31 + import {MutedWordsDialog} from '#/components/dialogs/MutedWords' 32 + import {SigninDialog} from '#/components/dialogs/Signin' 33 + import {Outlet as PortalOutlet} from '#/components/Portal' 28 34 import {RoutesContainer, TabsNavigator} from '#/Navigation' 35 + import {BottomSheetOutlet} from '../../../modules/bottom-sheet' 29 36 import {updateActiveViewAsync} from '../../../modules/expo-bluesky-swiss-army/src/VisibilityView' 30 37 import {Composer} from './Composer' 31 38 import {DrawerContent} from './Drawer' ··· 145 152 </View> 146 153 <Composer winHeight={winDim.height} /> 147 154 <ModalsContainer /> 155 + <MutedWordsDialog /> 156 + <SigninDialog /> 157 + <EmailDialog /> 158 + <InAppBrowserConsentDialog /> 159 + <LinkWarningDialog /> 148 160 <Lightbox /> 161 + <PortalOutlet /> 162 + <BottomSheetOutlet /> 149 163 </> 150 164 ) 151 165 }
+10
src/view/shell/index.web.tsx
··· 17 17 import {ModalsContainer} from '#/view/com/modals/Modal' 18 18 import {ErrorBoundary} from '#/view/com/util/ErrorBoundary' 19 19 import {atoms as a, select, useTheme} from '#/alf' 20 + import {EmailDialog} from '#/components/dialogs/EmailDialog' 21 + import {LinkWarningDialog} from '#/components/dialogs/LinkWarning' 22 + import {MutedWordsDialog} from '#/components/dialogs/MutedWords' 23 + import {SigninDialog} from '#/components/dialogs/Signin' 24 + import {Outlet as PortalOutlet} from '#/components/Portal' 20 25 import {FlatNavigator, RoutesContainer} from '#/Navigation' 21 26 import {Composer} from './Composer.web' 22 27 import {DrawerContent} from './Drawer' ··· 62 67 </ErrorBoundary> 63 68 <Composer winHeight={0} /> 64 69 <ModalsContainer /> 70 + <MutedWordsDialog /> 71 + <SigninDialog /> 72 + <EmailDialog /> 73 + <LinkWarningDialog /> 65 74 <Lightbox /> 75 + <PortalOutlet /> 66 76 67 77 {showDrawerDelayedExit && ( 68 78 <>