Skip to content

UserItem: Clean up onPress logic a bit #4429

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
chrisbobbe merged 3 commits into from
Jan 22, 2021
Merged

UserItem: Clean up onPress logic a bit #4429

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
3aecd87
UserItem [nfc]: Drop a spurious "is email empty" condition.
gnprice Jan 22, 2021
90e864a
UserItem [nfc]: Stop requiring onPress prop.
gnprice Jan 22, 2021
e41ce88
UserItem: Don't pass a do-nothing onPress down to the touchables.
gnprice Jan 22, 2021
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
2 changes: 1 addition & 1 deletion src/sharing/ShareToPm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ class ShareToPm extends React.Component<Props, State> {
}
const preview = [];
selectedRecipients.forEach(userId => {
preview.push(<UserItem userId={userId} onPress={() => {}} key={userId} />);
preview.push(<UserItem userId={userId} key={userId} />);
});
return preview;
};
Expand Down
17 changes: 9 additions & 8 deletions src/users/UserItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ type Props<UserT> = $ReadOnly<{|
isSelected: boolean,
showEmail: boolean,
unreadCount?: number,
onPress: UserT => void,
onPress?: UserT => void,
|}>;

/**
Expand All @@ -56,21 +56,22 @@ export class UserItemRaw<

handlePress = () => {
const { user, onPress } = this.props;
// TODO cut this `user.email` condition -- it should never trigger, and
// looks like a fudge for the possibility of data coming from
// the late NULL_USER
if (user.email && onPress) {
if (onPress) {
onPress(user);
}
};

render() {
const { user, isSelected, unreadCount, showEmail } = this.props;
const { user, isSelected, onPress, unreadCount, showEmail } = this.props;

return (
<Touchable onPress={this.handlePress}>
<Touchable onPress={onPress && this.handlePress}>
<View style={[styles.listItem, isSelected && componentStyles.selectedRow]}>
<UserAvatarWithPresenceById size={48} userId={user.user_id} onPress={this.handlePress} />
<UserAvatarWithPresenceById
size={48}
userId={user.user_id}
onPress={onPress && this.handlePress}
/>
<View style={componentStyles.textWrapper}>
<RawLabel
style={[componentStyles.text, isSelected && componentStyles.selectedText]}
Expand Down