Skip to content

migrate to react native 0.39 #35

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 10 commits into
base: master
Choose a base branch
from
Open

migrate to react native 0.39 #35

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3a323cf
Update SmartScrollView.js
izadmehr Dec 4, 2016
ecae494
move to textInout which will be under keyboard in iOS
izadmehr Dec 20, 2016
f77bacf
Scrolling when keyboard is open in iOS
izadmehr Dec 20, 2016
f6a5b3a
bug fixed: scrolling in the iOS when keyboard is open
izadmehr Dec 21, 2016
f145781
add keyboardDismissMode option to the ScrollView
izadmehr Dec 27, 2016
c9a5e41
take keyboardDismissMode from props
izadmehr Dec 27, 2016
ef4d38c
Update SmartScrollView.js
izadmehr Mar 25, 2017
abfe494
bug fixed: component not shown in react-native 0.42
izadmehr Mar 26, 2017
327bd42
bug fix: crash on closing modal that contain SmartScrollView
izadmehr Mar 26, 2017
e578e78
Read keyboardShouldPersistTaps from props
izadmehr May 7, 2017
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
40 changes: 22 additions & 18 deletions SmartScrollView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import React, {

import ReactNative, {
View,
StyleSheet,
ScrollView,
Keyboard,
Dimensions,
Expand Down Expand Up @@ -123,13 +122,17 @@ class SmartScrollView extends Component {
const num = ReactNative.findNodeHandle(this._smartScroll);
const strippedBackRef = ref.slice('input_'.length);

setTimeout(() => {
this[ref] && setTimeout(() => {
onRefFocus(strippedBackRef);
this.setState({focusedField: strippedBackRef})
this[ref].measureLayout(num, (X,Y,W,H) => {
const py = Y - scrollPosition;

if ( py + H > scrollWindowHeight ){
if (!scrollWindowHeight) {
setTimeout(() => {
this._focusNode(ref);
}, 100);
} else if ( py + H > scrollWindowHeight ){
const nextScrollPosition = (Y + H) - scrollWindowHeight + scrollPadding;

this._smartScroll.scrollTo({y: nextScrollPosition});
Expand Down Expand Up @@ -157,7 +160,9 @@ class SmartScrollView extends Component {
zoomScale,
showsVerticalScrollIndicator,
contentInset,
onScroll
onScroll,
keyboardDismissMode,
keyboardShouldPersistTaps
} = this.props;
let inputIndex = 0;
const smartClone = (element, i) => {
Expand Down Expand Up @@ -213,21 +218,18 @@ class SmartScrollView extends Component {
}

const content = recursivelyCheckAndAdd(scrollChildren, '0');

return (
<View
ref = { component => this._container=component }
style = {scrollContainerStyle}
onLayout={(e) => this._layout = e.nativeEvent.layout}
>
<View
style = {this.state.keyBoardUp ? { height: this.state.scrollWindowHeight } : styles.flex1}
>
<View>
<ScrollView
ref = { component => this._smartScroll=component }
automaticallyAdjustContentInsets = { false }
scrollsToTop = { false }
style = { styles.flex1 }
style = {this.state.keyBoardUp ? { height: this.state.scrollWindowHeight } : {}}
onScroll = { (event) => {
this._updateScrollPosition(event)
onScroll(event)
Expand All @@ -237,8 +239,9 @@ class SmartScrollView extends Component {
contentInset = { contentInset }
zoomScale = { zoomScale }
showsVerticalScrollIndicator = { showsVerticalScrollIndicator }
keyboardShouldPersistTaps = { true }
keyboardShouldPersistTaps = {keyboardShouldPersistTaps}
bounces = { false }
keyboardDismissMode = {keyboardDismissMode}
>
{content}
</ScrollView>
Expand All @@ -248,12 +251,6 @@ class SmartScrollView extends Component {
}
}

const styles = StyleSheet.create({
flex1: {
flex: 1
}
});

SmartScrollView.propTypes = {
forceFocusField: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
scrollContainerStyle: View.propTypes.style,
Expand All @@ -263,16 +260,20 @@ SmartScrollView.propTypes = {
contentInset: PropTypes.object,
onScroll: PropTypes.func,
onRefFocus: PropTypes.func,
keyboardDismissMode: PropTypes.string,
keyboardShouldPersistTaps: PropTypes.string,
};

SmartScrollView.defaultProps = {
scrollContainerStyle: styles.flex1,
scrollContainerStyle: {},
scrollPadding: 5,
zoomScale: 1,
showsVerticalScrollIndicator: true,
contentInset: {top: 0, left: 0, bottom: 0, right: 0},
onScroll: () => {},
onRefFocus: () => {}
onRefFocus: () => {},
keyboardDismissMode: 'none',
keyboardShouldPersistTaps: 'always'
};

export default SmartScrollView;
Expand All @@ -293,3 +294,6 @@ export default SmartScrollView;
// lastTap: currentTap
// })
// }
/**
* Created by Meysam on 5/7/17.
*/