Skip to content

refactor: use styled-components in comment-list-item #723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
machour merged 3 commits into from
Feb 13, 2018
Merged

refactor: use styled-components in comment-list-item #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
163cc95
refactor(comment-list-item.component): use styled-components
MrLoh Oct 22, 2017
e704e55
fix(style): Keep unitless
chinesedfan Feb 12, 2018
3382fdc
fix(lint): fix stylelint
chinesedfan Feb 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .stylelintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"block-no-empty": null,
"declaration-colon-newline-after": null,
"declaration-property-value-whitelist": {
"margin": ["/^(0|[+-]?(\\d*\\.)?\\d+px)( (0|[+-]?(\\d*\\.)?\\d+px))?$/"],
"padding": ["/^(0|[+-]?(\\d*\\.)?\\d+px)( (0|[+-]?(\\d*\\.)?\\d+px))?$/"],
"margin": ["/^(0|[+-]?(\\d*\\.)?\\d+px)( (0|[+-]?(\\d*\\.)?\\d+px)){0,3}$/"],
"padding": ["/^(0|[+-]?(\\d*\\.)?\\d+px)( (0|[+-]?(\\d*\\.)?\\d+px)){0,3}$/"],
},
"value-list-max-empty-lines": null
},
Expand Down
190 changes: 91 additions & 99 deletions src/components/comment-list-item.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,79 +3,79 @@

import React, { Component } from 'react';
import { connect } from 'react-redux';
import { StyleSheet, View, Text, TouchableOpacity, Image } from 'react-native';
import styled from 'styled-components';
import { GithubHtmlView } from 'components';
import { Icon } from 'react-native-elements';
import ActionSheet from 'react-native-actionsheet';

import { translate, relativeTimeToNow } from 'utils';
import { colors, fonts, normalize } from 'config';

const styles = StyleSheet.create({
container: {
paddingRight: 10,
paddingTop: 10,
backgroundColor: 'transparent',
},
header: {
flexDirection: 'row',
marginLeft: 10,
alignItems: 'center',
},
avatarContainer: {
backgroundColor: colors.greyLight,
borderRadius: 17,
width: 34,
height: 34,
},
avatar: {
width: 34,
height: 34,
borderRadius: 17,
},
titleSubtitleContainer: {
justifyContent: 'center',
flex: 1,
marginLeft: 10,
},
dateContainer: {
flex: 0.15,
alignItems: 'flex-end',
justifyContent: 'center',
},
linkDescription: {
...fonts.fontPrimaryBold,
fontSize: normalize(13),
color: colors.primaryDark,
},
date: {
color: colors.greyDark,
},
commentContainer: {
paddingTop: 5,
marginLeft: 54,
borderBottomColor: colors.greyLight,
borderBottomWidth: 1,
},
commentBottomPadding: {
paddingBottom: 15,
},
commentText: {
fontSize: normalize(12),
color: colors.primaryDark,
},
commentTextNone: {
...fonts.fontPrimary,
color: colors.primaryDark,
fontStyle: 'italic',
},
actionButtonIconContainer: {
paddingTop: 5,
paddingBottom: 10,
alignItems: 'flex-end',
justifyContent: 'center',
},
});
const Container = styled.View`
padding: 10px 10px 0 0;
Copy link
Copy Markdown
Member

@machour machour Feb 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to cause a Travis build failure, could you have a look?

Copy link
Copy Markdown
Member Author

@chinesedfan chinesedfan Feb 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@machour It is due to my stylelint regular expression. Fixed now.

background-color: transparent;
`;

const Header = styled.View`
flex-direction: row;
margin-left: 10;
align-items: center;
`;

const AvatarContainer = styled.TouchableOpacity`
background-color: ${colors.greyLight};
border-radius: 17;
width: 34;
height: 34;
`;

const Avatar = styled.Image`
border-radius: 17;
width: 34;
height: 34;
`;

const TitleSubtitleContainer = styled.View`
justify-content: center;
flex: 1;
margin-left: 10;
`;

const DateContainer = styled.View`
flex: 0.15;
align-items: flex-end;
justify-content: center;
`;

const LinkDescription = styled.Text`
${{ ...fonts.fontPrimaryBold }};
font-size: ${normalize(13)};
color: ${colors.primaryDark};
`;

const DateLabel = styled.Text`
color: ${colors.greyDark};
`;

const CommentContainer = styled.View`
padding-top: 5;
margin-left: 54;
border-bottom-color: ${colors.greyLight};
border-bottom-width: 1;
padding-bottom: ${props => (props.bottomPadding ? 15 : 0)};
`;

const CommentTextNone = styled.Text`
${{ ...fonts.fontPrimary }};
color: ${colors.primaryDark};
font-style: italic;
`;

const ActionButtonIconContainer = styled.View`
padding: 5px 0 10px;
Copy link
Copy Markdown
Member

@machour machour Feb 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And this too

align-items: flex-end;
justify-content: center;
`;

const mapStateToProps = state => ({
authUser: state.auth.user,
Expand Down Expand Up @@ -131,11 +131,10 @@ class CommentListItemComponent extends Component {
comment.user && authUser.login === comment.user.login;

return (
<View style={styles.container}>
<View style={styles.header}>
<Container>
<Header>
{comment.user && (
<TouchableOpacity
style={styles.avatarContainer}
<AvatarContainer
onPress={() =>
navigation.navigate(
authUser.login === comment.user.login
Expand All @@ -144,21 +143,20 @@ class CommentListItemComponent extends Component {
{
user: comment.user,
}
)}
)
}
>
<Image
style={styles.avatar}
<Avatar
source={{
uri: comment.user.avatar_url,
}}
/>
</TouchableOpacity>
</AvatarContainer>
)}

{comment.user && (
<View style={styles.titleSubtitleContainer}>
<Text
style={styles.linkDescription}
<TitleSubtitleContainer>
<LinkDescription
onPress={() =>
navigation.navigate(
authUser.login === comment.user.login
Expand All @@ -167,49 +165,43 @@ class CommentListItemComponent extends Component {
{
user: comment.user,
}
)}
)
}
>
{comment.user.login}
</Text>
</View>
</LinkDescription>
</TitleSubtitleContainer>
)}

<View style={styles.dateContainer}>
<Text style={styles.date}>
{relativeTimeToNow(comment.created_at)}
</Text>
</View>
</View>

<View
style={[
styles.commentContainer,
!isActionMenuEnabled && styles.commentBottomPadding,
]}
>
<DateContainer>
<DateLabel>{relativeTimeToNow(comment.created_at)}</DateLabel>
</DateContainer>
</Header>

<CommentContainer bottomPadding={!isActionMenuEnabled}>
{commentPresent ? (
<GithubHtmlView
source={comment.body_html}
onLinkPress={onLinkPress}
/>
) : (
<Text style={styles.commentTextNone}>
<CommentTextNone>
{translate('issue.main.noDescription', locale)}
</Text>
</CommentTextNone>
)}

{isActionMenuEnabled && (
<View style={styles.actionButtonIconContainer}>
<ActionButtonIconContainer>
<Icon
color={colors.grey}
size={20}
name={'ellipsis-h'}
type={'font-awesome'}
onPress={this.showMenu}
/>
</View>
</ActionButtonIconContainer>
)}
</View>
</CommentContainer>

<ActionSheet
ref={o => {
Expand All @@ -223,7 +215,7 @@ class CommentListItemComponent extends Component {
cancelButtonIndex={this.commentActionSheetOptions(comment).length}
onPress={this.handlePress}
/>
</View>
</Container>
);
}
}
Expand Down