@websy/websy-designs 1.7.18 → 1.7.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -6609,11 +6609,24 @@ class WebsyTable3 {
|
|
|
6609
6609
|
event.preventDefault()
|
|
6610
6610
|
// console.log('scrollwheel', event)
|
|
6611
6611
|
if (Math.abs(event.deltaX) > Math.abs(event.deltaY)) {
|
|
6612
|
-
this.scrollX(Math.max(-2, Math.min(2, event.deltaX)))
|
|
6612
|
+
// this.scrollX(Math.max(-2, Math.min(2, event.deltaX)))
|
|
6613
|
+
if (this.hScrollRequired === false) {
|
|
6614
|
+
return
|
|
6615
|
+
}
|
|
6616
|
+
const scrollHandleEl = document.getElementById(`${this.elementId}_hScrollHandle`)
|
|
6617
|
+
const scrollContainerEl = document.getElementById(`${this.elementId}_hScrollContainer`)
|
|
6618
|
+
let resolvedDelta = (scrollContainerEl.getBoundingClientRect().width - scrollHandleEl.getBoundingClientRect().width) / this.totalColumnCount
|
|
6619
|
+
if (event.deltaX < 0) {
|
|
6620
|
+
resolvedDelta = resolvedDelta * -1
|
|
6621
|
+
}
|
|
6622
|
+
this.scrollX(resolvedDelta)
|
|
6613
6623
|
}
|
|
6614
6624
|
else {
|
|
6615
6625
|
// console.log('delta', event.deltaY)
|
|
6616
6626
|
// force the scroll to be a single row at a time
|
|
6627
|
+
if (this.vScrollRequired === false) {
|
|
6628
|
+
return
|
|
6629
|
+
}
|
|
6617
6630
|
const scrollHandleEl = document.getElementById(`${this.elementId}_vScrollHandle`)
|
|
6618
6631
|
const scrollContainerEl = document.getElementById(`${this.elementId}_vScrollContainer`)
|
|
6619
6632
|
let resolvedDelta = (scrollContainerEl.getBoundingClientRect().height - scrollHandleEl.getBoundingClientRect().height) / this.totalRowCount
|
|
@@ -7219,21 +7219,40 @@ var WebsyTable3 = /*#__PURE__*/function () {
|
|
|
7219
7219
|
event.preventDefault(); // console.log('scrollwheel', event)
|
|
7220
7220
|
|
|
7221
7221
|
if (Math.abs(event.deltaX) > Math.abs(event.deltaY)) {
|
|
7222
|
-
this.scrollX(Math.max(-2, Math.min(2, event.deltaX)))
|
|
7222
|
+
// this.scrollX(Math.max(-2, Math.min(2, event.deltaX)))
|
|
7223
|
+
if (this.hScrollRequired === false) {
|
|
7224
|
+
return;
|
|
7225
|
+
}
|
|
7226
|
+
|
|
7227
|
+
var scrollHandleEl = document.getElementById("".concat(this.elementId, "_hScrollHandle"));
|
|
7228
|
+
var scrollContainerEl = document.getElementById("".concat(this.elementId, "_hScrollContainer"));
|
|
7229
|
+
var resolvedDelta = (scrollContainerEl.getBoundingClientRect().width - scrollHandleEl.getBoundingClientRect().width) / this.totalColumnCount;
|
|
7230
|
+
|
|
7231
|
+
if (event.deltaX < 0) {
|
|
7232
|
+
resolvedDelta = resolvedDelta * -1;
|
|
7233
|
+
}
|
|
7234
|
+
|
|
7235
|
+
this.scrollX(resolvedDelta);
|
|
7223
7236
|
} else {
|
|
7224
7237
|
// console.log('delta', event.deltaY)
|
|
7225
7238
|
// force the scroll to be a single row at a time
|
|
7226
|
-
|
|
7227
|
-
|
|
7228
|
-
|
|
7239
|
+
if (this.vScrollRequired === false) {
|
|
7240
|
+
return;
|
|
7241
|
+
}
|
|
7242
|
+
|
|
7243
|
+
var _scrollHandleEl2 = document.getElementById("".concat(this.elementId, "_vScrollHandle"));
|
|
7244
|
+
|
|
7245
|
+
var _scrollContainerEl = document.getElementById("".concat(this.elementId, "_vScrollContainer"));
|
|
7246
|
+
|
|
7247
|
+
var _resolvedDelta = (_scrollContainerEl.getBoundingClientRect().height - _scrollHandleEl2.getBoundingClientRect().height) / this.totalRowCount;
|
|
7229
7248
|
|
|
7230
7249
|
if (event.deltaY < 0) {
|
|
7231
|
-
|
|
7250
|
+
_resolvedDelta = _resolvedDelta * -1;
|
|
7232
7251
|
} // console.log('resolvedDelta', resolvedDelta)
|
|
7233
7252
|
// this.scrollY(Math.max(-2, Math.min(2, event.deltaY)))
|
|
7234
7253
|
|
|
7235
7254
|
|
|
7236
|
-
this.scrollY(
|
|
7255
|
+
this.scrollY(_resolvedDelta);
|
|
7237
7256
|
}
|
|
7238
7257
|
} else if (this.options.onNativeScroll) {
|
|
7239
7258
|
var el = document.getElementById("".concat(this.elementId, "_tableBody"));
|