From 886e2c9a823bd1c08c05a308b3eaef68cb719c45 Mon Sep 17 00:00:00 2001
From: Andrew Hrdy <hrdyandrew@gmail.com>
Date: Thu, 28 Dec 2017 12:26:05 -0500
Subject: [PATCH] Revert to native scrolling.

---
 package.json                       | 2 --
 src/components/Sidebar.js          | 5 ++---
 src/containers/Layout.js           | 7 ++-----
 src/styles/components/sidebar.scss | 4 ++--
 src/styles/containers/layout.scss  | 4 ----
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index e02c69c..296646b 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,6 @@
     "fuzzysearch": "^1.0.3",
     "history": "^4.6.3",
     "immutability-helper": "^2.3.0",
-    "install": "^0.10.2",
     "mapbox": "^1.0.0-beta9",
     "mapbox-gl": "^0.40.1",
     "material-ui": "^1.0.0-beta.24",
@@ -20,7 +19,6 @@
     "react": "^15.6.1",
     "react-autosuggest": "^9.3.2",
     "react-classnames": "^0.1.2",
-    "react-custom-scrollbars": "^4.2.1",
     "react-dom": "^15.6.1",
     "react-mapbox-gl": "^2.5.2",
     "react-redux": "^5.0.5",
diff --git a/src/components/Sidebar.js b/src/components/Sidebar.js
index b937328..6083c3d 100644
--- a/src/components/Sidebar.js
+++ b/src/components/Sidebar.js
@@ -11,7 +11,6 @@ import Chip from 'material-ui/Chip';
 import WeekHours from './WeekHours';
 import { toggleSidebar } from '../actions/ui';
 import FacilityTags from './FacilityTags';
-import { Scrollbars } from 'react-custom-scrollbars';
 
 const Sidebar = ({facility, isSidebarOpen, isSidebarMapOpen, toggleSidebarMap, facilities}) => {
 
@@ -49,7 +48,7 @@ const Sidebar = ({facility, isSidebarOpen, isSidebarMapOpen, toggleSidebarMap, f
                 </div>
             </div>
             <Divider className={'sidebar-divider'}/>
-            <Scrollbars className={'sidebar-scroll'}>
+            <div className={'sidebar-scroll'}>
             <div className={'sidebar-label-holder'}>
                     <TextwTitle label="Building" content="The Johnson Center"/>
                     <TextwTitle label="Address" content="https://amenufromaplace.com"/>
@@ -57,7 +56,7 @@ const Sidebar = ({facility, isSidebarOpen, isSidebarMapOpen, toggleSidebarMap, f
                     <TextwTitle label="Tags" content={<FacilityTags facility={facility} />}/>
                     <TextwTitle label="Hours" content={<WeekHours facility={facility} />}/>
             </div>
-            </Scrollbars>
+            </div>
             <div className={'sidebar-row2'}>
                 <FacilitiesMap isMapOpen={isSidebarMapOpen} facilities={facilities} facility={facility}/>
 
diff --git a/src/containers/Layout.js b/src/containers/Layout.js
index 9bd4786..9a1cbd6 100644
--- a/src/containers/Layout.js
+++ b/src/containers/Layout.js
@@ -5,11 +5,8 @@ import AppBar from '../components/AppBar';
 import Sidebar from '../components/Sidebar';
 import {getFacilities, setFacilities,sortByFavorites} from '../actions/api';
 import CardContainer from '../components/CardContainer';
-import SearchBar from './SearchBar';
 import KeyboardArrowLeft from 'material-ui-icons/KeyboardArrowLeft';
 import KeyboardArrowRight from 'material-ui-icons/KeyboardArrowRight';
-import { Scrollbars } from 'react-custom-scrollbars';
-
 
 class Layout extends React.Component {
     constructor(props) {
@@ -47,10 +44,10 @@ class Layout extends React.Component {
                 }}/>
                 <div className={'layout-container'}>
                     <div className={'layout-main-content'}>
-                        <Scrollbars className={'layout-card-container'}>
+                        <div className={'layout-card-container'}>
                             <CardContainer styles={'layout-card-container'} searchTerm={searchTerm} campusRegion={campusRegion}
                                            facilities={facilities} />
-                        </Scrollbars>
+                        </div>
                     </div>
                     
                     <Sidebar facilities={facilities} facility={selectedFacility} isSidebarOpen={isSidebarOpen}
diff --git a/src/styles/components/sidebar.scss b/src/styles/components/sidebar.scss
index 04fdf05..146b9e1 100644
--- a/src/styles/components/sidebar.scss
+++ b/src/styles/components/sidebar.scss
@@ -82,8 +82,8 @@
   width: 100%;
 }
 .sidebar-scroll{
-    height:calc(100% - 220px - 116px - 32px) !important;
-    overflow-y: auto;
+  height:calc(100% - 220px - 116px - 32px) !important;
+  overflow-y: auto;
 }
 
 @media screen and (max-width: map-get($breakpoints, lg) - 1px) {
diff --git a/src/styles/containers/layout.scss b/src/styles/containers/layout.scss
index 9070e8b..7ec6cf2 100644
--- a/src/styles/containers/layout.scss
+++ b/src/styles/containers/layout.scss
@@ -57,10 +57,6 @@
   overflow-x: hidden;
 }
 
-// .layout-card-container::-webkit-scrollbar {
-//     display: none;
-// }
-
 @media screen and (max-width: map-get($breakpoints, lg) - 1px) {
   .layout-sidebar-toggle-container {
     display: none;
-- 
GitLab