From 441d129334ebf6fc92322327e475651327f892c7 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Mon, 18 Mar 2024 10:42:19 +0000
Subject: [PATCH 1/4] fix: change y scroll behavior

---
 packages/nc-gui/assets/style.scss        | 6 +++---
 packages/nc-gui/components/nc/Select.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss
index 4b195ee081..45c1100a97 100644
--- a/packages/nc-gui/assets/style.scss
+++ b/packages/nc-gui/assets/style.scss
@@ -65,7 +65,7 @@ main {
 }
 
 .nc-scrollbar-md {
-  overflow-y: scroll;
+  overflow-y: auto;
   overflow-x: hidden;
   scrollbar-width: thin !important;
 
@@ -89,7 +89,7 @@ main {
 }
 
 .nc-scrollbar-lg {
-  overflow-y: scroll;
+  overflow-y: auto;
   overflow-x: hidden;
   scrollbar-width: thin !important;
 
@@ -141,7 +141,7 @@ main {
 }
 
 .nc-scrollbar-dark-md {
-  overflow-y: scroll;
+  overflow-y: auto;
   overflow-x: hidden;
   scrollbar-width: thin !important;
 
diff --git a/packages/nc-gui/components/nc/Select.vue b/packages/nc-gui/components/nc/Select.vue
index de9faeea46..1335ddd4d5 100644
--- a/packages/nc-gui/components/nc/Select.vue
+++ b/packages/nc-gui/components/nc/Select.vue
@@ -109,7 +109,7 @@ const onChange = (value: string) => {
   @apply !rounded-xl py-1.5;
 
   .rc-virtual-list-holder {
-    overflow-y: scroll;
+    overflow-y: auto;
     overflow-x: hidden;
     font-weight: 500;
 

From 424b299b31cb4439a69a1aee68087c5bed972d4a Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Mon, 18 Mar 2024 10:42:19 +0000
Subject: [PATCH 2/4] fix: replace windicss y scroll with auto

---
 packages/nc-gui/components/account/AppStore.vue              | 2 +-
 packages/nc-gui/components/account/License.vue               | 2 +-
 packages/nc-gui/pages/account/index/users/[[nestedPage]].vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/account/AppStore.vue b/packages/nc-gui/components/account/AppStore.vue
index 2403b8bc3f..fd278b4d76 100644
--- a/packages/nc-gui/components/account/AppStore.vue
+++ b/packages/nc-gui/components/account/AppStore.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="h-full overflow-y-scroll scrollbar-thin-dull pt-2 px-5">
+  <div class="h-full overflow-y-auto scrollbar-thin-dull pt-2 px-5">
     <div class="text-xl mt-4 mb-8 text-left font-weight-bold">{{ $t('title.appStore') }}</div>
     <div>
       <LazyDashboardSettingsAppStore />
diff --git a/packages/nc-gui/components/account/License.vue b/packages/nc-gui/components/account/License.vue
index cfd1f684b4..9b42bd64b9 100644
--- a/packages/nc-gui/components/account/License.vue
+++ b/packages/nc-gui/components/account/License.vue
@@ -36,7 +36,7 @@ loadLicense()
 </script>
 
 <template>
-  <div class="h-full overflow-y-scroll scrollbar-thin-dull">
+  <div class="h-full overflow-y-auto scrollbar-thin-dull">
     <!--    <div class="text-xl mt-4 mb-8 text-center font-weight-bold">License</div>-->
     <!--    <div class="mx-auto w-150">-->
     <!--      <div>-->
diff --git a/packages/nc-gui/pages/account/index/users/[[nestedPage]].vue b/packages/nc-gui/pages/account/index/users/[[nestedPage]].vue
index cff0f35356..8a524845bc 100644
--- a/packages/nc-gui/pages/account/index/users/[[nestedPage]].vue
+++ b/packages/nc-gui/pages/account/index/users/[[nestedPage]].vue
@@ -5,7 +5,7 @@ const { isUIAllowed } = useRoles()
 </script>
 
 <template>
-  <div class="h-full overflow-y-scroll scrollbar-thin-dull pt-2">
+  <div class="h-full overflow-y-auto scrollbar-thin-dull pt-2">
     <template
       v-if="
         $route.params.nestedPage === 'password-reset' ||

From 75c7819fff0bdef72b4207492c6b70a32059d4d4 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Mon, 18 Mar 2024 10:42:19 +0000
Subject: [PATCH 3/4] fix: use important to avoid typesense override

---
 packages/nc-gui/assets/style.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss
index 45c1100a97..bffde067c0 100644
--- a/packages/nc-gui/assets/style.scss
+++ b/packages/nc-gui/assets/style.scss
@@ -65,7 +65,7 @@ main {
 }
 
 .nc-scrollbar-md {
-  overflow-y: auto;
+  overflow-y: auto !important;
   overflow-x: hidden;
   scrollbar-width: thin !important;
 
@@ -89,7 +89,7 @@ main {
 }
 
 .nc-scrollbar-lg {
-  overflow-y: auto;
+  overflow-y: auto !important;
   overflow-x: hidden;
   scrollbar-width: thin !important;
 
@@ -141,7 +141,7 @@ main {
 }
 
 .nc-scrollbar-dark-md {
-  overflow-y: auto;
+  overflow-y: auto !important;
   overflow-x: hidden;
   scrollbar-width: thin !important;
 

From d96a42adaea7f9b950df8d6f69a403ebf9fe5728 Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Mon, 18 Mar 2024 10:42:19 +0000
Subject: [PATCH 4/4] fix: replace scroll with auto for horizontal scrollbars

---
 packages/nc-gui/assets/style.scss                   | 6 +++---
 packages/nc-gui/components/project/ShareBaseDlg.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/assets/style.scss b/packages/nc-gui/assets/style.scss
index bffde067c0..0687d9ea7a 100644
--- a/packages/nc-gui/assets/style.scss
+++ b/packages/nc-gui/assets/style.scss
@@ -113,7 +113,7 @@ main {
 }
 
 .nc-scrollbar-x-md {
-  overflow-x: scroll;
+  overflow-x: auto !important;
   scrollbar-width: thin !important;
 
 
@@ -174,7 +174,7 @@ main {
 }
 
 .nc-scrollbar-x-md-dark {
-  overflow-x: scroll;
+  overflow-x: auto !important;
   scrollbar-width: thin !important;
 
   
@@ -204,7 +204,7 @@ main {
 }
 
 .nc-scrollbar-x-lg {
-  overflow-x: scroll;
+  overflow-x: auto !important;
 
   &::-webkit-scrollbar {
     width: 8px;
diff --git a/packages/nc-gui/components/project/ShareBaseDlg.vue b/packages/nc-gui/components/project/ShareBaseDlg.vue
index e0f56f623e..c64b4c10a2 100644
--- a/packages/nc-gui/components/project/ShareBaseDlg.vue
+++ b/packages/nc-gui/components/project/ShareBaseDlg.vue
@@ -235,7 +235,7 @@ const onRoleChange = (role: keyof typeof RoleLabels) => (inviteData.roles = role
         <div class="flex justify-between gap-3 w-full">
           <div
             ref="divRef"
-            class="flex items-center border-1 gap-1 w-full overflow-x-scroll nc-scrollbar-x-md items-center h-10 rounded-lg !min-w-96"
+            class="flex items-center border-1 gap-1 w-full overflow-x-auto nc-scrollbar-x-md items-center h-10 rounded-lg !min-w-96"
             tabindex="0"
             :class="{
               'border-primary/100': isDivFocused,