Only scroll to input when hidden by the keyboard (APSL#67)

janicduplessis · alvaromb · commit 153dc0874a11 · 2016-10-06T10:11:34.000+02:00
diff --git a/lib/KeyboardAwareMixin.js b/lib/KeyboardAwareMixin.js
@@ -52,12 +52,18 @@ const KeyboardAwareMixin = {
       if (!currentlyFocusedField) {
         return
       }
+
       UIManager.viewIsDescendantOf(
         currentlyFocusedField,
         this.getScrollResponder().getInnerViewNode(),
         (isAncestor) => {
           if (isAncestor) {
-            this.scrollToFocusedInputWithNodeHandle(currentlyFocusedField)
+            // Check if the TextInput will be hidden by the keyboard
+            UIManager.measureInWindow(currentlyFocusedField, (x, y, width, height) => {
+              if (y + height > frames.endCoordinates.screenY) {
+                this.scrollToFocusedInputWithNodeHandle(currentlyFocusedField)
+              }
+            })
           }
         }
       )

Original file line number	Diff line number	Diff line change
`@@ -52,12 +52,18 @@ const KeyboardAwareMixin = {`
`52`	`52`	`if (!currentlyFocusedField) {`
`53`	`53`	`return`
`54`	`54`	`}`
	`55`	`+`
`55`	`56`	`UIManager.viewIsDescendantOf(`
`56`	`57`	`currentlyFocusedField,`
`57`	`58`	`this.getScrollResponder().getInnerViewNode(),`
`58`	`59`	`(isAncestor) => {`
`59`	`60`	`if (isAncestor) {`
`60`		`- this.scrollToFocusedInputWithNodeHandle(currentlyFocusedField)`
	`61`	`+ // Check if the TextInput will be hidden by the keyboard`
	`62`	`+ UIManager.measureInWindow(currentlyFocusedField, (x, y, width, height) => {`
	`63`	`+ if (y + height > frames.endCoordinates.screenY) {`
	`64`	`+ this.scrollToFocusedInputWithNodeHandle(currentlyFocusedField)`
	`65`	`+ }`
	`66`	`+ })`
`61`	`67`	`}`
`62`	`68`	`}`
`63`	`69`	`)`