Move NUXDialogs into shell (#9573)

(cherry picked from commit 998ee78e3d)
This commit is contained in:
Eric Bailey
2025-12-18 12:08:17 -06:00
parent 6d5ef7d929
commit e8a4b8822e
4 changed files with 4 additions and 4 deletions
-2
View File
@@ -61,7 +61,6 @@ import {Shell} from '#/view/shell'
import {ThemeProvider as Alf} from '#/alf' import {ThemeProvider as Alf} from '#/alf'
import {useColorModeTheme} from '#/alf/util/useColorModeTheme' import {useColorModeTheme} from '#/alf/util/useColorModeTheme'
import {Provider as ContextMenuProvider} from '#/components/ContextMenu' import {Provider as ContextMenuProvider} from '#/components/ContextMenu'
import {NuxDialogs} from '#/components/dialogs/nuxs'
import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry' import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs' import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
import {Provider as PolicyUpdateOverlayProvider} from '#/components/PolicyUpdateOverlay' import {Provider as PolicyUpdateOverlayProvider} from '#/components/PolicyUpdateOverlay'
@@ -165,7 +164,6 @@ function InnerApp() {
<IntentDialogProvider> <IntentDialogProvider>
<TestCtrls /> <TestCtrls />
<Shell /> <Shell />
<NuxDialogs />
<ToastOutlet /> <ToastOutlet />
</IntentDialogProvider> </IntentDialogProvider>
</GlobalGestureEventsProvider> </GlobalGestureEventsProvider>
-2
View File
@@ -48,7 +48,6 @@ import {Shell} from '#/view/shell/index'
import {ThemeProvider as Alf} from '#/alf' import {ThemeProvider as Alf} from '#/alf'
import {useColorModeTheme} from '#/alf/util/useColorModeTheme' import {useColorModeTheme} from '#/alf/util/useColorModeTheme'
import {Provider as ContextMenuProvider} from '#/components/ContextMenu' import {Provider as ContextMenuProvider} from '#/components/ContextMenu'
import {NuxDialogs} from '#/components/dialogs/nuxs'
import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry' import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs' import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
import {Provider as PolicyUpdateOverlayProvider} from '#/components/PolicyUpdateOverlay' import {Provider as PolicyUpdateOverlayProvider} from '#/components/PolicyUpdateOverlay'
@@ -138,7 +137,6 @@ function InnerApp() {
<HideBottomBarBorderProvider> <HideBottomBarBorderProvider>
<IntentDialogProvider> <IntentDialogProvider>
<Shell /> <Shell />
<NuxDialogs />
<ToastOutlet /> <ToastOutlet />
</IntentDialogProvider> </IntentDialogProvider>
</HideBottomBarBorderProvider> </HideBottomBarBorderProvider>
+2
View File
@@ -32,6 +32,7 @@ import {EmailDialog} from '#/components/dialogs/EmailDialog'
import {InAppBrowserConsentDialog} from '#/components/dialogs/InAppBrowserConsent' import {InAppBrowserConsentDialog} from '#/components/dialogs/InAppBrowserConsent'
import {LinkWarningDialog} from '#/components/dialogs/LinkWarning' import {LinkWarningDialog} from '#/components/dialogs/LinkWarning'
import {MutedWordsDialog} from '#/components/dialogs/MutedWords' import {MutedWordsDialog} from '#/components/dialogs/MutedWords'
import {NuxDialogs} from '#/components/dialogs/nuxs'
import {SigninDialog} from '#/components/dialogs/Signin' import {SigninDialog} from '#/components/dialogs/Signin'
import { import {
Outlet as PolicyUpdateOverlayPortalOutlet, Outlet as PolicyUpdateOverlayPortalOutlet,
@@ -110,6 +111,7 @@ function ShellInner() {
<InAppBrowserConsentDialog /> <InAppBrowserConsentDialog />
<LinkWarningDialog /> <LinkWarningDialog />
<Lightbox /> <Lightbox />
<NuxDialogs />
{/* Until policy update has been completed by the user, don't render anything that is portaled */} {/* Until policy update has been completed by the user, don't render anything that is portaled */}
{policyUpdateState.completed && ( {policyUpdateState.completed && (
+2
View File
@@ -22,6 +22,7 @@ import {AgeAssuranceRedirectDialog} from '#/components/ageAssurance/AgeAssurance
import {EmailDialog} from '#/components/dialogs/EmailDialog' import {EmailDialog} from '#/components/dialogs/EmailDialog'
import {LinkWarningDialog} from '#/components/dialogs/LinkWarning' import {LinkWarningDialog} from '#/components/dialogs/LinkWarning'
import {MutedWordsDialog} from '#/components/dialogs/MutedWords' import {MutedWordsDialog} from '#/components/dialogs/MutedWords'
import {NuxDialogs} from '#/components/dialogs/nuxs'
import {SigninDialog} from '#/components/dialogs/Signin' import {SigninDialog} from '#/components/dialogs/Signin'
import {useWelcomeModal} from '#/components/hooks/useWelcomeModal' import {useWelcomeModal} from '#/components/hooks/useWelcomeModal'
import { import {
@@ -86,6 +87,7 @@ function ShellInner() {
<AgeAssuranceRedirectDialog /> <AgeAssuranceRedirectDialog />
<LinkWarningDialog /> <LinkWarningDialog />
<Lightbox /> <Lightbox />
<NuxDialogs />
{welcomeModalControl.isOpen && ( {welcomeModalControl.isOpen && (
<WelcomeModal control={welcomeModalControl} /> <WelcomeModal control={welcomeModalControl} />