From 8f113f8b7567432018d22c47284323cf592219e3 Mon Sep 17 00:00:00 2001
From: Alexander Platov <sas_lord@mail.ru>
Date: Wed, 1 Jun 2022 06:26:43 +0300
Subject: [PATCH] Scroller: Added autohide. Fixed track height when displaying
 table and colors. (#1964)

Signed-off-by: Alexander Platov <sas_lord@mail.ru>
---
 packages/theme/styles/_colors.scss         | 14 ++---
 packages/theme/styles/components.scss      |  8 +--
 packages/ui/src/components/Scroller.svelte | 69 ++++++++++++++--------
 3 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/packages/theme/styles/_colors.scss b/packages/theme/styles/_colors.scss
index 862050f9a9..907a327079 100644
--- a/packages/theme/styles/_colors.scss
+++ b/packages/theme/styles/_colors.scss
@@ -66,9 +66,9 @@
   --highlight-select-border: #2f3544;
   --highlight-select-hover: #323a4e;
 
-  --scrollbar-bar-color: #28292b;  // #ffffff10;
-  --scrollbar-bar-hover: #2d2f36;  // #ffffff15;
-  --scrollbar-track-color: #27282b;  // #ffffff0a;
+  --scrollbar-bar-color: #303236;
+  --scrollbar-bar-hover: #8a8f98;
+  --scrollbar-track-color: #303236;
 
   --dark-color: #62666d;
   --content-color: #8a8f98;
@@ -216,9 +216,9 @@
   --highlight-select-border: #e6eaff;
   --highlight-select-hover: #e4ebff;
 
-  --scrollbar-bar-color: #eee;  // #00000010;
-  --scrollbar-bar-hover: #f0f3f9;  // #00000015;
-  --scrollbar-track-color: #f8f9fb;  // #0000000a;
+  --scrollbar-bar-color: #e0e0e0;
+  --scrollbar-bar-hover: #90959d;
+  --scrollbar-track-color: #e0e0e0;
 
   --dark-color: #90959d;
   --content-color: #3c4149;
@@ -229,7 +229,7 @@
   --warning-color: #f2994a;  // Dark
   --error-color: #eb5757;  // Dark
 
-  --divider-color: #00000010;
+  --divider-color: #e0e0e0;
   --menu-bg-select: #f0f3f9;
   --menu-icon-hover: #282a30;
   --popup-bg-color: linear-gradient(136.61deg, rgb(255, 255, 255) 13.72%, rgb(255, 255, 255) 74.3%);
diff --git a/packages/theme/styles/components.scss b/packages/theme/styles/components.scss
index ef0c2dcba2..e98c8f223b 100644
--- a/packages/theme/styles/components.scss
+++ b/packages/theme/styles/components.scss
@@ -339,8 +339,8 @@
     height: 2.5rem;
     font-weight: 500;
     font-size: .75rem;
-    color: var(--theme-content-dark-color);
-    box-shadow: inset 0 -1px 0 0 var(--theme-bg-focused-color);
+    color: var(--dark-color);
+    box-shadow: inset 0 -1px 0 0 var(--divider-color);
     user-select: none;
     // z-index: 5;
 
@@ -394,7 +394,7 @@
 
   .antiTable-body__row {
     height: 3.25rem;
-    color: var(--theme-caption-color);
+    color: var(--caption-color);
 
     &:not(:last-child) { border-bottom: 1px solid var(--accent-bg-color); }
     &:hover .antiTable-cells__firstCell .antiTable-cells__firstCell-menuRow { visibility: visible; }
@@ -411,7 +411,7 @@
   }
 
   .antiTable-body__border {
-    border: 1px solid var(--theme-button-border-hovered);
+    border: 1px solid var(--divider-color);
   }
 
   &.highlightRows .antiTable-body__row {
diff --git a/packages/ui/src/components/Scroller.svelte b/packages/ui/src/components/Scroller.svelte
index e4ec6ba274..753214e45d 100644
--- a/packages/ui/src/components/Scroller.svelte
+++ b/packages/ui/src/components/Scroller.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { afterUpdate, onDestroy, onMount } from 'svelte'
+  import { onDestroy, onMount } from 'svelte'
 
   export let padding: boolean = false
   export let autoscroll: boolean = false
@@ -34,15 +34,30 @@
   let scrolling: boolean = autoscroll
   let firstScroll: boolean = autoscroll
 
+  let timer: number
+
+  $: shift = tableFade ? 40 : 0
+
   const checkBar = (): void => {
     if (divBar && divScroll) {
-      const proc = (divScroll.clientHeight / divScroll.scrollHeight) * 100
-      const procScroll = (divScroll.clientHeight - 4) / 100
-      const procTop = divScroll.scrollTop / divScroll.scrollHeight
-      divBar.style.height = procScroll * proc + 'px'
-      divBar.style.top = procTop * (divScroll.clientHeight - 4) + 2 + 'px'
+      const trackH = divScroll.clientHeight - shift - 4
+      const scrollH = divScroll.scrollHeight
+      const proc = scrollH / trackH
+      divBar.style.height = divScroll.clientHeight / proc + 'px'
+      divBar.style.top = divScroll.scrollTop / proc + shift + 2 + 'px'
       if (mask === 'none') divBar.style.visibility = 'hidden'
-      else divBar.style.visibility = 'visible'
+      else {
+        divBar.style.visibility = 'visible'
+        if (divBar) {
+          if (timer) {
+            clearTimeout(timer)
+            divBar.style.opacity = '1'
+          }
+          timer = setTimeout(() => {
+            divBar.style.opacity = '0'
+          }, 2000)
+        }
+      }
       if (divScroll.clientHeight >= divScroll.scrollHeight) divBar.style.visibility = 'hidden'
     }
   }
@@ -52,11 +67,11 @@
     if (isScrolling && divBar && divScroll) {
       const rectScroll = divScroll.getBoundingClientRect()
       let Y = event.clientY - dY
-      if (Y < rectScroll.top + 2) Y = rectScroll.top + 2
+      if (Y < rectScroll.top + shift + 2) Y = rectScroll.top + shift + 2
       if (Y > rectScroll.bottom - divBar.clientHeight - 2) Y = rectScroll.bottom - divBar.clientHeight - 2
       divBar.style.top = Y - rectScroll.y + 'px'
-      const topBar = Y - rectScroll.y - 2
-      const heightScroll = rectScroll.height - 4 - divBar.clientHeight
+      const topBar = Y - rectScroll.y - shift - 2
+      const heightScroll = rectScroll.height - 4 - divBar.clientHeight - shift
       const procBar = topBar / heightScroll
       divScroll.scrollTop = (divScroll.scrollHeight - divScroll.clientHeight) * procBar
     }
@@ -103,8 +118,6 @@
     if (!isScrolling) checkBar()
   }
 
-  const observer = new IntersectionObserver(() => checkFade(), { root: null, threshold: 0.1 })
-
   const scrollDown = (): void => {
     divScroll.scrollTop = divScroll.scrollHeight - divHeight
   }
@@ -112,26 +125,19 @@
   onMount(() => {
     if (divScroll && divBox) {
       divScroll.addEventListener('scroll', checkFade)
+      const observer = new IntersectionObserver(() => checkFade(), { root: null, threshold: 0.1 })
       const tempEl = divBox.querySelector('*') as HTMLElement
       if (tempEl) observer.observe(tempEl)
       if (autoscroll && scrolling) {
         scrollDown()
         firstScroll = false
       }
-      checkFade()
+      checkBar()
     }
   })
   onDestroy(() => {
     if (divScroll) divScroll.removeEventListener('scroll', checkFade)
   })
-  afterUpdate(() => {
-    if (divScroll && divBox) {
-      const tempEl = divBox.querySelector('*') as HTMLElement
-      if (tempEl) observer.observe(tempEl)
-      if (autoscroll && scrolling) scrollDown()
-      checkFade()
-    }
-  })
 
   let divHeight: number
   const _resize = (): void => checkFade()
@@ -153,8 +159,14 @@
       <slot />
     </div>
   </div>
-  <div class="bar" class:hovered={isScrolling} bind:this={divBar} on:mousedown={onScrollStart} />
-  <div class="track" class:hovered={isScrolling} bind:this={divTrack} />
+  <div
+    class="bar"
+    class:hovered={isScrolling}
+    bind:this={divBar}
+    on:mousedown={onScrollStart}
+    on:mouseleave={checkFade}
+  />
+  <div class="track" class:hovered={isScrolling} class:tableFade bind:this={divTrack} />
 </div>
 
 <style lang="scss">
@@ -206,6 +218,10 @@
     transition: all 0.1s ease-in-out;
     background-color: var(--scrollbar-track-color);
     border-radius: 0.5rem;
+
+    &.tableFade {
+      top: 42px;
+    }
   }
   .bar {
     visibility: hidden;
@@ -219,17 +235,18 @@
     transform: scaleX(0.5);
     background-color: var(--scrollbar-bar-color);
     border-radius: 0.125rem;
-    opacity: 0.5;
+    opacity: 0;
+    box-shadow: 0 0 1px 1px var(--board-bg-color);
     cursor: pointer;
     z-index: 1;
-    transition: all 0.1s;
+    transition: all 0.15s;
 
     &:hover,
     &.hovered {
       background-color: var(--scrollbar-bar-hover);
       transform: scaleX(1);
       border-radius: 0.25rem;
-      opacity: 1;
+      opacity: 1 !important;
       box-shadow: 0 0 1px black;
 
       & + .track {