commit: a071047c1333cee6baa389aabd73394749a1af11
parent: 6f34a6a77f5df6ddd6980c85c9edcc6aa400df73
Author: Eugen Rochko <eugen@zeonfederated.com>
Date: Fri, 23 Jun 2017 17:52:56 +0200
Merge branch 'sorin-davidoi-swipe-gestures'
Diffstat:
6 files changed, 71 insertions(+), 13 deletions(-)
diff --git 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 (
- <div className='columns-area'>
+ <ReactSwipeable onSwipedLeft={this.handleLeftSwipe} onSwipedRight={this.handleRightSwipe} className='columns-area'>
{children}
- </div>
+ </ReactSwipeable>
);
}
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js
@@ -1,4 +1,5 @@
import React from 'react';
+import ReactSwipeable from 'react-swipeable';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
import ExtendedVideoPlayer from '../../../components/extended_video_player';
@@ -83,7 +84,9 @@ class MediaModal extends ImmutablePureComponent {
<div className='media-modal__content'>
<IconButton className='media-modal__close' title={intl.formatMessage(messages.close)} icon='times' onClick={onClose} size={16} />
- {content}
+ <ReactSwipeable onSwipedRight={this.handlePrevClick} onSwipedLeft={this.handleNextClick}>
+ {content}
+ </ReactSwipeable>
</div>
{rightNav}
diff --git 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 = [
+ <NavLink className='tabs-bar__link primary' activeClassName='active' to='/statuses/new'><i className='fa fa-fw fa-pencil' /><FormattedMessage id='tabs_bar.compose' defaultMessage='Compose' /></NavLink>,
+ <NavLink className='tabs-bar__link primary' activeClassName='active' to='/timelines/home'><i className='fa fa-fw fa-home' /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>,
+ <NavLink className='tabs-bar__link primary' activeClassName='active' to='/notifications'><i className='fa fa-fw fa-bell' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>,
+
+ <NavLink className='tabs-bar__link secondary' activeClassName='active' to='/timelines/public/local'><i className='fa fa-fw fa-users' /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>,
+ <NavLink className='tabs-bar__link secondary' activeClassName='active' exact to='/timelines/public'><i className='fa fa-fw fa-globe' /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>,
+
+ <NavLink className='tabs-bar__link primary' activeClassName='active' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started'><i className='fa fa-fw fa-asterisk' /></NavLink>,
+];
+
+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 (
<div className='tabs-bar'>
- <NavLink className='tabs-bar__link primary' activeClassName='active' to='/statuses/new'><i className='fa fa-fw fa-pencil' /><FormattedMessage id='tabs_bar.compose' defaultMessage='Compose' /></NavLink>
- <NavLink className='tabs-bar__link primary' activeClassName='active' to='/timelines/home'><i className='fa fa-fw fa-home' /><FormattedMessage id='tabs_bar.home' defaultMessage='Home' /></NavLink>
- <NavLink className='tabs-bar__link primary' activeClassName='active' to='/notifications'><i className='fa fa-fw fa-bell' /><FormattedMessage id='tabs_bar.notifications' defaultMessage='Notifications' /></NavLink>
-
- <NavLink className='tabs-bar__link secondary' activeClassName='active' to='/timelines/public/local'><i className='fa fa-fw fa-users' /><FormattedMessage id='tabs_bar.local_timeline' defaultMessage='Local' /></NavLink>
- <NavLink className='tabs-bar__link secondary' activeClassName='active' exact to='/timelines/public'><i className='fa fa-fw fa-globe' /><FormattedMessage id='tabs_bar.federated_timeline' defaultMessage='Federated' /></NavLink>
-
- <NavLink className='tabs-bar__link primary' activeClassName='active' style={{ flexGrow: '0', flexBasis: '30px' }} to='/getting-started'><i className='fa fa-fw fa-asterisk' /></NavLink>
+ {React.Children.toArray(links)}
</div>
);
}
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
@@ -1473,8 +1473,10 @@
&:hover,
&:focus,
&:active {
- background: lighten($ui-base-color, 14%);
- transition: all 100ms linear;
+ @media screen and (min-width: 1025px) {
+ background: lighten($ui-base-color, 14%);
+ transition: all 100ms linear;
+ }
}
span {
diff --git a/package.json b/package.json
@@ -88,6 +88,7 @@
"react-router-dom": "^4.1.1",
"react-router-scroll": "ytase/react-router-scroll#build",
"react-simple-dropdown": "^3.0.0",
+ "react-swipeable": "^4.0.1",
"react-textarea-autosize": "^5.0.6",
"react-toggle": "^4.0.1",
"redis": "^2.7.1",
diff --git a/yarn.lock b/yarn.lock
@@ -5778,6 +5778,12 @@ react-style-proptype@^3.0.0:
dependencies:
prop-types "^15.5.4"
+react-swipeable@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/react-swipeable/-/react-swipeable-4.0.1.tgz#2cb3a04a52ccebf5361881b30e233dc13ee4b115"
+ dependencies:
+ prop-types "^15.5.8"
+
react-test-renderer@^15.5.4:
version "15.5.4"
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.5.4.tgz#d4ebb23f613d685ea8f5390109c2d20fbf7c83bc"
