From a6d8d1036a1a4336cb8fde6e3c318685cf6a7226 Mon Sep 17 00:00:00 2001 From: Sorin Davidoi Date: Thu, 8 Jun 2017 17:41:32 +0200 Subject: [PATCH] feat: Swipeable columns --- .../features/ui/components/columns_area.js | 26 +++++++++++- .../features/ui/components/tabs_bar.js | 40 +++++++++++++++---- 2 files changed, 56 insertions(+), 10 deletions(-) diff --git a/app/javascript/mastodon/features/ui/components/columns_area.js b/app/javascript/mastodon/features/ui/components/columns_area.js index 6ed8bc20d6..43be348408 100644 --- a/app/javascript/mastodon/features/ui/components/columns_area.js +++ b/app/javascript/mastodon/features/ui/components/columns_area.js @@ -2,12 +2,14 @@ import React from 'react'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePureComponent from 'react-immutable-pure-component'; +import ReactSwipeable from 'react-swipeable'; import HomeTimeline from '../../home_timeline'; import Notifications from '../../notifications'; import PublicTimeline from '../../public_timeline'; import CommunityTimeline from '../../community_timeline'; import HashtagTimeline from '../../hashtag_timeline'; import Compose from '../../compose'; +import { getPreviousLink, getNextLink } from './tabs_bar'; const componentMap = { 'COMPOSE': Compose, @@ -20,20 +22,40 @@ const componentMap = { class ColumnsArea extends ImmutablePureComponent { + static contextTypes = { + router: PropTypes.object.isRequired, + }; + static propTypes = { columns: ImmutablePropTypes.list.isRequired, singleColumn: PropTypes.bool, 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 () { const { columns, children, singleColumn } = this.props; if (singleColumn) { return ( -
+ {children} -
+ ); } diff --git a/app/javascript/mastodon/features/ui/components/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js index 265cb818b8..09acee0670 100644 --- a/app/javascript/mastodon/features/ui/components/tabs_bar.js +++ b/app/javascript/mastodon/features/ui/components/tabs_bar.js @@ -2,19 +2,43 @@ import React from 'react'; import NavLink from 'react-router-dom/NavLink'; import { FormattedMessage } from 'react-intl'; +const links = [ + , + , + , + + , + , + + , +]; + +export function getPreviousLink (path) { + const index = links.findIndex(link => link.props.to === path); + + if (index > 0) { + return links[index - 1].props.to; + } + + return null; +}; + +export function getNextLink (path) { + const index = links.findIndex(link => link.props.to === path); + + if (index !== -1 && index < links.length - 1) { + return links[index + 1].props.to; + } + + return null; +}; + class TabsBar extends React.Component { render () { return (
- - - - - - - - + {React.Children.toArray(links)}
); }