Skip to content

Commit 8c79a68

Browse files
committed
version 3.2.4 released: temporary fixed for header stuck issue on Android
1 parent aa72284 commit 8c79a68

File tree

3 files changed

+26
-28
lines changed

3 files changed

+26
-28
lines changed

Example/yarn.lock

+8-8
Original file line numberDiff line numberDiff line change
@@ -2744,8 +2744,8 @@ [email protected]:
27442744
prop-types "^15.5.10"
27452745

27462746
native-base@^2.3.1:
2747-
version "2.3.1"
2748-
resolved "https://registry.yarnpkg.com/native-base/-/native-base-2.3.1.tgz#415d75ca0b2933612ac2fc7b89b07f62826c4481"
2747+
version "2.3.2"
2748+
resolved "https://registry.yarnpkg.com/native-base/-/native-base-2.3.2.tgz#4cc837cf240f2e8a981952c14085acb280ab45d0"
27492749
dependencies:
27502750
blueimp-md5 "^2.5.0"
27512751
clamp "^1.0.1"
@@ -3132,9 +3132,9 @@ [email protected]:
31323132
shell-quote "^1.6.1"
31333133
ws "^2.0.3"
31343134

3135-
"react-native-drawer@https://github.com/GeekyAnts/react-native-drawer":
3135+
"react-native-drawer@git+https://github.com/GeekyAnts/react-native-drawer.git":
31363136
version "2.3.0"
3137-
resolved "https://github.com/GeekyAnts/react-native-drawer#8d9078516d177c9cb02d2579a6860706d2370d25"
3137+
resolved "git+https://github.com/GeekyAnts/react-native-drawer.git#8d9078516d177c9cb02d2579a6860706d2370d25"
31383138
dependencies:
31393139
prop-types "^15.5.8"
31403140
tween-functions "^1.0.1"
@@ -3145,17 +3145,17 @@ [email protected]:
31453145
dependencies:
31463146
lodash "^4.11.1"
31473147

3148-
"react-native-keyboard-aware-scroll-view@https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view":
3148+
"react-native-keyboard-aware-scroll-view@git+https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view.git":
31493149
version "0.2.9"
3150-
resolved "https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view#f4805f254d6cc8e3329f5fb224944401f66655db"
3150+
resolved "git+https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view.git#f4805f254d6cc8e3329f5fb224944401f66655db"
31513151
dependencies:
31523152
create-react-class "^15.6.0"
31533153
prop-types "^15.5.10"
31543154
react-timer-mixin "^0.13.3"
31553155

31563156
react-native-ultimate-listview@^3.2.2:
3157-
version "3.2.2"
3158-
resolved "https://registry.yarnpkg.com/react-native-ultimate-listview/-/react-native-ultimate-listview-3.2.2.tgz#682f13db53bcd4c6856b112d6a526a71e1b0fae6"
3157+
version "3.2.4"
3158+
resolved "https://registry.yarnpkg.com/react-native-ultimate-listview/-/react-native-ultimate-listview-3.2.4.tgz#56e62aff713a603387aab51ec45b77a75e42b2d4"
31593159

31603160
react-native-vector-icons@~4.1.1:
31613161
version "4.1.1"

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-native-ultimate-listview",
3-
"version": "3.2.3",
3+
"version": "3.2.4",
44
"description": "A high performance FlatList providing customised pull-to-refresh | auto-pagination & infinite-scrolling | gridview layout | swipeable-row. The truly ultimate version that I have done the most tricky part for you, just simply follow the instructions shown below to put it in your app.",
55
"main": "index.js",
66
"scripts": {

src/refreshableScrollView.android.js

+17-19
Original file line numberDiff line numberDiff line change
@@ -181,29 +181,27 @@ export default class RefreshableScrollView extends ScrollView {
181181
};
182182

183183
renderRefreshHeader() {
184-
if (this.state.refreshTitle !== "Pull to refresh") {
185-
if (this.props.customRefreshView) {
186-
return (
187-
<View style={[defaultHeaderStyles.header, this.props.refreshViewStyle]}>
188-
{this.props.customRefreshView(this.state.refreshStatus, this._offsetY)}
189-
</View>
190-
);
191-
}
192-
184+
if (this.props.customRefreshView) {
193185
return (
194-
<View style={[defaultHeaderStyles.header, this.props.refreshViewStyle, {height: this.state.showRefreshHeader ? this.props.refreshViewHeight : 0}]}>
195-
<View style={defaultHeaderStyles.status}>
196-
{this.renderSpinner()}
197-
<Text style={defaultHeaderStyles.statusTitle}>{this.state.refreshTitle}</Text>
198-
</View>
199-
{this.props.displayDate &&
200-
<Text
201-
style={[defaultHeaderStyles.date, this.props.dateStyle]}>{this.props.dateTitle + this.state.date}</Text>
202-
}
186+
<View style={[defaultHeaderStyles.header, this.props.refreshViewStyle]}>
187+
{this.props.customRefreshView(this.state.refreshStatus, this._offsetY)}
203188
</View>
204189
);
205190
}
206191

192+
return (
193+
<View
194+
style={[defaultHeaderStyles.header, this.props.refreshViewStyle, {height: this.props.refreshViewHeight}]}>
195+
<View style={defaultHeaderStyles.status}>
196+
{this.renderSpinner()}
197+
<Text style={defaultHeaderStyles.statusTitle}>{this.state.refreshTitle}</Text>
198+
</View>
199+
{this.props.displayDate &&
200+
<Text
201+
style={[defaultHeaderStyles.date, this.props.dateStyle]}>{this.props.dateTitle + this.state.date}</Text>
202+
}
203+
</View>
204+
);
207205
}
208206

209207
renderSpinner() {
@@ -237,7 +235,7 @@ export default class RefreshableScrollView extends ScrollView {
237235
{...this.props}
238236
scrollEventThrottle={16}
239237
onScroll={this.onScroll}
240-
//contentContainerStyle={{paddingBottom: 80}}
238+
contentContainerStyle={{minHeight: height}}
241239
//onMomentumScrollEnd={this.onScrollEndDrag}
242240
onScrollEndDrag={this.onScrollEndDrag}
243241
onScrollBeginDrag={this.onScrollBeginDrag}>

0 commit comments

Comments
 (0)