|
|
@ -2,12 +2,14 @@ import React from 'react'; |
|
|
|
import PropTypes from 'prop-types'; |
|
|
|
import PropTypes from 'prop-types'; |
|
|
|
import ImmutablePropTypes from 'react-immutable-proptypes'; |
|
|
|
import ImmutablePropTypes from 'react-immutable-proptypes'; |
|
|
|
import ImmutablePureComponent from 'react-immutable-pure-component'; |
|
|
|
import ImmutablePureComponent from 'react-immutable-pure-component'; |
|
|
|
|
|
|
|
import ReactSwipeable from 'react-swipeable'; |
|
|
|
import HomeTimeline from '../../home_timeline'; |
|
|
|
import HomeTimeline from '../../home_timeline'; |
|
|
|
import Notifications from '../../notifications'; |
|
|
|
import Notifications from '../../notifications'; |
|
|
|
import PublicTimeline from '../../public_timeline'; |
|
|
|
import PublicTimeline from '../../public_timeline'; |
|
|
|
import CommunityTimeline from '../../community_timeline'; |
|
|
|
import CommunityTimeline from '../../community_timeline'; |
|
|
|
import HashtagTimeline from '../../hashtag_timeline'; |
|
|
|
import HashtagTimeline from '../../hashtag_timeline'; |
|
|
|
import Compose from '../../compose'; |
|
|
|
import Compose from '../../compose'; |
|
|
|
|
|
|
|
import { getPreviousLink, getNextLink } from './tabs_bar'; |
|
|
|
|
|
|
|
|
|
|
|
const componentMap = { |
|
|
|
const componentMap = { |
|
|
|
'COMPOSE': Compose, |
|
|
|
'COMPOSE': Compose, |
|
|
@ -20,20 +22,40 @@ const componentMap = { |
|
|
|
|
|
|
|
|
|
|
|
class ColumnsArea extends ImmutablePureComponent { |
|
|
|
class ColumnsArea extends ImmutablePureComponent { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static contextTypes = { |
|
|
|
|
|
|
|
router: PropTypes.object.isRequired, |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
static propTypes = { |
|
|
|
static propTypes = { |
|
|
|
columns: ImmutablePropTypes.list.isRequired, |
|
|
|
columns: ImmutablePropTypes.list.isRequired, |
|
|
|
singleColumn: PropTypes.bool, |
|
|
|
singleColumn: PropTypes.bool, |
|
|
|
children: PropTypes.node, |
|
|
|
children: PropTypes.node, |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
handleRightSwipe = () => { |
|
|
|
|
|
|
|
const previousLink = getPreviousLink(this.context.router.history.location.pathname); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (previousLink) { |
|
|
|
|
|
|
|
this.context.router.history.push(previousLink); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
handleLeftSwipe = () => { |
|
|
|
|
|
|
|
const previousLink = getNextLink(this.context.router.history.location.pathname); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (previousLink) { |
|
|
|
|
|
|
|
this.context.router.history.push(previousLink); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
render () { |
|
|
|
render () { |
|
|
|
const { columns, children, singleColumn } = this.props; |
|
|
|
const { columns, children, singleColumn } = this.props; |
|
|
|
|
|
|
|
|
|
|
|
if (singleColumn) { |
|
|
|
if (singleColumn) { |
|
|
|
return ( |
|
|
|
return ( |
|
|
|
<div className='columns-area'> |
|
|
|
<ReactSwipeable onSwipedLeft={this.handleLeftSwipe} onSwipedRight={this.handleRightSwipe} className='columns-area'> |
|
|
|
{children} |
|
|
|
{children} |
|
|
|
</div> |
|
|
|
</ReactSwipeable> |
|
|
|
); |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|