handsontable 0.0.0-next-09eb648-20230511 → 0.0.0-next-0962f2c-20230512

package/helpers/mixed.js

@@ -152,7 +152,7 @@ var domMessages = {
 function _injectProductInfo(key, element) {
   var hasValidType = !isEmpty(key);
   var isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  var hotVersion = "0.0.0-next-09eb648-20230511";
+  var hotVersion = "0.0.0-next-0962f2c-20230512";
   var keyValidityDate;
   var consoleMessageState = 'invalid';
   var domMessageState = 'invalid';

package/helpers/mixed.mjs

@@ -142,7 +142,7 @@ var domMessages = {
 export function _injectProductInfo(key, element) {
   var hasValidType = !isEmpty(key);
   var isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  var hotVersion = "0.0.0-next-09eb648-20230511";
+  var hotVersion = "0.0.0-next-0962f2c-20230512";
   var keyValidityDate;
   var consoleMessageState = 'invalid';
   var 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-09eb648-20230511",
+  "version": "0.0.0-next-0962f2c-20230512",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/customBorders/customBorders.d.ts

@@ -14,6 +14,8 @@ export interface BorderRange {
   };
 }
 export type DetailedSettings = (SimpleCellCoords | BorderRange) & {
+  start?: BorderOptions | string;
+  end?: BorderOptions | string;
   left?: BorderOptions | string;
   right?: BorderOptions | string;
   top?: BorderOptions | string;

package/plugins/manualRowMove/manualRowMove.js

@@ -484,38 +484,53 @@ var ManualRowMove = /*#__PURE__*/function (_BasePlugin) {
       }
       var wtTable = this.hot.view._wt.wtTable;
       var TD = priv.target.TD;
-      var rootElementOffset = (0, _element.offset)(this.hot.rootElement);
-      var tdOffsetTop = this.hot.view.THEAD.offsetHeight + this.getRowsHeight(0, coords.row - 1);
-      var mouseOffsetTop = priv.target.eventPageY - rootElementOffset.top + wtTable.holder.scrollTop;
+      var rootElement = this.hot.rootElement;
+      var rootElementOffset = (0, _element.offset)(rootElement);
+      var trimmingContainer = (0, _element.getTrimmingContainer)(rootElement);
+      var tableScroll = wtTable.holder.scrollTop;
+      var trimmingContainerScroll;
+
+      // Trimming container is the `window` element.
+      if (this.hot.rootWindow === trimmingContainer) {
+        trimmingContainerScroll = trimmingContainer.scrollY;
+      } else {
+        trimmingContainerScroll = trimmingContainer.scrollTop;
+      }
+      var pixelsAbove = rootElementOffset.top - trimmingContainerScroll;
+      var pixelsRelToTableStart = priv.target.eventPageY - pixelsAbove + tableScroll;
       var hiderHeight = wtTable.hider.offsetHeight;
       var tbodyOffsetTop = wtTable.TBODY.offsetTop;
       var backlightElemMarginTop = this.backlight.getOffset().top;
       var backlightElemHeight = this.backlight.getSize().height;
+      var tdMiddle = TD.offsetHeight / 2;
+      var tdHeight = TD.offsetHeight;
+      var tdStartPixel = this.hot.view.THEAD.offsetHeight + this.getRowsHeight(0, coords.row - 1);
+      var isBelowTable = pixelsRelToTableStart >= tdStartPixel + tdMiddle;
       if (this.isFixedRowTop(coords.row)) {
-        tdOffsetTop += wtTable.holder.scrollTop;
+        tdStartPixel += wtTable.holder.scrollTop;
       }
       if (coords.row < 0) {
         // if hover on colHeader
         priv.target.row = firstVisible > 0 ? firstVisible - 1 : firstVisible;
-      } else if (TD.offsetHeight / 2 + tdOffsetTop <= mouseOffsetTop) {
+      } else if (isBelowTable) {
         // if hover on lower part of TD
         priv.target.row = coords.row + 1;
         // unfortunately first row is bigger than rest
-        tdOffsetTop += coords.row === 0 ? TD.offsetHeight - 1 : TD.offsetHeight;
+        tdStartPixel += coords.row === 0 ? tdHeight - 1 : tdHeight;
       } else {
         // elsewhere on table
         priv.target.row = coords.row;
       }
-      var backlightTop = mouseOffsetTop;
-      var guidelineTop = tdOffsetTop;
-      if (mouseOffsetTop + backlightElemHeight + backlightElemMarginTop >= hiderHeight) {
+      var backlightTop = pixelsRelToTableStart;
+      var guidelineTop = tdStartPixel;
+      if (pixelsRelToTableStart + backlightElemHeight + backlightElemMarginTop >= hiderHeight) {
         // prevent display backlight below table
         backlightTop = hiderHeight - backlightElemHeight - backlightElemMarginTop;
-      } else if (mouseOffsetTop + backlightElemMarginTop < tbodyOffsetTop) {
+      } else if (pixelsRelToTableStart + backlightElemMarginTop < tbodyOffsetTop) {
         // prevent display above below table
         backlightTop = tbodyOffsetTop + Math.abs(backlightElemMarginTop);
       }
-      if (tdOffsetTop >= hiderHeight - 1) {
+      if (tdStartPixel >= hiderHeight - 1) {
         // prevent display guideline below table
         guidelineTop = hiderHeight - 1;
       }

package/plugins/manualRowMove/manualRowMove.mjs

@@ -34,7 +34,7 @@ import "core-js/modules/es.symbol.iterator.js";
 import { BasePlugin } from "../base/index.mjs";
 import Hooks from "../../pluginHooks.mjs";
 import { arrayReduce } from "../../helpers/array.mjs";
-import { addClass, removeClass, offset } from "../../helpers/dom/element.mjs";
+import { addClass, removeClass, offset, getTrimmingContainer } from "../../helpers/dom/element.mjs";
 import { rangeEach } from "../../helpers/number.mjs";
 import EventManager from "../../eventManager.mjs";
 import BacklightUI from "./ui/backlight.mjs";
@@ -477,38 +477,53 @@ export var ManualRowMove = /*#__PURE__*/function (_BasePlugin) {
       }
       var wtTable = this.hot.view._wt.wtTable;
       var TD = priv.target.TD;
-      var rootElementOffset = offset(this.hot.rootElement);
-      var tdOffsetTop = this.hot.view.THEAD.offsetHeight + this.getRowsHeight(0, coords.row - 1);
-      var mouseOffsetTop = priv.target.eventPageY - rootElementOffset.top + wtTable.holder.scrollTop;
+      var rootElement = this.hot.rootElement;
+      var rootElementOffset = offset(rootElement);
+      var trimmingContainer = getTrimmingContainer(rootElement);
+      var tableScroll = wtTable.holder.scrollTop;
+      var trimmingContainerScroll;
+
+      // Trimming container is the `window` element.
+      if (this.hot.rootWindow === trimmingContainer) {
+        trimmingContainerScroll = trimmingContainer.scrollY;
+      } else {
+        trimmingContainerScroll = trimmingContainer.scrollTop;
+      }
+      var pixelsAbove = rootElementOffset.top - trimmingContainerScroll;
+      var pixelsRelToTableStart = priv.target.eventPageY - pixelsAbove + tableScroll;
       var hiderHeight = wtTable.hider.offsetHeight;
       var tbodyOffsetTop = wtTable.TBODY.offsetTop;
       var backlightElemMarginTop = this.backlight.getOffset().top;
       var backlightElemHeight = this.backlight.getSize().height;
+      var tdMiddle = TD.offsetHeight / 2;
+      var tdHeight = TD.offsetHeight;
+      var tdStartPixel = this.hot.view.THEAD.offsetHeight + this.getRowsHeight(0, coords.row - 1);
+      var isBelowTable = pixelsRelToTableStart >= tdStartPixel + tdMiddle;
       if (this.isFixedRowTop(coords.row)) {
-        tdOffsetTop += wtTable.holder.scrollTop;
+        tdStartPixel += wtTable.holder.scrollTop;
       }
       if (coords.row < 0) {
         // if hover on colHeader
         priv.target.row = firstVisible > 0 ? firstVisible - 1 : firstVisible;
-      } else if (TD.offsetHeight / 2 + tdOffsetTop <= mouseOffsetTop) {
+      } else if (isBelowTable) {
         // if hover on lower part of TD
         priv.target.row = coords.row + 1;
         // unfortunately first row is bigger than rest
-        tdOffsetTop += coords.row === 0 ? TD.offsetHeight - 1 : TD.offsetHeight;
+        tdStartPixel += coords.row === 0 ? tdHeight - 1 : tdHeight;
       } else {
         // elsewhere on table
         priv.target.row = coords.row;
       }
-      var backlightTop = mouseOffsetTop;
-      var guidelineTop = tdOffsetTop;
-      if (mouseOffsetTop + backlightElemHeight + backlightElemMarginTop >= hiderHeight) {
+      var backlightTop = pixelsRelToTableStart;
+      var guidelineTop = tdStartPixel;
+      if (pixelsRelToTableStart + backlightElemHeight + backlightElemMarginTop >= hiderHeight) {
         // prevent display backlight below table
         backlightTop = hiderHeight - backlightElemHeight - backlightElemMarginTop;
-      } else if (mouseOffsetTop + backlightElemMarginTop < tbodyOffsetTop) {
+      } else if (pixelsRelToTableStart + backlightElemMarginTop < tbodyOffsetTop) {
         // prevent display above below table
         backlightTop = tbodyOffsetTop + Math.abs(backlightElemMarginTop);
       }
-      if (tdOffsetTop >= hiderHeight - 1) {
+      if (tdStartPixel >= hiderHeight - 1) {
         // prevent display guideline below table
         guidelineTop = hiderHeight - 1;
       }