handsontable 0.0.0-next-ee5ee21-20241202 → 0.0.0-next-b3759c7-20241203

package/3rdparty/walkontable/src/renderer/table.js

@@ -52,7 +52,8 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 class TableRenderer {
   constructor(rootNode) {
     let {
-      cellRenderer
+      cellRenderer,
+      stylesHandler
     } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     /**
      * Table element which will be used to render the children element.
@@ -168,9 +169,14 @@ class TableRenderer {
      * @type {'inline_start'|'top'|'top_inline_start_corner'|'bottom'|'bottom_inline_start_corner'|'master'}
      */
     _defineProperty(this, "activeOverlayName", void 0);
+    /**
+     * Styles handler instance.
+     */
+    _defineProperty(this, "stylesHandler", void 0);
     this.rootNode = rootNode;
     this.rootDocument = this.rootNode.ownerDocument;
     this.cellRenderer = cellRenderer;
+    this.stylesHandler = stylesHandler;
   }
 
   /**
@@ -313,12 +319,15 @@ class TableRenderer {
     // Fix for multi-line content and for supporting `rowHeights` option.
     for (let visibleRowIndex = 0; visibleRowIndex < rowsToRender; visibleRowIndex++) {
       const TR = rows.getRenderedNode(visibleRowIndex);
+      const rowUtils = this.rowUtils;
       if (TR.firstChild) {
         const sourceRowIndex = this.renderedRowToSource(visibleRowIndex);
-        const rowHeight = this.rowUtils.getHeightByOverlayName(sourceRowIndex, this.activeOverlayName);
+        const rowHeight = rowUtils.getHeightByOverlayName(sourceRowIndex, this.activeOverlayName);
+        const isBorderBoxSizing = this.stylesHandler.areCellsBorderBox();
+        const borderCompensation = isBorderBoxSizing ? 0 : 1;
         if (rowHeight) {
           // Decrease height. 1 pixel will be "replaced" by 1px border top
-          TR.firstChild.style.height = `${rowHeight - 1}px`;
+          TR.firstChild.style.height = `${rowHeight - borderCompensation}px`;
         } else {
           TR.firstChild.style.height = '';
         }

package/3rdparty/walkontable/src/renderer/table.mjs

@@ -49,7 +49,8 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 export default class TableRenderer {
   constructor(rootNode) {
     let {
-      cellRenderer
+      cellRenderer,
+      stylesHandler
     } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
     /**
      * Table element which will be used to render the children element.
@@ -165,9 +166,14 @@ export default class TableRenderer {
      * @type {'inline_start'|'top'|'top_inline_start_corner'|'bottom'|'bottom_inline_start_corner'|'master'}
      */
     _defineProperty(this, "activeOverlayName", void 0);
+    /**
+     * Styles handler instance.
+     */
+    _defineProperty(this, "stylesHandler", void 0);
     this.rootNode = rootNode;
     this.rootDocument = this.rootNode.ownerDocument;
     this.cellRenderer = cellRenderer;
+    this.stylesHandler = stylesHandler;
   }
 
   /**
@@ -310,12 +316,15 @@ export default class TableRenderer {
     // Fix for multi-line content and for supporting `rowHeights` option.
     for (let visibleRowIndex = 0; visibleRowIndex < rowsToRender; visibleRowIndex++) {
       const TR = rows.getRenderedNode(visibleRowIndex);
+      const rowUtils = this.rowUtils;
       if (TR.firstChild) {
         const sourceRowIndex = this.renderedRowToSource(visibleRowIndex);
-        const rowHeight = this.rowUtils.getHeightByOverlayName(sourceRowIndex, this.activeOverlayName);
+        const rowHeight = rowUtils.getHeightByOverlayName(sourceRowIndex, this.activeOverlayName);
+        const isBorderBoxSizing = this.stylesHandler.areCellsBorderBox();
+        const borderCompensation = isBorderBoxSizing ? 0 : 1;
         if (rowHeight) {
           // Decrease height. 1 pixel will be "replaced" by 1px border top
-          TR.firstChild.style.height = `${rowHeight - 1}px`;
+          TR.firstChild.style.height = `${rowHeight - borderCompensation}px`;
         } else {
           TR.firstChild.style.height = '';
         }

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();
     }
@@ -437,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.
@@ -449,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;
@@ -463,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;
         }
       }
@@ -472,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;
         }
       }

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

@@ -2,7 +2,7 @@ import { addClass, hasClass, removeClass, getTrimmingContainer, innerWidth, inne
 import { stopImmediatePropagation } from "../../../../../helpers/dom/event.mjs";
 import { objectEach } from "../../../../../helpers/object.mjs";
 import { isMobileBrowser } from "../../../../../helpers/browser.mjs";
-import { CORNER_DEFAULT_STYLE } from "./constants.mjs";
+import { getCornerStyle } from "./utils.mjs";
 /**
  *
  */
@@ -32,9 +32,9 @@ class Border {
     this.bottomStyle = null;
     this.startStyle = null;
     this.endStyle = null;
-    this.cornerDefaultStyle = CORNER_DEFAULT_STYLE;
+    this.cornerDefaultStyle = 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);
@@ -163,9 +163,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 (isMobileBrowser() && this.instance.getSetting('isDataViewInstance')) {
       this.createMultipleSelectorHandles();
     }
@@ -434,9 +434,11 @@ class Border {
     if (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.
@@ -446,8 +448,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;
@@ -460,7 +466,7 @@ class Border {
           cornerOverlappingContainer = cornerEdge >= 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;
         }
       }
@@ -469,7 +475,7 @@ class Border {
         const cornerBottomEdge = toTdOffsetTop + outerHeight(toTD) + parseInt(this.cornerDefaultStyle.height, 10) / 2;
         const cornerOverlappingContainer = cornerBottomEdge >= 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;
         }
       }

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

@@ -0,0 +1,26 @@
+"use strict";
+
+exports.__esModule = true;
+const getCornerStyle = wot => {
+  const stylesHandler = wot.stylesHandler;
+  if (stylesHandler.isClassicTheme()) {
+    return Object.freeze({
+      width: 6,
+      height: 6,
+      borderWidth: 1,
+      borderStyle: 'solid',
+      borderColor: '#FFF'
+    });
+  }
+  const cornerSizeFromVar = stylesHandler.getCSSVariableValue('cell-autofill-size');
+  const cornerBorderWidthFromVar = stylesHandler.getCSSVariableValue('cell-autofill-border-width');
+  const cornerColorFromVar = stylesHandler.getCSSVariableValue('cell-autofill-border-color');
+  return Object.freeze({
+    width: cornerSizeFromVar,
+    height: cornerSizeFromVar,
+    borderWidth: cornerBorderWidthFromVar,
+    borderStyle: 'solid',
+    borderColor: cornerColorFromVar
+  });
+};
+exports.getCornerStyle = getCornerStyle;

package/3rdparty/walkontable/src/selection/border/utils.mjs

@@ -0,0 +1,22 @@
+export const getCornerStyle = wot => {
+  const stylesHandler = wot.stylesHandler;
+  if (stylesHandler.isClassicTheme()) {
+    return Object.freeze({
+      width: 6,
+      height: 6,
+      borderWidth: 1,
+      borderStyle: 'solid',
+      borderColor: '#FFF'
+    });
+  }
+  const cornerSizeFromVar = stylesHandler.getCSSVariableValue('cell-autofill-size');
+  const cornerBorderWidthFromVar = stylesHandler.getCSSVariableValue('cell-autofill-border-width');
+  const cornerColorFromVar = stylesHandler.getCSSVariableValue('cell-autofill-border-color');
+  return Object.freeze({
+    width: cornerSizeFromVar,
+    height: cornerSizeFromVar,
+    borderWidth: cornerBorderWidthFromVar,
+    borderStyle: 'solid',
+    borderColor: cornerColorFromVar
+  });
+};

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

@@ -16,12 +16,12 @@ Object.keys(_constants).forEach(function (key) {
   if (key in exports && exports[key] === _constants[key]) return;
   exports[key] = _constants[key];
 });
-var _constants2 = require("./border/constants");
-Object.keys(_constants2).forEach(function (key) {
+var _utils = require("./border/utils");
+Object.keys(_utils).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _constants2[key]) return;
-  exports[key] = _constants2[key];
+  if (key in exports && exports[key] === _utils[key]) return;
+  exports[key] = _utils[key];
 });
 var _manager = require("./manager");
 exports.SelectionManager = _manager.SelectionManager;

package/3rdparty/walkontable/src/selection/index.mjs

@@ -1,5 +1,5 @@
 import Selection from "./selection.mjs";
 export * from "./constants.mjs";
-export * from "./border/constants.mjs";
+export * from "./border/utils.mjs";
 export { SelectionManager } from "./manager.mjs";
 export { Selection };

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

@@ -19,7 +19,6 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
  * @property {Option} currentRowClassName Option `currentRowClassName`.
  * @property {Option} data Option `data`.
  * @property {Option} defaultColumnWidth Option `defaultColumnWidth`.
- * @property {Option} defaultRowHeight Option `defaultRowHeight`.
  * @property {Option} externalRowCalculator Option `externalRowCalculator`.
  * @property {Option} fixedColumnsStart Option `fixedColumnsStart`.
  * @property {Option} fixedRowsBottom Option `fixedRowsBottom`.
@@ -185,7 +184,6 @@ class Settings {
       rowHeightByOverlayName() {
         // return undefined means use default size for the rendered cell content
       },
-      defaultRowHeight: 23,
       defaultColumnWidth: 50,
       selections: null,
       hideBorderOnMouseDownOver: false,

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

@@ -16,7 +16,6 @@ import { objectEach } from "../../../helpers/object.mjs";
  * @property {Option} currentRowClassName Option `currentRowClassName`.
  * @property {Option} data Option `data`.
  * @property {Option} defaultColumnWidth Option `defaultColumnWidth`.
- * @property {Option} defaultRowHeight Option `defaultRowHeight`.
  * @property {Option} externalRowCalculator Option `externalRowCalculator`.
  * @property {Option} fixedColumnsStart Option `fixedColumnsStart`.
  * @property {Option} fixedRowsBottom Option `fixedRowsBottom`.
@@ -180,7 +179,6 @@ export default class Settings {
       rowHeightByOverlayName() {
         // return undefined means use default size for the rendered cell content
       },
-      defaultRowHeight: 23,
       defaultColumnWidth: 50,
       selections: null,
       hideBorderOnMouseDownOver: false,

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

@@ -117,7 +117,8 @@ class Table {
       TBODY: this.TBODY,
       rowUtils: this.rowUtils,
       columnUtils: this.columnUtils,
-      cellRenderer: this.wtSettings.getSettingPure('cellRenderer')
+      cellRenderer: this.wtSettings.getSettingPure('cellRenderer'),
+      stylesHandler: this.dataAccessObject.stylesHandler
     });
   }
 
@@ -353,7 +354,7 @@ class Table {
   markIfOversizedColumnHeader(col) {
     const sourceColIndex = this.columnFilter.renderedToSource(col);
     let level = this.wtSettings.getSetting('columnHeaders').length;
-    const defaultRowHeight = this.wtSettings.getSetting('defaultRowHeight');
+    const defaultRowHeight = this.dataAccessObject.stylesHandler.getDefaultRowHeight();
     let previousColHeaderHeight;
     let currentHeader;
     let currentHeaderHeight;
@@ -631,10 +632,14 @@ class Table {
       return;
     }
     let rowCount = this.TBODY.childNodes.length;
-    const expectedTableHeight = rowCount * this.wtSettings.getSetting('defaultRowHeight');
+    const expectedTableHeight = rowCount * this.dataAccessObject.stylesHandler.getDefaultRowHeight();
     const actualTableHeight = (0, _element.innerHeight)(this.TBODY) - 1;
+    const borderBoxSizing = this.wot.stylesHandler.areCellsBorderBox();
+    const rowHeightFn = borderBoxSizing ? _element.outerHeight : _element.innerHeight;
+    const borderCompensation = borderBoxSizing ? 0 : 1;
+    const firstRowBorderCompensation = borderBoxSizing ? 1 : 0;
     let previousRowHeight;
-    let rowInnerHeight;
+    let rowCurrentHeight;
     let sourceRowIndex;
     let currentTr;
     let rowHeader;
@@ -648,14 +653,17 @@ class Table {
       previousRowHeight = this.getRowHeight(sourceRowIndex);
       currentTr = this.getTrForRow(sourceRowIndex);
       rowHeader = currentTr.querySelector('th');
+      const topBorderCompensation = sourceRowIndex === 0 ? firstRowBorderCompensation : 0;
       if (rowHeader) {
-        rowInnerHeight = (0, _element.innerHeight)(rowHeader);
+        rowCurrentHeight = rowHeightFn(rowHeader);
       } else {
-        rowInnerHeight = (0, _element.innerHeight)(currentTr) - 1;
+        rowCurrentHeight = rowHeightFn(currentTr) - borderCompensation;
       }
-      if (!previousRowHeight && this.wtSettings.getSetting('defaultRowHeight') < rowInnerHeight || previousRowHeight < rowInnerHeight) {
-        rowInnerHeight += 1;
-        this.dataAccessObject.wtViewport.oversizedRows[sourceRowIndex] = rowInnerHeight;
+      if (!previousRowHeight && this.dataAccessObject.stylesHandler.getDefaultRowHeight() < rowCurrentHeight - topBorderCompensation || previousRowHeight < rowCurrentHeight) {
+        if (!borderBoxSizing) {
+          rowCurrentHeight += 1;
+        }
+        this.dataAccessObject.wtViewport.oversizedRows[sourceRowIndex] = rowCurrentHeight;
       }
     }
   }

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

@@ -113,7 +113,8 @@ class Table {
       TBODY: this.TBODY,
       rowUtils: this.rowUtils,
       columnUtils: this.columnUtils,
-      cellRenderer: this.wtSettings.getSettingPure('cellRenderer')
+      cellRenderer: this.wtSettings.getSettingPure('cellRenderer'),
+      stylesHandler: this.dataAccessObject.stylesHandler
     });
   }
 
@@ -349,7 +350,7 @@ class Table {
   markIfOversizedColumnHeader(col) {
     const sourceColIndex = this.columnFilter.renderedToSource(col);
     let level = this.wtSettings.getSetting('columnHeaders').length;
-    const defaultRowHeight = this.wtSettings.getSetting('defaultRowHeight');
+    const defaultRowHeight = this.dataAccessObject.stylesHandler.getDefaultRowHeight();
     let previousColHeaderHeight;
     let currentHeader;
     let currentHeaderHeight;
@@ -627,10 +628,14 @@ class Table {
       return;
     }
     let rowCount = this.TBODY.childNodes.length;
-    const expectedTableHeight = rowCount * this.wtSettings.getSetting('defaultRowHeight');
+    const expectedTableHeight = rowCount * this.dataAccessObject.stylesHandler.getDefaultRowHeight();
     const actualTableHeight = innerHeight(this.TBODY) - 1;
+    const borderBoxSizing = this.wot.stylesHandler.areCellsBorderBox();
+    const rowHeightFn = borderBoxSizing ? outerHeight : innerHeight;
+    const borderCompensation = borderBoxSizing ? 0 : 1;
+    const firstRowBorderCompensation = borderBoxSizing ? 1 : 0;
     let previousRowHeight;
-    let rowInnerHeight;
+    let rowCurrentHeight;
     let sourceRowIndex;
     let currentTr;
     let rowHeader;
@@ -644,14 +649,17 @@ class Table {
       previousRowHeight = this.getRowHeight(sourceRowIndex);
       currentTr = this.getTrForRow(sourceRowIndex);
       rowHeader = currentTr.querySelector('th');
+      const topBorderCompensation = sourceRowIndex === 0 ? firstRowBorderCompensation : 0;
       if (rowHeader) {
-        rowInnerHeight = innerHeight(rowHeader);
+        rowCurrentHeight = rowHeightFn(rowHeader);
       } else {
-        rowInnerHeight = innerHeight(currentTr) - 1;
+        rowCurrentHeight = rowHeightFn(currentTr) - borderCompensation;
       }
-      if (!previousRowHeight && this.wtSettings.getSetting('defaultRowHeight') < rowInnerHeight || previousRowHeight < rowInnerHeight) {
-        rowInnerHeight += 1;
-        this.dataAccessObject.wtViewport.oversizedRows[sourceRowIndex] = rowInnerHeight;
+      if (!previousRowHeight && this.dataAccessObject.stylesHandler.getDefaultRowHeight() < rowCurrentHeight - topBorderCompensation || previousRowHeight < rowCurrentHeight) {
+        if (!borderBoxSizing) {
+          rowCurrentHeight += 1;
+        }
+        this.dataAccessObject.wtViewport.oversizedRows[sourceRowIndex] = rowCurrentHeight;
       }
     }
   }

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

@@ -66,6 +66,7 @@
  * @property {Walkontable} cloneSource CloneSource.
  * @property {Walkontable} wot Wot.
  * @property {number} parentTableOffset ParentTableOffset.
+ * @property {StylesHandler} stylesHandler StylesHandler.
  * @property {number|null} startColumnRendered StartColumnRendered.
  * @property {number|null} startColumnVisible StartColumnVisible.
  * @property {number|null} endColumnRendered EndColumnRendered.

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

@@ -66,6 +66,7 @@
  * @property {Walkontable} cloneSource CloneSource.
  * @property {Walkontable} wot Wot.
  * @property {number} parentTableOffset ParentTableOffset.
+ * @property {StylesHandler} stylesHandler StylesHandler.
  * @property {number|null} startColumnRendered StartColumnRendered.
  * @property {number|null} startColumnVisible StartColumnVisible.
  * @property {number|null} endColumnRendered EndColumnRendered.

package/3rdparty/walkontable/src/utils/column.js

@@ -50,7 +50,7 @@ class ColumnUtils {
    * @returns {number}
    */
   getHeaderHeight(level) {
-    let height = this.wtSettings.getSetting('defaultRowHeight');
+    let height = this.dataAccessObject.stylesHandler.getDefaultRowHeight();
     const oversizedHeight = this.dataAccessObject.wtViewport.oversizedColumnHeaders[level];
     if (oversizedHeight !== undefined) {
       height = height ? Math.max(height, oversizedHeight) : oversizedHeight;

package/3rdparty/walkontable/src/utils/column.mjs

@@ -47,7 +47,7 @@ export default class ColumnUtils {
    * @returns {number}
    */
   getHeaderHeight(level) {
-    let height = this.wtSettings.getSetting('defaultRowHeight');
+    let height = this.dataAccessObject.stylesHandler.getDefaultRowHeight();
     const oversizedHeight = this.dataAccessObject.wtViewport.oversizedColumnHeaders[level];
     if (oversizedHeight !== undefined) {
       height = height ? Math.max(height, oversizedHeight) : oversizedHeight;