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

Merge pull request #1032 from bluesky-social/fix-1001-modal-scrolling 

#1001 Modal content overflow
zio/stable
Eric Bailey 2023-07-18 16:46:22 -05:00 committed by GitHub
parent 8a66af11ae 9ef54814f0
commit a6bb38ee51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/view/shell/Composer.web.tsx
View File

@ -5,6 +5,7 @@ import {ComposePost} from '../com/composer/Composer'
import {ComposerOpts} from 'state/models/ui/shell' import {ComposerOpts} from 'state/models/ui/shell'
import {usePalette} from 'lib/hooks/usePalette' import {usePalette} from 'lib/hooks/usePalette'
import {isMobileWeb} from 'platform/detection' import {isMobileWeb} from 'platform/detection'
import {BOTTOM_BAR_HEIGHT} from 'view/shell/bottom-bar/BottomBarStyles'
export const Composer = observer( export const Composer = observer(
({ ({
@ -62,7 +63,10 @@ const styles = StyleSheet.create({
paddingVertical: 0, paddingVertical: 0,
paddingHorizontal: 2, paddingHorizontal: 2,
borderRadius: isMobileWeb ? 0 : 8, borderRadius: isMobileWeb ? 0 : 8,
marginBottom: '10vh', marginBottom: isMobileWeb ? BOTTOM_BAR_HEIGHT : 0,
borderWidth: 1, borderWidth: 1,
maxHeight: isMobileWeb
? `calc(100% - ${BOTTOM_BAR_HEIGHT}px)`
: 'calc(100% - (40px * 2))',
}, },
}) })

3
src/view/shell/bottom-bar/BottomBarStyles.tsx
View File

@ -1,8 +1,11 @@
import {StyleSheet} from 'react-native' import {StyleSheet} from 'react-native'
import {colors} from 'lib/styles' import {colors} from 'lib/styles'
export const BOTTOM_BAR_HEIGHT = 61
export const styles = StyleSheet.create({ export const styles = StyleSheet.create({
bottomBar: { bottomBar: {
height: BOTTOM_BAR_HEIGHT,
position: 'absolute', position: 'absolute',
bottom: 0, bottom: 0,
left: 0, left: 0,