Fix codler#8, codler#12, APSL#484 APSL#494

Author: codler

README.md

@@ -14,6 +14,7 @@ A ScrollView component that handles keyboard appearance and automatically scroll
 
 ## Supported versions
 
+- `v2.0.0` requires `RN>=0.65.1`
 - `v1.0.0` requires `RN>=0.63.0`
 
 ## Installation

lib/KeyboardAwareHOC.js

@@ -123,11 +123,8 @@ const ScrollIntoViewDefaultOptions: KeyboardAwareHOCOptions = {
     // getNode() permit to support Animated.ScrollView automatically
     // see https://github.com/facebook/react-native/issues/19650
     // see https://stackoverflow.com/questions/42051368/scrollto-is-undefined-on-animated-scrollview/48786374
-    if (ref.getNode) {
-      return ref.getNode()
-    } else {
-      return ref
-    }
+    // see https://github.com/facebook/react-native/commit/66e72bb4e00aafbcb9f450ed5db261d98f99f82a
+    return ref
   }
 }
 
@@ -241,12 +238,12 @@ function KeyboardAwareHOC(
 
     scrollToPosition = (x: number, y: number, animated: boolean = true) => {
       const responder = this.getScrollResponder()
-      responder && responder.scrollResponderScrollTo({ x, y, animated })
+      responder && responder.scrollTo({ x, y, animated })
     }
 
     scrollToEnd = (animated?: boolean = true) => {
       const responder = this.getScrollResponder()
-      responder && responder.scrollResponderScrollToEnd({ animated })
+      responder && responder.scrollToEnd({ animated })
     }
 
     scrollForExtraHeightOnAndroid = (extraHeight: number) => {
@@ -339,7 +336,7 @@ function KeyboardAwareHOC(
           keyboardSpace -= _KAM_DEFAULT_TAB_BAR_HEIGHT
         }
         this.setState({ keyboardSpace })
-        const currentlyFocusedField = TextInput.State.currentlyFocusedInput ? findNodeHandle(TextInput.State.currentlyFocusedInput()) : TextInput.State.currentlyFocusedField()
+        const currentlyFocusedField = findNodeHandle(TextInput.State.currentlyFocusedInput())
         const responder = this.getScrollResponder()
         if (!currentlyFocusedField || !responder) {
           return
@@ -462,7 +459,7 @@ function KeyboardAwareHOC(
     }
 
     update = () => {
-      const currentlyFocusedField = TextInput.State.currentlyFocusedInput ? findNodeHandle(TextInput.State.currentlyFocusedInput()) : TextInput.State.currentlyFocusedField()
+      const currentlyFocusedField = findNodeHandle(TextInput.State.currentlyFocusedInput())
       const responder = this.getScrollResponder()
 
       if (!currentlyFocusedField || !responder) {

package.json

@@ -39,7 +39,7 @@
     "react-native-iphone-x-helper": "^1.0.3"
   },
   "peerDependencies": {
-    "react-native": ">=0.63.0"
+    "react-native": ">=0.65.1"
   },
   "devDependencies": {
     "babel-eslint": "^10.0.2",