handsontable 14.6.1 → 15.0.0-next-4472a60-20241203

package/3rdparty/walkontable/src/scroll.js

@@ -3,6 +3,7 @@
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
 var _element = require("../../../helpers/dom/element");
+var _object = require("../../../helpers/object");
 function _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -39,15 +40,20 @@ class Scroll {
    * Scrolls viewport to a cell.
    *
    * @param {CellCoords} coords The cell coordinates.
-   * @param {boolean} [snapToTop] If `true`, viewport is scrolled to show the cell on the top of the table.
-   * @param {boolean} [snapToRight] If `true`, viewport is scrolled to show the cell on the right of the table.
-   * @param {boolean} [snapToBottom] If `true`, viewport is scrolled to show the cell on the bottom of the table.
-   * @param {boolean} [snapToLeft] If `true`, viewport is scrolled to show the cell on the left of the table.
+   * @param {'auto' | 'start' | 'end'} [horizontalSnap='auto'] If `'start'`, viewport is scrolled to show
+   * the cell on the left of the table. If `'end'`, viewport is scrolled to show the cell on the right of
+   * the table. When `'auto'`, the viewport is scrolled only when the column is outside of the viewport.
+   * @param {'auto' | 'top' | 'bottom'} [verticalSnap='auto'] If `'top'`, viewport is scrolled to show
+   * the cell on the top of the table. If `'bottom'`, viewport is scrolled to show the cell on the bottom of
+   * the table. When `'auto'`, the viewport is scrolled only when the row is outside of the viewport.
    * @returns {boolean}
    */
-  scrollViewport(coords, snapToTop, snapToRight, snapToBottom, snapToLeft) {
-    const scrolledHorizontally = this.scrollViewportHorizontally(coords.col, snapToRight, snapToLeft);
-    const scrolledVertically = this.scrollViewportVertically(coords.row, snapToTop, snapToBottom);
+  scrollViewport(coords, horizontalSnap, verticalSnap) {
+    if (coords.col < 0 || coords.row < 0) {
+      return false;
+    }
+    const scrolledHorizontally = this.scrollViewportHorizontally(coords.col, horizontalSnap);
+    const scrolledVertically = this.scrollViewportVertically(coords.row, verticalSnap);
     return scrolledHorizontally || scrolledVertically;
   }
 
@@ -55,42 +61,43 @@ class Scroll {
    * Scrolls viewport to a column.
    *
    * @param {number} column Visual column index.
-   * @param {boolean} [snapToRight] If `true`, viewport is scrolled to show the cell on the right of the table.
-   * @param {boolean} [snapToLeft] If `true`, viewport is scrolled to show the cell on the left of the table.
+   * @param {'auto' | 'start' | 'end'} [snapping='auto'] If `'start'`, viewport is scrolled to show
+   * the cell on the left of the table. If `'end'`, viewport is scrolled to show the cell on the right of
+   * the table. When `'auto'`, the viewport is scrolled only when the column is outside of the viewport.
    * @returns {boolean}
    */
-  scrollViewportHorizontally(column, snapToRight, snapToLeft) {
+  scrollViewportHorizontally(column) {
+    let snapping = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'auto';
     const {
       drawn,
       totalColumns
     } = this.dataAccessObject;
-
-    // do not scroll the viewport when the column points to a range outside of the dataset
-    if (!drawn || !Number.isInteger(column) || column < 0 || column > totalColumns) {
+    if (!drawn) {
+      return false;
+    }
+    const snappingObject = (0, _object.createObjectPropListener)(snapping);
+    column = this.dataAccessObject.wtSettings.getSetting('onBeforeViewportScrollHorizontally', column, snappingObject);
+    if (!Number.isInteger(column) || column < 0 || column > totalColumns) {
       return false;
     }
-    const autoSnapping = snapToRight === undefined && snapToLeft === undefined;
+    snapping = snappingObject.value;
     const {
       fixedColumnsStart,
       inlineStartOverlay
     } = this.dataAccessObject;
+    const autoSnapping = snapping === 'auto';
 
-    // for auto-snapping (both snap* arguments are undefined) do not scroll the viewport
-    // when the columns points to the overlays
+    // for auto-snapping do not scroll the viewport when the columns points to the overlays
     if (autoSnapping && column < fixedColumnsStart) {
       return false;
     }
-    column = this.dataAccessObject.wtSettings.getSetting('onBeforeViewportScrollHorizontally', column);
-    if (!Number.isInteger(column) || column < 0 || column > totalColumns) {
-      return false;
-    }
     const firstColumn = this.getFirstVisibleColumn();
     const lastColumn = this.getLastVisibleColumn();
     let result = false;
     if (autoSnapping && (column < firstColumn || column > lastColumn) || !autoSnapping) {
       // if there is at least one fully visible column determine the snapping direction based on
-      // that columns or by snapToRight/snapToLeft flags, if provided.
-      result = inlineStartOverlay.scrollTo(column, autoSnapping ? column >= this.getLastPartiallyVisibleColumn() : snapToRight);
+      // that columns or by snapping flag, if provided.
+      result = inlineStartOverlay.scrollTo(column, autoSnapping ? column >= this.getLastPartiallyVisibleColumn() : snapping === 'end');
     }
     return result;
   }
@@ -99,43 +106,45 @@ class Scroll {
    * Scrolls viewport to a row.
    *
    * @param {number} row Visual row index.
-   * @param {boolean} [snapToTop] If `true`, viewport is scrolled to show the cell on the top of the table.
-   * @param {boolean} [snapToBottom] If `true`, viewport is scrolled to show the cell on the bottom of the table.
+   * @param {'auto' | 'top' | 'bottom'} [snapping='auto'] If `'top'`, viewport is scrolled to show
+   * the cell on the top of the table. If `'bottom'`, viewport is scrolled to show the cell on
+   * the bottom of the table. When `'auto'`, the viewport is scrolled only when the row is outside of
+   * the viewport.
    * @returns {boolean}
    */
-  scrollViewportVertically(row, snapToTop, snapToBottom) {
+  scrollViewportVertically(row) {
+    let snapping = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'auto';
     const {
       drawn,
       totalRows
     } = this.dataAccessObject;
-
-    // do not scroll the viewport when the row points to a range outside of the dataset
-    if (!drawn || !Number.isInteger(row) || row < 0 || row > totalRows) {
+    if (!drawn) {
+      return false;
+    }
+    const snappingObject = (0, _object.createObjectPropListener)(snapping);
+    row = this.dataAccessObject.wtSettings.getSetting('onBeforeViewportScrollVertically', row, snappingObject);
+    if (!Number.isInteger(row) || row < 0 || row > totalRows) {
       return false;
     }
-    const autoSnapping = snapToTop === undefined && snapToBottom === undefined;
+    snapping = snappingObject.value;
     const {
       fixedRowsBottom,
       fixedRowsTop,
       topOverlay
     } = this.dataAccessObject;
+    const autoSnapping = snapping === 'auto';
 
-    // for auto-snapping (both snap* arguments are undefined) do not scroll the viewport
-    // when the rows points to the overlays
+    // for auto-snapping do not scroll the viewport when the rows points to the overlays
     if (autoSnapping && (row < fixedRowsTop || row > totalRows - fixedRowsBottom - 1)) {
       return false;
     }
-    row = this.dataAccessObject.wtSettings.getSetting('onBeforeViewportScrollVertically', row);
-    if (!Number.isInteger(row) || row < 0 || row > totalRows) {
-      return false;
-    }
     const firstRow = this.getFirstVisibleRow();
     const lastRow = this.getLastVisibleRow();
     let result = false;
     if (autoSnapping && (row < firstRow || row > lastRow) || !autoSnapping) {
       // if there is at least one fully visible row determine the snapping direction based on
-      // that rows or by snapToTop/snapToBottom flags, if provided.
-      result = topOverlay.scrollTo(row, autoSnapping ? row >= this.getLastPartiallyVisibleRow() : snapToBottom);
+      // that rows or by snapping flag, if provided.
+      result = topOverlay.scrollTo(row, autoSnapping ? row >= this.getLastPartiallyVisibleRow() : snapping === 'bottom');
     }
     return result;
   }

package/3rdparty/walkontable/src/scroll.mjs

@@ -6,6 +6,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 import { innerHeight, innerWidth, getScrollLeft, getScrollTop, offset } from "../../../helpers/dom/element.mjs";
+import { createObjectPropListener } from "../../../helpers/object.mjs";
 /**
  * @class Scroll
  */
@@ -36,15 +37,20 @@ class Scroll {
    * Scrolls viewport to a cell.
    *
    * @param {CellCoords} coords The cell coordinates.
-   * @param {boolean} [snapToTop] If `true`, viewport is scrolled to show the cell on the top of the table.
-   * @param {boolean} [snapToRight] If `true`, viewport is scrolled to show the cell on the right of the table.
-   * @param {boolean} [snapToBottom] If `true`, viewport is scrolled to show the cell on the bottom of the table.
-   * @param {boolean} [snapToLeft] If `true`, viewport is scrolled to show the cell on the left of the table.
+   * @param {'auto' | 'start' | 'end'} [horizontalSnap='auto'] If `'start'`, viewport is scrolled to show
+   * the cell on the left of the table. If `'end'`, viewport is scrolled to show the cell on the right of
+   * the table. When `'auto'`, the viewport is scrolled only when the column is outside of the viewport.
+   * @param {'auto' | 'top' | 'bottom'} [verticalSnap='auto'] If `'top'`, viewport is scrolled to show
+   * the cell on the top of the table. If `'bottom'`, viewport is scrolled to show the cell on the bottom of
+   * the table. When `'auto'`, the viewport is scrolled only when the row is outside of the viewport.
    * @returns {boolean}
    */
-  scrollViewport(coords, snapToTop, snapToRight, snapToBottom, snapToLeft) {
-    const scrolledHorizontally = this.scrollViewportHorizontally(coords.col, snapToRight, snapToLeft);
-    const scrolledVertically = this.scrollViewportVertically(coords.row, snapToTop, snapToBottom);
+  scrollViewport(coords, horizontalSnap, verticalSnap) {
+    if (coords.col < 0 || coords.row < 0) {
+      return false;
+    }
+    const scrolledHorizontally = this.scrollViewportHorizontally(coords.col, horizontalSnap);
+    const scrolledVertically = this.scrollViewportVertically(coords.row, verticalSnap);
     return scrolledHorizontally || scrolledVertically;
   }
 
@@ -52,42 +58,43 @@ class Scroll {
    * Scrolls viewport to a column.
    *
    * @param {number} column Visual column index.
-   * @param {boolean} [snapToRight] If `true`, viewport is scrolled to show the cell on the right of the table.
-   * @param {boolean} [snapToLeft] If `true`, viewport is scrolled to show the cell on the left of the table.
+   * @param {'auto' | 'start' | 'end'} [snapping='auto'] If `'start'`, viewport is scrolled to show
+   * the cell on the left of the table. If `'end'`, viewport is scrolled to show the cell on the right of
+   * the table. When `'auto'`, the viewport is scrolled only when the column is outside of the viewport.
    * @returns {boolean}
    */
-  scrollViewportHorizontally(column, snapToRight, snapToLeft) {
+  scrollViewportHorizontally(column) {
+    let snapping = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'auto';
     const {
       drawn,
       totalColumns
     } = this.dataAccessObject;
-
-    // do not scroll the viewport when the column points to a range outside of the dataset
-    if (!drawn || !Number.isInteger(column) || column < 0 || column > totalColumns) {
+    if (!drawn) {
+      return false;
+    }
+    const snappingObject = createObjectPropListener(snapping);
+    column = this.dataAccessObject.wtSettings.getSetting('onBeforeViewportScrollHorizontally', column, snappingObject);
+    if (!Number.isInteger(column) || column < 0 || column > totalColumns) {
       return false;
     }
-    const autoSnapping = snapToRight === undefined && snapToLeft === undefined;
+    snapping = snappingObject.value;
     const {
       fixedColumnsStart,
       inlineStartOverlay
     } = this.dataAccessObject;
+    const autoSnapping = snapping === 'auto';
 
-    // for auto-snapping (both snap* arguments are undefined) do not scroll the viewport
-    // when the columns points to the overlays
+    // for auto-snapping do not scroll the viewport when the columns points to the overlays
     if (autoSnapping && column < fixedColumnsStart) {
       return false;
     }
-    column = this.dataAccessObject.wtSettings.getSetting('onBeforeViewportScrollHorizontally', column);
-    if (!Number.isInteger(column) || column < 0 || column > totalColumns) {
-      return false;
-    }
     const firstColumn = this.getFirstVisibleColumn();
     const lastColumn = this.getLastVisibleColumn();
     let result = false;
     if (autoSnapping && (column < firstColumn || column > lastColumn) || !autoSnapping) {
       // if there is at least one fully visible column determine the snapping direction based on
-      // that columns or by snapToRight/snapToLeft flags, if provided.
-      result = inlineStartOverlay.scrollTo(column, autoSnapping ? column >= this.getLastPartiallyVisibleColumn() : snapToRight);
+      // that columns or by snapping flag, if provided.
+      result = inlineStartOverlay.scrollTo(column, autoSnapping ? column >= this.getLastPartiallyVisibleColumn() : snapping === 'end');
     }
     return result;
   }
@@ -96,43 +103,45 @@ class Scroll {
    * Scrolls viewport to a row.
    *
    * @param {number} row Visual row index.
-   * @param {boolean} [snapToTop] If `true`, viewport is scrolled to show the cell on the top of the table.
-   * @param {boolean} [snapToBottom] If `true`, viewport is scrolled to show the cell on the bottom of the table.
+   * @param {'auto' | 'top' | 'bottom'} [snapping='auto'] If `'top'`, viewport is scrolled to show
+   * the cell on the top of the table. If `'bottom'`, viewport is scrolled to show the cell on
+   * the bottom of the table. When `'auto'`, the viewport is scrolled only when the row is outside of
+   * the viewport.
    * @returns {boolean}
    */
-  scrollViewportVertically(row, snapToTop, snapToBottom) {
+  scrollViewportVertically(row) {
+    let snapping = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'auto';
     const {
       drawn,
       totalRows
     } = this.dataAccessObject;
-
-    // do not scroll the viewport when the row points to a range outside of the dataset
-    if (!drawn || !Number.isInteger(row) || row < 0 || row > totalRows) {
+    if (!drawn) {
+      return false;
+    }
+    const snappingObject = createObjectPropListener(snapping);
+    row = this.dataAccessObject.wtSettings.getSetting('onBeforeViewportScrollVertically', row, snappingObject);
+    if (!Number.isInteger(row) || row < 0 || row > totalRows) {
       return false;
     }
-    const autoSnapping = snapToTop === undefined && snapToBottom === undefined;
+    snapping = snappingObject.value;
     const {
       fixedRowsBottom,
       fixedRowsTop,
       topOverlay
     } = this.dataAccessObject;
+    const autoSnapping = snapping === 'auto';
 
-    // for auto-snapping (both snap* arguments are undefined) do not scroll the viewport
-    // when the rows points to the overlays
+    // for auto-snapping do not scroll the viewport when the rows points to the overlays
     if (autoSnapping && (row < fixedRowsTop || row > totalRows - fixedRowsBottom - 1)) {
       return false;
     }
-    row = this.dataAccessObject.wtSettings.getSetting('onBeforeViewportScrollVertically', row);
-    if (!Number.isInteger(row) || row < 0 || row > totalRows) {
-      return false;
-    }
     const firstRow = this.getFirstVisibleRow();
     const lastRow = this.getLastVisibleRow();
     let result = false;
     if (autoSnapping && (row < firstRow || row > lastRow) || !autoSnapping) {
       // if there is at least one fully visible row determine the snapping direction based on
-      // that rows or by snapToTop/snapToBottom flags, if provided.
-      result = topOverlay.scrollTo(row, autoSnapping ? row >= this.getLastPartiallyVisibleRow() : snapToBottom);
+      // that rows or by snapping flag, if provided.
+      result = topOverlay.scrollTo(row, autoSnapping ? row >= this.getLastPartiallyVisibleRow() : snapping === 'bottom');
     }
     return result;
   }

package/3rdparty/walkontable/src/selection/border/border.js

@@ -5,7 +5,7 @@ var _element = require("../../../../../helpers/dom/element");
 var _event = require("../../../../../helpers/dom/event");
 var _object = require("../../../../../helpers/object");
 var _browser = require("../../../../../helpers/browser");
-var _constants = require("./constants");
+var _utils = require("./utils");
 /**
  *
  */
@@ -35,9 +35,9 @@ class Border {
     this.bottomStyle = null;
     this.startStyle = null;
     this.endStyle = null;
-    this.cornerDefaultStyle = _constants.CORNER_DEFAULT_STYLE;
+    this.cornerDefaultStyle = (0, _utils.getCornerStyle)(this.instance);
     // Offset to moving the corner to be centered relative to the grid.
-    this.cornerCenterPointOffset = -(parseInt(this.cornerDefaultStyle.width, 10) / 2);
+    this.cornerCenterPointOffset = -Math.ceil(parseInt(this.cornerDefaultStyle.width, 10) / 2);
     this.corner = null;
     this.cornerStyle = null;
     this.createBorders(settings);
@@ -166,9 +166,9 @@ class Border {
     this.corner = this.main.childNodes[4];
     this.corner.className += ' corner';
     this.cornerStyle = this.corner.style;
-    this.cornerStyle.width = this.cornerDefaultStyle.width;
-    this.cornerStyle.height = this.cornerDefaultStyle.height;
-    this.cornerStyle.border = [this.cornerDefaultStyle.borderWidth, this.cornerDefaultStyle.borderStyle, this.cornerDefaultStyle.borderColor].join(' ');
+    this.cornerStyle.width = `${this.cornerDefaultStyle.width}px`;
+    this.cornerStyle.height = `${this.cornerDefaultStyle.height}px`;
+    this.cornerStyle.border = [`${this.cornerDefaultStyle.borderWidth}px`, this.cornerDefaultStyle.borderStyle, this.cornerDefaultStyle.borderColor].join(' ');
     if ((0, _browser.isMobileBrowser)() && this.instance.getSetting('isDataViewInstance')) {
       this.createMultipleSelectorHandles();
     }
@@ -322,66 +322,52 @@ class Border {
     if (this.disabled) {
       return;
     }
+    let [fromRow, fromColumn, toRow, toColumn] = corners;
+
+    // borders can not be rendered on headers so hide them
+    if (fromRow < 0 && toRow < 0 || fromColumn < 0 && toColumn < 0) {
+      this.disappear();
+      return;
+    }
     const {
       wtTable,
       rootDocument,
       rootWindow
-    } = this.wot; // todo refactoring: consider about using internal facade (it is given by external code)
-    let fromRow;
-    let toRow;
-    let fromColumn;
-    let toColumn;
-    let rowHeader;
-    let columnHeader;
-    const rowsCount = wtTable.getRenderedRowsCount();
-    for (let i = 0; i < rowsCount; i += 1) {
-      const s = wtTable.rowFilter.renderedToSource(i);
-      if (s >= corners[0] && s <= corners[2]) {
-        fromRow = s;
-        rowHeader = corners[0];
-        break;
-      }
-    }
-    for (let i = rowsCount - 1; i >= 0; i -= 1) {
-      const s = wtTable.rowFilter.renderedToSource(i);
-      if (s >= corners[0] && s <= corners[2]) {
-        toRow = s;
-        break;
-      }
-    }
-    const columnsCount = wtTable.getRenderedColumnsCount();
-    for (let i = 0; i < columnsCount; i += 1) {
-      const s = wtTable.columnFilter.renderedToSource(i);
-      if (s >= corners[1] && s <= corners[3]) {
-        fromColumn = s;
-        columnHeader = corners[1];
-        break;
+    } = this.wot;
+    const isMultiple = fromRow !== toRow || fromColumn !== toColumn;
+    const firstRenderedRow = wtTable.getFirstRenderedRow();
+    const lastRenderedRow = wtTable.getLastRenderedRow();
+    const firstRenderedColumn = wtTable.getFirstRenderedColumn();
+    const lastRenderedColumn = wtTable.getLastRenderedColumn();
+    let fromTD;
+    if (isMultiple) {
+      fromColumn = Math.max(fromColumn, firstRenderedColumn);
+      toColumn = Math.min(toColumn, lastRenderedColumn);
+      fromRow = Math.max(fromRow, firstRenderedRow);
+      toRow = Math.min(toRow, lastRenderedRow);
+      if (toColumn < fromColumn || toRow < fromRow) {
+        this.disappear();
+        return;
       }
-    }
-    for (let i = columnsCount - 1; i >= 0; i -= 1) {
-      const s = wtTable.columnFilter.renderedToSource(i);
-      if (s >= corners[1] && s <= corners[3]) {
-        toColumn = s;
-        break;
+      fromTD = wtTable.getCell(this.wot.createCellCoords(fromRow, fromColumn));
+    } else {
+      fromTD = wtTable.getCell(this.wot.createCellCoords(fromRow, fromColumn));
+      if (!(fromTD instanceof HTMLElement)) {
+        this.disappear();
+        return;
       }
     }
-    if (fromRow === undefined || fromColumn === undefined) {
-      this.disappear();
-      return;
-    }
-    let fromTD = wtTable.getCell(this.wot.createCellCoords(fromRow, fromColumn));
-    const isMultiple = fromRow !== toRow || fromColumn !== toColumn;
     const toTD = isMultiple ? wtTable.getCell(this.wot.createCellCoords(toRow, toColumn)) : fromTD;
     const fromOffset = (0, _element.offset)(fromTD);
     const toOffset = isMultiple ? (0, _element.offset)(toTD) : fromOffset;
     const containerOffset = (0, _element.offset)(wtTable.TABLE);
-    const containerWidth = (0, _element.outerWidth)(wtTable.TABLE);
     const minTop = fromOffset.top;
     const minLeft = fromOffset.left;
     const isRtl = this.wot.wtSettings.getSetting('rtlMode');
     let inlineStartPos = 0;
     let width = 0;
     if (isRtl) {
+      const containerWidth = (0, _element.outerWidth)(wtTable.TABLE);
       const fromWidth = (0, _element.outerWidth)(fromTD);
       const gridRightPos = rootWindow.innerWidth - containerOffset.left - containerWidth;
       width = minLeft + fromWidth - toOffset.left;
@@ -391,6 +377,7 @@ class Border {
       inlineStartPos = minLeft - containerOffset.left - 1;
     }
     if (this.isEntireColumnSelected(fromRow, toRow)) {
+      const rowHeader = fromRow;
       const modifiedValues = this.getDimensionsFromHeader('columns', fromColumn, toColumn, rowHeader, containerOffset);
       let fromTH = null;
       if (modifiedValues) {
@@ -403,6 +390,7 @@ class Border {
     let top = minTop - containerOffset.top - 1;
     let height = toOffset.top + (0, _element.outerHeight)(toTD) - minTop;
     if (this.isEntireRowSelected(fromColumn, toColumn)) {
+      const columnHeader = fromColumn;
       const modifiedValues = this.getDimensionsFromHeader('rows', fromRow, toRow, columnHeader, containerOffset);
       let fromTH = null;
       if (modifiedValues) {
@@ -412,7 +400,7 @@ class Border {
         fromTD = fromTH;
       }
     }
-    const style = (0, _element.getComputedStyle)(fromTD, rootWindow);
+    const style = rootWindow.getComputedStyle(fromTD);
     if (parseInt(style.borderTopWidth, 10) > 0) {
       top += 1;
       height = height > 0 ? height - 1 : 0;
@@ -441,7 +429,7 @@ class Border {
     this.endStyle.display = 'block';
     let cornerVisibleSetting = this.settings.border.cornerVisible;
     cornerVisibleSetting = typeof cornerVisibleSetting === 'function' ? cornerVisibleSetting(this.settings.layerLevel) : cornerVisibleSetting;
-    const hookResult = this.wot.getSetting('onModifyGetCellCoords', toRow, toColumn);
+    const hookResult = this.wot.getSetting('onModifyGetCellCoords', toRow, toColumn, false, 'render');
     let [checkRow, checkCol] = [toRow, toColumn];
     if (hookResult && Array.isArray(hookResult)) {
       [,, checkRow, checkCol] = hookResult;
@@ -449,9 +437,11 @@ class Border {
     if ((0, _browser.isMobileBrowser)() || !cornerVisibleSetting || this.isPartRange(checkRow, checkCol)) {
       this.cornerStyle.display = 'none';
     } else {
-      this.cornerStyle.top = `${top + height + this.cornerCenterPointOffset - 1}px`;
-      this.cornerStyle[inlinePosProperty] = `${inlineStartPos + width + this.cornerCenterPointOffset - 1}px`;
-      this.cornerStyle.borderRightWidth = this.cornerDefaultStyle.borderWidth;
+      this.cornerStyle.top = `${top + height + this.cornerCenterPointOffset - this.cornerDefaultStyle.borderWidth}px`;
+      this.cornerStyle[inlinePosProperty] = `${inlineStartPos + width + this.cornerCenterPointOffset - this.cornerDefaultStyle.borderWidth}px`;
+      this.cornerStyle.borderRightWidth = `${this.cornerDefaultStyle.borderWidth}px`;
+      this.cornerStyle.borderLeftWidth = `${this.cornerDefaultStyle.borderWidth}px`;
+      this.cornerStyle.borderBottomWidth = `${this.cornerDefaultStyle.borderWidth}px`;
       this.cornerStyle.width = this.cornerDefaultStyle.width;
 
       // Hide the fill handle, so the possible further adjustments won't force unneeded scrollbars.
@@ -461,8 +451,12 @@ class Border {
       if (trimToWindow) {
         trimmingContainer = rootDocument.documentElement;
       }
-      const cornerHalfWidth = parseInt(this.cornerDefaultStyle.width, 10) / 2;
-      const cornerHalfHeight = parseInt(this.cornerDefaultStyle.height, 10) / 2;
+
+      // -1 was initially removed from the base position to compansate for the table border. We need to exclude it from
+      // the corner width.
+      const cornerBorderCompensation = parseInt(this.cornerDefaultStyle.borderWidth, 10) - 1;
+      const cornerHalfWidth = Math.ceil(parseInt(this.cornerDefaultStyle.width, 10) / 2);
+      const cornerHalfHeight = Math.ceil(parseInt(this.cornerDefaultStyle.height, 10) / 2);
       if (toColumn === this.wot.getSetting('totalColumns') - 1) {
         const toTdOffsetLeft = trimToWindow ? toTD.getBoundingClientRect().left : toTD.offsetLeft;
         let cornerOverlappingContainer = false;
@@ -475,7 +469,7 @@ class Border {
           cornerOverlappingContainer = cornerEdge >= (0, _element.innerWidth)(trimmingContainer);
         }
         if (cornerOverlappingContainer) {
-          this.cornerStyle[inlinePosProperty] = `${Math.floor(inlineStartPos + width + this.cornerCenterPointOffset - cornerHalfWidth)}px`;
+          this.cornerStyle[inlinePosProperty] = `${Math.floor(inlineStartPos + width + this.cornerCenterPointOffset - cornerHalfWidth - cornerBorderCompensation)}px`;
           this.cornerStyle[isRtl ? 'borderLeftWidth' : 'borderRightWidth'] = 0;
         }
       }
@@ -484,7 +478,7 @@ class Border {
         const cornerBottomEdge = toTdOffsetTop + (0, _element.outerHeight)(toTD) + parseInt(this.cornerDefaultStyle.height, 10) / 2;
         const cornerOverlappingContainer = cornerBottomEdge >= (0, _element.innerHeight)(trimmingContainer);
         if (cornerOverlappingContainer) {
-          this.cornerStyle.top = `${Math.floor(top + height + this.cornerCenterPointOffset - cornerHalfHeight)}px`;
+          this.cornerStyle.top = `${Math.floor(top + height + this.cornerCenterPointOffset - cornerHalfHeight - cornerBorderCompensation)}px`;
           this.cornerStyle.borderBottomWidth = 0;
         }
       }