@@ -181,26 +181,29 @@ export default class RefreshableScrollView extends ScrollView {
181
181
} ;
182
182
183
183
renderRefreshHeader ( ) {
184
- if ( this . props . customRefreshView ) {
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
+
185
193
return (
186
- < View style = { [ defaultHeaderStyles . header , this . props . refreshViewStyle ] } >
187
- { this . props . customRefreshView ( this . state . refreshStatus , this . _offsetY ) }
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
+ }
188
203
</ View >
189
204
) ;
190
205
}
191
206
192
- return (
193
- < View style = { [ defaultHeaderStyles . header , this . props . refreshViewStyle , { height : this . state . showRefreshHeader ? this . props . refreshViewHeight : 0 } ] } >
194
- < View style = { defaultHeaderStyles . status } >
195
- { this . renderSpinner ( ) }
196
- < Text style = { defaultHeaderStyles . statusTitle } > { this . state . refreshTitle } </ Text >
197
- </ View >
198
- { this . props . displayDate &&
199
- < Text
200
- style = { [ defaultHeaderStyles . date , this . props . dateStyle ] } > { this . props . dateTitle + this . state . date } </ Text >
201
- }
202
- </ View >
203
- ) ;
204
207
}
205
208
206
209
renderSpinner ( ) {
@@ -271,4 +274,4 @@ const defaultHeaderStyles = StyleSheet.create({
271
274
color : '#333333' ,
272
275
marginTop : 5
273
276
}
274
- } ) ;
277
+ } ) ;
0 commit comments