@websy/websy-designs 1.7.16 → 1.7.18

package/dist/websy-designs-es6.debug.js

@@ -6609,11 +6609,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)))
+        // console.log('delta', 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) {
@@ -6622,7 +6631,7 @@ class WebsyTable3 {
     }  
   }  
   handleTouchEnd (event) {
-    console.log('touch end fired')
+    // console.log('touch end fired')
     if (typeof event.targetTouches !== 'undefined') {
       this.isTouchScrolling = false		
       this.touchEndTime = (new Date()).getTime()
@@ -6634,7 +6643,7 @@ class WebsyTable3 {
     }
   }
   handleTouchMove (event) {
-    console.log(event.target.classList)
+    // console.log(event.target.classList)
     if (this.isTouchScrolling === true) {      
       event.preventDefault()
       event.stopPropagation()
@@ -6656,7 +6665,7 @@ class WebsyTable3 {
         // else {
         //   this.isTouchScrolling = false
         // }
-        console.log('delta', this.mouseYStart, event.targetTouches[0].pageY, deltaY)
+        // console.log('delta', this.mouseYStart, event.targetTouches[0].pageY, deltaY)
         // deltaX = deltaX * (scrollHandleXEl.offsetWidth / this.sizes.scrollableWidth)
         // deltaY = deltaY * (scrollHandleYEl.offsetHeight / this.sizes.bodyHeight)
         // console.log('delta', deltaY)
@@ -6690,7 +6699,7 @@ class WebsyTable3 {
     if (event.target.classList.contains('websy-table-cell-collapse')) {
       return
     }
-    console.log(event.target.classList)
+    // console.log(event.target.classList)
     if (this.options.virtualScroll === true) {
       this.touchStartTime = (new Date()).getTime()
       this.isTouchScrolling = true
@@ -6925,6 +6934,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')
     }    
@@ -6934,9 +6946,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
@@ -6945,7 +6958,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)

package/dist/websy-designs-es6.js

@@ -7219,10 +7219,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"));
@@ -7232,8 +7243,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
   }, {
     key: "handleTouchEnd",
     value: function handleTouchEnd(event) {
-      console.log('touch end fired');
-
+      // console.log('touch end fired')
       if (typeof event.targetTouches !== 'undefined') {
         this.isTouchScrolling = false;
         this.touchEndTime = new Date().getTime();
@@ -7246,8 +7256,7 @@ var WebsyTable3 = /*#__PURE__*/function () {
   }, {
     key: "handleTouchMove",
     value: function handleTouchMove(event) {
-      console.log(event.target.classList);
-
+      // console.log(event.target.classList)
       if (this.isTouchScrolling === true) {
         event.preventDefault();
         event.stopPropagation();
@@ -7269,8 +7278,8 @@ var WebsyTable3 = /*#__PURE__*/function () {
           // else {
           //   this.isTouchScrolling = false
           // }
-
-          console.log('delta', this.mouseYStart, event.targetTouches[0].pageY, deltaY); // deltaX = deltaX * (scrollHandleXEl.offsetWidth / this.sizes.scrollableWidth)
+          // console.log('delta', this.mouseYStart, event.targetTouches[0].pageY, deltaY)
+          // deltaX = deltaX * (scrollHandleXEl.offsetWidth / this.sizes.scrollableWidth)
           // deltaY = deltaY * (scrollHandleYEl.offsetHeight / this.sizes.bodyHeight)
           // console.log('delta', deltaY)
           // NW      
@@ -7305,9 +7314,8 @@ var WebsyTable3 = /*#__PURE__*/function () {
 
       if (event.target.classList.contains('websy-table-cell-collapse')) {
         return;
-      }
+      } // console.log(event.target.classList)
 
-      console.log(event.target.classList);
 
       if (this.options.virtualScroll === true) {
         this.touchStartTime = new Date().getTime();
@@ -7613,6 +7621,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');
       }
@@ -7623,11 +7635,10 @@ 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"));
@@ -7637,7 +7648,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)