Skip to content
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

Added Hover effect on Sidebar rows #1463

Merged
merged 3 commits into from
Feb 12, 2021
Merged

Added Hover effect on Sidebar rows #1463

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
4335731
new: added Hover effect on Sidebar links
parasharrajat Feb 11, 2021
3e371b6
fix: cleanup
parasharrajat Feb 12, 2021
334de8d
fix: indentation
parasharrajat Feb 12, 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
5 changes: 4 additions & 1 deletion src/components/Hoverable/HoverablePropTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import PropTypes from 'prop-types';

const propTypes = {
// Children to wrap with Hoverable.
children: PropTypes.node.isRequired,
children: PropTypes.oneOfType([
PropTypes.node,
PropTypes.func,
]).isRequired,

// Function that executes when the mouse moves over the children.
onHoverIn: PropTypes.func,
Expand Down
6 changes: 6 additions & 0 deletions src/components/OptionsList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ import OptionRow from '../pages/home/sidebar/OptionRow';
import optionPropTypes from './optionPropTypes';

const propTypes = {
// Style for hovered state
// eslint-disable-next-line react/forbid-prop-types
optionHoveredStyle: PropTypes.object,

// Extra styles for the section list container
contentContainerStyles: PropTypes.arrayOf(PropTypes.object),

Expand Down Expand Up @@ -63,6 +67,7 @@ const propTypes = {
};

const defaultProps = {
optionHoveredStyle: undefined,
contentContainerStyles: [],
sections: [],
focusedIndex: 0,
Expand Down Expand Up @@ -145,6 +150,7 @@ class OptionsList extends Component {
return (
<OptionRow
option={item}
hoverStyle={this.props.optionHoveredStyle}
optionIsFocused={!this.props.disableFocusOptions
&& this.props.focusedIndex === (index + section.indexOffset)}
onSelectRow={this.props.onSelectRow}
Expand Down
1 change: 1 addition & 0 deletions src/components/OptionsSelector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ class OptionsSelector extends Component {
</View>
<OptionsList
ref={el => this.list = el}
optionHoveredStyle={styles.hoveredComponentBG}
onSelectRow={this.props.onSelectRow}
sections={this.props.sections}
focusedIndex={this.state.focusedIndex}
Expand Down
130 changes: 71 additions & 59 deletions src/pages/home/sidebar/OptionRow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,13 @@ import Icon from '../../../components/Icon';
import {Pencil, PinCircle, Checkmark} from '../../../components/Icon/Expensicons';
import MultipleAvatars from '../../../components/MultipleAvatars';
import themeColors from '../../../styles/themes/default';
import Hoverable from '../../../components/Hoverable';

const propTypes = {
// Style for hovered state
// eslint-disable-next-line react/forbid-prop-types
hoverStyle: PropTypes.object,

// Option to allow the user to choose from can be type 'report' or 'user'
option: optionPropTypes.isRequired,

Expand All @@ -38,13 +43,15 @@ const propTypes = {
};

const defaultProps = {
hoverStyle: styles.sidebarLinkHover,
hideAdditionalOptionStates: false,
showSelectedState: false,
isSelected: false,
forceTextUnreadStyle: false,
};

const OptionRow = ({
hoverStyle,
option,
optionIsFocused,
onSelectRow,
Expand All @@ -59,77 +66,82 @@ const OptionRow = ({
const textUnreadStyle = (option.isUnread || forceTextUnreadStyle)
? [textStyle, styles.sidebarLinkTextUnread] : [textStyle];
return (
<View
style={[
styles.flexRow,
styles.alignItemsCenter,
styles.justifyContentBetween,
styles.sidebarLink,
styles.sidebarLinkInner,
optionIsFocused ? styles.sidebarLinkActive : null,
]}
>
<TouchableOpacity
onPress={() => onSelectRow(option)}
activeOpacity={0.8}
style={StyleSheet.flatten([
styles.chatLinkRowPressable,
styles.flexGrow1,
styles.optionItemAvatarNameWrapper,
])}
>
<Hoverable>
{hovered => (
<View
style={[
styles.flexRow,
styles.alignItemsCenter,
styles.justifyContentBetween,
styles.sidebarLink,
styles.sidebarLinkInner,
optionIsFocused ? styles.sidebarLinkActive : null,
hovered && !optionIsFocused ? hoverStyle : null,
]}
>
{
!_.isEmpty(option.icons)
&& (
<MultipleAvatars
avatarImageURLs={option.icons}
optionIsFocused={optionIsFocused}
/>
)
}
<View style={[styles.flex1]}>
<Text style={[styles.optionDisplayName, textUnreadStyle]} numberOfLines={1}>
{option.text}
</Text>
{option.alternateText ? (
<Text
style={[textStyle, styles.optionAlternateText, styles.mt1]}
numberOfLines={1}
>
{option.alternateText}
</Text>
) : null}
</View>
{showSelectedState && (
<View style={[styles.selectCircle]}>
{isSelected && (
<Icon src={Checkmark} fill={themeColors.iconSuccessFill} />
<TouchableOpacity
onPress={() => onSelectRow(option)}
activeOpacity={0.8}
style={StyleSheet.flatten([
styles.chatLinkRowPressable,
styles.flexGrow1,
styles.optionItemAvatarNameWrapper,
])}
>
<View
style={[
styles.flexRow,
styles.alignItemsCenter,
]}
>
{
!_.isEmpty(option.icons)
&& (
<MultipleAvatars
avatarImageURLs={option.icons}
optionIsFocused={optionIsFocused}
/>
)
}
<View style={[styles.flex1]}>
<Text style={[styles.optionDisplayName, textUnreadStyle]} numberOfLines={1}>
{option.text}
</Text>
{option.alternateText ? (
<Text
style={[textStyle, styles.optionAlternateText, styles.mt1]}
numberOfLines={1}
>
{option.alternateText}
</Text>
) : null}
</View>
{showSelectedState && (
<View style={[styles.selectCircle]}>
{isSelected && (
<Icon src={Checkmark} fill={themeColors.iconSuccessFill} />
)}
</View>
)}
</View>
)}
</View>
</TouchableOpacity>
{!hideAdditionalOptionStates && (
<View style={styles.flexRow}>
{option.hasDraftComment && (
<View style={styles.ml2}>
<Icon src={Pencil} />
</View>
)}
{option.isPinned && (
<View style={styles.ml2}>
<Icon src={PinCircle} />
</TouchableOpacity>
{!hideAdditionalOptionStates && (
<View style={styles.flexRow}>
{option.hasDraftComment && (
<View style={styles.ml2}>
<Icon src={Pencil} />
</View>
)}
{option.isPinned && (
<View style={styles.ml2}>
<Icon src={PinCircle} />
</View>
)}
</View>
)}
</View>
)}
</View>
</Hoverable>
);
};

Expand Down
8 changes: 8 additions & 0 deletions src/styles/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@ const styles = {
color: themeColors.textReversed,
},

hoveredComponentBG: {
backgroundColor: themeColors.componentBGHover,
},

touchableButtonImage: {
alignItems: 'center',
height: variables.componentSizeNormal,
Expand Down Expand Up @@ -457,6 +461,10 @@ const styles = {
overflow: 'hidden',
},

sidebarLinkHover: {
backgroundColor: themeColors.sidebarHover,
},

sidebarLinkActive: {
backgroundColor: themeColors.border,
textDecorationLine: 'none',
Expand Down
2 changes: 2 additions & 0 deletions src/styles/themes/default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ export default {
shadow: colors.black,
link: colors.blue,
componentBG: colors.white,
componentBGHover: colors.gray1,
appBG: colors.white,
heading: colors.charcoal,
sidebar: colors.gray1,
sidebarHover: colors.white,
border: colors.gray2,
borderFocus: colors.blue,
icon: colors.gray3,
Expand Down