version 3.2.4 released: temporary fixed for header stuck issue on And…

…roid
gameboyVito · Sep 25, 2017 · 8c79a68 · 8c79a68
1 parent aa72284
commit 8c79a68
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 28 deletions.
diff --git a/Example/yarn.lock b/Example/yarn.lock
@@ -2744,8 +2744,8 @@ [email protected]:
     prop-types "^15.5.10"
 
 native-base@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/native-base/-/native-base-2.3.1.tgz#415d75ca0b2933612ac2fc7b89b07f62826c4481"
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/native-base/-/native-base-2.3.2.tgz#4cc837cf240f2e8a981952c14085acb280ab45d0"
   dependencies:
     blueimp-md5 "^2.5.0"
     clamp "^1.0.1"
@@ -3132,9 +3132,9 @@ [email protected]:
     shell-quote "^1.6.1"
     ws "^2.0.3"
 
-"react-native-drawer@https://github.com/GeekyAnts/react-native-drawer":
+"react-native-drawer@git+https://github.com/GeekyAnts/react-native-drawer.git":
   version "2.3.0"
-  resolved "https://github.com/GeekyAnts/react-native-drawer#8d9078516d177c9cb02d2579a6860706d2370d25"
+  resolved "git+https://github.com/GeekyAnts/react-native-drawer.git#8d9078516d177c9cb02d2579a6860706d2370d25"
   dependencies:
     prop-types "^15.5.8"
     tween-functions "^1.0.1"
@@ -3145,17 +3145,17 @@ [email protected]:
   dependencies:
     lodash "^4.11.1"
 
-"react-native-keyboard-aware-scroll-view@https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view":
+"react-native-keyboard-aware-scroll-view@git+https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view.git":
   version "0.2.9"
-  resolved "https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view#f4805f254d6cc8e3329f5fb224944401f66655db"
+  resolved "git+https://github.com/GeekyAnts/react-native-keyboard-aware-scroll-view.git#f4805f254d6cc8e3329f5fb224944401f66655db"
   dependencies:
     create-react-class "^15.6.0"
     prop-types "^15.5.10"
     react-timer-mixin "^0.13.3"
 
 react-native-ultimate-listview@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/react-native-ultimate-listview/-/react-native-ultimate-listview-3.2.2.tgz#682f13db53bcd4c6856b112d6a526a71e1b0fae6"
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/react-native-ultimate-listview/-/react-native-ultimate-listview-3.2.4.tgz#56e62aff713a603387aab51ec45b77a75e42b2d4"
 
 react-native-vector-icons@~4.1.1:
   version "4.1.1"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-ultimate-listview",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "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.",
   "main": "index.js",
   "scripts": {

diff --git a/src/refreshableScrollView.android.js b/src/refreshableScrollView.android.js
@@ -181,29 +181,27 @@ export default class RefreshableScrollView extends ScrollView {
     };
 
     renderRefreshHeader() {
-        if (this.state.refreshTitle !== "Pull to refresh") {
-            if (this.props.customRefreshView) {
-                return (
-                    <View style={[defaultHeaderStyles.header, this.props.refreshViewStyle]}>
-                        {this.props.customRefreshView(this.state.refreshStatus, this._offsetY)}
-                    </View>
-                );
-            }
-
+        if (this.props.customRefreshView) {
             return (
-                <View style={[defaultHeaderStyles.header, this.props.refreshViewStyle, {height: this.state.showRefreshHeader ? this.props.refreshViewHeight : 0}]}>
-                    <View style={defaultHeaderStyles.status}>
-                        {this.renderSpinner()}
-                        <Text style={defaultHeaderStyles.statusTitle}>{this.state.refreshTitle}</Text>
-                    </View>
-                    {this.props.displayDate &&
-                    <Text
-                        style={[defaultHeaderStyles.date, this.props.dateStyle]}>{this.props.dateTitle + this.state.date}</Text>
-                    }
+                <View style={[defaultHeaderStyles.header, this.props.refreshViewStyle]}>
+                    {this.props.customRefreshView(this.state.refreshStatus, this._offsetY)}
                 </View>
             );
         }
 
+        return (
+            <View
+                style={[defaultHeaderStyles.header, this.props.refreshViewStyle, {height: this.props.refreshViewHeight}]}>
+                <View style={defaultHeaderStyles.status}>
+                    {this.renderSpinner()}
+                    <Text style={defaultHeaderStyles.statusTitle}>{this.state.refreshTitle}</Text>
+                </View>
+                {this.props.displayDate &&
+                <Text
+                    style={[defaultHeaderStyles.date, this.props.dateStyle]}>{this.props.dateTitle + this.state.date}</Text>
+                }
+            </View>
+        );
     }
 
     renderSpinner() {
@@ -237,7 +235,7 @@ export default class RefreshableScrollView extends ScrollView {
                 {...this.props}
                 scrollEventThrottle={16}
                 onScroll={this.onScroll}
-                //contentContainerStyle={{paddingBottom: 80}}
+                contentContainerStyle={{minHeight: height}}
                 //onMomentumScrollEnd={this.onScrollEndDrag}
                 onScrollEndDrag={this.onScrollEndDrag}
                 onScrollBeginDrag={this.onScrollBeginDrag}>