toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

More fixes to the post layout (#2408)

Browse source
This commit is contained in:
Elias Nahum 2018-11-30 11:12:07 -03:00
parent d83b129634
commit f332dacedd
No known key found for this signature in database
GPG key ID: E038DB71E0B61702
2 changed files with 56 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/components/message_attachments/message_attachment.js
View file

@ -65,7 +65,7 @@ export default class MessageAttachment extends PureComponent {
}
return (
<View>
<React.Fragment>
<AttachmentPreText
baseTextStyle={baseTextStyle}
blockStyles={blockStyles}
@ -75,9 +75,7 @@ export default class MessageAttachment extends PureComponent {
textStyles={textStyles}
value={attachment.pretext}
/>
<View
style={[style.container, style.border, borderStyle]}
>
<View style={[style.container, style.border, borderStyle]}>
<AttachmentAuthor
icon={attachment.author_icon}
link={attachment.author_link}
@ -125,7 +123,7 @@ export default class MessageAttachment extends PureComponent {
theme={theme}
/>
</View>
</View>
</React.Fragment>
);
}
}

112
app/components/post_body/post_body.js
View file

@ -189,17 +189,15 @@ export default class PostBody extends PureComponent {
}
return (
<View style={style.row}>
<PostAddChannelMember
baseTextStyle={messageStyle}
navigator={navigator}
onPostPress={onPress}
textStyles={textStyles}
postId={postProps.add_channel_member.post_id}
userIds={postProps.add_channel_member.user_ids}
usernames={postProps.add_channel_member.usernames}
/>
</View>
<PostAddChannelMember
baseTextStyle={messageStyle}
navigator={navigator}
onPostPress={onPress}
textStyles={textStyles}
postId={postProps.add_channel_member.post_id}
userIds={postProps.add_channel_member.user_ids}
usernames={postProps.add_channel_member.usernames}
/>
);
};
@ -323,66 +321,57 @@ export default class PostBody extends PureComponent {
let body;
let messageComponent;
if (hasBeenDeleted) {
messageComponent = (
<View style={style.row}>
<FormattedText
style={messageStyle}
id='post_body.deleted'
defaultMessage='(message deleted)'
/>
</View>
body = (
<FormattedText
style={messageStyle}
id='post_body.deleted'
defaultMessage='(message deleted)'
/>
);
body = (<View>{messageComponent}</View>);
} else if (isPostAddChannelMember) {
messageComponent = this.renderAddChannelMember(style, messageStyle, textStyles);
} else if (postType === Posts.POST_TYPES.COMBINED_USER_ACTIVITY) {
const {allUserIds, allUsernames, messageData} = postProps.user_activity;
messageComponent = (
<View style={style.row}>
<CombinedSystemMessage
allUserIds={allUserIds}
allUsernames={allUsernames}
linkStyle={textStyles.link}
messageData={messageData}
navigator={navigator}
textStyles={textStyles}
theme={theme}
/>
</View>
<CombinedSystemMessage
allUserIds={allUserIds}
allUsernames={allUsernames}
linkStyle={textStyles.link}
messageData={messageData}
navigator={navigator}
textStyles={textStyles}
theme={theme}
/>
);
} else if (isEmojiOnly) {
messageComponent = (
<View style={style.row}>
<MarkdownEmoji
baseTextStyle={messageStyle}
isEdited={hasBeenEdited}
shouldRenderJumboEmoji={shouldRenderJumboEmoji}
value={message}
/>
</View>
<MarkdownEmoji
baseTextStyle={messageStyle}
isEdited={hasBeenEdited}
shouldRenderJumboEmoji={shouldRenderJumboEmoji}
value={message}
/>
);
} else if (message.length) {
messageComponent = (
<View style={style.row}>
<View
style={[(isPendingOrFailedPost && style.pendingPost), (isLongPost && {maxHeight})]}
removeClippedSubviews={isLongPost}
>
<Markdown
baseTextStyle={messageStyle}
blockStyles={blockStyles}
imageMetadata={metadata?.images}
isEdited={hasBeenEdited}
isReplyPost={isReplyPost}
isSearchResult={isSearchResult}
navigator={navigator}
onHashtagPress={onHashtagPress}
onPermalinkPress={onPermalinkPress}
onPostPress={onPress}
textStyles={textStyles}
value={message}
/>
</View>
<View
style={[style.messageContainer, (isPendingOrFailedPost && style.pendingPost), (isLongPost && {maxHeight})]}
removeClippedSubviews={isLongPost}
>
<Markdown
baseTextStyle={messageStyle}
blockStyles={blockStyles}
imageMetadata={metadata?.images}
isEdited={hasBeenEdited}
isReplyPost={isReplyPost}
isSearchResult={isSearchResult}
navigator={navigator}
onHashtagPress={onHashtagPress}
onPermalinkPress={onPermalinkPress}
onPostPress={onPress}
textStyles={textStyles}
value={message}
/>
</View>
);
}
@ -437,6 +426,11 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
messageBody: {
paddingBottom: 2,
paddingTop: 2,
width: '100%',
},
messageContainer: {
overflow: 'hidden',
width: '100%',
},
retry: {
justifyContent: 'center',