From 3d403a013d3ad4878d47b8dbd24ce371efecdfbf Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Thu, 8 Jun 2017 17:36:01 +0200
Subject: [PATCH 1/4] chore(yarn): Install react-swipeable
---
package.json | 1 +
yarn.lock | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/package.json b/package.json
index e6fc02bbb0c..4a611e68522 100644
--- 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
index 26c6f7c7a37..2eb1a5c7594 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5774,6 +5774,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"
From a6d8d1036a1a4336cb8fde6e3c318685cf6a7226 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Thu, 8 Jun 2017 17:41:32 +0200
Subject: [PATCH 2/4] 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 6ed8bc20d6a..43be3484083 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 (
- <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/tabs_bar.js b/app/javascript/mastodon/features/ui/components/tabs_bar.js
index 265cb818b8e..09acee0670c 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 = [
+ <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>
);
}
From bc6e95822930dc21f4f1a2c264ed9b976ef162f4 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Thu, 8 Jun 2017 17:41:43 +0200
Subject: [PATCH 3/4] feat: Swipeable media
---
.../mastodon/features/ui/components/media_modal.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/app/javascript/mastodon/features/ui/components/media_modal.js b/app/javascript/mastodon/features/ui/components/media_modal.js
index cff1a0cf52d..c6b293aeb75 100644
--- 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 LoadingIndicator from '../../../components/loading_indicator';
import ImmutablePropTypes from 'react-immutable-proptypes';
import PropTypes from 'prop-types';
@@ -84,7 +85,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}
From d8c47813771795893fe739e066708b84974130b8 Mon Sep 17 00:00:00 2001
From: Sorin Davidoi <sorin.davidoi@gmail.com>
Date: Sat, 10 Jun 2017 20:47:07 +0200
Subject: [PATCH 4/4] fix: Apply :hover, :focus and :active only when multiple
columns
---
app/javascript/styles/components.scss | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/javascript/styles/components.scss b/app/javascript/styles/components.scss
index ecfc186ebed..c2062c398f8 100644
--- 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 {