Fix mSafari focus #23922
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There was a problem hiding this comment. You were controlling the |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,136 @@ | ||||||||
| import _ from 'underscore'; | ||||||||
| import React, {useRef, useEffect, useCallback} from 'react'; | ||||||||
| import PropTypes from 'prop-types'; | ||||||||
| import {View} from 'react-native'; | ||||||||
| import PopoverWithMeasuredContent from '../PopoverWithMeasuredContent'; | ||||||||
| import styles from '../../styles/styles'; | ||||||||
| import withWindowDimensions, {windowDimensionsPropTypes} from '../withWindowDimensions'; | ||||||||
| import MenuItem from '../MenuItem'; | ||||||||
| import {propTypes as createMenuPropTypes, defaultProps as createMenuDefaultProps} from './popoverMenuPropTypes'; | ||||||||
| import refPropTypes from '../refPropTypes'; | ||||||||
| import Text from '../Text'; | ||||||||
| import CONST from '../../CONST'; | ||||||||
| import useArrowKeyFocusManager from '../../hooks/useArrowKeyFocusManager'; | ||||||||
| import useKeyboardShortcut from '../../hooks/useKeyboardShortcut'; | ||||||||
| import useWindowDimensions from '../../hooks/useWindowDimensions'; | ||||||||
|
|
||||||||
| const propTypes = { | ||||||||
| ...createMenuPropTypes, | ||||||||
| ...windowDimensionsPropTypes, | ||||||||
|
|
||||||||
| /** The horizontal and vertical anchors points for the popover */ | ||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||
| anchorPosition: PropTypes.shape({ | ||||||||
| horizontal: PropTypes.number.isRequired, | ||||||||
| vertical: PropTypes.number.isRequired, | ||||||||
| }).isRequired, | ||||||||
|
|
||||||||
| /** Ref of the anchor */ | ||||||||
| anchorRef: refPropTypes, | ||||||||
|
|
||||||||
| /** Where the popover should be positioned relative to the anchor points. */ | ||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||
| anchorAlignment: PropTypes.shape({ | ||||||||
| horizontal: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL)), | ||||||||
| vertical: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_VERTICAL)), | ||||||||
| }), | ||||||||
|
|
||||||||
| /** Indicates whether navigation should occur before closing the modal */ | ||||||||
| shouldNavigateBeforeClosingModal: PropTypes.bool, | ||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||
|
|
||||||||
| withoutOverlay: PropTypes.bool, | ||||||||
| }; | ||||||||
|
|
||||||||
| const defaultProps = { | ||||||||
| ...createMenuDefaultProps, | ||||||||
| anchorAlignment: { | ||||||||
| horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT, | ||||||||
| vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM, | ||||||||
| }, | ||||||||
| shouldNavigateBeforeClosingModal: false, | ||||||||
| anchorRef: () => {}, | ||||||||
| withoutOverlay: false, | ||||||||
| }; | ||||||||
|
|
||||||||
| function BasePopoverMenu(props) { | ||||||||
| const {isSmallScreenWidth} = useWindowDimensions(); | ||||||||
| const selectedItemIndex = useRef(null); | ||||||||
| const [focusedIndex, setFocusedIndex] = useArrowKeyFocusManager({initialFocusedIndex: -1, maxIndex: props.menuItems.length - 1, isActive: props.isVisible}); | ||||||||
|
|
||||||||
| const onModalHide = useCallback(() => { | ||||||||
| if (selectedItemIndex.current == null) { | ||||||||
| return; | ||||||||
| } | ||||||||
|
|
||||||||
| setFocusedIndex(-1); | ||||||||
| props.menuItems[selectedItemIndex.current].onSelected(); | ||||||||
| selectedItemIndex.current = null; | ||||||||
| }, [props.menuItems, selectedItemIndex, setFocusedIndex]); | ||||||||
|
|
||||||||
| useEffect(() => { | ||||||||
| if (!props.shouldNavigateBeforeClosingModal) { | ||||||||
| return; | ||||||||
| } | ||||||||
| onModalHide(); | ||||||||
| }, [onModalHide, props.shouldNavigateBeforeClosingModal]); | ||||||||
|
|
||||||||
| const selectItem = (index) => { | ||||||||
| const selectedItem = props.menuItems[index]; | ||||||||
| props.onItemSelected(selectedItem, index); | ||||||||
| selectedItemIndex.current = index; | ||||||||
| }; | ||||||||
|
|
||||||||
| useKeyboardShortcut( | ||||||||
| CONST.KEYBOARD_SHORTCUTS.ENTER, | ||||||||
| () => { | ||||||||
| if (focusedIndex === -1) { | ||||||||
| return; | ||||||||
| } | ||||||||
| selectItem(focusedIndex); | ||||||||
| setFocusedIndex(-1); // Reset the focusedIndex on selecting any menu | ||||||||
| }, | ||||||||
| {isActive: props.isVisible}, | ||||||||
| ); | ||||||||
|
|
||||||||
| return ( | ||||||||
| <PopoverWithMeasuredContent | ||||||||
| anchorPosition={props.anchorPosition} | ||||||||
| anchorRef={props.anchorRef} | ||||||||
| anchorAlignment={props.anchorAlignment} | ||||||||
| onClose={props.onClose} | ||||||||
| onModalHide={() => { | ||||||||
| if (props.shouldNavigateBeforeClosingModal) { | ||||||||
| return; | ||||||||
| } | ||||||||
| onModalHide(); | ||||||||
| }} | ||||||||
| isVisible={props.isVisible} | ||||||||
| animationIn={props.animationIn} | ||||||||
| animationOut={props.animationOut} | ||||||||
| animationInTiming={props.animationInTiming} | ||||||||
| disableAnimation={props.disableAnimation} | ||||||||
| fromSidebarMediumScreen={props.fromSidebarMediumScreen} | ||||||||
| withoutOverlay={props.withoutOverlay} | ||||||||
| > | ||||||||
| <View style={isSmallScreenWidth ? {} : styles.createMenuContainer}> | ||||||||
| {!_.isEmpty(props.headerText) && <Text style={[styles.createMenuHeaderText, styles.ml3]}>{props.headerText}</Text>} | ||||||||
| {_.map(props.menuItems, (item, menuIndex) => ( | ||||||||
| <MenuItem | ||||||||
| key={item.text} | ||||||||
| icon={item.icon} | ||||||||
| iconWidth={item.iconWidth} | ||||||||
| iconHeight={item.iconHeight} | ||||||||
| title={item.text} | ||||||||
| description={item.description} | ||||||||
| onPress={() => selectItem(menuIndex)} | ||||||||
| focused={focusedIndex === menuIndex} | ||||||||
| /> | ||||||||
| ))} | ||||||||
| </View> | ||||||||
| </PopoverWithMeasuredContent> | ||||||||
| ); | ||||||||
| } | ||||||||
|
|
||||||||
| BasePopoverMenu.propTypes = propTypes; | ||||||||
| BasePopoverMenu.defaultProps = defaultProps; | ||||||||
| BasePopoverMenu.displayName = 'BasePopoverMenu'; | ||||||||
|
|
||||||||
| export default React.memo(withWindowDimensions(BasePopoverMenu)); | ||||||||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This will break the form draft features on safari. Going to test it first.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So it doesn't break the form drafts. That is a different key. Trying to see for other states.