[Video] Tweak order of elements in composer (#5213)

zio/stable
Hailey 2024-09-07 13:29:27 -07:00 committed by GitHub
parent f1877e44f2
commit 9b8d62ca25
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 32 additions and 32 deletions

View File

@ -200,6 +200,7 @@ export const ComposePost = observer(function ComposePost({
} }
}, },
}) })
const hasVideo = Boolean(videoUploadState.asset || videoUploadState.video)
const [publishOnUpload, setPublishOnUpload] = useState(false) const [publishOnUpload, setPublishOnUpload] = useState(false)
@ -730,22 +731,10 @@ export const ComposePost = observer(function ComposePost({
/> />
</View> </View>
)} )}
<View style={[a.mt_md]}>
{quote ? (
<View style={[s.mt5, s.mb2, isWeb && s.mb10]}>
<View style={{pointerEvents: 'none'}}>
<QuoteEmbed quote={quote} />
</View>
{quote.uri !== initQuote?.uri && (
<QuoteX onRemove={() => setQuote(undefined)} />
)}
</View>
) : null}
<LayoutAnimationConfig skipExiting> <LayoutAnimationConfig skipExiting>
{(videoUploadState.asset || videoUploadState.video) && ( {hasVideo && (
<Animated.View <Animated.View
style={[a.w_full, a.mt_xs]} style={[a.w_full, a.mt_lg]}
entering={native(ZoomIn)} entering={native(ZoomIn)}
exiting={native(ZoomOut)}> exiting={native(ZoomOut)}>
{videoUploadState.asset && {videoUploadState.asset &&
@ -772,6 +761,17 @@ export const ComposePost = observer(function ComposePost({
</Animated.View> </Animated.View>
)} )}
</LayoutAnimationConfig> </LayoutAnimationConfig>
<View style={!hasVideo ? [a.mt_md] : []}>
{quote ? (
<View style={[s.mt5, s.mb2, isWeb && s.mb10]}>
<View style={{pointerEvents: 'none'}}>
<QuoteEmbed quote={quote} />
</View>
{quote.uri !== initQuote?.uri && (
<QuoteX onRemove={() => setQuote(undefined)} />
)}
</View>
) : null}
</View> </View>
</Animated.ScrollView> </Animated.ScrollView>
<SuggestedLanguage text={richtext.text} /> <SuggestedLanguage text={richtext.text} />