Merge pull request #1948 from Expensify/Rory-MoveContextMenuUp

Move ReportActionContextMenu up for grouped ReportActionItems
Expensify · Mar 19, 2021 · 2c9f366 · 2c9f366
2 parents 01a0447 + 1017f44
commit 2c9f366
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
@@ -6,8 +6,10 @@ import {withOnyx} from 'react-native-onyx';
 import CONST from '../../../CONST';
 import ONYXKEYS from '../../../ONYXKEYS';
 import ReportActionPropTypes from './ReportActionPropTypes';
-import styles from '../../../styles/styles';
-import getReportActionItemStyles from '../../../styles/getReportActionItemStyles';
+import {
+    getReportActionItemStyle,
+    getMiniReportActionContextMenuWrapperStyle,
+} from '../../../styles/getReportActionItemStyles';
 import PressableWithSecondaryInteraction from '../../../components/PressableWithSecondaryInteraction';
 import Hoverable from '../../../components/Hoverable';
 import PopoverWithMeasuredContent from '../../../components/PopoverWithMeasuredContent';
@@ -107,12 +109,12 @@ class ReportActionItem extends Component {
                 <Hoverable>
                     {hovered => (
                         <View>
-                            <View style={getReportActionItemStyles(hovered)}>
+                            <View style={getReportActionItemStyle(hovered)}>
                                 {!this.props.displayAsGroup
                                     ? <ReportActionItemSingle action={this.props.action} />
                                     : <ReportActionItemGrouped action={this.props.action} />}
                             </View>
-                            <View style={styles.miniReportActionContextMenuWrapperStyle}>
+                            <View style={getMiniReportActionContextMenuWrapperStyle(this.props.displayAsGroup)}>
                                 <ReportActionContextMenu
                                     reportID={this.props.reportID}
                                     reportActionID={this.props.action.sequenceNumber}

diff --git a/src/styles/getReportActionItemStyles.js b/src/styles/getReportActionItemStyles.js
@@ -1,16 +1,31 @@
 import themeColors from './themes/default';
+import positioning from './utilities/positioning';
 
 /**
  * Generate the styles for the ReportActionItem wrapper view.
  *
  * @param {Boolean} [isHovered]
  * @returns {Object}
  */
-export default function (isHovered = false) {
+export function getReportActionItemStyle(isHovered = false) {
     return {
         display: 'flex',
         justifyContent: 'space-between',
         backgroundColor: isHovered ? themeColors.hoverComponentBG : themeColors.componentBG,
         cursor: 'default',
     };
 }
+
+/**
+ * Generate the wrapper styles for the mini ReportActionContextMenu.
+ *
+ * @param {Boolean} isReportActionItemGrouped
+ * @returns {Object}
+ */
+export function getMiniReportActionContextMenuWrapperStyle(isReportActionItemGrouped) {
+    return {
+        ...(isReportActionItemGrouped ? positioning.tn8 : positioning.tn4),
+        ...positioning.r4,
+        position: 'absolute',
+    };
+}
diff --git a/src/styles/styles.js b/src/styles/styles.js
@@ -10,7 +10,6 @@ import sizing from './utilities/sizing';
 import flex from './utilities/flex';
 import display from './utilities/display';
 import overflow from './utilities/overflow';
-import positioning from './utilities/positioning';
 import whiteSpace from './utilities/whiteSpace';
 import wordBreak from './utilities/wordBreak';
 import textInputAlignSelf from './utilities/textInputAlignSelf';
@@ -964,12 +963,6 @@ const styles = {
         borderColor: colors.transparent,
     },
 
-    miniReportActionContextMenuWrapperStyle: {
-        ...positioning.tn4,
-        ...positioning.r4,
-        position: 'absolute',
-    },
-
     reportActionContextMenuText: {
         color: themeColors.heading,
         fontFamily: fontFamily.GTA_BOLD,

diff --git a/src/styles/utilities/positioning.js b/src/styles/utilities/positioning.js
@@ -6,6 +6,9 @@ export default {
     tn4: {
         top: -16,
     },
+    tn8: {
+        top: -32,
+    },
     r4: {
         right: 16,
     },