diff options
Diffstat (limited to 'src/view/com/composer')
| -rw-r--r-- | src/view/com/composer/Composer.tsx | 5 | ||||
| -rw-r--r-- | src/view/com/composer/text-input/TextInput.tsx | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/view/com/composer/Composer.tsx b/src/view/com/composer/Composer.tsx index 492b9074f..71714fdde 100644 --- a/src/view/com/composer/Composer.tsx +++ b/src/view/com/composer/Composer.tsx @@ -699,6 +699,7 @@ export const ComposePost = ({ dispatch={composerDispatch} textInput={post.id === activePost.id ? textInput : null} isFirstPost={index === 0} + isLastPost={index === thread.posts.length - 1} isPartOfThread={thread.posts.length > 1} isReply={index > 0 || !!replyTo} isActive={post.id === activePost.id} @@ -738,6 +739,7 @@ let ComposerPost = React.memo(function ComposerPost({ isActive, isReply, isFirstPost, + isLastPost, isPartOfThread, canRemovePost, canRemoveQuote, @@ -752,6 +754,7 @@ let ComposerPost = React.memo(function ComposerPost({ isActive: boolean isReply: boolean isFirstPost: boolean + isLastPost: boolean isPartOfThread: boolean canRemovePost: boolean canRemoveQuote: boolean @@ -830,6 +833,8 @@ let ComposerPost = React.memo(function ComposerPost({ <View style={[ a.mx_lg, + a.mb_sm, + !isActive && isLastPost && a.mb_lg, !isActive && styles.inactivePost, isTextOnly && isNative && a.flex_grow, ]}> diff --git a/src/view/com/composer/text-input/TextInput.tsx b/src/view/com/composer/text-input/TextInput.tsx index e9c5d86b9..ea92d0b91 100644 --- a/src/view/com/composer/text-input/TextInput.tsx +++ b/src/view/com/composer/text-input/TextInput.tsx @@ -96,10 +96,11 @@ export const TextInput = forwardRef(function TextInputImpl( newRt.detectFacetsWithoutResolution() setRichText(newRt) - const prefix = getMentionAt( - newText, - textInputSelection.current?.start || 0, - ) + // NOTE: BinaryFiddler + // onChangeText happens before onSelectionChange, cursorPos is out of bound if the user deletes characters, + const cursorPos = textInputSelection.current?.start ?? 0 + const prefix = getMentionAt(newText, Math.min(cursorPos, newText.length)) + if (prefix) { setAutocompletePrefix(prefix.value) } else if (autocompletePrefix) { |