Compare commits

...

5 Commits

Author SHA1 Message Date
Eric Bailey 9c68f7b8d8 Merge remote-tracking branch 'origin/main' into dialog-outlets
* origin/main:
  Modernise link warning dialog (#8243)
  rearrange settings (#8519)
  Mark translatable text in `PreferenceControls.tsx` (#8516)
  fix other case of promise.all misuse (#8505)
  Nightly source-language update
  Delete some old dialogs (#8512)
  copy tweak (#8506)
  facepalm (#8510)
  add fabric package/lock files (#8509)
2025-06-18 09:04:19 -05:00
Eric Bailey 03f7693204 Gate browser consent dialog just to be clear 2025-06-17 15:27:29 -05:00
Eric Bailey 5617ed2d8f Do the same on web 2025-06-17 15:25:20 -05:00
Eric Bailey 3e97409925 Ok leave old ModalsContainer alone for now 2025-06-17 15:22:16 -05:00
Eric Bailey b780fc3dcf Move all dialogs within NavigationContent on native 2025-06-17 14:52:45 -05:00
5 changed files with 22 additions and 28 deletions
-2
View File
@@ -64,7 +64,6 @@ import {Shell} from '#/view/shell'
import {ThemeProvider as Alf} from '#/alf'
import {useColorModeTheme} from '#/alf/util/useColorModeTheme'
import {Provider as ContextMenuProvider} from '#/components/ContextMenu'
import {NuxDialogs} from '#/components/dialogs/nuxs'
import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
import {Provider as PortalProvider} from '#/components/Portal'
@@ -157,7 +156,6 @@ function InnerApp() {
<IntentDialogProvider>
<TestCtrls />
<Shell />
<NuxDialogs />
</IntentDialogProvider>
</GestureHandlerRootView>
</HideBottomBarBorderProvider>
-2
View File
@@ -54,7 +54,6 @@ import {Shell} from '#/view/shell/index'
import {ThemeProvider as Alf} from '#/alf'
import {useColorModeTheme} from '#/alf/util/useColorModeTheme'
import {Provider as ContextMenuProvider} from '#/components/ContextMenu'
import {NuxDialogs} from '#/components/dialogs/nuxs'
import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
import {Provider as PortalProvider} from '#/components/Portal'
@@ -135,7 +134,6 @@ function InnerApp() {
<HideBottomBarBorderProvider>
<IntentDialogProvider>
<Shell />
<NuxDialogs />
</IntentDialogProvider>
</HideBottomBarBorderProvider>
</ServiceConfigProvider>
@@ -40,6 +40,14 @@ import {Onboarding} from '#/screens/Onboarding'
import {SignupQueued} from '#/screens/SignupQueued'
import {Takendown} from '#/screens/Takendown'
import {atoms as a, useLayoutBreakpoints} from '#/alf'
import {EmailDialog} from '#/components/dialogs/EmailDialog'
import {InAppBrowserConsentDialog} from '#/components/dialogs/InAppBrowserConsent'
import {LinkWarningDialog} from '#/components/dialogs/LinkWarning'
import {MutedWordsDialog} from '#/components/dialogs/MutedWords'
import {NuxDialogs} from '#/components/dialogs/nuxs'
import {SigninDialog} from '#/components/dialogs/Signin'
import {Outlet as PortalOutlet} from '#/components/Portal'
import {BottomSheetOutlet} from '#/../modules/bottom-sheet'
import {BottomBarWeb} from './bottom-bar/BottomBarWeb'
import {DesktopLeftNav} from './desktop/LeftNav'
import {DesktopRightNav} from './desktop/RightNav'
@@ -167,6 +175,20 @@ function NativeStackNavigator({
{!isMobile && <DesktopRightNav routeName={activeRoute.name} />}
</>
)}
{/* Start: individual dialogs and outlets */}
<MutedWordsDialog />
<SigninDialog />
<EmailDialog />
<LinkWarningDialog />
{!isWeb && <InAppBrowserConsentDialog />}
<PortalOutlet />
<BottomSheetOutlet />
{/* End: individual dialogs and outlets */}
{/* Start: dialog controllers */}
<NuxDialogs />
{/* End: dialog controllers */}
</NavigationContent>
)
}
-14
View File
@@ -25,14 +25,7 @@ import {ModalsContainer} from '#/view/com/modals/Modal'
import {ErrorBoundary} from '#/view/com/util/ErrorBoundary'
import {atoms as a, select, useTheme} from '#/alf'
import {setSystemUITheme} from '#/alf/util/systemUI'
import {EmailDialog} from '#/components/dialogs/EmailDialog'
import {InAppBrowserConsentDialog} from '#/components/dialogs/InAppBrowserConsent'
import {LinkWarningDialog} from '#/components/dialogs/LinkWarning'
import {MutedWordsDialog} from '#/components/dialogs/MutedWords'
import {SigninDialog} from '#/components/dialogs/Signin'
import {Outlet as PortalOutlet} from '#/components/Portal'
import {RoutesContainer, TabsNavigator} from '#/Navigation'
import {BottomSheetOutlet} from '../../../modules/bottom-sheet'
import {updateActiveViewAsync} from '../../../modules/expo-bluesky-swiss-army/src/VisibilityView'
import {Composer} from './Composer'
import {DrawerContent} from './Drawer'
@@ -152,14 +145,7 @@ function ShellInner() {
</View>
<Composer winHeight={winDim.height} />
<ModalsContainer />
<MutedWordsDialog />
<SigninDialog />
<EmailDialog />
<InAppBrowserConsentDialog />
<LinkWarningDialog />
<Lightbox />
<PortalOutlet />
<BottomSheetOutlet />
</>
)
}
-10
View File
@@ -17,11 +17,6 @@ import {Lightbox} from '#/view/com/lightbox/Lightbox'
import {ModalsContainer} from '#/view/com/modals/Modal'
import {ErrorBoundary} from '#/view/com/util/ErrorBoundary'
import {atoms as a, select, useTheme} from '#/alf'
import {EmailDialog} from '#/components/dialogs/EmailDialog'
import {LinkWarningDialog} from '#/components/dialogs/LinkWarning'
import {MutedWordsDialog} from '#/components/dialogs/MutedWords'
import {SigninDialog} from '#/components/dialogs/Signin'
import {Outlet as PortalOutlet} from '#/components/Portal'
import {FlatNavigator, RoutesContainer} from '#/Navigation'
import {Composer} from './Composer.web'
import {DrawerContent} from './Drawer'
@@ -67,12 +62,7 @@ function ShellInner() {
</ErrorBoundary>
<Composer winHeight={0} />
<ModalsContainer />
<MutedWordsDialog />
<SigninDialog />
<EmailDialog />
<LinkWarningDialog />
<Lightbox />
<PortalOutlet />
{showDrawerDelayedExit && (
<>