feat(rn): add pull to refresh to pagination

Signed-off-by: Godefroy Ponsinet <godefroy.ponsinet@outlook.com>
berty · Nov 14, 2018 · a3a1d50 · a3a1d50
1 parent e5aecf4
commit a3a1d50
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/client/react-native/common/components/Screens/Chats/Add.js b/client/react-native/common/components/Screens/Chats/Add.js
@@ -112,7 +112,6 @@ export default class ListScreen extends Component {
   }
 
   onDefaultSubmit = async ({ contactsID }) => {
-    const retry = this.props.navigation.getParam('retry')
     await mutations.conversationCreate.commit({
       title: '',
       topic: '',
@@ -124,7 +123,6 @@ export default class ListScreen extends Component {
         overrideDisplayStatus: '',
       })),
     })
-    retry && retry()
     this.props.navigation.goBack(null)
   }
 

diff --git a/client/react-native/common/relay/Pagination.js b/client/react-native/common/relay/Pagination.js
@@ -21,14 +21,22 @@ class PaginationContainer extends PureComponent {
     }
     this.props.relay.loadMore(
       (this.props.variables && this.props.variables.count) || 10,
-      console.error
+      err => err && console.error(err)
     )
   }
 
+  refetch = () => {
+    const { relay, data, connection } = this.props
+    const edges =
+      data[connection] && data[connection].edges ? data[connection].edges : []
+
+    relay.refetchConnection(edges.length, err => err && console.error(err))
+  }
+
   keyExtractor = item => item.cursor
 
   render () {
-    const { data, connection, retry, relay, renderItem, inverted } = this.props
+    const { data, connection, relay, renderItem, inverted } = this.props
     return (
       <FlatList
         data={
@@ -38,7 +46,7 @@ class PaginationContainer extends PureComponent {
         }
         inverted={inverted}
         refreshing={relay.isLoading()}
-        onRefresh={retry}
+        onRefresh={this.refetch}
         onEndReached={this.onEndReached}
         keyExtractor={this.keyExtractor}
         renderItem={({ item: { node } }) => renderItem({ data: node })}