Merge branch 'revert-loading-indicator' into 'develop'

PullToRefresh: switch back to the old loading indicator for now

See merge request soapbox-pub/soapbox-fe!899
merge-requests/900/head
Alex Gleason 3 years ago
commit 0374b058fa

@ -1,7 +1,6 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import PTRComponent from 'react-simple-pull-to-refresh'; import PTRComponent from 'react-simple-pull-to-refresh';
import LoadingSpinner from 'soapbox/components/loading_spinner';
/** /**
* PullToRefresh: * PullToRefresh:
@ -33,7 +32,7 @@ export default class PullToRefresh extends React.Component {
onRefresh={this.handleRefresh} onRefresh={this.handleRefresh}
pullingContent={null} pullingContent={null}
// `undefined` will fallback to the default, while `null` will render nothing // `undefined` will fallback to the default, while `null` will render nothing
refreshingContent={onRefresh ? <LoadingSpinner size={30} /> : null} refreshingContent={onRefresh ? undefined : null}
pullDownThreshold={67} pullDownThreshold={67}
maxPullDownDistance={95} maxPullDownDistance={95}
resistance={2} resistance={2}

Loading…
Cancel
Save