From cd7278f0c7fbe94b25470be483425274a647821f Mon Sep 17 00:00:00 2001 From: Sam Hariri <137707942+samh-nl@users.noreply.github.com> Date: Wed, 20 Sep 2023 17:06:38 +0200 Subject: [PATCH 01/17] feat: arrow navigation in context menu --- src/components/ContextMenuItem.js | 7 +- .../BaseReportActionContextMenu.js | 69 +++++++++++++++---- 2 files changed, 61 insertions(+), 15 deletions(-) diff --git a/src/components/ContextMenuItem.js b/src/components/ContextMenuItem.js index c7ca3f948da4..aaca5575233f 100644 --- a/src/components/ContextMenuItem.js +++ b/src/components/ContextMenuItem.js @@ -34,6 +34,9 @@ const propTypes = { /** The action accept for anonymous user or not */ isAnonymousAction: PropTypes.bool, + + /** Whether the menu item is focused or not */ + focused: PropTypes.bool, }; const defaultProps = { @@ -42,9 +45,10 @@ const defaultProps = { successText: '', description: '', isAnonymousAction: false, + focused: false, }; -function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, description, isAnonymousAction}) { +function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, description, isAnonymousAction, focused}) { const {windowWidth} = useWindowDimensions(); const [isThrottledButtonActive, setThrottledButtonInactive] = useThrottledButtonState(); @@ -89,6 +93,7 @@ function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, descriptionTextStyle={styles.breakAll} style={getContextMenuItemStyles(windowWidth)} isAnonymousAction={isAnonymousAction} + focused={focused} /> ); } diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index 3f4a5fe3ac4c..11c8d1aa3428 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -15,6 +15,9 @@ import {withBetas} from '../../../../components/OnyxProvider'; import * as Session from '../../../../libs/actions/Session'; import {hideContextMenu} from './ReportActionContextMenu'; import ONYXKEYS from '../../../../ONYXKEYS'; +import CONST from '../../../../CONST'; +import useArrowKeyFocusManager from '../../../../hooks/useArrowKeyFocusManager'; +import useKeyboardShortcut from '../../../../hooks/useKeyboardShortcut'; const propTypes = { /** String representing the context menu type [LINK, REPORT_ACTION] which controls context menu choices */ @@ -56,6 +59,20 @@ function BaseReportActionContextMenu(props) { const shouldShowFilter = (contextAction) => contextAction.shouldShow(props.type, reportAction, props.isArchivedRoom, props.betas, props.anchor, props.isChronosReport, props.reportID, props.isPinnedChat, props.isUnreadChat); + const shouldEnableArrowNavigation = !props.isMini && (props.isVisible || shouldKeepOpen); + const filteredContextMenuActions = _.filter(ContextMenuActions, shouldShowFilter); + + // Context menu actions that are not rendered as menu items are excluded from arrow navigation + const nonMenuItemActionIndexes = _.map(filteredContextMenuActions, (contextAction, index) => (_.isFunction(contextAction.renderContent) ? index : undefined)); + const disabledIndexes = _.filter(nonMenuItemActionIndexes, (index) => !_.isUndefined(index)); + + const [focusedIndex, setFocusedIndex] = useArrowKeyFocusManager({ + initialFocusedIndex: -1, + disabledIndexes, + maxIndex: filteredContextMenuActions.length - 1, + isActive: shouldEnableArrowNavigation, + }); + /** * Checks if user is anonymous. If true and the action doesn't accept for anonymous user, hides the context menu and * shows the sign in modal. Else, executes the callback. @@ -75,31 +92,54 @@ function BaseReportActionContextMenu(props) { } }; + const shouldClosePopupOnSelectItem = !props.isMini; + const selectItemPayload = { + reportAction, + reportID: props.reportID, + draftMessage: props.draftMessage, + selection: props.selection, + close: () => setShouldKeepOpen(false), + openContextMenu: () => setShouldKeepOpen(true), + interceptAnonymousUser, + }; + + /** + * Handles the selection of an item from the context menu + * + * @param {Object} contextAction + * @param {Function} contextAction.onPress + * @param {Boolean} contextAction.isAnonymousAction + */ + const selectItem = (contextAction) => { + interceptAnonymousUser(() => contextAction.onPress(shouldClosePopupOnSelectItem, selectItemPayload), contextAction.isAnonymousAction); + }; + + useKeyboardShortcut( + CONST.KEYBOARD_SHORTCUTS.ENTER, + () => { + if (focusedIndex === -1) { + return; + } + selectItem(filteredContextMenuActions[focusedIndex]); + setFocusedIndex(-1); + }, + {isActive: shouldEnableArrowNavigation}, + ); + return ( (props.isVisible || shouldKeepOpen) && ( - {_.map(_.filter(ContextMenuActions, shouldShowFilter), (contextAction) => { - const closePopup = !props.isMini; - const payload = { - reportAction, - reportID: props.reportID, - draftMessage: props.draftMessage, - selection: props.selection, - close: () => setShouldKeepOpen(false), - openContextMenu: () => setShouldKeepOpen(true), - interceptAnonymousUser, - }; - + {_.map(_.filter(ContextMenuActions, shouldShowFilter), (contextAction, index) => { if (contextAction.renderContent) { // make sure that renderContent isn't mixed with unsupported props if (__DEV__ && (contextAction.text != null || contextAction.icon != null)) { throw new Error('Dev error: renderContent() and text/icon cannot be used together.'); } - return contextAction.renderContent(closePopup, payload); + return contextAction.renderContent(shouldClosePopupOnSelectItem, selectItemPayload); } return ( @@ -110,9 +150,10 @@ function BaseReportActionContextMenu(props) { successText={contextAction.successTextTranslateKey ? props.translate(contextAction.successTextTranslateKey) : undefined} isMini={props.isMini} key={contextAction.textTranslateKey} - onPress={() => interceptAnonymousUser(() => contextAction.onPress(closePopup, payload), contextAction.isAnonymousAction)} + onPress={() => selectItem(contextAction)} description={contextAction.getDescription(props.selection, props.isSmallScreenWidth)} isAnonymousAction={contextAction.isAnonymousAction} + focused={focusedIndex === index} /> ); })} From fa0b8e741c0a3f829218dd1e0e5330fd5af1c1db Mon Sep 17 00:00:00 2001 From: Sam Hariri <137707942+samh-nl@users.noreply.github.com> Date: Wed, 20 Sep 2023 18:16:29 +0200 Subject: [PATCH 02/17] fix: use internal press handler on Enter --- src/components/ContextMenuItem.js | 18 +++++-- .../BaseReportActionContextMenu.js | 47 ++++++++----------- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/src/components/ContextMenuItem.js b/src/components/ContextMenuItem.js index aaca5575233f..8a609dbedec8 100644 --- a/src/components/ContextMenuItem.js +++ b/src/components/ContextMenuItem.js @@ -1,4 +1,4 @@ -import React from 'react'; +import React, {forwardRef, useImperativeHandle} from 'react'; import PropTypes from 'prop-types'; import MenuItem from './MenuItem'; import Icon from './Icon'; @@ -37,6 +37,9 @@ const propTypes = { /** Whether the menu item is focused or not */ focused: PropTypes.bool, + + /** Forwarded ref to ContextMenuItem */ + innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]), }; const defaultProps = { @@ -46,9 +49,10 @@ const defaultProps = { description: '', isAnonymousAction: false, focused: false, + innerRef: null, }; -function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, description, isAnonymousAction, focused}) { +function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, description, isAnonymousAction, focused, innerRef}) { const {windowWidth} = useWindowDimensions(); const [isThrottledButtonActive, setThrottledButtonInactive] = useThrottledButtonState(); @@ -65,6 +69,8 @@ function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, } }; + useImperativeHandle(innerRef, () => ({triggerPressAndUpdateSuccess})); + const itemIcon = !isThrottledButtonActive && successIcon ? successIcon : icon; const itemText = !isThrottledButtonActive && successText ? successText : text; @@ -102,4 +108,10 @@ ContextMenuItem.propTypes = propTypes; ContextMenuItem.defaultProps = defaultProps; ContextMenuItem.displayName = 'ContextMenuItem'; -export default ContextMenuItem; +export default forwardRef((props, ref) => ( + +)); diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index 07d273d6daeb..e26e9c1bae64 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -1,4 +1,4 @@ -import React, {useMemo, useState, memo} from 'react'; +import React, {useRef, useMemo, useState, memo} from 'react'; import {InteractionManager, View} from 'react-native'; import lodashGet from 'lodash/get'; import _ from 'underscore'; @@ -48,6 +48,7 @@ const defaultProps = { ...GenericReportActionContextMenuDefaultProps, }; function BaseReportActionContextMenu(props) { + const menuItemRefs = useRef([]); const [shouldKeepOpen, setShouldKeepOpen] = useState(false); const wrapperStyle = getReportActionContextMenuStyles(props.isMini, props.isSmallScreenWidth); @@ -94,35 +95,13 @@ function BaseReportActionContextMenu(props) { } }; - const shouldClosePopupOnSelectItem = !props.isMini; - const selectItemPayload = { - reportAction, - reportID: props.reportID, - draftMessage: props.draftMessage, - selection: props.selection, - close: () => setShouldKeepOpen(false), - openContextMenu: () => setShouldKeepOpen(true), - interceptAnonymousUser, - }; - - /** - * Handles the selection of an item from the context menu - * - * @param {Object} contextAction - * @param {Function} contextAction.onPress - * @param {Boolean} contextAction.isAnonymousAction - */ - const selectItem = (contextAction) => { - interceptAnonymousUser(() => contextAction.onPress(shouldClosePopupOnSelectItem, selectItemPayload), contextAction.isAnonymousAction); - }; - useKeyboardShortcut( CONST.KEYBOARD_SHORTCUTS.ENTER, () => { - if (focusedIndex === -1) { + if (!menuItemRefs.current[focusedIndex]) { return; } - selectItem(filteredContextMenuActions[focusedIndex]); + menuItemRefs.current[focusedIndex].triggerPressAndUpdateSuccess(); setFocusedIndex(-1); }, {isActive: shouldEnableArrowNavigation}, @@ -135,24 +114,38 @@ function BaseReportActionContextMenu(props) { style={wrapperStyle} > {_.map(_.filter(ContextMenuActions, shouldShowFilter), (contextAction, index) => { + const closePopup = !props.isMini; + const payload = { + reportAction, + reportID: props.reportID, + draftMessage: props.draftMessage, + selection: props.selection, + close: () => setShouldKeepOpen(false), + openContextMenu: () => setShouldKeepOpen(true), + interceptAnonymousUser, + }; + if (contextAction.renderContent) { // make sure that renderContent isn't mixed with unsupported props if (__DEV__ && (contextAction.text != null || contextAction.icon != null)) { throw new Error('Dev error: renderContent() and text/icon cannot be used together.'); } - return contextAction.renderContent(shouldClosePopupOnSelectItem, selectItemPayload); + return contextAction.renderContent(closePopup, payload); } return ( { + menuItemRefs.current[index] = ref; + }} icon={contextAction.icon} text={props.translate(contextAction.textTranslateKey, {action: reportAction})} successIcon={contextAction.successIcon} successText={contextAction.successTextTranslateKey ? props.translate(contextAction.successTextTranslateKey) : undefined} isMini={props.isMini} key={contextAction.textTranslateKey} - onPress={() => selectItem(contextAction)} + onPress={() => interceptAnonymousUser(() => contextAction.onPress(closePopup, payload), contextAction.isAnonymousAction)} description={contextAction.getDescription(props.selection, props.isSmallScreenWidth)} isAnonymousAction={contextAction.isAnonymousAction} focused={focusedIndex === index} From 5869c6c6a53341239a74e9bd442e6e0b00ed0b86 Mon Sep 17 00:00:00 2001 From: Sam Hariri <137707942+samh-nl@users.noreply.github.com> Date: Thu, 21 Sep 2023 14:39:38 +0200 Subject: [PATCH 03/17] Update src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js Co-authored-by: Situ Chandra Shil <108292595+situchan@users.noreply.github.com> --- .../home/report/ContextMenu/BaseReportActionContextMenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index e26e9c1bae64..009fa44325dd 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -113,7 +113,7 @@ function BaseReportActionContextMenu(props) { ref={props.contentRef} style={wrapperStyle} > - {_.map(_.filter(ContextMenuActions, shouldShowFilter), (contextAction, index) => { + {_.map(filteredContextMenuActions, (contextAction, index) => { const closePopup = !props.isMini; const payload = { reportAction, From e8d944200af65157469f2e282381a52f61c46926 Mon Sep 17 00:00:00 2001 From: Sam Hariri <137707942+samh-nl@users.noreply.github.com> Date: Thu, 21 Sep 2023 14:39:52 +0200 Subject: [PATCH 04/17] Update src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js Co-authored-by: Situ Chandra Shil <108292595+situchan@users.noreply.github.com> --- .../home/report/ContextMenu/BaseReportActionContextMenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index 009fa44325dd..a59141564ae7 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -48,7 +48,7 @@ const defaultProps = { ...GenericReportActionContextMenuDefaultProps, }; function BaseReportActionContextMenu(props) { - const menuItemRefs = useRef([]); + const menuItemRefs = useRef({}); const [shouldKeepOpen, setShouldKeepOpen] = useState(false); const wrapperStyle = getReportActionContextMenuStyles(props.isMini, props.isSmallScreenWidth); From 18a9e816a7cd7b650fd660afd24d0f0a20323344 Mon Sep 17 00:00:00 2001 From: Sam Hariri <137707942+samh-nl@users.noreply.github.com> Date: Thu, 21 Sep 2023 16:57:40 +0200 Subject: [PATCH 05/17] Revert "Update src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js" This reverts commit e8d944200af65157469f2e282381a52f61c46926. --- .../home/report/ContextMenu/BaseReportActionContextMenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index a59141564ae7..009fa44325dd 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -48,7 +48,7 @@ const defaultProps = { ...GenericReportActionContextMenuDefaultProps, }; function BaseReportActionContextMenu(props) { - const menuItemRefs = useRef({}); + const menuItemRefs = useRef([]); const [shouldKeepOpen, setShouldKeepOpen] = useState(false); const wrapperStyle = getReportActionContextMenuStyles(props.isMini, props.isSmallScreenWidth); From 777ca934a60ddd42013f348d836dd2e73a4bf657 Mon Sep 17 00:00:00 2001 From: Sam Hariri <137707942+samh-nl@users.noreply.github.com> Date: Thu, 21 Sep 2023 16:58:12 +0200 Subject: [PATCH 06/17] Revert "Update src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js" This reverts commit 5869c6c6a53341239a74e9bd442e6e0b00ed0b86. --- .../home/report/ContextMenu/BaseReportActionContextMenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index 009fa44325dd..e26e9c1bae64 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -113,7 +113,7 @@ function BaseReportActionContextMenu(props) { ref={props.contentRef} style={wrapperStyle} > - {_.map(filteredContextMenuActions, (contextAction, index) => { + {_.map(_.filter(ContextMenuActions, shouldShowFilter), (contextAction, index) => { const closePopup = !props.isMini; const payload = { reportAction, From 0867e442f233ca2c84fd36cec83d83adf10f0458 Mon Sep 17 00:00:00 2001 From: Sam Hariri <137707942+samh-nl@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:04:35 +0200 Subject: [PATCH 07/17] Revert "fix: use internal press handler on Enter" This reverts commit fa0b8e741c0a3f829218dd1e0e5330fd5af1c1db. --- src/components/ContextMenuItem.js | 18 ++----- .../BaseReportActionContextMenu.js | 47 +++++++++++-------- 2 files changed, 30 insertions(+), 35 deletions(-) diff --git a/src/components/ContextMenuItem.js b/src/components/ContextMenuItem.js index 8a609dbedec8..aaca5575233f 100644 --- a/src/components/ContextMenuItem.js +++ b/src/components/ContextMenuItem.js @@ -1,4 +1,4 @@ -import React, {forwardRef, useImperativeHandle} from 'react'; +import React from 'react'; import PropTypes from 'prop-types'; import MenuItem from './MenuItem'; import Icon from './Icon'; @@ -37,9 +37,6 @@ const propTypes = { /** Whether the menu item is focused or not */ focused: PropTypes.bool, - - /** Forwarded ref to ContextMenuItem */ - innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]), }; const defaultProps = { @@ -49,10 +46,9 @@ const defaultProps = { description: '', isAnonymousAction: false, focused: false, - innerRef: null, }; -function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, description, isAnonymousAction, focused, innerRef}) { +function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, description, isAnonymousAction, focused}) { const {windowWidth} = useWindowDimensions(); const [isThrottledButtonActive, setThrottledButtonInactive] = useThrottledButtonState(); @@ -69,8 +65,6 @@ function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, } }; - useImperativeHandle(innerRef, () => ({triggerPressAndUpdateSuccess})); - const itemIcon = !isThrottledButtonActive && successIcon ? successIcon : icon; const itemText = !isThrottledButtonActive && successText ? successText : text; @@ -108,10 +102,4 @@ ContextMenuItem.propTypes = propTypes; ContextMenuItem.defaultProps = defaultProps; ContextMenuItem.displayName = 'ContextMenuItem'; -export default forwardRef((props, ref) => ( - -)); +export default ContextMenuItem; diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index e26e9c1bae64..07d273d6daeb 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -1,4 +1,4 @@ -import React, {useRef, useMemo, useState, memo} from 'react'; +import React, {useMemo, useState, memo} from 'react'; import {InteractionManager, View} from 'react-native'; import lodashGet from 'lodash/get'; import _ from 'underscore'; @@ -48,7 +48,6 @@ const defaultProps = { ...GenericReportActionContextMenuDefaultProps, }; function BaseReportActionContextMenu(props) { - const menuItemRefs = useRef([]); const [shouldKeepOpen, setShouldKeepOpen] = useState(false); const wrapperStyle = getReportActionContextMenuStyles(props.isMini, props.isSmallScreenWidth); @@ -95,13 +94,35 @@ function BaseReportActionContextMenu(props) { } }; + const shouldClosePopupOnSelectItem = !props.isMini; + const selectItemPayload = { + reportAction, + reportID: props.reportID, + draftMessage: props.draftMessage, + selection: props.selection, + close: () => setShouldKeepOpen(false), + openContextMenu: () => setShouldKeepOpen(true), + interceptAnonymousUser, + }; + + /** + * Handles the selection of an item from the context menu + * + * @param {Object} contextAction + * @param {Function} contextAction.onPress + * @param {Boolean} contextAction.isAnonymousAction + */ + const selectItem = (contextAction) => { + interceptAnonymousUser(() => contextAction.onPress(shouldClosePopupOnSelectItem, selectItemPayload), contextAction.isAnonymousAction); + }; + useKeyboardShortcut( CONST.KEYBOARD_SHORTCUTS.ENTER, () => { - if (!menuItemRefs.current[focusedIndex]) { + if (focusedIndex === -1) { return; } - menuItemRefs.current[focusedIndex].triggerPressAndUpdateSuccess(); + selectItem(filteredContextMenuActions[focusedIndex]); setFocusedIndex(-1); }, {isActive: shouldEnableArrowNavigation}, @@ -114,38 +135,24 @@ function BaseReportActionContextMenu(props) { style={wrapperStyle} > {_.map(_.filter(ContextMenuActions, shouldShowFilter), (contextAction, index) => { - const closePopup = !props.isMini; - const payload = { - reportAction, - reportID: props.reportID, - draftMessage: props.draftMessage, - selection: props.selection, - close: () => setShouldKeepOpen(false), - openContextMenu: () => setShouldKeepOpen(true), - interceptAnonymousUser, - }; - if (contextAction.renderContent) { // make sure that renderContent isn't mixed with unsupported props if (__DEV__ && (contextAction.text != null || contextAction.icon != null)) { throw new Error('Dev error: renderContent() and text/icon cannot be used together.'); } - return contextAction.renderContent(closePopup, payload); + return contextAction.renderContent(shouldClosePopupOnSelectItem, selectItemPayload); } return ( { - menuItemRefs.current[index] = ref; - }} icon={contextAction.icon} text={props.translate(contextAction.textTranslateKey, {action: reportAction})} successIcon={contextAction.successIcon} successText={contextAction.successTextTranslateKey ? props.translate(contextAction.successTextTranslateKey) : undefined} isMini={props.isMini} key={contextAction.textTranslateKey} - onPress={() => interceptAnonymousUser(() => contextAction.onPress(closePopup, payload), contextAction.isAnonymousAction)} + onPress={() => selectItem(contextAction)} description={contextAction.getDescription(props.selection, props.isSmallScreenWidth)} isAnonymousAction={contextAction.isAnonymousAction} focused={focusedIndex === index} From fe468184a2e1c427a77fffe088a8755dc00262d2 Mon Sep 17 00:00:00 2001 From: Sam Hariri <137707942+samh-nl@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:05:01 +0200 Subject: [PATCH 08/17] Revert "feat: arrow navigation in context menu" This reverts commit cd7278f0c7fbe94b25470be483425274a647821f. --- src/components/ContextMenuItem.js | 7 +- .../BaseReportActionContextMenu.js | 69 ++++--------------- 2 files changed, 15 insertions(+), 61 deletions(-) diff --git a/src/components/ContextMenuItem.js b/src/components/ContextMenuItem.js index aaca5575233f..c7ca3f948da4 100644 --- a/src/components/ContextMenuItem.js +++ b/src/components/ContextMenuItem.js @@ -34,9 +34,6 @@ const propTypes = { /** The action accept for anonymous user or not */ isAnonymousAction: PropTypes.bool, - - /** Whether the menu item is focused or not */ - focused: PropTypes.bool, }; const defaultProps = { @@ -45,10 +42,9 @@ const defaultProps = { successText: '', description: '', isAnonymousAction: false, - focused: false, }; -function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, description, isAnonymousAction, focused}) { +function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, description, isAnonymousAction}) { const {windowWidth} = useWindowDimensions(); const [isThrottledButtonActive, setThrottledButtonInactive] = useThrottledButtonState(); @@ -93,7 +89,6 @@ function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, descriptionTextStyle={styles.breakAll} style={getContextMenuItemStyles(windowWidth)} isAnonymousAction={isAnonymousAction} - focused={focused} /> ); } diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index 07d273d6daeb..6382af6a898e 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -15,9 +15,6 @@ import {withBetas} from '../../../../components/OnyxProvider'; import * as Session from '../../../../libs/actions/Session'; import {hideContextMenu} from './ReportActionContextMenu'; import ONYXKEYS from '../../../../ONYXKEYS'; -import CONST from '../../../../CONST'; -import useArrowKeyFocusManager from '../../../../hooks/useArrowKeyFocusManager'; -import useKeyboardShortcut from '../../../../hooks/useKeyboardShortcut'; const propTypes = { /** String representing the context menu type [LINK, REPORT_ACTION] which controls context menu choices */ @@ -61,20 +58,6 @@ function BaseReportActionContextMenu(props) { const shouldShowFilter = (contextAction) => contextAction.shouldShow(props.type, reportAction, props.isArchivedRoom, props.betas, props.anchor, props.isChronosReport, props.reportID, props.isPinnedChat, props.isUnreadChat); - const shouldEnableArrowNavigation = !props.isMini && (props.isVisible || shouldKeepOpen); - const filteredContextMenuActions = _.filter(ContextMenuActions, shouldShowFilter); - - // Context menu actions that are not rendered as menu items are excluded from arrow navigation - const nonMenuItemActionIndexes = _.map(filteredContextMenuActions, (contextAction, index) => (_.isFunction(contextAction.renderContent) ? index : undefined)); - const disabledIndexes = _.filter(nonMenuItemActionIndexes, (index) => !_.isUndefined(index)); - - const [focusedIndex, setFocusedIndex] = useArrowKeyFocusManager({ - initialFocusedIndex: -1, - disabledIndexes, - maxIndex: filteredContextMenuActions.length - 1, - isActive: shouldEnableArrowNavigation, - }); - /** * Checks if user is anonymous. If true and the action doesn't accept for anonymous user, hides the context menu and * shows the sign in modal. Else, executes the callback. @@ -94,54 +77,31 @@ function BaseReportActionContextMenu(props) { } }; - const shouldClosePopupOnSelectItem = !props.isMini; - const selectItemPayload = { - reportAction, - reportID: props.reportID, - draftMessage: props.draftMessage, - selection: props.selection, - close: () => setShouldKeepOpen(false), - openContextMenu: () => setShouldKeepOpen(true), - interceptAnonymousUser, - }; - - /** - * Handles the selection of an item from the context menu - * - * @param {Object} contextAction - * @param {Function} contextAction.onPress - * @param {Boolean} contextAction.isAnonymousAction - */ - const selectItem = (contextAction) => { - interceptAnonymousUser(() => contextAction.onPress(shouldClosePopupOnSelectItem, selectItemPayload), contextAction.isAnonymousAction); - }; - - useKeyboardShortcut( - CONST.KEYBOARD_SHORTCUTS.ENTER, - () => { - if (focusedIndex === -1) { - return; - } - selectItem(filteredContextMenuActions[focusedIndex]); - setFocusedIndex(-1); - }, - {isActive: shouldEnableArrowNavigation}, - ); - return ( (props.isVisible || shouldKeepOpen) && ( - {_.map(_.filter(ContextMenuActions, shouldShowFilter), (contextAction, index) => { + {_.map(_.filter(ContextMenuActions, shouldShowFilter), (contextAction) => { + const closePopup = !props.isMini; + const payload = { + reportAction, + reportID: props.reportID, + draftMessage: props.draftMessage, + selection: props.selection, + close: () => setShouldKeepOpen(false), + openContextMenu: () => setShouldKeepOpen(true), + interceptAnonymousUser, + }; + if (contextAction.renderContent) { // make sure that renderContent isn't mixed with unsupported props if (__DEV__ && (contextAction.text != null || contextAction.icon != null)) { throw new Error('Dev error: renderContent() and text/icon cannot be used together.'); } - return contextAction.renderContent(shouldClosePopupOnSelectItem, selectItemPayload); + return contextAction.renderContent(closePopup, payload); } return ( @@ -152,10 +112,9 @@ function BaseReportActionContextMenu(props) { successText={contextAction.successTextTranslateKey ? props.translate(contextAction.successTextTranslateKey) : undefined} isMini={props.isMini} key={contextAction.textTranslateKey} - onPress={() => selectItem(contextAction)} + onPress={() => interceptAnonymousUser(() => contextAction.onPress(closePopup, payload), contextAction.isAnonymousAction)} description={contextAction.getDescription(props.selection, props.isSmallScreenWidth)} isAnonymousAction={contextAction.isAnonymousAction} - focused={focusedIndex === index} /> ); })} From 85ceb1ec97f1e1d3bb90b649af0b0273b346d288 Mon Sep 17 00:00:00 2001 From: Sam Hariri <137707942+samh-nl@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:13:04 +0200 Subject: [PATCH 09/17] Revert "Revert "feat: arrow navigation in context menu"" This reverts commit fe468184a2e1c427a77fffe088a8755dc00262d2. --- src/components/ContextMenuItem.js | 7 +- .../BaseReportActionContextMenu.js | 69 +++++++++++++++---- 2 files changed, 61 insertions(+), 15 deletions(-) diff --git a/src/components/ContextMenuItem.js b/src/components/ContextMenuItem.js index c7ca3f948da4..aaca5575233f 100644 --- a/src/components/ContextMenuItem.js +++ b/src/components/ContextMenuItem.js @@ -34,6 +34,9 @@ const propTypes = { /** The action accept for anonymous user or not */ isAnonymousAction: PropTypes.bool, + + /** Whether the menu item is focused or not */ + focused: PropTypes.bool, }; const defaultProps = { @@ -42,9 +45,10 @@ const defaultProps = { successText: '', description: '', isAnonymousAction: false, + focused: false, }; -function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, description, isAnonymousAction}) { +function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, description, isAnonymousAction, focused}) { const {windowWidth} = useWindowDimensions(); const [isThrottledButtonActive, setThrottledButtonInactive] = useThrottledButtonState(); @@ -89,6 +93,7 @@ function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, descriptionTextStyle={styles.breakAll} style={getContextMenuItemStyles(windowWidth)} isAnonymousAction={isAnonymousAction} + focused={focused} /> ); } diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index 6382af6a898e..07d273d6daeb 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -15,6 +15,9 @@ import {withBetas} from '../../../../components/OnyxProvider'; import * as Session from '../../../../libs/actions/Session'; import {hideContextMenu} from './ReportActionContextMenu'; import ONYXKEYS from '../../../../ONYXKEYS'; +import CONST from '../../../../CONST'; +import useArrowKeyFocusManager from '../../../../hooks/useArrowKeyFocusManager'; +import useKeyboardShortcut from '../../../../hooks/useKeyboardShortcut'; const propTypes = { /** String representing the context menu type [LINK, REPORT_ACTION] which controls context menu choices */ @@ -58,6 +61,20 @@ function BaseReportActionContextMenu(props) { const shouldShowFilter = (contextAction) => contextAction.shouldShow(props.type, reportAction, props.isArchivedRoom, props.betas, props.anchor, props.isChronosReport, props.reportID, props.isPinnedChat, props.isUnreadChat); + const shouldEnableArrowNavigation = !props.isMini && (props.isVisible || shouldKeepOpen); + const filteredContextMenuActions = _.filter(ContextMenuActions, shouldShowFilter); + + // Context menu actions that are not rendered as menu items are excluded from arrow navigation + const nonMenuItemActionIndexes = _.map(filteredContextMenuActions, (contextAction, index) => (_.isFunction(contextAction.renderContent) ? index : undefined)); + const disabledIndexes = _.filter(nonMenuItemActionIndexes, (index) => !_.isUndefined(index)); + + const [focusedIndex, setFocusedIndex] = useArrowKeyFocusManager({ + initialFocusedIndex: -1, + disabledIndexes, + maxIndex: filteredContextMenuActions.length - 1, + isActive: shouldEnableArrowNavigation, + }); + /** * Checks if user is anonymous. If true and the action doesn't accept for anonymous user, hides the context menu and * shows the sign in modal. Else, executes the callback. @@ -77,31 +94,54 @@ function BaseReportActionContextMenu(props) { } }; + const shouldClosePopupOnSelectItem = !props.isMini; + const selectItemPayload = { + reportAction, + reportID: props.reportID, + draftMessage: props.draftMessage, + selection: props.selection, + close: () => setShouldKeepOpen(false), + openContextMenu: () => setShouldKeepOpen(true), + interceptAnonymousUser, + }; + + /** + * Handles the selection of an item from the context menu + * + * @param {Object} contextAction + * @param {Function} contextAction.onPress + * @param {Boolean} contextAction.isAnonymousAction + */ + const selectItem = (contextAction) => { + interceptAnonymousUser(() => contextAction.onPress(shouldClosePopupOnSelectItem, selectItemPayload), contextAction.isAnonymousAction); + }; + + useKeyboardShortcut( + CONST.KEYBOARD_SHORTCUTS.ENTER, + () => { + if (focusedIndex === -1) { + return; + } + selectItem(filteredContextMenuActions[focusedIndex]); + setFocusedIndex(-1); + }, + {isActive: shouldEnableArrowNavigation}, + ); + return ( (props.isVisible || shouldKeepOpen) && ( - {_.map(_.filter(ContextMenuActions, shouldShowFilter), (contextAction) => { - const closePopup = !props.isMini; - const payload = { - reportAction, - reportID: props.reportID, - draftMessage: props.draftMessage, - selection: props.selection, - close: () => setShouldKeepOpen(false), - openContextMenu: () => setShouldKeepOpen(true), - interceptAnonymousUser, - }; - + {_.map(_.filter(ContextMenuActions, shouldShowFilter), (contextAction, index) => { if (contextAction.renderContent) { // make sure that renderContent isn't mixed with unsupported props if (__DEV__ && (contextAction.text != null || contextAction.icon != null)) { throw new Error('Dev error: renderContent() and text/icon cannot be used together.'); } - return contextAction.renderContent(closePopup, payload); + return contextAction.renderContent(shouldClosePopupOnSelectItem, selectItemPayload); } return ( @@ -112,9 +152,10 @@ function BaseReportActionContextMenu(props) { successText={contextAction.successTextTranslateKey ? props.translate(contextAction.successTextTranslateKey) : undefined} isMini={props.isMini} key={contextAction.textTranslateKey} - onPress={() => interceptAnonymousUser(() => contextAction.onPress(closePopup, payload), contextAction.isAnonymousAction)} + onPress={() => selectItem(contextAction)} description={contextAction.getDescription(props.selection, props.isSmallScreenWidth)} isAnonymousAction={contextAction.isAnonymousAction} + focused={focusedIndex === index} /> ); })} From 32ac96435a3ddce7414034cfede4a3ab27246326 Mon Sep 17 00:00:00 2001 From: Sam Hariri <137707942+samh-nl@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:13:31 +0200 Subject: [PATCH 10/17] Revert "Revert "fix: use internal press handler on Enter"" This reverts commit 0867e442f233ca2c84fd36cec83d83adf10f0458. --- src/components/ContextMenuItem.js | 18 +++++-- .../BaseReportActionContextMenu.js | 47 ++++++++----------- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/src/components/ContextMenuItem.js b/src/components/ContextMenuItem.js index aaca5575233f..8a609dbedec8 100644 --- a/src/components/ContextMenuItem.js +++ b/src/components/ContextMenuItem.js @@ -1,4 +1,4 @@ -import React from 'react'; +import React, {forwardRef, useImperativeHandle} from 'react'; import PropTypes from 'prop-types'; import MenuItem from './MenuItem'; import Icon from './Icon'; @@ -37,6 +37,9 @@ const propTypes = { /** Whether the menu item is focused or not */ focused: PropTypes.bool, + + /** Forwarded ref to ContextMenuItem */ + innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]), }; const defaultProps = { @@ -46,9 +49,10 @@ const defaultProps = { description: '', isAnonymousAction: false, focused: false, + innerRef: null, }; -function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, description, isAnonymousAction, focused}) { +function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, description, isAnonymousAction, focused, innerRef}) { const {windowWidth} = useWindowDimensions(); const [isThrottledButtonActive, setThrottledButtonInactive] = useThrottledButtonState(); @@ -65,6 +69,8 @@ function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, } }; + useImperativeHandle(innerRef, () => ({triggerPressAndUpdateSuccess})); + const itemIcon = !isThrottledButtonActive && successIcon ? successIcon : icon; const itemText = !isThrottledButtonActive && successText ? successText : text; @@ -102,4 +108,10 @@ ContextMenuItem.propTypes = propTypes; ContextMenuItem.defaultProps = defaultProps; ContextMenuItem.displayName = 'ContextMenuItem'; -export default ContextMenuItem; +export default forwardRef((props, ref) => ( + +)); diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index 07d273d6daeb..e26e9c1bae64 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -1,4 +1,4 @@ -import React, {useMemo, useState, memo} from 'react'; +import React, {useRef, useMemo, useState, memo} from 'react'; import {InteractionManager, View} from 'react-native'; import lodashGet from 'lodash/get'; import _ from 'underscore'; @@ -48,6 +48,7 @@ const defaultProps = { ...GenericReportActionContextMenuDefaultProps, }; function BaseReportActionContextMenu(props) { + const menuItemRefs = useRef([]); const [shouldKeepOpen, setShouldKeepOpen] = useState(false); const wrapperStyle = getReportActionContextMenuStyles(props.isMini, props.isSmallScreenWidth); @@ -94,35 +95,13 @@ function BaseReportActionContextMenu(props) { } }; - const shouldClosePopupOnSelectItem = !props.isMini; - const selectItemPayload = { - reportAction, - reportID: props.reportID, - draftMessage: props.draftMessage, - selection: props.selection, - close: () => setShouldKeepOpen(false), - openContextMenu: () => setShouldKeepOpen(true), - interceptAnonymousUser, - }; - - /** - * Handles the selection of an item from the context menu - * - * @param {Object} contextAction - * @param {Function} contextAction.onPress - * @param {Boolean} contextAction.isAnonymousAction - */ - const selectItem = (contextAction) => { - interceptAnonymousUser(() => contextAction.onPress(shouldClosePopupOnSelectItem, selectItemPayload), contextAction.isAnonymousAction); - }; - useKeyboardShortcut( CONST.KEYBOARD_SHORTCUTS.ENTER, () => { - if (focusedIndex === -1) { + if (!menuItemRefs.current[focusedIndex]) { return; } - selectItem(filteredContextMenuActions[focusedIndex]); + menuItemRefs.current[focusedIndex].triggerPressAndUpdateSuccess(); setFocusedIndex(-1); }, {isActive: shouldEnableArrowNavigation}, @@ -135,24 +114,38 @@ function BaseReportActionContextMenu(props) { style={wrapperStyle} > {_.map(_.filter(ContextMenuActions, shouldShowFilter), (contextAction, index) => { + const closePopup = !props.isMini; + const payload = { + reportAction, + reportID: props.reportID, + draftMessage: props.draftMessage, + selection: props.selection, + close: () => setShouldKeepOpen(false), + openContextMenu: () => setShouldKeepOpen(true), + interceptAnonymousUser, + }; + if (contextAction.renderContent) { // make sure that renderContent isn't mixed with unsupported props if (__DEV__ && (contextAction.text != null || contextAction.icon != null)) { throw new Error('Dev error: renderContent() and text/icon cannot be used together.'); } - return contextAction.renderContent(shouldClosePopupOnSelectItem, selectItemPayload); + return contextAction.renderContent(closePopup, payload); } return ( { + menuItemRefs.current[index] = ref; + }} icon={contextAction.icon} text={props.translate(contextAction.textTranslateKey, {action: reportAction})} successIcon={contextAction.successIcon} successText={contextAction.successTextTranslateKey ? props.translate(contextAction.successTextTranslateKey) : undefined} isMini={props.isMini} key={contextAction.textTranslateKey} - onPress={() => selectItem(contextAction)} + onPress={() => interceptAnonymousUser(() => contextAction.onPress(closePopup, payload), contextAction.isAnonymousAction)} description={contextAction.getDescription(props.selection, props.isSmallScreenWidth)} isAnonymousAction={contextAction.isAnonymousAction} focused={focusedIndex === index} From 56d0a92bd5ccddf572ef43ef554634fc2c6e4643 Mon Sep 17 00:00:00 2001 From: Sam Hariri <137707942+samh-nl@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:13:52 +0200 Subject: [PATCH 11/17] Revert "Revert "Update src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js"" This reverts commit 777ca934a60ddd42013f348d836dd2e73a4bf657. --- .../home/report/ContextMenu/BaseReportActionContextMenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index e26e9c1bae64..009fa44325dd 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -113,7 +113,7 @@ function BaseReportActionContextMenu(props) { ref={props.contentRef} style={wrapperStyle} > - {_.map(_.filter(ContextMenuActions, shouldShowFilter), (contextAction, index) => { + {_.map(filteredContextMenuActions, (contextAction, index) => { const closePopup = !props.isMini; const payload = { reportAction, From c70a37453db5c532c7d0d4b553ae41e2bea91536 Mon Sep 17 00:00:00 2001 From: Sam Hariri <137707942+samh-nl@users.noreply.github.com> Date: Thu, 21 Sep 2023 17:14:06 +0200 Subject: [PATCH 12/17] Revert "Revert "Update src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js"" This reverts commit 18a9e816a7cd7b650fd660afd24d0f0a20323344. --- .../home/report/ContextMenu/BaseReportActionContextMenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index 009fa44325dd..a59141564ae7 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -48,7 +48,7 @@ const defaultProps = { ...GenericReportActionContextMenuDefaultProps, }; function BaseReportActionContextMenu(props) { - const menuItemRefs = useRef([]); + const menuItemRefs = useRef({}); const [shouldKeepOpen, setShouldKeepOpen] = useState(false); const wrapperStyle = getReportActionContextMenuStyles(props.isMini, props.isSmallScreenWidth); From 10bb5008ebd2dd7da1d48d601d2f19c46b723a57 Mon Sep 17 00:00:00 2001 From: Sam Hariri <137707942+samh-nl@users.noreply.github.com> Date: Thu, 21 Sep 2023 23:23:55 +0200 Subject: [PATCH 13/17] fix: prevent propagation of enter --- .../home/report/ContextMenu/BaseReportActionContextMenu.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index a59141564ae7..154c15923b26 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -97,10 +97,14 @@ function BaseReportActionContextMenu(props) { useKeyboardShortcut( CONST.KEYBOARD_SHORTCUTS.ENTER, - () => { + (event) => { + // Ensures the event does not cause side-effects beyond the context menu, e.g. when an outside element is focused + event.stopPropagation(); + if (!menuItemRefs.current[focusedIndex]) { return; } + menuItemRefs.current[focusedIndex].triggerPressAndUpdateSuccess(); setFocusedIndex(-1); }, From 6428b2885948335e8c87d2e5cbdef7913ff57851 Mon Sep 17 00:00:00 2001 From: Sam Hariri <137707942+samh-nl@users.noreply.github.com> Date: Fri, 22 Sep 2023 00:00:49 +0200 Subject: [PATCH 14/17] fix: stopPropagation if item is selected --- .../home/report/ContextMenu/BaseReportActionContextMenu.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index 154c15923b26..85ee8c5ae877 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -98,13 +98,13 @@ function BaseReportActionContextMenu(props) { useKeyboardShortcut( CONST.KEYBOARD_SHORTCUTS.ENTER, (event) => { - // Ensures the event does not cause side-effects beyond the context menu, e.g. when an outside element is focused - event.stopPropagation(); - if (!menuItemRefs.current[focusedIndex]) { return; } + // Ensures the event does not cause side-effects beyond the context menu, e.g. when an outside element is focused + event.stopPropagation(); + menuItemRefs.current[focusedIndex].triggerPressAndUpdateSuccess(); setFocusedIndex(-1); }, From 4d4fff3bf60303f23ec49443c66602d9f33159c2 Mon Sep 17 00:00:00 2001 From: Sam Hariri <137707942+samh-nl@users.noreply.github.com> Date: Fri, 22 Sep 2023 00:26:31 +0200 Subject: [PATCH 15/17] fix: check event is set --- .../home/report/ContextMenu/BaseReportActionContextMenu.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index 85ee8c5ae877..a4d7d08955c2 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -103,7 +103,9 @@ function BaseReportActionContextMenu(props) { } // Ensures the event does not cause side-effects beyond the context menu, e.g. when an outside element is focused - event.stopPropagation(); + if (event) { + event.stopPropagation(); + } menuItemRefs.current[focusedIndex].triggerPressAndUpdateSuccess(); setFocusedIndex(-1); From 82ed8fc38f20ed804d44724f412688291994da5b Mon Sep 17 00:00:00 2001 From: Sam Hariri <137707942+samh-nl@users.noreply.github.com> Date: Fri, 22 Sep 2023 08:48:04 +0200 Subject: [PATCH 16/17] Update src/components/ContextMenuItem.js Co-authored-by: Francois Laithier --- src/components/ContextMenuItem.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ContextMenuItem.js b/src/components/ContextMenuItem.js index 8a609dbedec8..7eab161fa5b2 100644 --- a/src/components/ContextMenuItem.js +++ b/src/components/ContextMenuItem.js @@ -36,7 +36,7 @@ const propTypes = { isAnonymousAction: PropTypes.bool, /** Whether the menu item is focused or not */ - focused: PropTypes.bool, + isFocused: PropTypes.bool, /** Forwarded ref to ContextMenuItem */ innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]), From ea487db8637b2183e478b77ebe347b15ad09cd2d Mon Sep 17 00:00:00 2001 From: Sam Hariri <137707942+samh-nl@users.noreply.github.com> Date: Fri, 22 Sep 2023 08:52:24 +0200 Subject: [PATCH 17/17] style: isFocused --- src/components/ContextMenuItem.js | 6 +++--- .../home/report/ContextMenu/BaseReportActionContextMenu.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/ContextMenuItem.js b/src/components/ContextMenuItem.js index 7eab161fa5b2..2314f2fcf64e 100644 --- a/src/components/ContextMenuItem.js +++ b/src/components/ContextMenuItem.js @@ -48,11 +48,11 @@ const defaultProps = { successText: '', description: '', isAnonymousAction: false, - focused: false, + isFocused: false, innerRef: null, }; -function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, description, isAnonymousAction, focused, innerRef}) { +function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, description, isAnonymousAction, isFocused, innerRef}) { const {windowWidth} = useWindowDimensions(); const [isThrottledButtonActive, setThrottledButtonInactive] = useThrottledButtonState(); @@ -99,7 +99,7 @@ function ContextMenuItem({onPress, successIcon, successText, icon, text, isMini, descriptionTextStyle={styles.breakAll} style={getContextMenuItemStyles(windowWidth)} isAnonymousAction={isAnonymousAction} - focused={focused} + focused={isFocused} /> ); } diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js index a4d7d08955c2..fc56b3b1fac9 100755 --- a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js +++ b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js @@ -154,7 +154,7 @@ function BaseReportActionContextMenu(props) { onPress={() => interceptAnonymousUser(() => contextAction.onPress(closePopup, payload), contextAction.isAnonymousAction)} description={contextAction.getDescription(props.selection, props.isSmallScreenWidth)} isAnonymousAction={contextAction.isAnonymousAction} - focused={focusedIndex === index} + isFocused={focusedIndex === index} /> ); })}