-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into animate-payment-icon-…
…in-money-request-preview
- Loading branch information
Showing
32 changed files
with
391 additions
and
114 deletions.
There are no files selected for viewing
Submodule Mobile-Expensify
updated
from b8cd97 to 42e14b
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| #!/bin/bash | ||
| ### | ||
| # This script modifies the autocompleteParser.js file to be compatible with worklets. | ||
| # autocompleteParser.js is generated by PeggyJS and uses some parts of syntax not supported by worklets. | ||
| # This script runs each time the parser is generated by the `generate-autocomplete-parser` command. | ||
| ### | ||
|
|
||
| filePath=$1 | ||
|
|
||
| if [ ! -f "$filePath" ]; then | ||
| echo "$filePath does not exist." | ||
| exit 1 | ||
| fi | ||
| # shellcheck disable=SC2016 | ||
| if awk 'BEGIN { print "\47worklet\47\n\nclass peg\$SyntaxError{}" } 1' "$filePath" | sed 's/function peg\$SyntaxError/function temporary/g' | sed 's/peg$subclass(peg$SyntaxError, Error);//g' > tmp.txt; then | ||
| mv tmp.txt "$filePath" | ||
| echo "Successfully updated $filePath" | ||
| else | ||
| echo "An error occurred while modifying the file." | ||
| rm -f tmp.txt | ||
| exit 1 | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
src/components/Search/SearchInputSelectionWrapper/index.native.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| import type {ForwardedRef} from 'react'; | ||
| import React, {forwardRef} from 'react'; | ||
| import SearchAutocompleteInput from '@components/Search/SearchAutocompleteInput'; | ||
| import type {SearchAutocompleteInputProps} from '@components/Search/SearchAutocompleteInput'; | ||
| import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types'; | ||
|
|
||
| function SearchInputSelectionWrapper(props: SearchAutocompleteInputProps, ref: ForwardedRef<BaseTextInputRef>) { | ||
| return ( | ||
| <SearchAutocompleteInput | ||
| ref={ref} | ||
| // eslint-disable-next-line react/jsx-props-no-spreading | ||
| {...props} | ||
| selection={undefined} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| SearchInputSelectionWrapper.displayName = 'SearchInputSelectionWrapper'; | ||
|
|
||
| export default forwardRef(SearchInputSelectionWrapper); |
20 changes: 20 additions & 0 deletions
20
src/components/Search/SearchInputSelectionWrapper/index.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| import type {ForwardedRef} from 'react'; | ||
| import React, {forwardRef} from 'react'; | ||
| import SearchAutocompleteInput from '@components/Search/SearchAutocompleteInput'; | ||
| import type {SearchAutocompleteInputProps} from '@components/Search/SearchAutocompleteInput'; | ||
| import type {BaseTextInputRef} from '@components/TextInput/BaseTextInput/types'; | ||
|
|
||
| function SearchInputSelectionWrapper({selection, ...props}: SearchAutocompleteInputProps, ref: ForwardedRef<BaseTextInputRef>) { | ||
| return ( | ||
| <SearchAutocompleteInput | ||
| selection={selection} | ||
| ref={ref} | ||
| // eslint-disable-next-line react/jsx-props-no-spreading | ||
| {...props} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| SearchInputSelectionWrapper.displayName = 'SearchInputSelectionWrapper'; | ||
|
|
||
| export default forwardRef(SearchInputSelectionWrapper); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.