Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve some merge conflicts

Browse Source
This commit is contained in:
Alexander Eggers
2023-06-14 20:38:44 +10:00
parent da5ed0d10b
commit 42a088803d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/Components/TextInput/TextInput.js
+2 -2
View File
@@ -1428,7 +1428,7 @@ function InternalTextInput(props: Props): React.Node {
textInput = (
<RCTTextInputView
ref={_setNativeRef}
{...props}
{...otherProps}
{...eventHandlers}
accessibilityState={_accessibilityState}
accessible={accessible}
@@ -1478,7 +1478,7 @@ function InternalTextInput(props: Props): React.Node {
* fixed */
<AndroidTextInput
ref={_setNativeRef}
{...props}
{...otherProps}
{...eventHandlers}
accessibilityState={_accessibilityState}
accessibilityLabelledBy={_accessibilityLabelledBy}