From 0df719d5315fedecd5e783aeb5765aa53c5dc9aa Mon Sep 17 00:00:00 2001
From: Baptiste Arnaud <contact@baptiste-arnaud.fr>
Date: Mon, 28 Feb 2022 14:22:43 +0100
Subject: [PATCH] =?UTF-8?q?feat:=20=E2=99=BF=EF=B8=8F=20Hide=20steps=20sid?=
 =?UTF-8?q?ebar=20scrollbar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/builder/assets/styles/custom.css                 | 11 +++++++++++
 .../components/editor/StepsSideBar/StepSideBar.tsx    |  1 +
 apps/builder/services/typebots/results.ts             | 11 ++++++-----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/apps/builder/assets/styles/custom.css b/apps/builder/assets/styles/custom.css
index a8a85d83f..ba664e029 100644
--- a/apps/builder/assets/styles/custom.css
+++ b/apps/builder/assets/styles/custom.css
@@ -2,6 +2,17 @@
   cursor: grabbing !important;
 }
 
+/* Hide scrollbar for Chrome, Safari and Opera */
+.hide-scrollbar::-webkit-scrollbar {
+  display: none;
+}
+
+/* Hide scrollbar for IE, Edge and Firefox */
+.hide-scrollbar {
+  -ms-overflow-style: none; /* IE and Edge */
+  scrollbar-width: none; /* Firefox */
+}
+
 /* * {
   outline: 1px solid #f00 !important;
   opacity: 1 !important;
diff --git a/apps/builder/components/editor/StepsSideBar/StepSideBar.tsx b/apps/builder/components/editor/StepsSideBar/StepSideBar.tsx
index f6e26b333..802978fd6 100644
--- a/apps/builder/components/editor/StepsSideBar/StepSideBar.tsx
+++ b/apps/builder/components/editor/StepsSideBar/StepSideBar.tsx
@@ -97,6 +97,7 @@ export const StepsSideBar = () => {
         spacing={6}
         userSelect="none"
         overflowY="scroll"
+        className="hide-scrollbar"
       >
         <Flex justifyContent="flex-end">
           <Tooltip label={isLocked ? 'Unlock sidebar' : 'Lock sidebar'}>
diff --git a/apps/builder/services/typebots/results.ts b/apps/builder/services/typebots/results.ts
index 91d41f5e0..6cd3d7924 100644
--- a/apps/builder/services/typebots/results.ts
+++ b/apps/builder/services/typebots/results.ts
@@ -28,7 +28,7 @@ export const useResults = ({
   typebotId: string
   onError: (error: Error) => void
 }) => {
-  const { data, error, mutate, setSize, size } = useSWRInfinite<
+  const { data, error, mutate, setSize, size, isValidating } = useSWRInfinite<
     { results: ResultWithAnswers[] },
     Error
   >(
@@ -50,10 +50,11 @@ export const useResults = ({
     setSize,
     size,
     hasMore:
-      data &&
-      data.length > 0 &&
-      data[data.length - 1].results.length > 0 &&
-      data.length === paginationLimit,
+      isValidating ||
+      (data &&
+        data.length > 0 &&
+        data[data.length - 1].results.length > 0 &&
+        data.length === paginationLimit),
   }
 }