Merge pull request Expensify#19011 from allroundexperts/fix-15289

src/App.js

@@ -12,6 +12,7 @@ import Expensify from './Expensify';
 import {LocaleContextProvider} from './components/withLocalize';
 import OnyxProvider from './components/OnyxProvider';
 import HTMLEngineProvider from './components/HTMLEngineProvider';
+import PopoverContextProvider from './components/PopoverProvider';
 import ComposeProviders from './components/ComposeProviders';
 import SafeArea from './components/SafeArea';
 import * as Environment from './libs/Environment/Environment';
@@ -51,6 +52,7 @@ function App() {
                     HTMLEngineProvider,
                     WindowDimensionsProvider,
                     KeyboardStateProvider,
+                    PopoverContextProvider,
                     CurrentReportIDContextProvider,
                     PickerStateProvider,
                     EnvironmentProvider,

src/components/AddPaymentMethodMenu.js

@@ -9,6 +9,7 @@ import CONST from '../CONST';
 import withWindowDimensions from './withWindowDimensions';
 import Permissions from '../libs/Permissions';
 import PopoverMenu from './PopoverMenu';
+import refPropTypes from './refPropTypes';
 import paypalMeDataPropTypes from './paypalMeDataPropTypes';
 
 const propTypes = {
@@ -33,6 +34,9 @@ const propTypes = {
     /** List of betas available to current user */
     betas: PropTypes.arrayOf(PropTypes.string),
 
+    /** Popover anchor ref */
+    anchorRef: refPropTypes,
+
     ...withLocalizePropTypes,
 };
 
@@ -41,6 +45,7 @@ const defaultProps = {
     payPalMeData: {},
     shouldShowPaypal: true,
     betas: [],
+    anchorRef: () => {},
 };
 
 function AddPaymentMethodMenu(props) {
@@ -49,6 +54,7 @@ function AddPaymentMethodMenu(props) {
             isVisible={props.isVisible}
             onClose={props.onClose}
             anchorPosition={props.anchorPosition}
+            anchorRef={props.anchorRef}
             onItemSelected={props.onClose}
             menuItems={[
                 {
@@ -77,6 +83,7 @@ function AddPaymentMethodMenu(props) {
                       ]
                     : []),
             ]}
+            withoutOverlay
         />
     );
 }

src/components/AvatarWithImagePicker.js

@@ -116,6 +116,7 @@ class AvatarWithImagePicker extends React.Component {
             imageUri: '',
             imageType: '',
         };
+        this.anchorRef = React.createRef();
     }
 
     componentDidMount() {
@@ -225,22 +226,14 @@ class AvatarWithImagePicker extends React.Component {
         this.setState({isAvatarCropModalOpen: false});
     }
 
-    /**
-     * Create menu items list for avatar menu
-     *
-     * @param {Function} openPicker
-     * @returns {Array}
-     */
-    createMenuItems(openPicker) {
+    render() {
+        const DefaultAvatar = this.props.DefaultAvatar;
+        const additionalStyles = _.isArray(this.props.style) ? this.props.style : [this.props.style];
         const menuItems = [
             {
                 icon: Expensicons.Upload,
                 text: this.props.translate('avatarWithImagePicker.uploadPhoto'),
-                onSelected: () => {
-                    openPicker({
-                        onPicked: this.showAvatarCropModal,
-                    });
-                },
+                onSelected: () => {},
             },
         ];
 
@@ -255,17 +248,11 @@ class AvatarWithImagePicker extends React.Component {
                 },
             });
         }
-        return menuItems;
-    }
-
-    render() {
-        const DefaultAvatar = this.props.DefaultAvatar;
-        const additionalStyles = _.isArray(this.props.style) ? this.props.style : [this.props.style];
 
         return (
             <View style={[styles.alignItemsCenter, ...additionalStyles]}>
                 <PressableWithoutFeedback
-                    onPress={() => this.setState({isMenuVisible: true})}
+                    onPress={() => this.setState((prev) => ({isMenuVisible: !prev.isMenuVisible}))}
                     accessibilityRole={CONST.ACCESSIBILITY_ROLE.IMAGEBUTTON}
                     accessibilityLabel={this.props.translate('avatarWithImagePicker.editImage')}
                     disabled={this.state.isAvatarCropModalOpen}
@@ -311,9 +298,21 @@ class AvatarWithImagePicker extends React.Component {
                                     <PopoverMenu
                                         isVisible={this.state.isMenuVisible}
                                         onClose={() => this.setState({isMenuVisible: false})}
-                                        onItemSelected={() => this.setState({isMenuVisible: false})}
-                                        menuItems={this.createMenuItems(openPicker)}
+                                        onItemSelected={(item, index) => {
+                                            this.setState({isMenuVisible: false});
+                                            // In order for the file picker to open dynamically, the click
+                                            // function must be called from within a event handler that was initiated
+                                            // by the user.
+                                            if (index === 0) {
+                                                openPicker({
+                                                    onPicked: this.showAvatarCropModal,
+                                                });
+                                            }
+                                        }}
+                                        menuItems={menuItems}
                                         anchorPosition={this.props.anchorPosition}
+                                        withoutOverlay
+                                        anchorRef={this.anchorRef}
                                         anchorAlignment={this.props.anchorAlignment}
                                     />
                                 </>

src/components/ButtonWithDropdownMenu.js

@@ -117,6 +117,8 @@ function ButtonWithDropdownMenu(props) {
                     onClose={() => setIsMenuVisible(false)}
                     onItemSelected={() => setIsMenuVisible(false)}
                     anchorPosition={popoverAnchorPosition}
+                    anchorRef={caretButton}
+                    withoutOverlay
                     anchorAlignment={{
                         horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
                         vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,

src/components/EmojiPicker/EmojiPicker.js

@@ -155,6 +155,8 @@ const EmojiPicker = forwardRef((props, ref) => {
                 vertical: emojiPopoverAnchorPosition.vertical,
                 horizontal: emojiPopoverAnchorPosition.horizontal,
             }}
+            anchorRef={emojiPopoverAnchor}
+            withoutOverlay
             popoverDimensions={{
                 width: CONST.EMOJI_PICKER_SIZE.WIDTH,
                 height: CONST.EMOJI_PICKER_SIZE.HEIGHT,

src/components/EmojiPicker/EmojiPickerButton.js

@@ -1,4 +1,4 @@
-import React, {useEffect} from 'react';
+import React, {useEffect, useRef} from 'react';
 import PropTypes from 'prop-types';
 import styles from '../../styles/styles';
 import * as StyleUtils from '../../styles/StyleUtils';
@@ -34,15 +34,23 @@ const defaultProps = {
 };
 
 function EmojiPickerButton(props) {
-    let emojiPopoverAnchor = null;
+    const emojiPopoverAnchor = useRef(null);
+
     useEffect(() => EmojiPickerAction.resetEmojiPopoverAnchor, []);
+
     return (
         <Tooltip text={props.translate('reportActionCompose.emoji')}>
             <PressableWithoutFeedback
-                ref={(el) => (emojiPopoverAnchor = el)}
+                ref={emojiPopoverAnchor}
                 style={({hovered, pressed}) => [styles.chatItemEmojiButton, StyleUtils.getButtonBackgroundColorStyle(getButtonState(hovered, pressed))]}
                 disabled={props.isDisabled}
-                onPress={() => EmojiPickerAction.showEmojiPicker(props.onModalHide, props.onEmojiSelected, emojiPopoverAnchor, undefined, () => {}, props.reportAction)}
+                onPress={() => {
+                    if (!EmojiPickerAction.emojiPickerRef.current.isEmojiPickerVisible) {
+                        EmojiPickerAction.showEmojiPicker(props.onModalHide, props.onEmojiSelected, emojiPopoverAnchor.current, undefined, () => {}, props.reportAction);
+                    } else {
+                        EmojiPickerAction.emojiPickerRef.current.hideEmojiPicker();
+                    }
+                }}
                 nativeID={props.nativeID}
                 accessibilityLabel={props.translate('reportActionCompose.emoji')}
             >

src/components/FloatingActionButton.js

@@ -23,9 +23,16 @@ const propTypes = {
     // Current state (active or not active) of the component
     isActive: PropTypes.bool.isRequired,
 
+    // Ref for the button
+    buttonRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
+
     ...withLocalizePropTypes,
 };
 
+const defaultProps = {
+    buttonRef: () => {},
+};
+
 class FloatingActionButton extends PureComponent {
     constructor(props) {
         super(props);
@@ -75,7 +82,12 @@ class FloatingActionButton extends PureComponent {
             <Tooltip text={this.props.translate('common.new')}>
                 <View style={styles.floatingActionButtonContainer}>
                     <AnimatedPressable
-                        ref={(el) => (this.fabPressable = el)}
+                        ref={(el) => {
+                            this.fabPressable = el;
+                            if (this.props.buttonRef) {
+                                this.props.buttonRef.current = el;
+                            }
+                        }}
                         accessibilityLabel={this.props.accessibilityLabel}
                         accessibilityRole={this.props.accessibilityRole}
                         pressDimmingValue={1}
@@ -99,5 +111,14 @@ class FloatingActionButton extends PureComponent {
 }
 
 FloatingActionButton.propTypes = propTypes;
+FloatingActionButton.defaultProps = defaultProps;
+
+const FloatingActionButtonWithLocalize = withLocalize(FloatingActionButton);
 
-export default withLocalize(FloatingActionButton);
+export default React.forwardRef((props, ref) => (
+    <FloatingActionButtonWithLocalize
+        // eslint-disable-next-line
+        {...props}
+        buttonRef={ref}
+    />
+));

src/components/LHNOptionsList/OptionRowLHN.js

@@ -1,5 +1,5 @@
 import _ from 'underscore';
-import React, {useState} from 'react';
+import React, {useState, useRef} from 'react';
 import PropTypes from 'prop-types';
 import {View, StyleSheet} from 'react-native';
 import * as optionRowStyles from '../../styles/optionRowStyles';
@@ -57,6 +57,8 @@ const defaultProps = {
 };
 
 function OptionRowLHN(props) {
+    const popoverAnchor = useRef(null);
+
     const {translate} = useLocalize();
 
     const optionItem = props.optionItem;
@@ -71,7 +73,6 @@ function OptionRowLHN(props) {
         return null;
     }
 
-    let popoverAnchor = null;
     const textStyle = props.isFocused ? styles.sidebarLinkActiveText : styles.sidebarLinkText;
     const textUnreadStyle = optionItem.isUnread ? [textStyle, styles.sidebarLinkTextBold] : [textStyle];
     const displayNameStyle = StyleUtils.combineStyles([styles.optionDisplayName, styles.optionDisplayNameCompact, styles.pre, ...textUnreadStyle], props.style);
@@ -133,7 +134,7 @@ function OptionRowLHN(props) {
             <Hoverable>
                 {(hovered) => (
                     <PressableWithSecondaryInteraction
-                        ref={(el) => (popoverAnchor = el)}
+                        ref={popoverAnchor}
                         onPress={(e) => {
                             if (e) {
                                 e.preventDefault();

src/components/Popover/index.js

@@ -4,6 +4,7 @@ import {propTypes, defaultProps} from './popoverPropTypes';
 import CONST from '../../CONST';
 import Modal from '../Modal';
 import withWindowDimensions from '../withWindowDimensions';
+import PopoverWithoutOverlay from '../PopoverWithoutOverlay';
 
 /*
  * This is a convenience wrapper around the Modal component for a responsive Popover.
@@ -25,6 +26,12 @@ function Popover(props) {
             document.body,
         );
     }
+
+    if (props.withoutOverlay && !props.isSmallScreenWidth) {
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        return createPortal(<PopoverWithoutOverlay {...props} />, document.body);
+    }
+
     return (
         <Modal
             // eslint-disable-next-line react/jsx-props-no-spreading

src/components/Popover/popoverPropTypes.js

@@ -1,6 +1,7 @@
 import _ from 'underscore';
 import PropTypes from 'prop-types';
 import {propTypes as modalPropTypes, defaultProps as defaultModalProps} from '../Modal/modalPropTypes';
+import refPropTypes from '../refPropTypes';
 import CONST from '../../CONST';
 
 const propTypes = {
@@ -14,6 +15,9 @@ const propTypes = {
         left: PropTypes.number,
     }),
 
+    /** The anchor ref of the popover */
+    anchorRef: refPropTypes,
+
     /** A react-native-animatable animation timing for the modal display animation. */
     animationInTiming: PropTypes.number,
 
@@ -30,6 +34,7 @@ const defaultProps = {
 
     // Anchor position is optional only because it is not relevant on mobile
     anchorPosition: {},
+    anchorRef: () => {},
     disableAnimation: true,
 };
 

src/components/PopoverMenu/index.js

@@ -7,6 +7,7 @@ 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';
@@ -23,11 +24,16 @@ const propTypes = {
         vertical: PropTypes.number.isRequired,
     }).isRequired,
 
+    /** Ref of the anchor */
+    anchorRef: refPropTypes,
+
     /** Where the popover should be positioned relative to the anchor points. */
     anchorAlignment: PropTypes.shape({
         horizontal: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL)),
         vertical: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_VERTICAL)),
     }),
+
+    withoutOverlay: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -36,6 +42,8 @@ const defaultProps = {
         horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
         vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
     },
+    anchorRef: () => {},
+    withoutOverlay: false,
 };
 
 function PopoverMenu(props) {
@@ -45,7 +53,7 @@ function PopoverMenu(props) {
 
     const selectItem = (index) => {
         const selectedItem = props.menuItems[index];
-        props.onItemSelected(selectedItem);
+        props.onItemSelected(selectedItem, index);
         setSelectedItemIndex(index);
     };
 
@@ -64,6 +72,7 @@ function PopoverMenu(props) {
     return (
         <PopoverWithMeasuredContent
             anchorPosition={props.anchorPosition}
+            anchorRef={props.anchorRef}
             anchorAlignment={props.anchorAlignment}
             onClose={props.onClose}
             isVisible={props.isVisible}
@@ -79,6 +88,7 @@ function PopoverMenu(props) {
             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>}

src/components/PopoverMenu/popoverMenuPropTypes.js

@@ -33,6 +33,9 @@ const propTypes = {
         left: PropTypes.number,
     }).isRequired,
 
+    /** The anchor reference of the CreateMenu popover */
+    anchorRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]).isRequired,
+
     /** A react-native-animatable animation definition for the modal display animation. */
     animationIn: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),