Allow to skip scroll to child when focused

chatium · Feb 20, 2021 · 386733e · 386733e
1 parent 24eb7e5
commit 386733e
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 10 deletions.
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
@@ -84,6 +84,8 @@ public class ReactScrollView extends ScrollView
   private ReactViewBackgroundManager mReactBackgroundManager;
   private @Nullable StateWrapper mStateWrapper;
 
+  protected boolean mShouldScrollToFocusedView = true;
+
   public ReactScrollView(ReactContext context) {
     this(context, null);
   }
@@ -233,7 +235,7 @@ protected void onAttachedToWindow() {
    */
   @Override
   public void requestChildFocus(View child, View focused) {
-    if (focused != null) {
+    if (mShouldScrollToFocusedView && focused != null) {
       scrollToChild(focused);
     }
     super.requestChildFocus(child, focused);

diff --git a/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3-javadoc.jar b/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3-javadoc.jar
diff --git a/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3-javadoc.jar.md5 b/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3-javadoc.jar.md5
@@ -1 +1 @@
-9ad231f1328c2e15cdb214701e3d67d7
+a62d3aee1c9cceb11111e47fe86f6895
diff --git a/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3-javadoc.jar.sha1 b/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3-javadoc.jar.sha1
@@ -1 +1 @@
-925dae6c0b95a76952b9ca67c9ecc0516d34845b
+37b7ac95b0dad096a1f7c86e7c91ec9a19689801
diff --git a/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3-sources.jar b/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3-sources.jar
diff --git a/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3-sources.jar.md5 b/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3-sources.jar.md5
@@ -1 +1 @@
-23c74129204f5dce0775481f6c5c1846
+7e018e1618e3ed91f7190a87fbf6f8fd
diff --git a/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3-sources.jar.sha1 b/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3-sources.jar.sha1
@@ -1 +1 @@
-480ca5e1951bc5e1b402035e049d2f5989ee855b
+120cf9185b4000a20ee888bb5143c7cd84252e5c
diff --git a/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3.aar b/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3.aar
diff --git a/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3.aar.md5 b/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3.aar.md5
@@ -1 +1 @@
-4ab2f5077e71d37d103ec9a54c0125e3
+2f0449d83b7a7b4fac4b1e4002168d9e
diff --git a/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3.aar.sha1 b/android/com/facebook/react/react-native/0.63.3/react-native-0.63.3.aar.sha1
@@ -1 +1 @@
-dc80e3daef98d8a93d0b27f112064dca2befad0b
+f1488cee7e2aaea7296cd85ed28cef6ffd6a71be
diff --git a/android/com/facebook/react/react-native/maven-metadata.xml b/android/com/facebook/react/react-native/maven-metadata.xml
@@ -7,6 +7,6 @@
     <versions>
       <version>0.63.3</version>
     </versions>
-    <lastUpdated>20210118115124</lastUpdated>
+    <lastUpdated>20210220082632</lastUpdated>
   </versioning>
 </metadata>
diff --git a/android/com/facebook/react/react-native/maven-metadata.xml.md5 b/android/com/facebook/react/react-native/maven-metadata.xml.md5
@@ -1 +1 @@
-9e8368db4b25b70b3357d7651c2a9581
+f6aef19bede087035fa4ee7003ec011c
diff --git a/android/com/facebook/react/react-native/maven-metadata.xml.sha1 b/android/com/facebook/react/react-native/maven-metadata.xml.sha1
@@ -1 +1 @@
-c642c754fb73ebb284c5b44dbc1d4af6aa871921
+9142920477d91d3be761d8f7152fd68f098bb017