From e86b22b98d6ec0d21b63c6ae49f66b6dee7d07af Mon Sep 17 00:00:00 2001 From: Jayesh Mangwani Date: Tue, 25 Apr 2023 01:13:26 +0530 Subject: [PATCH 1/5] feat: added vertical space to video chat button --- .../BaseVideoChatButtonAndMenu.js | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/components/VideoChatButtonAndMenu/BaseVideoChatButtonAndMenu.js b/src/components/VideoChatButtonAndMenu/BaseVideoChatButtonAndMenu.js index 64119c475de7..3d56924125e9 100755 --- a/src/components/VideoChatButtonAndMenu/BaseVideoChatButtonAndMenu.js +++ b/src/components/VideoChatButtonAndMenu/BaseVideoChatButtonAndMenu.js @@ -131,15 +131,17 @@ class BaseVideoChatButtonAndMenu extends Component { top: this.state.videoChatIconPosition.y + 40, }} > - {_.map(this.menuItemData, ({icon, text, onPress}) => ( - - ))} + + {_.map(this.menuItemData, ({icon, text, onPress}) => ( + + ))} + ); From 0705b0c1083885226746274dd87c852d9dc05bcb Mon Sep 17 00:00:00 2001 From: Jayesh Mangwani Date: Tue, 25 Apr 2023 01:14:53 +0530 Subject: [PATCH 2/5] feat: added vertical space to Action Context Menu --- .../home/report/ContextMenu/BaseReportActionContextMenu.js | 2 +- src/styles/getReportActionContextMenuStyles.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index e562a417d423..1da859e123c0 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -45,7 +45,7 @@ const defaultProps = { class BaseReportActionContextMenu extends React.Component { constructor(props) { super(props); - this.wrapperStyle = getReportActionContextMenuStyles(this.props.isMini); + this.wrapperStyle = getReportActionContextMenuStyles(this.props.isMini, this.props.isSmallScreenWidth); this.state = { shouldKeepOpen: false, diff --git a/src/styles/getReportActionContextMenuStyles.js b/src/styles/getReportActionContextMenuStyles.js index 496b0762aca7..c9916acfafab 100644 --- a/src/styles/getReportActionContextMenuStyles.js +++ b/src/styles/getReportActionContextMenuStyles.js @@ -25,10 +25,11 @@ const bigWrapperStyle = [ * Generate the wrapper styles for the ReportActionContextMenu. * * @param {Boolean} isMini + * @param {Boolean} isSmallScreenWidth * @returns {Array} */ -function getReportActionContextMenuStyles(isMini) { - return isMini ? miniWrapperStyle : bigWrapperStyle; +function getReportActionContextMenuStyles(isMini, isSmallScreenWidth) { + return isMini ? miniWrapperStyle : [...bigWrapperStyle, !isSmallScreenWidth && styles.pv3]; } export default getReportActionContextMenuStyles; From a20dc3d851c4fb7acedfd4cd99b74f262e8cdc90 Mon Sep 17 00:00:00 2001 From: Jayesh Mangwani Date: Tue, 25 Apr 2023 10:42:49 +0530 Subject: [PATCH 3/5] fix: added comments to menu style, removed boolean styles --- src/styles/getReportActionContextMenuStyles.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/styles/getReportActionContextMenuStyles.js b/src/styles/getReportActionContextMenuStyles.js index c9916acfafab..5577e2d48756 100644 --- a/src/styles/getReportActionContextMenuStyles.js +++ b/src/styles/getReportActionContextMenuStyles.js @@ -29,7 +29,9 @@ const bigWrapperStyle = [ * @returns {Array} */ function getReportActionContextMenuStyles(isMini, isSmallScreenWidth) { - return isMini ? miniWrapperStyle : [...bigWrapperStyle, !isSmallScreenWidth && styles.pv3]; + // For the bottom_docked modal type, we have defined default paddings in getBaseModalStyles file, so there is no need to add vertical padding for small screen width + // When popover modal type, then only Need to pass vertical padding. + return isMini ? miniWrapperStyle : [...bigWrapperStyle, isSmallScreenWidth ? {} : styles.pv3]; } export default getReportActionContextMenuStyles; From 839673ad22fdfea3a7b310dbb4d0fb1d2c36705c Mon Sep 17 00:00:00 2001 From: Jayesh Mangwani Date: Tue, 25 Apr 2023 13:01:35 +0530 Subject: [PATCH 4/5] fix: replaced ternary with if condition --- src/styles/getReportActionContextMenuStyles.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/styles/getReportActionContextMenuStyles.js b/src/styles/getReportActionContextMenuStyles.js index 5577e2d48756..a68c01667483 100644 --- a/src/styles/getReportActionContextMenuStyles.js +++ b/src/styles/getReportActionContextMenuStyles.js @@ -29,9 +29,12 @@ const bigWrapperStyle = [ * @returns {Array} */ function getReportActionContextMenuStyles(isMini, isSmallScreenWidth) { - // For the bottom_docked modal type, we have defined default paddings in getBaseModalStyles file, so there is no need to add vertical padding for small screen width - // When popover modal type, then only Need to pass vertical padding. - return isMini ? miniWrapperStyle : [...bigWrapperStyle, isSmallScreenWidth ? {} : styles.pv3]; + if (isMini) { + return miniWrapperStyle; + } + + // Small screens use a bottom-docked modal that already has vertical padding. + return [...bigWrapperStyle, isSmallScreenWidth ? {} : styles.pv3]; } export default getReportActionContextMenuStyles; From 9631688fd79e352ef163d5ff70d5a36f6a368900 Mon Sep 17 00:00:00 2001 From: Jayesh Mangwani Date: Tue, 25 Apr 2023 13:13:01 +0530 Subject: [PATCH 5/5] fix: fomatted conditional styling --- src/styles/getReportActionContextMenuStyles.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/styles/getReportActionContextMenuStyles.js b/src/styles/getReportActionContextMenuStyles.js index a68c01667483..c1ed4cbd3021 100644 --- a/src/styles/getReportActionContextMenuStyles.js +++ b/src/styles/getReportActionContextMenuStyles.js @@ -33,8 +33,12 @@ function getReportActionContextMenuStyles(isMini, isSmallScreenWidth) { return miniWrapperStyle; } - // Small screens use a bottom-docked modal that already has vertical padding. - return [...bigWrapperStyle, isSmallScreenWidth ? {} : styles.pv3]; + return [ + ...bigWrapperStyle, + + // Small screens use a bottom-docked modal that already has vertical padding. + isSmallScreenWidth ? {} : styles.pv3, + ]; } export default getReportActionContextMenuStyles;