|
|
@ -28,6 +28,8 @@ const componentMap = {
|
|
|
|
'LIST': ListTimeline,
|
|
|
|
'LIST': ListTimeline,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const shouldHideFAB = path => path.match(/^\/statuses\//);
|
|
|
|
|
|
|
|
|
|
|
|
@component => injectIntl(component, { withRef: true })
|
|
|
|
@component => injectIntl(component, { withRef: true })
|
|
|
|
export default class ColumnsArea extends ImmutablePureComponent {
|
|
|
|
export default class ColumnsArea extends ImmutablePureComponent {
|
|
|
|
|
|
|
|
|
|
|
@ -153,7 +155,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
|
|
|
|
this.pendingIndex = null;
|
|
|
|
this.pendingIndex = null;
|
|
|
|
|
|
|
|
|
|
|
|
if (singleColumn) {
|
|
|
|
if (singleColumn) {
|
|
|
|
const floatingActionButton = this.context.router.history.location.pathname === '/statuses/new' ? null : <Link key='floating-action-button' to='/statuses/new' className='floating-action-button'><i className='fa fa-pencil' /></Link>;
|
|
|
|
const floatingActionButton = shouldHideFAB(this.context.router.history.location.pathname) ? null : <Link key='floating-action-button' to='/statuses/new' className='floating-action-button'><i className='fa fa-pencil' /></Link>;
|
|
|
|
|
|
|
|
|
|
|
|
return columnIndex !== -1 ? [
|
|
|
|
return columnIndex !== -1 ? [
|
|
|
|
<ReactSwipeableViews key='content' index={columnIndex} onChangeIndex={this.handleSwipe} onTransitionEnd={this.handleAnimationEnd} animateTransitions={shouldAnimate} springConfig={{ duration: '400ms', delay: '0s', easeFunction: 'ease' }} style={{ height: '100%' }}>
|
|
|
|
<ReactSwipeableViews key='content' index={columnIndex} onChangeIndex={this.handleSwipe} onTransitionEnd={this.handleAnimationEnd} animateTransitions={shouldAnimate} springConfig={{ duration: '400ms', delay: '0s', easeFunction: 'ease' }} style={{ height: '100%' }}>
|
|
|
|