Removed unnecessary scrollContainer in status, account_gallery

document scrolls, not individual containers/components
simply removed the wrapping <ScrollContainer /> and updated indentation
This commit is contained in:
mgabdev 2019-07-17 18:57:44 -04:00
parent c466fc6b86
commit d978734bce
2 changed files with 68 additions and 74 deletions

View File

@ -12,7 +12,6 @@ import Column from '../ui/components/column';
import ImmutablePureComponent from 'react-immutable-pure-component'; import ImmutablePureComponent from 'react-immutable-pure-component';
import { getAccountGallery } from 'gabsocial/selectors'; import { getAccountGallery } from 'gabsocial/selectors';
import MediaItem from './components/media_item'; import MediaItem from './components/media_item';
import { ScrollContainer } from 'react-router-scroll-4';
import LoadMore from 'gabsocial/components/load_more'; import LoadMore from 'gabsocial/components/load_more';
import MissingIndicator from 'gabsocial/components/missing_indicator'; import MissingIndicator from 'gabsocial/components/missing_indicator';
import { openModal } from 'gabsocial/actions/modal'; import { openModal } from 'gabsocial/actions/modal';
@ -189,7 +188,6 @@ class AccountGallery extends ImmutablePureComponent {
return ( return (
<Column> <Column>
<ScrollContainer scrollKey='account_gallery'>
<div className='slist slist--flex' onScroll={this.handleScroll}> <div className='slist slist--flex' onScroll={this.handleScroll}>
<div className='account__section-headline'> <div className='account__section-headline'>
<div style={{width: '100%', display: 'flex'}}> <div style={{width: '100%', display: 'flex'}}>
@ -228,7 +226,6 @@ class AccountGallery extends ImmutablePureComponent {
</div> </div>
)} )}
</div> </div>
</ScrollContainer>
</Column> </Column>
); );
} }

View File

@ -33,7 +33,6 @@ import {
import { initMuteModal } from '../../actions/mutes'; import { initMuteModal } from '../../actions/mutes';
import { initReport } from '../../actions/reports'; import { initReport } from '../../actions/reports';
import { makeGetStatus } from '../../selectors'; import { makeGetStatus } from '../../selectors';
import { ScrollContainer } from 'react-router-scroll-4';
import ColumnHeader from '../../components/column_header'; import ColumnHeader from '../../components/column_header';
import StatusContainer from '../../containers/status_container'; import StatusContainer from '../../containers/status_container';
import { openModal } from '../../actions/modal'; import { openModal } from '../../actions/modal';
@ -471,7 +470,6 @@ class Status extends ImmutablePureComponent {
/> />
} }
<ScrollContainer scrollKey='thread'>
<div ref={this.setRef}> <div ref={this.setRef}>
{ancestors} {ancestors}
@ -507,7 +505,6 @@ class Status extends ImmutablePureComponent {
{descendants} {descendants}
</div> </div>
</ScrollContainer>
</Column> </Column>
); );
} }