From 5a9d75857dadc2d77e43f5fd083720f3f8886588 Mon Sep 17 00:00:00 2001
From: ta264 <ta264@users.noreply.github.com>
Date: Mon, 12 Apr 2021 21:30:44 +0100
Subject: [PATCH] Fixed: Rogue scrollbar on large screens

---
 frontend/src/Components/Swipe/SwipeHeader.css |  1 -
 frontend/src/Components/Swipe/SwipeHeader.js  | 24 ++++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/frontend/src/Components/Swipe/SwipeHeader.css b/frontend/src/Components/Swipe/SwipeHeader.css
index 58521b999..0e0e423ea 100644
--- a/frontend/src/Components/Swipe/SwipeHeader.css
+++ b/frontend/src/Components/Swipe/SwipeHeader.css
@@ -7,7 +7,6 @@
 .content {
   position: relative;
   display: flex;
-  width: 300%;
   height: 100%;
   transition: var(--transition);
   transform: translateX(var(--translate));
diff --git a/frontend/src/Components/Swipe/SwipeHeader.js b/frontend/src/Components/Swipe/SwipeHeader.js
index b68b61595..6b378783f 100644
--- a/frontend/src/Components/Swipe/SwipeHeader.js
+++ b/frontend/src/Components/Swipe/SwipeHeader.js
@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Measure from 'Components/Measure';
+import { isMobile as isMobileUtil } from 'Utilities/mobile';
 import styles from './SwipeHeader.css';
 
 function cursorPosition(event) {
@@ -15,6 +16,8 @@ class SwipeHeader extends Component {
   constructor(props) {
     super(props);
 
+    this._isMobile = isMobileUtil();
+
     this.state = {
       containerWidth: 0,
       touching: null,
@@ -32,7 +35,7 @@ class SwipeHeader extends Component {
   // Listeners
 
   onMouseDown = (e) => {
-    if (!this.props.isSmallScreen || this.state.touching) {
+    if (!this.props.isSmallScreen || !this._isMobile || this.state.touching) {
       return;
     }
 
@@ -177,7 +180,8 @@ class SwipeHeader extends Component {
       children,
       prevComponent,
       currentComponent,
-      nextComponent
+      nextComponent,
+      isSmallScreen
     } = this.props;
 
     const {
@@ -187,13 +191,21 @@ class SwipeHeader extends Component {
       stage
     } = this.state;
 
+    const allowSwipe = isSmallScreen && this._isMobile;
+
     const useTransition = !touching && stage !== 'navigated' && stage !== 'init';
 
     const style = {
-      '--translate': `${translate - containerWidth}px`,
-      '--transition': useTransition ? `transform ${transitionDuration}ms ease-out` : undefined
+      width: '100%',
+      '--translate': 0
     };
 
+    if (allowSwipe) {
+      style.width = '300%';
+      style['--translate'] = `${translate - containerWidth}px`;
+      style['--transition'] = useTransition ? `transform ${transitionDuration}ms ease-out` : undefined;
+    }
+
     return (
       <Measure
         className={className}
@@ -208,9 +220,9 @@ class SwipeHeader extends Component {
           onTouchStart={this.onMouseDown}
           onTransitionEnd={this.onTransitionEnd}
         >
-          {prevComponent(containerWidth)}
+          {allowSwipe ? prevComponent(containerWidth) : null}
           {currentComponent(containerWidth)}
-          {nextComponent(containerWidth)}
+          {allowSwipe ? nextComponent(containerWidth) : null}
         </div>
       </Measure>
     );