Merge pull request #28931 from rezkiy37/fix/28919-disabled-fields-on-…

…confirm-task [CP Staging] Fix disabled chevron of "MenuItem" (cherry picked from commit 74ce732)
Expensify · Oct 5, 2023 · e57db58 · e57db58
1 parent 307fa6c
commit e57db58
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 19 deletions.
diff --git a/src/components/MenuItem.js b/src/components/MenuItem.js
@@ -2,7 +2,6 @@ import _ from 'underscore';
 import React, {useEffect, useMemo} from 'react';
 import {View} from 'react-native';
 import ExpensiMark from 'expensify-common/lib/ExpensiMark';
-import PressableWithFeedback from './Pressable/PressableWithFeedback';
 import Text from './Text';
 import styles from '../styles/styles';
 import themeColors from '../styles/themes/default';
@@ -50,8 +49,6 @@ const defaultProps = {
     iconHeight: undefined,
     description: undefined,
     iconRight: Expensicons.ArrowRight,
-    onIconRightPress: undefined,
-    iconRightAccessibilityLabel: undefined,
     iconStyles: [],
     iconFill: undefined,
     secondaryIconFill: undefined,
@@ -136,7 +133,7 @@ const MenuItem = React.forwardRef((props, ref) => {
         return '';
     }, [props.title, props.shouldRenderAsHTML, props.shouldParseTitle, html]);
 
-    const hasPressableRightComponent = props.onIconRightPress || props.iconRight || (props.rightComponent && props.shouldShowRightComponent);
+    const hasPressableRightComponent = props.iconRight || (props.rightComponent && props.shouldShowRightComponent);
 
     return (
         <Hoverable>
@@ -345,19 +342,12 @@ const MenuItem = React.forwardRef((props, ref) => {
                                     </View>
                                 )}
                                 {Boolean(props.shouldShowRightIcon) && (
-                                    <PressableWithFeedback
-                                        wrapperStyle={[styles.popoverMenuIcon, styles.pointerEventsAuto, props.disabled && styles.cursorDisabled]}
-                                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
-                                        accessibilityLabel={props.iconRightAccessibilityLabel ? props.iconRightAccessibilityLabel : ''}
-                                        accessible={!props.onIconRightPress}
-                                        disabled={!props.onIconRightPress}
-                                        onPress={props.onIconRightPress}
-                                    >
+                                    <View style={[styles.popoverMenuIcon, styles.pointerEventsAuto, props.disabled && styles.cursorDisabled]}>
                                         <Icon
                                             src={props.iconRight}
                                             fill={StyleUtils.getIconFillColor(getButtonState(props.focused || isHovered, pressed, props.success, props.disabled, props.interactive))}
                                         />
-                                    </PressableWithFeedback>
+                                    </View>
                                 )}
                                 {props.shouldShowRightComponent && props.rightComponent}
                                 {props.shouldShowSelectedState && <SelectCircle isChecked={props.isSelected} />}

diff --git a/src/components/menuItemPropTypes.js b/src/components/menuItemPropTypes.js
@@ -67,12 +67,6 @@ const propTypes = {
     /** Overrides the icon for shouldShowRightIcon */
     iconRight: PropTypes.elementType,
 
-    /** Function to fire when the right icon has been pressed */
-    onIconRightPress: PropTypes.func,
-
-    /** accessibilityLabel for the right icon when it's pressable */
-    iconRightAccessibilityLabel: PropTypes.string,
-
     /** A description text to show under the title */
     description: PropTypes.string,