@websy/websy-designs 1.7.17 → 1.7.19

package/dist/websy-designs.debug.js

@@ -7024,18 +7024,31 @@ class WebsyTable3 {
       event.preventDefault()
       // console.log('scrollwheel', event)
       if (Math.abs(event.deltaX) > Math.abs(event.deltaY)) {
-        this.scrollX(Math.max(-2, Math.min(2, event.deltaX)))
+        // this.scrollX(Math.max(-2, Math.min(2, event.deltaX)))
+        if (this.hScrollRequired === false) {
+          return
+        }
+        const scrollHandleEl = document.getElementById(`${this.elementId}_hScrollHandle`)    
+        const scrollContainerEl = document.getElementById(`${this.elementId}_hScrollContainer`)
+        let resolvedDelta = (scrollContainerEl.getBoundingClientRect().width - scrollHandleEl.getBoundingClientRect().width) / this.totalColumnCount
+        if (event.deltaX < 0) {
+          resolvedDelta = resolvedDelta * -1
+        }
+        this.scrollX(resolvedDelta)
       }
       else {
-        console.log('delta', event.deltaY)
+        // console.log('delta', event.deltaY)
         // force the scroll to be a single row at a time
+        if (this.vScrollRequired === false) {
+          return
+        }
         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)
+        // console.log('resolvedDelta', resolvedDelta)
         // this.scrollY(Math.max(-2, Math.min(2, event.deltaY)))
         this.scrollY(resolvedDelta)
       }
@@ -7046,7 +7059,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()
@@ -7058,7 +7071,7 @@ class WebsyTable3 {
     }
   }
   handleTouchMove (event) {
-    console.log(event.target.classList)
+    // console.log(event.target.classList)
     if (this.isTouchScrolling === true) {      
       event.preventDefault()
       event.stopPropagation()
@@ -7080,7 +7093,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)
@@ -7114,7 +7127,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
@@ -7364,7 +7377,7 @@ class WebsyTable3 {
     // if (this.vScrollRequired === false) {
     //   return
     // }
-    console.log('this.handleYStart', this.handleYStart)
+    // console.log('this.handleYStart', this.handleYStart)
     const scrollContainerEl = document.getElementById(`${this.elementId}_vScrollContainer`)
     const scrollHandleEl = document.getElementById(`${this.elementId}_vScrollHandle`)    
     let handlePos

package/dist/websy-designs.js

@@ -7700,21 +7700,40 @@ var WebsyTable3 = /*#__PURE__*/function () {
         event.preventDefault(); // console.log('scrollwheel', event)
 
         if (Math.abs(event.deltaX) > Math.abs(event.deltaY)) {
-          this.scrollX(Math.max(-2, Math.min(2, event.deltaX)));
-        } else {
-          console.log('delta', event.deltaY); // force the scroll to be a single row at a time
+          // this.scrollX(Math.max(-2, Math.min(2, event.deltaX)))
+          if (this.hScrollRequired === false) {
+            return;
+          }
 
-          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;
+          var scrollHandleEl = document.getElementById("".concat(this.elementId, "_hScrollHandle"));
+          var scrollContainerEl = document.getElementById("".concat(this.elementId, "_hScrollContainer"));
+          var resolvedDelta = (scrollContainerEl.getBoundingClientRect().width - scrollHandleEl.getBoundingClientRect().width) / this.totalColumnCount;
 
-          if (event.deltaY < 0) {
+          if (event.deltaX < 0) {
             resolvedDelta = resolvedDelta * -1;
           }
 
-          console.log('resolvedDelta', resolvedDelta); // this.scrollY(Math.max(-2, Math.min(2, event.deltaY)))
+          this.scrollX(resolvedDelta);
+        } else {
+          // console.log('delta', event.deltaY)
+          // force the scroll to be a single row at a time
+          if (this.vScrollRequired === false) {
+            return;
+          }
+
+          var _scrollHandleEl2 = document.getElementById("".concat(this.elementId, "_vScrollHandle"));
+
+          var _scrollContainerEl = document.getElementById("".concat(this.elementId, "_vScrollContainer"));
 
-          this.scrollY(resolvedDelta);
+          var _resolvedDelta = (_scrollContainerEl.getBoundingClientRect().height - _scrollHandleEl2.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"));
@@ -7724,8 +7743,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();
@@ -7738,8 +7756,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();
@@ -7761,8 +7778,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      
@@ -7797,9 +7814,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();
@@ -8122,8 +8138,8 @@ var WebsyTable3 = /*#__PURE__*/function () {
       }, 200); // if (this.vScrollRequired === false) {
       //   return
       // }
+      // console.log('this.handleYStart', this.handleYStart)
 
-      console.log('this.handleYStart', this.handleYStart);
       var scrollContainerEl = document.getElementById("".concat(this.elementId, "_vScrollContainer"));
       var scrollHandleEl = document.getElementById("".concat(this.elementId, "_vScrollHandle"));
       var handlePos;