Merge pull request #20553 from allroundexperts/fix-20495

fix: show cursor pointer for option row where no press function is given
Expensify · Jun 9, 2023 · 33fda84 · 33fda84
2 parents 2381734 + ac263be
commit 33fda84
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
@@ -166,7 +166,6 @@ function MoneyRequestConfirmationList(props) {
                     data: [formattedPayeePersonalDetails],
                     shouldShow: true,
                     indexOffset: 0,
-                    isDisabled: true,
                 },
                 {
                     title: translate('moneyRequestConfirmationList.whoWasThere'),
@@ -296,7 +295,6 @@ function MoneyRequestConfirmationList(props) {
             selectedOptions={selectedOptions}
             canSelectMultipleOptions={canModifyParticipants}
             disableArrowKeysActions={!canModifyParticipants}
-            isDisabled={!canModifyParticipants}
             boldStyle
             shouldTextInputAppearBelowOptions
             shouldShowTextInput={false}

diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js
@@ -68,7 +68,7 @@ const defaultProps = {
     isSelected: false,
     boldStyle: false,
     showTitleTooltip: false,
-    onSelectRow: () => {},
+    onSelectRow: undefined,
     isDisabled: false,
     optionIsFocused: false,
     style: null,
@@ -151,6 +151,10 @@ class OptionRow extends Component {
                         <PressableWithFeedback
                             ref={(el) => (pressableRef = el)}
                             onPress={(e) => {
+                                if (!this.props.onSelectRow) {
+                                    return;
+                                }
+
                                 this.setState({isDisabled: true});
                                 if (e) {
                                     e.preventDefault();
@@ -172,6 +176,7 @@ class OptionRow extends Component {
                                 this.props.shouldDisableRowInnerPadding ? null : styles.sidebarLinkInner,
                                 this.props.optionIsFocused ? styles.sidebarLinkActive : null,
                                 this.props.shouldHaveOptionSeparator && styles.borderTop,
+                                !this.props.onSelectRow && !this.props.isDisabled ? styles.cursorDefault : null,
                             ]}
                             accessibilityLabel={this.props.option.text}
                             accessibilityRole="button"

diff --git a/src/components/OptionsList/optionsListPropTypes.js b/src/components/OptionsList/optionsListPropTypes.js
@@ -88,7 +88,7 @@ const defaultProps = {
     hideSectionHeaders: false,
     disableFocusOptions: false,
     boldStyle: false,
-    onSelectRow: () => {},
+    onSelectRow: undefined,
     headerMessage: '',
     innerRef: null,
     showTitleTooltip: false,

diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js
@@ -305,7 +305,7 @@ class BaseOptionsSelector extends Component {
             <OptionsList
                 ref={(el) => (this.list = el)}
                 optionHoveredStyle={this.props.optionHoveredStyle}
-                onSelectRow={this.selectRow}
+                onSelectRow={this.props.onSelectRow ? this.selectRow : undefined}
                 sections={this.props.sections}
                 focusedIndex={this.state.focusedIndex}
                 selectedOptions={this.props.selectedOptions}

diff --git a/src/components/OptionsSelector/optionsSelectorPropTypes.js b/src/components/OptionsSelector/optionsSelectorPropTypes.js
@@ -109,7 +109,7 @@ const propTypes = {
 };
 
 const defaultProps = {
-    onSelectRow: () => {},
+    onSelectRow: undefined,
     textInputLabel: '',
     placeholderText: '',
     keyboardType: 'default',

diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js
@@ -345,7 +345,6 @@ class WorkspaceMembersPage extends React.Component {
                     />
                     <View style={styles.flex1}>
                         <OptionRow
-                            isDisabled
                             boldStyle
                             option={{
                                 text: this.props.formatPhoneNumber(item.displayName),
@@ -360,6 +359,7 @@ class WorkspaceMembersPage extends React.Component {
                                 ],
                                 keyForList: item.login,
                             }}
+                            onSelectRow={() => this.toggleUser(item.login, item.pendingAction)}
                         />
                     </View>
                     {(this.props.session.email === item.login || item.role === 'admin') && (