From ee20216ce864e974f55f4685f29033803527b762 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 14 Jun 2023 10:29:49 +0700 Subject: [PATCH 01/10] fix: remain focus when selecting option --- src/components/OptionRow.js | 1 + src/components/OptionsList/BaseOptionsList.js | 1 + src/components/OptionsSelector/BaseOptionsSelector.js | 9 +++++++++ 3 files changed, 11 insertions(+) diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js index 28ee50ccf8a1..4dfbc7462041 100644 --- a/src/components/OptionRow.js +++ b/src/components/OptionRow.js @@ -183,6 +183,7 @@ class OptionRow extends Component { hoverDimmingValue={1} hoverStyle={this.props.hoverStyle} focusStyle={this.props.hoverStyle} + onMouseDown={this.props.onRowMouseDown} > diff --git a/src/components/OptionsList/BaseOptionsList.js b/src/components/OptionsList/BaseOptionsList.js index df14af5234bd..4b3df3c900ed 100644 --- a/src/components/OptionsList/BaseOptionsList.js +++ b/src/components/OptionsList/BaseOptionsList.js @@ -174,6 +174,7 @@ class BaseOptionsList extends Component { isDisabled={isDisabled} shouldHaveOptionSeparator={index > 0 && this.props.shouldHaveOptionSeparator} shouldDisableRowInnerPadding={this.props.shouldDisableRowInnerPadding} + onRowMouseDown={this.props.onRowMouseDown} /> ); } diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js index f64c5975b986..c079a78eb779 100755 --- a/src/components/OptionsSelector/BaseOptionsSelector.js +++ b/src/components/OptionsSelector/BaseOptionsSelector.js @@ -261,6 +261,7 @@ class BaseOptionsSelector extends Component { * @returns {Promise} */ selectRow(option, ref) { + console.log("selectRow") return new Promise((resolve) => { if (this.props.shouldShowTextInput && this.props.shouldFocusOnSelectRow) { if (this.relatedTarget && ref === this.relatedTarget) { @@ -337,6 +338,14 @@ class BaseOptionsSelector extends Component { contentContainerStyles={[safeAreaPaddingBottomStyle, ...this.props.contentContainerStyles]} listContainerStyles={this.props.listContainerStyles} isLoading={!this.props.shouldShowOptions} + onRowMouseDown={(e) => { + if (!e || !this.textInput.isFocused()) { + return; + } + console.log("onRowMouseDown") + + e.preventDefault(); + }} /> ); return ( From ab6dd45d1bb3d44c6b035e3e9dabe7892862c80e Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 14 Jun 2023 11:43:59 +0700 Subject: [PATCH 02/10] fix: lint --- src/components/OptionsSelector/BaseOptionsSelector.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js index c079a78eb779..8815cb1a0a2d 100755 --- a/src/components/OptionsSelector/BaseOptionsSelector.js +++ b/src/components/OptionsSelector/BaseOptionsSelector.js @@ -261,7 +261,7 @@ class BaseOptionsSelector extends Component { * @returns {Promise} */ selectRow(option, ref) { - console.log("selectRow") + console.log('selectRow'); return new Promise((resolve) => { if (this.props.shouldShowTextInput && this.props.shouldFocusOnSelectRow) { if (this.relatedTarget && ref === this.relatedTarget) { @@ -342,8 +342,8 @@ class BaseOptionsSelector extends Component { if (!e || !this.textInput.isFocused()) { return; } - console.log("onRowMouseDown") - + console.log('onRowMouseDown'); + e.preventDefault(); }} /> From 0debd1ca3206ad1f8c4a481e8294d3e799019e9b Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 14 Jun 2023 11:44:38 +0700 Subject: [PATCH 03/10] fix: lint --- src/components/OptionsSelector/BaseOptionsSelector.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js index 8815cb1a0a2d..f65e82def619 100755 --- a/src/components/OptionsSelector/BaseOptionsSelector.js +++ b/src/components/OptionsSelector/BaseOptionsSelector.js @@ -342,8 +342,6 @@ class BaseOptionsSelector extends Component { if (!e || !this.textInput.isFocused()) { return; } - console.log('onRowMouseDown'); - e.preventDefault(); }} /> From 59a6ffcba892e7243761cf8251a3c4cf37384d23 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 14 Jun 2023 11:45:20 +0700 Subject: [PATCH 04/10] fix: lint --- src/components/OptionsSelector/BaseOptionsSelector.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js index f65e82def619..887d2f4923ba 100755 --- a/src/components/OptionsSelector/BaseOptionsSelector.js +++ b/src/components/OptionsSelector/BaseOptionsSelector.js @@ -261,7 +261,6 @@ class BaseOptionsSelector extends Component { * @returns {Promise} */ selectRow(option, ref) { - console.log('selectRow'); return new Promise((resolve) => { if (this.props.shouldShowTextInput && this.props.shouldFocusOnSelectRow) { if (this.relatedTarget && ref === this.relatedTarget) { From 77930ee3527055f20e53071458ed816f5dc5d9ab Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 28 Jun 2023 17:46:43 +0700 Subject: [PATCH 05/10] select text when user unselect member --- .../MoneyRequestParticipantsSplitSelector.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js index ef486dff123f..5eacd7e328cf 100755 --- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js +++ b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js @@ -219,6 +219,7 @@ class MoneyRequestParticipantsSplitSelector extends Component { headerMessage={headerMessage} boldStyle shouldShowConfirmButton + shouldFocusOnSelectRow confirmButtonText={this.props.translate('common.next')} onConfirmSelection={this.finalizeParticipants} textInputLabel={this.props.translate('optionsSelector.nameEmailOrPhoneNumber')} From f825d179ca6acfb206b68055eff50138d09aa992 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Tue, 4 Jul 2023 17:19:38 +0700 Subject: [PATCH 06/10] retain search input in split bill --- ios/Podfile.lock | 2 +- src/components/OptionRow.js | 2 -- src/components/OptionsList/BaseOptionsList.js | 1 - src/components/OptionsSelector/BaseOptionsSelector.js | 6 ------ 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 41f6eadb9bd3..80ba0e0b5b79 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1141,4 +1141,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 4ed1c7b099741c82e2b0411b95f6468e72be6c76 -COCOAPODS: 1.12.1 +COCOAPODS: 1.11.3 diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js index c6e3928512ea..14b16949de70 100644 --- a/src/components/OptionRow.js +++ b/src/components/OptionRow.js @@ -185,8 +185,6 @@ class OptionRow extends Component { accessibilityRole="button" hoverDimmingValue={1} hoverStyle={this.props.hoverStyle} - focusStyle={this.props.hoverStyle} - onMouseDown={this.props.onRowMouseDown} > diff --git a/src/components/OptionsList/BaseOptionsList.js b/src/components/OptionsList/BaseOptionsList.js index dec3c7b10504..9c5777e222c9 100644 --- a/src/components/OptionsList/BaseOptionsList.js +++ b/src/components/OptionsList/BaseOptionsList.js @@ -174,7 +174,6 @@ class BaseOptionsList extends Component { isDisabled={isDisabled} shouldHaveOptionSeparator={index > 0 && this.props.shouldHaveOptionSeparator} shouldDisableRowInnerPadding={this.props.shouldDisableRowInnerPadding} - onRowMouseDown={this.props.onRowMouseDown} /> ); } diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js index 09ad223d405f..0311af867a1e 100755 --- a/src/components/OptionsSelector/BaseOptionsSelector.js +++ b/src/components/OptionsSelector/BaseOptionsSelector.js @@ -337,12 +337,6 @@ class BaseOptionsSelector extends Component { contentContainerStyles={[safeAreaPaddingBottomStyle, ...this.props.contentContainerStyles]} listContainerStyles={this.props.listContainerStyles} isLoading={!this.props.shouldShowOptions} - onRowMouseDown={(e) => { - if (!e || !this.textInput.isFocused()) { - return; - } - e.preventDefault(); - }} /> ); return ( From 9c3f92ce2d81fb2f5a04481d620f1c88efe92c42 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Tue, 4 Jul 2023 17:21:23 +0700 Subject: [PATCH 07/10] remove redandunt --- ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 80ba0e0b5b79..41f6eadb9bd3 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1141,4 +1141,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 4ed1c7b099741c82e2b0411b95f6468e72be6c76 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 From f4776fe15aa69f80899e2e15b107edb80373020a Mon Sep 17 00:00:00 2001 From: dukenv0307 <129500732+dukenv0307@users.noreply.github.com> Date: Wed, 5 Jul 2023 00:03:26 +0700 Subject: [PATCH 08/10] Update src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js Co-authored-by: Sobit Neupane <073bct543.sobit@pcampus.edu.np> --- .../MoneyRequestParticipantsSplitSelector.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js index 648e5da7ae74..e249abf7c138 100755 --- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js +++ b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js @@ -178,7 +178,7 @@ function MoneyRequestParticipantsSplitSelector({betas, participants, personalDet textInputLabel={translate('optionsSelector.nameEmailOrPhoneNumber')} safeAreaPaddingBottomStyle={safeAreaPaddingBottomStyle} shouldShowOptions={isOptionsDataReady} - shouldFocusOnSelectRow + shouldFocusOnSelectRow={!Browser.isMobile()} /> ); From a93b78a358fcff3c170b6c9843330f39ef96dc53 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 5 Jul 2023 00:12:05 +0700 Subject: [PATCH 09/10] add import --- .../MoneyRequestParticipantsSplitSelector.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js index e249abf7c138..7a14a15acc0e 100755 --- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js +++ b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js @@ -12,8 +12,10 @@ import CONST from '../../../../CONST'; import withLocalize, {withLocalizePropTypes} from '../../../../components/withLocalize'; import compose from '../../../../libs/compose'; import personalDetailsPropType from '../../../personalDetailsPropType'; +import * as Browser from '../../../../libs/Browser'; import reportPropTypes from '../../../reportPropTypes'; + const propTypes = { /** Beta features list */ betas: PropTypes.arrayOf(PropTypes.string), From fdb9f85567f0891002192d666ab4d1c41d0af35d Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 5 Jul 2023 00:17:11 +0700 Subject: [PATCH 10/10] remove empty line --- .../MoneyRequestParticipantsSplitSelector.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js index 7a14a15acc0e..0c1376006271 100755 --- a/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js +++ b/src/pages/iou/steps/MoneyRequstParticipantsPage/MoneyRequestParticipantsSplitSelector.js @@ -15,7 +15,6 @@ import personalDetailsPropType from '../../../personalDetailsPropType'; import * as Browser from '../../../../libs/Browser'; import reportPropTypes from '../../../reportPropTypes'; - const propTypes = { /** Beta features list */ betas: PropTypes.arrayOf(PropTypes.string),