fix: cleanup

Expensify · Feb 12, 2021 · 3e371b6 · 3e371b6
1 parent 4335731
commit 3e371b6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/src/components/OptionsList.js b/src/components/OptionsList.js
@@ -8,7 +8,8 @@ import optionPropTypes from './optionPropTypes';
 
 const propTypes = {
     // Style for hovered state
-    optionHoveredStyle: PropTypes.arrayOf(PropTypes.object),
+    // eslint-disable-next-line react/forbid-prop-types
+    optionHoveredStyle: PropTypes.object,
 
     // Extra styles for the section list container
     contentContainerStyles: PropTypes.arrayOf(PropTypes.object),
@@ -66,7 +67,7 @@ const propTypes = {
 };
 
 const defaultProps = {
-    optionHoveredStyle: [],
+    optionHoveredStyle: undefined,
     contentContainerStyles: [],
     sections: [],
     focusedIndex: 0,

diff --git a/src/components/OptionsSelector.js b/src/components/OptionsSelector.js
@@ -184,7 +184,7 @@ class OptionsSelector extends Component {
                 </View>
                 <OptionsList
                     ref={el => this.list = el}
-                    optionHoveredStyle={[styles.modalLinkHover]}
+                    optionHoveredStyle={styles.hoveredComponentBG}
                     onSelectRow={this.props.onSelectRow}
                     sections={this.props.sections}
                     focusedIndex={this.state.focusedIndex}

diff --git a/src/pages/home/sidebar/OptionRow.js b/src/pages/home/sidebar/OptionRow.js
@@ -17,7 +17,8 @@ import Hoverable from '../../../components/Hoverable';
 
 const propTypes = {
     // Style for hovered state
-    hoverStyle: PropTypes.arrayOf(PropTypes.object),
+    // 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,
@@ -42,7 +43,7 @@ const propTypes = {
 };
 
 const defaultProps = {
-    hoverStyle: [],
+    hoverStyle: styles.sidebarLinkHover,
     hideAdditionalOptionStates: false,
     showSelectedState: false,
     isSelected: false,
@@ -64,7 +65,6 @@ const OptionRow = ({
         : styles.sidebarLinkText;
     const textUnreadStyle = (option.isUnread || forceTextUnreadStyle)
         ? [textStyle, styles.sidebarLinkTextUnread] : [textStyle];
-    const hoveredStyle = hoverStyle ? [styles.sidebarLinkHover, ...hoverStyle] : [styles.sidebarLinkHover];
     return (
         <Hoverable>
             {hovered => (
@@ -76,7 +76,7 @@ const OptionRow = ({
                         styles.sidebarLink,
                         styles.sidebarLinkInner,
                         optionIsFocused ? styles.sidebarLinkActive : null,
-                        hovered && !optionIsFocused ? hoveredStyle : null,
+                        hovered && !optionIsFocused ? hoverStyle : null,
                     ]}
                 >
                     <TouchableOpacity

diff --git a/src/styles/styles.js b/src/styles/styles.js
@@ -157,6 +157,10 @@ const styles = {
         color: themeColors.textReversed,
     },
 
+    hoveredComponentBG: {
+        backgroundColor: themeColors.componentBGHover,
+    },
+
     touchableButtonImage: {
         alignItems: 'center',
         height: variables.componentSizeNormal,
@@ -778,10 +782,6 @@ const styles = {
         flex: 1,
     },
 
-    modalLinkHover: {
-        backgroundColor: themeColors.componentBGHover,
-    },
-
     borderBottom: {
         borderBottomWidth: 1,
         borderColor: themeColors.border,