Updated Satus

code-charity · May 18, 2020 · cdd012c · cdd012c
1 parent 2853953
commit cdd012c
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 27 deletions.
diff --git a/satus.css b/satus.css
@@ -503,6 +503,7 @@
     top: 0;
     right: 0;
 
+    min-height: 32px;
     padding: 0 2px;
 
     transition: background-color 200ms, opacity 300ms;
@@ -1194,8 +1195,10 @@
     overflow: hidden;
     flex-direction: column;
 
+    box-sizing: border-box;
     height: 100%;
 
+    border: 1px solid #e4e4e4;
     border-radius: 4px;
     background: var(--background-2);
 }
@@ -1218,17 +1221,18 @@
 
 .satus-table__body
 {
-    overflow-y: scroll;
+    overflow: hidden;
 
     flex: 1;
 }
 
-.satus-table__body > div
+.satus-table__body .satus-scrollbar__content > div
 {
     display: flex;
 
     align-items: center;
-}
+}
+
 /*--------------------------------------------------------------
 >>> TEXT
 --------------------------------------------------------------*/

diff --git a/satus.js b/satus.js
@@ -1209,9 +1209,9 @@ Satus.components.main = function(object) {
 
     return component;
 };
-/*--------------------------------------------------------------
+/*-----------------------------------------------------------------------------
 >>> SCROLL BAR
---------------------------------------------------------------*/
+-----------------------------------------------------------------------------*/
 
 Satus.components.scrollbar = function(parent) {
     var component = document.createElement('div'),
@@ -1224,51 +1224,64 @@ Satus.components.scrollbar = function(parent) {
     component_content.className = 'satus-scrollbar__content';
     component_thumb.className = 'satus-scrollbar__thumb';
 
-    window.addEventListener('resize', function(event) {
+
+    // RESIZE
+
+    function resize() {
         component_content.style.width = component.offsetWidth + 'px';
+        component_wrapper.style.height = component.offsetHeight + 'px';
+
+        if (component_wrapper.scrollHeight > component_wrapper.offsetHeight) {
+            component_thumb.style.height = component_wrapper.offsetHeight / component_wrapper.scrollHeight * component_wrapper.offsetHeight + 'px';
+        }
+    }
+
+    window.addEventListener('resize', resize);
+
+    new MutationObserver(resize).observe(component_content, {
+        subtree: true,
+        childList: true
     });
 
-    component.interval = false;
+
+    // HOVER
+
+    component.timeout = false;
 
     function active() {
-        if (component.interval) {
-            clearTimeout(component.interval);
+        if (component.timeout) {
+            clearTimeout(component.timeout);
 
-            component.interval = false;
+            component.timeout = false;
         }
 
         component.classList.add('active');
 
-        component.interval = setTimeout(function() {
+        component.timeout = setTimeout(function() {
             component.classList.remove('active');
 
-            component.interval = false;
+            component.timeout = false;
         }, 1000);
     }
 
     component.addEventListener('mousemove', active);
 
+
+    // SCROLL
+
     component_wrapper.addEventListener('scroll', function(event) {
         active();
 
         component_thumb.style.top = Math.floor(component_wrapper.scrollTop * (component_wrapper.offsetHeight - component_thumb.offsetHeight) / (component_wrapper.scrollHeight - component_wrapper.offsetHeight)) + 'px';
     });
 
-    new MutationObserver(function() {
-        component_content.style.width = component.offsetWidth + 'px';
-        component_wrapper.style.height = component.offsetHeight + 'px';
-
-        if (component_wrapper.scrollHeight > component_wrapper.offsetHeight) {
-            component_thumb.style.height = component_wrapper.offsetHeight / component_wrapper.scrollHeight * component_wrapper.offsetHeight + 'px';
-        }
-    }).observe(component_content, {
-        subtree: true,
-        childList: true
-    });
-
     component_thumb.addEventListener('mousedown', function(event) {
         var offsetY = event.layerY;
 
+        if (event.button !== 0) {
+            return false;
+        }
+
         function mousemove(event) {
             var offset = 100 / ((component.offsetHeight - component_thumb.offsetHeight) / (event.clientY - offsetY - component.getBoundingClientRect().top)),
                 scroll = component_wrapper.scrollHeight - component.offsetHeight;
@@ -1862,6 +1875,7 @@ Satus.components.table = function(item) {
     var table = document.createElement('div'),
         table_head = document.createElement('div'),
         table_body = document.createElement('div'),
+        component_scrollbar = Satus.components.scrollbar(table_body),
         table_rows = [];
 
     table_head.className = 'satus-table__head';
@@ -1939,13 +1953,13 @@ Satus.components.table = function(item) {
             table.update(sorted_rows);
         };
 
-        Satus.render(col, item.columns[i]);
+        Satus.render(item.columns[i], col);
 
         table_head.appendChild(col);
     }
 
     function update(rows) {
-        this.querySelector('.satus-table__body').innerHTML = '';
+        component_scrollbar.innerHTML = '';
 
         table_rows = rows;
 
@@ -1962,7 +1976,7 @@ Satus.components.table = function(item) {
                 row.appendChild(col);
             }
 
-            this.querySelector('.satus-table__body').appendChild(row);
+            component_scrollbar.appendChild(row);
         }
     }