Fix up disableRowInteractivity. Add missing propType

Expensify · Mar 8, 2022 · 495d3db · 495d3db
1 parent 9b20b23
commit 495d3db
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 11 deletions.
diff --git a/src/components/IOUConfirmationList.js b/src/components/IOUConfirmationList.js
@@ -364,7 +364,7 @@ class IOUConfirmationList extends Component {
                         canSelectMultipleOptions={this.props.hasMultipleParticipants}
                         selectedOptions={this.getSelectedOptions()}
                         onSelectRow={toggleOption}
-                        disableRowInteractivity={!this.props.isGroupSplit}
+                        isDisabled={!this.props.isGroupSplit}
                         optionHoveredStyle={hoverStyle}
                     />
                 </ScrollView>

diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js
@@ -62,9 +62,6 @@ const propTypes = {
     /** Whether this option should be disabled */
     isDisabled: PropTypes.bool,
 
-    /** Whether to disable the interactivity of this row */
-    disableRowInteractivity: PropTypes.bool,
-
     ...withLocalizePropTypes,
 };
 
@@ -80,7 +77,6 @@ const defaultProps = {
     onSelectRow: () => {},
     isDisabled: false,
     optionIsFocused: false,
-    disableRowInteractivity: false,
 };
 
 const OptionRow = (props) => {
@@ -143,7 +139,7 @@ const OptionRow = (props) => {
                         e.preventDefault();
                         props.onSelectRow(props.option, touchableRef);
                     }}
-                    disabled={props.disableRowInteractivity}
+                    disabled={props.isDisabled}
                     activeOpacity={0.8}
                     style={[
                         styles.flexRow,

diff --git a/src/components/OptionsList/BaseOptionsList.js b/src/components/OptionsList/BaseOptionsList.js
@@ -111,7 +111,7 @@ class BaseOptionsList extends Component {
                 showSelectedState={this.props.canSelectMultipleOptions}
                 hideAdditionalOptionStates={this.props.hideAdditionalOptionStates}
                 forceTextUnreadStyle={this.props.forceTextUnreadStyle}
-                disableRowInteractivity={this.props.disableRowInteractivity}
+                isDisabled={this.props.isDisabled}
             />
         );
     }

diff --git a/src/components/OptionsList/optionsListPropTypes.js b/src/components/OptionsList/optionsListPropTypes.js
@@ -74,7 +74,7 @@ const propTypes = {
     optionMode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)),
 
     /** Whether to disable the interactivity of the list's option row(s) */
-    disableRowInteractivity: PropTypes.bool,
+    isDisabled: PropTypes.bool,
 
     /** Callback to execute when the SectionList lays out */
     onLayout: PropTypes.func,
@@ -98,7 +98,7 @@ const defaultProps = {
     innerRef: null,
     showTitleTooltip: false,
     optionMode: undefined,
-    disableRowInteractivity: false,
+    isDisabled: false,
     onLayout: undefined,
 };
 

diff --git a/src/components/optionPropTypes.js b/src/components/optionPropTypes.js
@@ -35,6 +35,9 @@ export default PropTypes.shape({
     // Whether the report corresponds to a chat room
     isChatRoom: PropTypes.bool,
 
+    // Whether the option has an outstanding IOU
+    hasOutstandingIOU: PropTypes.bool,
+
     // List of participants of the report
     participantsList: PropTypes.arrayOf(participantPropTypes),
 

diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js
@@ -215,7 +215,7 @@ class WorkspaceMembersPage extends React.Component {
                     <View style={styles.flex1}>
                         <OptionRow
                             forceTextUnreadStyle
-                            disableRowInteractivity
+                            isDisabled
                             option={{
                                 text: Str.removeSMSDomain(item.displayName),
                                 alternateText: Str.removeSMSDomain(item.login),

diff --git a/src/stories/OptionRow.stories.js b/src/stories/OptionRow.stories.js
@@ -25,7 +25,6 @@ export default {
         forceTextUnreadStyle: false,
         showTitleTooltip: false,
         isDisabled: false,
-        disableRowInteractivity: false,
         backgroundColor: 'white',
         option: {
             isUnread: false,