diff options
author | Samuel Newman <mozzius@protonmail.com> | 2024-06-04 12:58:09 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-04 10:58:09 +0100 |
commit | d918f8dc2a07ff6cd94a1b37c5358dc6e9f6452c (patch) | |
tree | e5ce05e526315eec3eddb60b38c2ad036d7c73ff /src/view/shell | |
parent | d0327342783f5357f22fbc6b3903b51843306930 (diff) | |
download | voidsky-d918f8dc2a07ff6cd94a1b37c5358dc6e9f6452c.tar.zst |
Composer - unbork web (#4344)
* reduce side gap + add overflow hidden also remove the animations since they don't appear in prod, and are kinda broken * removed fixed height to fix alt text
Diffstat (limited to 'src/view/shell')
-rw-r--r-- | src/view/shell/Composer.web.tsx | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/src/view/shell/Composer.web.tsx b/src/view/shell/Composer.web.tsx index c9c604f11..64353db23 100644 --- a/src/view/shell/Composer.web.tsx +++ b/src/view/shell/Composer.web.tsx @@ -1,22 +1,20 @@ import React from 'react' import {StyleSheet, View} from 'react-native' -import Animated, {FadeIn, FadeInDown, FadeOut} from 'react-native-reanimated' import {useWebBodyScrollLock} from '#/lib/hooks/useWebBodyScrollLock' -import {usePalette} from 'lib/hooks/usePalette' -import {useWebMediaQueries} from 'lib/hooks/useWebMediaQueries' import {useComposerState} from 'state/shell/composer' import { EmojiPicker, EmojiPickerState, } from 'view/com/composer/text-input/web/EmojiPicker.web' +import {useBreakpoints, useTheme} from '#/alf' import {ComposePost} from '../com/composer/Composer' const BOTTOM_BAR_HEIGHT = 61 export function Composer({}: {winHeight: number}) { - const pal = usePalette('default') - const {isMobile} = useWebMediaQueries() + const t = useTheme() + const {gtMobile} = useBreakpoints() const state = useComposerState() const isActive = !!state useWebBodyScrollLock(isActive) @@ -49,20 +47,13 @@ export function Composer({}: {winHeight: number}) { } return ( - <Animated.View - style={styles.mask} - aria-modal - accessibilityViewIsModal - entering={FadeIn.duration(100)} - exiting={FadeOut}> - <Animated.View - entering={FadeInDown.duration(150)} - exiting={FadeOut} + <View style={styles.mask} aria-modal accessibilityViewIsModal> + <View style={[ styles.container, - isMobile && styles.containerMobile, - pal.view, - pal.border, + !gtMobile && styles.containerMobile, + t.atoms.bg, + t.atoms.border_contrast_medium, ]}> <ComposePost replyTo={state.replyTo} @@ -72,9 +63,9 @@ export function Composer({}: {winHeight: number}) { openPicker={onOpenPicker} text={state.text} /> - </Animated.View> + </View> <EmojiPicker state={pickerState} close={onClosePicker} /> - </Animated.View> + </View> ) } @@ -94,12 +85,12 @@ const styles = StyleSheet.create({ maxWidth: 600, width: '100%', paddingVertical: 0, - paddingHorizontal: 2, borderRadius: 8, marginBottom: 0, borderWidth: 1, // @ts-ignore web only maxHeight: 'calc(100% - (40px * 2))', + overflow: 'hidden', }, containerMobile: { borderRadius: 0, |