Replace sprockets/browserify with Webpack (#2617)
* Replace browserify with webpack * Add react-intl-translations-manager * Do not minify in development, add offline-plugin for ServiceWorker background cache updates * Adjust tests and dependencies * Fix production deployments * Fix tests * More optimizations * Improve travis cache for npm stuff * Re-run travis * Add back support for custom.scss as before * Remove offline-plugin and babili * Fix issue with Immutable.List().unshift(...values) not working as expected * Make travis load schema instead of running all migrations in sequence * Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in <UI /> * Add react definitions to places that use JSX * Add Procfile.dev for running rails, webpack and streaming API at the same time
This commit is contained in:
		
							
								
								
									
										74
									
								
								app/javascript/mastodon/features/blocks/index.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										74
									
								
								app/javascript/mastodon/features/blocks/index.js
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,74 @@
 | 
			
		||||
import React from 'react';
 | 
			
		||||
import { connect } from 'react-redux';
 | 
			
		||||
import ImmutablePropTypes from 'react-immutable-proptypes';
 | 
			
		||||
import PropTypes from 'prop-types';
 | 
			
		||||
import LoadingIndicator from '../../components/loading_indicator';
 | 
			
		||||
import { ScrollContainer } from 'react-router-scroll';
 | 
			
		||||
import Column from '../ui/components/column';
 | 
			
		||||
import ColumnBackButtonSlim from '../../components/column_back_button_slim';
 | 
			
		||||
import AccountContainer from '../../containers/account_container';
 | 
			
		||||
import { fetchBlocks, expandBlocks } from '../../actions/blocks';
 | 
			
		||||
import { defineMessages, injectIntl } from 'react-intl';
 | 
			
		||||
import ImmutablePureComponent from 'react-immutable-pure-component';
 | 
			
		||||
 | 
			
		||||
const messages = defineMessages({
 | 
			
		||||
  heading: { id: 'column.blocks', defaultMessage: 'Blocked users' }
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
const mapStateToProps = state => ({
 | 
			
		||||
  accountIds: state.getIn(['user_lists', 'blocks', 'items'])
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
class Blocks extends ImmutablePureComponent {
 | 
			
		||||
 | 
			
		||||
  constructor (props, context) {
 | 
			
		||||
    super(props, context);
 | 
			
		||||
    this.handleScroll = this.handleScroll.bind(this);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  componentWillMount () {
 | 
			
		||||
    this.props.dispatch(fetchBlocks());
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  handleScroll (e) {
 | 
			
		||||
    const { scrollTop, scrollHeight, clientHeight } = e.target;
 | 
			
		||||
 | 
			
		||||
    if (scrollTop === scrollHeight - clientHeight) {
 | 
			
		||||
      this.props.dispatch(expandBlocks());
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  render () {
 | 
			
		||||
    const { intl, accountIds } = this.props;
 | 
			
		||||
 | 
			
		||||
    if (!accountIds) {
 | 
			
		||||
      return (
 | 
			
		||||
        <Column>
 | 
			
		||||
          <LoadingIndicator />
 | 
			
		||||
        </Column>
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    return (
 | 
			
		||||
      <Column icon='ban' heading={intl.formatMessage(messages.heading)}>
 | 
			
		||||
        <ColumnBackButtonSlim />
 | 
			
		||||
        <ScrollContainer scrollKey='blocks'>
 | 
			
		||||
          <div className='scrollable' onScroll={this.handleScroll}>
 | 
			
		||||
            {accountIds.map(id =>
 | 
			
		||||
              <AccountContainer key={id} id={id} />
 | 
			
		||||
            )}
 | 
			
		||||
          </div>
 | 
			
		||||
        </ScrollContainer>
 | 
			
		||||
      </Column>
 | 
			
		||||
    );
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
Blocks.propTypes = {
 | 
			
		||||
  params: PropTypes.object.isRequired,
 | 
			
		||||
  dispatch: PropTypes.func.isRequired,
 | 
			
		||||
  accountIds: ImmutablePropTypes.list,
 | 
			
		||||
  intl: PropTypes.object.isRequired
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
export default connect(mapStateToProps)(injectIntl(Blocks));
 | 
			
		||||
		Reference in New Issue
	
	Block a user