handsontable 0.0.0-next-5d8c97d-20231228 → 0.0.0-next-3388fcb-20240102

package/helpers/mixed.js

@@ -134,7 +134,7 @@ const domMessages = {
 function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-5d8c97d-20231228";
+  const hotVersion = "0.0.0-next-3388fcb-20240102";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/helpers/mixed.mjs

@@ -124,7 +124,7 @@ const domMessages = {
 export function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-5d8c97d-20231228";
+  const hotVersion = "0.0.0-next-3388fcb-20240102";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/handsontable/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "0.0.0-next-5d8c97d-20231228",
+  "version": "0.0.0-next-3388fcb-20240102",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/pluginHooks.js

@@ -414,7 +414,7 @@ const REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-s
  */
 'afterUpdateData',
 /**
- * Fired after a scroll event, which is identified as a momentum scroll (e.g. On an iPad).
+ * Fired after a scroll event, which is identified as a momentum scroll.
  *
  * @event Hooks#afterMomentumScroll
  */

package/pluginHooks.mjs

@@ -410,7 +410,7 @@ const REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-s
  */
 'afterUpdateData',
 /**
- * Fired after a scroll event, which is identified as a momentum scroll (e.g. On an iPad).
+ * Fired after a scroll event, which is identified as a momentum scroll.
  *
  * @event Hooks#afterMomentumScroll
  */

package/plugins/dragToScroll/dragToScroll.d.ts

@@ -1,6 +1,13 @@
 import Core from '../../core';
 import { BasePlugin } from '../base';
 
+interface DOMBoundaries {
+  left: number;
+  right: number;
+  top: number;
+  bottom: number;
+}
+
 export type Settings = boolean;
 
 export class DragToScroll extends BasePlugin {
@@ -9,7 +16,7 @@ export class DragToScroll extends BasePlugin {
   boundaries: DOMRect | undefined;
 
   isEnabled(): boolean;
-  setBoundaries(boundaries: DOMRect): void;
+  setBoundaries(boundaries: DOMRect | DOMBoundaries): void;
   setCallback(callback: () => void): void;
   check(x: number, y: number): void;
 }

package/plugins/dragToScroll/dragToScroll.js

@@ -108,9 +108,16 @@ class DragToScroll extends _base.BasePlugin {
   /**
    * Sets the value of the visible element.
    *
-   * @param {DOMRect} boundaries An object with coordinates compatible with DOMRect.
+   * @param {DOMRect|{left: number, right: number, top: number, bottom: number}} [boundaries] An object with
+   * coordinates. Contains the window boundaries by default. The object is compatible with DOMRect.
    */
-  setBoundaries(boundaries) {
+  setBoundaries() {
+    let boundaries = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+      left: 0,
+      right: this.hot.rootWindow.innerWidth,
+      top: 0,
+      bottom: this.hot.rootWindow.innerHeight
+    };
     this.boundaries = boundaries;
   }
 
@@ -124,7 +131,7 @@ class DragToScroll extends _base.BasePlugin {
   }
 
   /**
-   * Checks if the mouse position (X, Y) is outside of the viewport and fires a callback with calculated X an Y diffs
+   * Checks if the mouse position (X, Y) is outside the viewport and fires a callback with calculated X an Y diffs
    * between passed boundaries.
    *
    * @param {number} x Mouse X coordinate to check.
@@ -229,24 +236,13 @@ function _setupListening2(event) {
   if ((0, _event.isRightClick)(event)) {
     return;
   }
-  const scrollHandler = this.hot.view._wt.wtTable.holder; // native scroll
-
-  if (scrollHandler === this.hot.rootWindow) {
-    // not much we can do currently
-    return;
-  }
-  this.setBoundaries(scrollHandler.getBoundingClientRect());
+  const scrollHandler = this.hot.view._wt.wtOverlays.topOverlay.mainTableScrollableElement;
+  this.setBoundaries(scrollHandler !== this.hot.rootWindow ? scrollHandler.getBoundingClientRect() : undefined);
   this.setCallback((scrollX, scrollY) => {
-    if (scrollX < 0) {
-      scrollHandler.scrollLeft -= 50;
-    } else if (scrollX > 0) {
-      scrollHandler.scrollLeft += 50;
-    }
-    if (scrollY < 0) {
-      scrollHandler.scrollTop -= 20;
-    } else if (scrollY > 0) {
-      scrollHandler.scrollTop += 20;
-    }
+    var _scrollHandler$scroll, _scrollHandler$scroll2;
+    const horizontalScrollValue = (_scrollHandler$scroll = scrollHandler.scrollLeft) !== null && _scrollHandler$scroll !== void 0 ? _scrollHandler$scroll : scrollHandler.scrollX;
+    const verticalScrollValue = (_scrollHandler$scroll2 = scrollHandler.scrollTop) !== null && _scrollHandler$scroll2 !== void 0 ? _scrollHandler$scroll2 : scrollHandler.scrollY;
+    scrollHandler.scroll(horizontalScrollValue + Math.sign(scrollX) * 50, verticalScrollValue + Math.sign(scrollY) * 20);
   });
   this.listen();
 }

package/plugins/dragToScroll/dragToScroll.mjs

@@ -105,9 +105,16 @@ export class DragToScroll extends BasePlugin {
   /**
    * Sets the value of the visible element.
    *
-   * @param {DOMRect} boundaries An object with coordinates compatible with DOMRect.
+   * @param {DOMRect|{left: number, right: number, top: number, bottom: number}} [boundaries] An object with
+   * coordinates. Contains the window boundaries by default. The object is compatible with DOMRect.
    */
-  setBoundaries(boundaries) {
+  setBoundaries() {
+    let boundaries = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+      left: 0,
+      right: this.hot.rootWindow.innerWidth,
+      top: 0,
+      bottom: this.hot.rootWindow.innerHeight
+    };
     this.boundaries = boundaries;
   }
 
@@ -121,7 +128,7 @@ export class DragToScroll extends BasePlugin {
   }
 
   /**
-   * Checks if the mouse position (X, Y) is outside of the viewport and fires a callback with calculated X an Y diffs
+   * Checks if the mouse position (X, Y) is outside the viewport and fires a callback with calculated X an Y diffs
    * between passed boundaries.
    *
    * @param {number} x Mouse X coordinate to check.
@@ -225,24 +232,13 @@ function _setupListening2(event) {
   if (isRightClick(event)) {
     return;
   }
-  const scrollHandler = this.hot.view._wt.wtTable.holder; // native scroll
-
-  if (scrollHandler === this.hot.rootWindow) {
-    // not much we can do currently
-    return;
-  }
-  this.setBoundaries(scrollHandler.getBoundingClientRect());
+  const scrollHandler = this.hot.view._wt.wtOverlays.topOverlay.mainTableScrollableElement;
+  this.setBoundaries(scrollHandler !== this.hot.rootWindow ? scrollHandler.getBoundingClientRect() : undefined);
   this.setCallback((scrollX, scrollY) => {
-    if (scrollX < 0) {
-      scrollHandler.scrollLeft -= 50;
-    } else if (scrollX > 0) {
-      scrollHandler.scrollLeft += 50;
-    }
-    if (scrollY < 0) {
-      scrollHandler.scrollTop -= 20;
-    } else if (scrollY > 0) {
-      scrollHandler.scrollTop += 20;
-    }
+    var _scrollHandler$scroll, _scrollHandler$scroll2;
+    const horizontalScrollValue = (_scrollHandler$scroll = scrollHandler.scrollLeft) !== null && _scrollHandler$scroll !== void 0 ? _scrollHandler$scroll : scrollHandler.scrollX;
+    const verticalScrollValue = (_scrollHandler$scroll2 = scrollHandler.scrollTop) !== null && _scrollHandler$scroll2 !== void 0 ? _scrollHandler$scroll2 : scrollHandler.scrollY;
+    scrollHandler.scroll(horizontalScrollValue + Math.sign(scrollX) * 50, verticalScrollValue + Math.sign(scrollY) * 20);
   });
   this.listen();
 }