Bluesky app fork with some witchin' additions 💫
0
fork

Configure Feed

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

Move dialog outputs inside navigation context (#8511)

* Move all dialogs within NavigationContent on native

* Ok leave old ModalsContainer alone for now

* Do the same on web

* Gate browser consent dialog just to be clear

authored by

Eric Bailey and committed by
GitHub
f83335f1 4da86e58

+22 -28
-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' 68 67 import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry' 69 68 import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs' 70 69 import {Provider as PortalProvider} from '#/components/Portal' ··· 157 156 <IntentDialogProvider> 158 157 <TestCtrls /> 159 158 <Shell /> 160 - <NuxDialogs /> 161 159 </IntentDialogProvider> 162 160 </GestureHandlerRootView> 163 161 </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' 58 57 import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry' 59 58 import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs' 60 59 import {Provider as PortalProvider} from '#/components/Portal' ··· 135 134 <HideBottomBarBorderProvider> 136 135 <IntentDialogProvider> 137 136 <Shell /> 138 - <NuxDialogs /> 139 137 </IntentDialogProvider> 140 138 </HideBottomBarBorderProvider> 141 139 </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' 43 51 import {BottomBarWeb} from './bottom-bar/BottomBarWeb' 44 52 import {DesktopLeftNav} from './desktop/LeftNav' 45 53 import {DesktopRightNav} from './desktop/RightNav' ··· 167 175 {!isMobile && <DesktopRightNav routeName={activeRoute.name} />} 168 176 </> 169 177 )} 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 */} 170 192 </NavigationContent> 171 193 ) 172 194 }
-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' 34 28 import {RoutesContainer, TabsNavigator} from '#/Navigation' 35 - import {BottomSheetOutlet} from '../../../modules/bottom-sheet' 36 29 import {updateActiveViewAsync} from '../../../modules/expo-bluesky-swiss-army/src/VisibilityView' 37 30 import {Composer} from './Composer' 38 31 import {DrawerContent} from './Drawer' ··· 152 145 </View> 153 146 <Composer winHeight={winDim.height} /> 154 147 <ModalsContainer /> 155 - <MutedWordsDialog /> 156 - <SigninDialog /> 157 - <EmailDialog /> 158 - <InAppBrowserConsentDialog /> 159 - <LinkWarningDialog /> 160 148 <Lightbox /> 161 - <PortalOutlet /> 162 - <BottomSheetOutlet /> 163 149 </> 164 150 ) 165 151 }
-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' 25 20 import {FlatNavigator, RoutesContainer} from '#/Navigation' 26 21 import {Composer} from './Composer.web' 27 22 import {DrawerContent} from './Drawer' ··· 67 62 </ErrorBoundary> 68 63 <Composer winHeight={0} /> 69 64 <ModalsContainer /> 70 - <MutedWordsDialog /> 71 - <SigninDialog /> 72 - <EmailDialog /> 73 - <LinkWarningDialog /> 74 65 <Lightbox /> 75 - <PortalOutlet /> 76 66 77 67 {showDrawerDelayedExit && ( 78 68 <>