Skip to content

Fix issue where disabling automatic scroll would also disable all keyboard avoiding behavior. #416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+7 −8
Open

Fix issue where disabling automatic scroll would also disable all keyboard avoiding behavior. #416

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df7f357
fixes issue where disabling automatic scroll would also disable all k…
terribleben Jan 14, 2020
e06d843
fixes issue measuring height on android
terribleben Jul 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions lib/KeyboardAwareHOC.js
View file
Original file line number Diff line number Diff line change
@@ -362,7 +362,6 @@ function KeyboardAwareHOC(
// Keyboard actions
_updateKeyboardSpace = (frames: Object) => {
// Automatically scroll to focused TextInput
if (this.props.enableAutomaticScroll) {
let keyboardSpace: number =
frames.endCoordinates.height + this.props.extraScrollHeight
if (this.props.viewIsInsideTabBar) {
@@ -392,7 +391,7 @@ function KeyboardAwareHOC(
textInputBottomPosition >
keyboardPosition - totalExtraHeight
) {
this._scrollToFocusedInputWithNodeHandle(
this.props.enableAutomaticScroll && this._scrollToFocusedInputWithNodeHandle(
currentlyFocusedField
)
}
@@ -406,13 +405,13 @@ function KeyboardAwareHOC(
keyboardSpace =
keyboardSpace -
(textInputBottomPosition - keyboardPosition)
this.setState({ keyboardSpace })
this.scrollForExtraHeightOnAndroid(totalExtraHeight)
// TODO: this wasn't working for castle: this.setState({ keyboardSpace })
this.props.enableAutomaticScroll && this.scrollForExtraHeightOnAndroid(totalExtraHeight)
} else if (
textInputBottomPosition >
keyboardPosition - totalExtraHeight
) {
this.scrollForExtraHeightOnAndroid(
this.props.enableAutomaticScroll && this.scrollForExtraHeightOnAndroid(
totalExtraHeight -
(keyboardPosition - textInputBottomPosition)
)
@@ -423,7 +422,7 @@ function KeyboardAwareHOC(
}
}
)
}

if (!this.props.resetScrollToCoords) {
if (!this.defaultResetScrollToCoords) {
this.defaultResetScrollToCoords = this.position
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-keyboard-aware-scroll-view",
"version": "0.9.1",
"name": "@castle-games/react-native-keyboard-aware-scroll-view",
"version": "0.9.2",
"description": "A React Native ScrollView component that resizes when the keyboard appears.",
"main": "index.js",
"types": "index.d.ts",