From fff56645cc8b270dcec28edc1f4d7df4a5786beb Mon Sep 17 00:00:00 2001
From: Youwen Wu <youwenw@gmail.com>
Date: Sun, 25 Feb 2024 01:05:44 -0800
Subject: [PATCH] fix: stop scrollbar from pushing content on windows

---
 client/package-lock.json |  8 +++++++-
 client/package.json      |  3 ++-
 client/src/App.svelte    | 28 ++++++++++++++++++++++++----
 client/src/app.css       |  6 ++++++
 4 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index 67c1c1a..13819b1 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -13,7 +13,8 @@
         "material-icons": "^1.13.12",
         "material-symbols": "^0.15.0",
         "socket.io-client": "^4.7.4",
-        "svelte-french-toast": "^1.2.0"
+        "svelte-french-toast": "^1.2.0",
+        "svrollbar": "^0.12.0"
       },
       "devDependencies": {
         "@svelte-plugins/tooltips": "^3.0.0",
@@ -2938,6 +2939,11 @@
         "svelte": "^3.2.1 || ^4.0.0-next.1"
       }
     },
+    "node_modules/svrollbar": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/svrollbar/-/svrollbar-0.12.0.tgz",
+      "integrity": "sha512-okH0sz8bGtw+tgOfN1mpEtbveifxROcE3mbUMBJ1RQz8Q+1rVr+nVG7EAJ9b0G80cGDu7dskjAWuzj3iru0k5g=="
+    },
     "node_modules/tailwindcss": {
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.1.tgz",
diff --git a/client/package.json b/client/package.json
index 3ff8dcc..900b593 100644
--- a/client/package.json
+++ b/client/package.json
@@ -32,6 +32,7 @@
     "material-icons": "^1.13.12",
     "material-symbols": "^0.15.0",
     "socket.io-client": "^4.7.4",
-    "svelte-french-toast": "^1.2.0"
+    "svelte-french-toast": "^1.2.0",
+    "svrollbar": "^0.12.0"
   }
 }
diff --git a/client/src/App.svelte b/client/src/App.svelte
index 29449d9..5ab43d6 100644
--- a/client/src/App.svelte
+++ b/client/src/App.svelte
@@ -12,6 +12,7 @@
   import Loading from './lib/Loading/Loading.svelte'
   import { settingsStore } from './lib/stores/settingsStore'
   import getSettings from './lib/utils/getSettings'
+  import { Svrollbar } from 'svrollbar'
 
   let activeApp: App = 'camera'
   let topics: TelemetryTopics = {
@@ -43,10 +44,15 @@
       initializationSequence()
     }, 3000)
   })
+
+  let infotainmentViewport: Element
+  let infotainmentContent: Element
 </script>
 
+<Svrollbar />
+
 <main
-  class="select-none transition-opacity duration-300"
+  class="select-none transition-opacity duration-300 overflow-x-hidden"
   class:opacity-0={loading}
 >
   <!-- driver dashboard -->
@@ -54,12 +60,18 @@
     <Dashboard />
   </div>
   <!-- the infotainment system -->
-  <div class="min-h-screen w-[65vw] right-0 absolute infotainment-container">
+  <Svrollbar viewport={infotainmentViewport} contents={infotainmentContent} />
+  <div
+    class="min-h-screen w-[65vw] right-0 absolute infotainment-container overflow-x-hidden"
+    bind:this={infotainmentViewport}
+  >
     <!-- dynamic app system (edit appList.ts to add new apps) -->
-    <div class="mx-10 mt-10">
+    <div class="mx-10 mt-10 overflow-x-hidden" bind:this={infotainmentContent}>
       <svelte:component this={appList[activeApp].component} />
     </div>
-    <div class="fixed w-[65vw] flex justify-center right-0 bottom-0 mb-4">
+    <div
+      class="fixed w-[65vw] flex justify-center right-0 bottom-0 mb-4 overflow-x-hidden"
+    >
       <AppBar bind:activeApp {appList} />
     </div>
   </div>
@@ -90,5 +102,13 @@
       #2c3e50,
       #fd746c
     ); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
+    /* hide scrollbar */
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+  }
+
+  .infotainment-container::-webkit-scrollbar {
+    /* hide scrollbar */
+    display: none;
   }
 </style>
diff --git a/client/src/app.css b/client/src/app.css
index 9342690..3f9b53a 100644
--- a/client/src/app.css
+++ b/client/src/app.css
@@ -15,6 +15,12 @@
 
   body {
     @apply bg-black text-white;
+    /* hide scrollbar */
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+  }
+  body::-webkit-scrollbar {
+    display: none;
   }
 }