zio/bsky-app
2
0
Fork 0
Code Pull requests Releases Packages Activity

Rework modals to support multiple active

Browse source
This commit is contained in:
Paul Frazee 2023-02-23 17:22:03 -06:00
parent b4f2a6979a
commit 154c34e915
13 changed files with 147 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/view/shell/mobile/index.tsx
View file

@ -28,7 +28,7 @@ import {Login} from '../../screens/Login'
import {Menu} from './Menu'
import {Onboard} from '../../screens/Onboard'
import {HorzSwipe} from '../../com/util/gestures/HorzSwipe'
import {Modal} from '../../com/modals/Modal'
import {ModalsContainer} from '../../com/modals/Modal'
import {Lightbox} from '../../com/lightbox/Lightbox'
import {Text} from '../../com/util/text/Text'
import {ErrorBoundary} from '../../com/util/ErrorBoundary'
@ -366,7 +366,7 @@ export const MobileShell: React.FC = observer(() => {
return (
<View style={styles.outerContainer}>
<Login />
<Modal />
<ModalsContainer />
</View>
)
}
@ -515,7 +515,7 @@ export const MobileShell: React.FC = observer(() => {
notificationCount={store.me.notifications.unreadCount}
/>
</Animated.View>
<Modal />
<ModalsContainer />
<Lightbox />
<Composer
active={store.shell.isComposerActive}

6
src/view/shell/web/index.tsx
View file

@ -11,7 +11,7 @@ import {Onboard} from '../../screens/Onboard'
import {Login} from '../../screens/Login'
import {ErrorBoundary} from '../../com/util/ErrorBoundary'
import {Lightbox} from '../../com/lightbox/Lightbox'
import {Modal} from '../../com/modals/Modal'
import {ModalsContainer} from '../../com/modals/Modal'
import {Text} from 'view/com/util/text/Text'
import {Composer} from './Composer'
import {usePalette} from 'lib/hooks/usePalette'
@ -32,7 +32,7 @@ export const WebShell: React.FC = observer(() => {
return (
<View style={styles.outerContainer}>
<Login />
<Modal />
<ModalsContainer />
</View>
)
}
@ -67,7 +67,7 @@ export const WebShell: React.FC = observer(() => {
imagesOpen={store.shell.composerOpts?.imagesOpen}
onPost={store.shell.composerOpts?.onPost}
/>
<Modal />
<ModalsContainer />
<Lightbox />
</View>
)