@websy/websy-designs 1.7.15 → 1.7.17

package/dist/websy-designs.debug.js

@@ -7024,11 +7024,20 @@ class WebsyTable3 {
       event.preventDefault()
       // console.log('scrollwheel', event)
       if (Math.abs(event.deltaX) > Math.abs(event.deltaY)) {
-        this.scrollX(Math.max(-5, Math.min(5, event.deltaX)))
+        this.scrollX(Math.max(-2, Math.min(2, event.deltaX)))
       }
       else {
         console.log('delta', event.deltaY)
-        this.scrollY(Math.max(-5, Math.min(5, event.deltaY)))
+        // force the scroll to be a single row at a time
+        const scrollHandleEl = document.getElementById(`${this.elementId}_vScrollHandle`)    
+        const scrollContainerEl = document.getElementById(`${this.elementId}_vScrollContainer`)
+        let resolvedDelta = (scrollContainerEl.getBoundingClientRect().height - scrollHandleEl.getBoundingClientRect().height) / this.totalRowCount
+        if (event.deltaY < 0) {
+          resolvedDelta = resolvedDelta * -1
+        }
+        console.log('resolvedDelta', resolvedDelta)
+        // this.scrollY(Math.max(-2, Math.min(2, event.deltaY)))
+        this.scrollY(resolvedDelta)
       }
     }  
     else if (this.options.onNativeScroll) {
@@ -7340,6 +7349,9 @@ class WebsyTable3 {
   }
   scrollY (diff) {
     const el = document.getElementById(`${this.elementId}_tableContainer`)
+    if (this.vScrollRequired === false) {
+      return
+    }
     if (!el.classList.contains('scrolling')) {
       el.classList.add('scrolling')
     }    
@@ -7349,9 +7361,10 @@ class WebsyTable3 {
     this.scrollTimeoutFn = setTimeout(() => {      
       el.classList.remove('scrolling')
     }, 200)
-    if (this.vScrollRequired === false) {
-      return
-    }
+    // if (this.vScrollRequired === false) {
+    //   return
+    // }
+    console.log('this.handleYStart', this.handleYStart)
     const scrollContainerEl = document.getElementById(`${this.elementId}_vScrollContainer`)
     const scrollHandleEl = document.getElementById(`${this.elementId}_vScrollHandle`)    
     let handlePos
@@ -7360,7 +7373,7 @@ class WebsyTable3 {
     }
     else {
       // console.log('appending not resetting')
-      handlePos = scrollHandleEl.offsetTop + diff
+      handlePos = +scrollHandleEl.style.top.replace('px', '') + diff
     }    
     const scrollableSpace = scrollContainerEl.getBoundingClientRect().height - scrollHandleEl.getBoundingClientRect().height
     // console.log('dragging y', (diff), scrollContainerEl.getBoundingClientRect().height - scrollHandleEl.getBoundingClientRect().height)
@@ -8084,15 +8097,15 @@ else {
     // Check to see if we need to balance the min and max values
     if (this.options.balancedMinMax) {
       if (this.options.orientation === 'horizontal') {
-        let biggestBottom = Math.max(Math.abs(this.options.data.bottom.min, this.options.data.bottom.max))
+        let biggestBottom = Math.max(Math.abs(this.options.data.bottom.min), this.options.data.bottom.max)
         this.options.data.bottom.min = 1 - biggestBottom
         this.options.data.bottom.max = biggestBottom
       }
       else {
-        let biggestLeft = Math.max(Math.abs(this.options.data.left.min, this.options.data.left.max))
+        let biggestLeft = Math.max(Math.abs(this.options.data.left.min), this.options.data.left.max)
         this.options.data.left.min = 1 - biggestLeft
         this.options.data.left.max = biggestLeft
-        let biggestRight = Math.max(Math.abs(this.options.data.right.min, this.options.data.right.max))
+        let biggestRight = Math.max(Math.abs(this.options.data.right.min), this.options.data.right.max)
         this.options.data.right.min = 1 - biggestRight
         this.options.data.right.max = biggestRight
       }

package/dist/websy-designs.js

@@ -7700,10 +7700,21 @@ var WebsyTable3 = /*#__PURE__*/function () {
         event.preventDefault(); // console.log('scrollwheel', event)
 
         if (Math.abs(event.deltaX) > Math.abs(event.deltaY)) {
-          this.scrollX(Math.max(-5, Math.min(5, event.deltaX)));
+          this.scrollX(Math.max(-2, Math.min(2, event.deltaX)));
         } else {
-          console.log('delta', event.deltaY);
-          this.scrollY(Math.max(-5, Math.min(5, event.deltaY)));
+          console.log('delta', event.deltaY); // force the scroll to be a single row at a time
+
+          var scrollHandleEl = document.getElementById("".concat(this.elementId, "_vScrollHandle"));
+          var scrollContainerEl = document.getElementById("".concat(this.elementId, "_vScrollContainer"));
+          var resolvedDelta = (scrollContainerEl.getBoundingClientRect().height - scrollHandleEl.getBoundingClientRect().height) / this.totalRowCount;
+
+          if (event.deltaY < 0) {
+            resolvedDelta = resolvedDelta * -1;
+          }
+
+          console.log('resolvedDelta', resolvedDelta); // this.scrollY(Math.max(-2, Math.min(2, event.deltaY)))
+
+          this.scrollY(resolvedDelta);
         }
       } else if (this.options.onNativeScroll) {
         var el = document.getElementById("".concat(this.elementId, "_tableBody"));
@@ -8094,6 +8105,10 @@ var WebsyTable3 = /*#__PURE__*/function () {
     value: function scrollY(diff) {
       var el = document.getElementById("".concat(this.elementId, "_tableContainer"));
 
+      if (this.vScrollRequired === false) {
+        return;
+      }
+
       if (!el.classList.contains('scrolling')) {
         el.classList.add('scrolling');
       }
@@ -8104,12 +8119,11 @@ var WebsyTable3 = /*#__PURE__*/function () {
 
       this.scrollTimeoutFn = setTimeout(function () {
         el.classList.remove('scrolling');
-      }, 200);
-
-      if (this.vScrollRequired === false) {
-        return;
-      }
+      }, 200); // if (this.vScrollRequired === false) {
+      //   return
+      // }
 
+      console.log('this.handleYStart', this.handleYStart);
       var scrollContainerEl = document.getElementById("".concat(this.elementId, "_vScrollContainer"));
       var scrollHandleEl = document.getElementById("".concat(this.elementId, "_vScrollHandle"));
       var handlePos;
@@ -8118,7 +8132,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
         handlePos = this.handleYStart + diff;
       } else {
         // console.log('appending not resetting')
-        handlePos = scrollHandleEl.offsetTop + diff;
+        handlePos = +scrollHandleEl.style.top.replace('px', '') + diff;
       }
 
       var scrollableSpace = scrollContainerEl.getBoundingClientRect().height - scrollHandleEl.getBoundingClientRect().height; // console.log('dragging y', (diff), scrollContainerEl.getBoundingClientRect().height - scrollHandleEl.getBoundingClientRect().height)
@@ -8964,14 +8978,14 @@ var WebsyChart = /*#__PURE__*/function () {
 
           if (this.options.balancedMinMax) {
             if (this.options.orientation === 'horizontal') {
-              var biggestBottom = Math.max(Math.abs(this.options.data.bottom.min, this.options.data.bottom.max));
+              var biggestBottom = Math.max(Math.abs(this.options.data.bottom.min), this.options.data.bottom.max);
               this.options.data.bottom.min = 1 - biggestBottom;
               this.options.data.bottom.max = biggestBottom;
             } else {
-              var biggestLeft = Math.max(Math.abs(this.options.data.left.min, this.options.data.left.max));
+              var biggestLeft = Math.max(Math.abs(this.options.data.left.min), this.options.data.left.max);
               this.options.data.left.min = 1 - biggestLeft;
               this.options.data.left.max = biggestLeft;
-              var biggestRight = Math.max(Math.abs(this.options.data.right.min, this.options.data.right.max));
+              var biggestRight = Math.max(Math.abs(this.options.data.right.min), this.options.data.right.max);
               this.options.data.right.min = 1 - biggestRight;
               this.options.data.right.max = biggestRight;
             }