Merge pull request #42380 from tienifr/fix/41922

fix User has to click twice to select currency
Expensify · Jun 13, 2024 · fb323f6 · fb323f6
2 parents fc6d67e + 0b253d0
commit fb323f6
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 15 deletions.
diff --git a/src/components/SelectionList/BaseListItem.tsx b/src/components/SelectionList/BaseListItem.tsx
@@ -18,7 +18,6 @@ function BaseListItem<TItem extends ListItem>({
  wrapperStyle,
  containerStyle,
  isDisabled = false,
- shouldPreventDefaultFocusOnSelectRow = false,
  shouldPreventEnterKeySubmit = false,
  canSelectMultiple = false,
  onSelectRow,
@@ -88,7 +87,7 @@ function BaseListItem<TItem extends ListItem>({
  hoverDimmingValue={1}
  hoverStyle={[!item.isDisabled && styles.hoveredComponentBG, hoverStyle]}
  dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true}}
- onMouseDown={shouldPreventDefaultFocusOnSelectRow ? (e) => e.preventDefault() : undefined}
+ onMouseDown={(e) => e.preventDefault()}
  id={keyForList ?? ''}
  style={pressableStyle}
  onFocus={onFocus}

diff --git a/src/components/SelectionList/InviteMemberListItem.tsx b/src/components/SelectionList/InviteMemberListItem.tsx
@@ -24,7 +24,6 @@ function InviteMemberListItem<TItem extends ListItem>({
  onSelectRow,
  onCheckboxPress,
  onDismissError,
- shouldPreventDefaultFocusOnSelectRow,
  rightHandSideComponent,
  onFocus,
  shouldSyncFocus,
@@ -56,7 +55,6 @@ function InviteMemberListItem<TItem extends ListItem>({
  canSelectMultiple={canSelectMultiple}
  onSelectRow={onSelectRow}
  onDismissError={onDismissError}
- shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow}
  rightHandSideComponent={rightHandSideComponent}
  errors={item.errors}
  pendingAction={item.pendingAction}

diff --git a/src/components/SelectionList/RadioListItem.tsx b/src/components/SelectionList/RadioListItem.tsx
@@ -13,7 +13,6 @@ function RadioListItem<TItem extends ListItem>({
  isDisabled,
  onSelectRow,
  onDismissError,
- shouldPreventDefaultFocusOnSelectRow,
  shouldPreventEnterKeySubmit,
  rightHandSideComponent,
  isMultilineSupported = false,
@@ -34,7 +33,6 @@ function RadioListItem<TItem extends ListItem>({
  showTooltip={showTooltip}
  onSelectRow={onSelectRow}
  onDismissError={onDismissError}
- shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow}
  shouldPreventEnterKeySubmit={shouldPreventEnterKeySubmit}
  rightHandSideComponent={rightHandSideComponent}
  keyForList={item.keyForList}

diff --git a/src/components/SelectionList/Search/ReportListItem.tsx b/src/components/SelectionList/Search/ReportListItem.tsx
@@ -68,7 +68,6 @@ function ReportListItem<TItem extends ListItem>({
  canSelectMultiple,
  onSelectRow,
  onDismissError,
- shouldPreventDefaultFocusOnSelectRow,
  onFocus,
  shouldSyncFocus,
 }: ReportListItemProps<TItem>) {
@@ -119,7 +118,6 @@ function ReportListItem<TItem extends ListItem>({
  canSelectMultiple={canSelectMultiple}
  onSelectRow={() => openReportInRHP(transactionItem)}
  onDismissError={onDismissError}
- shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow}
  onFocus={onFocus}
  shouldSyncFocus={shouldSyncFocus}
  />
@@ -138,7 +136,6 @@ function ReportListItem<TItem extends ListItem>({
  canSelectMultiple={canSelectMultiple}
  onSelectRow={onSelectRow}
  onDismissError={onDismissError}
- shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow}
  errors={item.errors}
  pendingAction={item.pendingAction}
  keyForList={item.keyForList}

diff --git a/src/components/SelectionList/Search/TransactionListItem.tsx b/src/components/SelectionList/Search/TransactionListItem.tsx
@@ -13,7 +13,6 @@ function TransactionListItem<TItem extends ListItem>({
  canSelectMultiple,
  onSelectRow,
  onDismissError,
- shouldPreventDefaultFocusOnSelectRow,
  onFocus,
  shouldSyncFocus,
 }: TransactionListItemProps<TItem>) {
@@ -42,7 +41,6 @@ function TransactionListItem<TItem extends ListItem>({
  canSelectMultiple={canSelectMultiple}
  onSelectRow={onSelectRow}
  onDismissError={onDismissError}
- shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow}
  errors={item.errors}
  pendingAction={item.pendingAction}
  keyForList={item.keyForList}

diff --git a/src/components/SelectionList/TableListItem.tsx b/src/components/SelectionList/TableListItem.tsx
@@ -21,7 +21,6 @@ function TableListItem<TItem extends ListItem>({
  onSelectRow,
  onCheckboxPress,
  onDismissError,
- shouldPreventDefaultFocusOnSelectRow,
  rightHandSideComponent,
  onFocus,
  shouldSyncFocus,
@@ -53,7 +52,6 @@ function TableListItem<TItem extends ListItem>({
  canSelectMultiple={canSelectMultiple}
  onSelectRow={onSelectRow}
  onDismissError={onDismissError}
- shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow}
  rightHandSideComponent={rightHandSideComponent}
  errors={item.errors}
  pendingAction={item.pendingAction}

diff --git a/src/components/SelectionList/UserListItem.tsx b/src/components/SelectionList/UserListItem.tsx
@@ -25,7 +25,6 @@ function UserListItem<TItem extends ListItem>({
  onSelectRow,
  onCheckboxPress,
  onDismissError,
- shouldPreventDefaultFocusOnSelectRow,
  shouldPreventEnterKeySubmit,
  rightHandSideComponent,
  onFocus,
@@ -59,7 +58,6 @@ function UserListItem<TItem extends ListItem>({
  canSelectMultiple={canSelectMultiple}
  onSelectRow={onSelectRow}
  onDismissError={onDismissError}
- shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow}
  shouldPreventEnterKeySubmit={shouldPreventEnterKeySubmit}
  rightHandSideComponent={rightHandSideComponent}
  errors={item.errors}