Skip to content
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

Make KeyboardAvoidingView with behavior="height" resize on keyboard close #18889

Closed
wants to merge 5 commits into from
Closed

Make KeyboardAvoidingView with behavior="height" resize on keyboard close #18889

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f35af0b
Save initial frame height & reuse it
WaldoJeffers Apr 16, 2018
7202b50
Merge branch 'master' of https://github.com/facebook/react-native
WaldoJeffers Aug 18, 2018
12384ae
Fix frame reference
WaldoJeffers Aug 18, 2018
e9dae83
Fix onLayout definition
WaldoJeffers Aug 18, 2018
708a789
Fix flow type
WaldoJeffers Aug 18, 2018
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
18 changes: 7 additions & 11 deletions Libraries/Components/Keyboard/KeyboardAvoidingView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ const KeyboardAvoidingView = createReactClass({
};
},

initialFrameHeight: 0,

subscriptions: ([]: Array<EmitterSubscription>),
frame: (null: ?ViewLayout),

Expand Down Expand Up @@ -129,15 +131,9 @@ const KeyboardAvoidingView = createReactClass({

_onLayout(event: ViewLayoutEvent) {
this.frame = event.nativeEvent.layout;
},

UNSAFE_componentWillUpdate(nextProps: Object, nextState: Object, nextContext?: Object): void {
if (nextState.bottom === this.state.bottom &&
this.props.behavior === 'height' &&
nextProps.behavior === 'height') {
// If the component rerenders without an internal state change, e.g.
// triggered by parent component re-rendering, no need for bottom to change.
nextState.bottom = 0;
if (!this.initialFrameHeight){
// save the initial frame height, before the keyboard is visible
this.initialFrameHeight = this.frame.height;
}
},

Expand Down Expand Up @@ -165,12 +161,12 @@ const KeyboardAvoidingView = createReactClass({
switch (behavior) {
case 'height':
let heightStyle;
if (this.frame) {
if (this.frame && this.state.bottom) {
// Note that we only apply a height change when there is keyboard present,
// i.e. this.state.bottom is greater than 0. If we remove that condition,
// this.frame.height will never go back to its original value.
// When height changes, we need to disable flex.
heightStyle = {height: this.frame.height - bottomHeight, flex: 0};
heightStyle = {height: this.initialFrameHeight - bottomHeight, flex: 0};
}
return (
<View ref={viewRef} style={[style, heightStyle]} onLayout={this._onLayout} {...props}>
Expand Down