robinwobin.dev
forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
Move NUXDialogs into shell (#9573)
authored by
Eric Bailey
and committed by
GitHub
998ee78e
a355eedf
+4
-4
-2
src/App.native.tsx
-2
src/App.native.tsx
···
61
61
import {ThemeProvider as Alf} from '#/alf'
62
62
import {useColorModeTheme} from '#/alf/util/useColorModeTheme'
63
63
import {Provider as ContextMenuProvider} from '#/components/ContextMenu'
64
-
import {NuxDialogs} from '#/components/dialogs/nuxs'
65
64
import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
66
65
import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
67
66
import {Provider as PolicyUpdateOverlayProvider} from '#/components/PolicyUpdateOverlay'
···
165
164
<IntentDialogProvider>
166
165
<TestCtrls />
167
166
<Shell />
168
-
<NuxDialogs />
169
167
<ToastOutlet />
170
168
</IntentDialogProvider>
171
169
</GlobalGestureEventsProvider>
-2
src/App.web.tsx
-2
src/App.web.tsx
···
48
48
import {ThemeProvider as Alf} from '#/alf'
49
49
import {useColorModeTheme} from '#/alf/util/useColorModeTheme'
50
50
import {Provider as ContextMenuProvider} from '#/components/ContextMenu'
51
-
import {NuxDialogs} from '#/components/dialogs/nuxs'
52
51
import {useStarterPackEntry} from '#/components/hooks/useStarterPackEntry'
53
52
import {Provider as IntentDialogProvider} from '#/components/intents/IntentDialogs'
54
53
import {Provider as PolicyUpdateOverlayProvider} from '#/components/PolicyUpdateOverlay'
···
138
137
<HideBottomBarBorderProvider>
139
138
<IntentDialogProvider>
140
139
<Shell />
141
-
<NuxDialogs />
142
140
<ToastOutlet />
143
141
</IntentDialogProvider>
144
142
</HideBottomBarBorderProvider>
+2
src/view/shell/index.tsx
+2
src/view/shell/index.tsx
···
32
32
import {InAppBrowserConsentDialog} from '#/components/dialogs/InAppBrowserConsent'
33
33
import {LinkWarningDialog} from '#/components/dialogs/LinkWarning'
34
34
import {MutedWordsDialog} from '#/components/dialogs/MutedWords'
35
+
import {NuxDialogs} from '#/components/dialogs/nuxs'
35
36
import {SigninDialog} from '#/components/dialogs/Signin'
36
37
import {
37
38
Outlet as PolicyUpdateOverlayPortalOutlet,
···
110
111
<InAppBrowserConsentDialog />
111
112
<LinkWarningDialog />
112
113
<Lightbox />
114
+
<NuxDialogs />
113
115
114
116
{/* Until policy update has been completed by the user, don't render anything that is portaled */}
115
117
{policyUpdateState.completed && (
+2
src/view/shell/index.web.tsx
+2
src/view/shell/index.web.tsx
···
22
22
import {EmailDialog} from '#/components/dialogs/EmailDialog'
23
23
import {LinkWarningDialog} from '#/components/dialogs/LinkWarning'
24
24
import {MutedWordsDialog} from '#/components/dialogs/MutedWords'
25
+
import {NuxDialogs} from '#/components/dialogs/nuxs'
25
26
import {SigninDialog} from '#/components/dialogs/Signin'
26
27
import {useWelcomeModal} from '#/components/hooks/useWelcomeModal'
27
28
import {
···
86
87
<AgeAssuranceRedirectDialog />
87
88
<LinkWarningDialog />
88
89
<Lightbox />
90
+
<NuxDialogs />
89
91
90
92
{welcomeModalControl.isOpen && (
91
93
<WelcomeModal control={welcomeModalControl} />