diff options
author | Samuel Newman <mozzius@protonmail.com> | 2025-02-25 08:07:45 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-02-25 08:07:45 -0800 |
commit | e40656128d2fad41762ec1e7f022bc10fcdd25fc (patch) | |
tree | 7eb120c585a06396fb455672799519270d5ee113 /src/view/com/composer/Composer.tsx | |
parent | d76cd88d917d39db4d5d66f4a0852502034c448a (diff) | |
download | voidsky-e40656128d2fad41762ec1e7f022bc10fcdd25fc.tar.zst |
* 6861: Use available space to make focus on Composer TextInput easier * Undo web * bluesky-social#6861: Adjust focus area for native platforms taking Embeds into consideration * use atoms * remove empty div * remove debug atom, whoopsie --------- Co-authored-by: GrizliK1988 <dgrachikov@gmail.com> Co-authored-by: Dan Abramov <dan.abramov@gmail.com>
Diffstat (limited to 'src/view/com/composer/Composer.tsx')
-rw-r--r-- | src/view/com/composer/Composer.tsx | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx index e8fe1a7ce..e80b80449 100644 --- a/src/view/com/composer/Composer.tsx +++ b/src/view/com/composer/Composer.tsx @@ -657,6 +657,7 @@ export const ComposePost = ({ ref={scrollViewRef} layout={native(LinearTransition)} onScroll={scrollHandler} + contentContainerStyle={a.flex_grow} style={a.flex_1} keyboardShouldPersistTaps="always" onContentSizeChange={onScrollViewContentSizeChange} @@ -795,19 +796,22 @@ let ComposerPost = React.memo(function ComposerPost({ ) return ( - <View style={[styles.post, !isActive && styles.inactivePost]}> - <View - style={[ - styles.textInputLayout, - isNative && styles.textInputLayoutMobile, - ]}> + <View + style={[ + a.mx_lg, + !isActive && styles.inactivePost, + isTextOnly && isNative && a.flex_grow, + ]}> + <View style={[a.flex_row, isNative && a.flex_1]}> <UserAvatar avatar={currentProfile?.avatar} size={50} type={currentProfile?.associated?.labeler ? 'labeler' : 'user'} + style={[a.mt_xs]} /> <TextInput ref={textInput} + style={[a.pt_xs]} richtext={richtext} placeholder={selectTextInputPlaceholder} autoFocus @@ -1077,9 +1081,8 @@ function ComposerEmbeds({ </Animated.View> )} </LayoutAnimationConfig> - - <View style={!video ? [a.mt_md] : []}> - {embed.quote?.uri ? ( + {embed.quote?.uri ? ( + <View style={!video ? [a.mt_md] : []}> <View style={[s.mt5, s.mb2, isWeb && s.mb10]}> <View style={{pointerEvents: 'none'}}> <LazyQuoteEmbed uri={embed.quote.uri} /> @@ -1088,8 +1091,8 @@ function ComposerEmbeds({ <QuoteX onRemove={() => dispatch({type: 'embed_remove_quote'})} /> )} </View> - ) : null} - </View> + </View> + ) : null} </> ) } @@ -1469,7 +1472,6 @@ const styles = StyleSheet.create({ marginLeft: 12, }, stickyFooterWeb: { - // @ts-ignore web-only position: 'sticky', bottom: 0, }, @@ -1503,19 +1505,9 @@ const styles = StyleSheet.create({ justifyContent: 'center', marginRight: 5, }, - post: { - marginHorizontal: 16, - }, inactivePost: { opacity: 0.5, }, - textInputLayout: { - flexDirection: 'row', - paddingTop: 4, - }, - textInputLayoutMobile: { - flex: 1, - }, addExtLinkBtn: { borderWidth: 1, borderRadius: 24, |