handsontable 0.0.0-next-407bbbc-20241107 → 0.0.0-next-6129043-20241108

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

@@ -21,5 +21,4 @@ var _viewportColumns = require("./viewportColumns");
 exports.ViewportColumnsCalculator = _viewportColumns.ViewportColumnsCalculator;
 exports.DEFAULT_COLUMN_WIDTH = _viewportColumns.DEFAULT_WIDTH;
 var _viewportRows = require("./viewportRows");
-exports.ViewportRowsCalculator = _viewportRows.ViewportRowsCalculator;
-exports.DEFAULT_ROW_HEIGHT = _viewportRows.DEFAULT_HEIGHT;
+exports.ViewportRowsCalculator = _viewportRows.ViewportRowsCalculator;

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

@@ -7,5 +7,5 @@ import { RenderedAllRowsCalculationType } from "./calculationType/renderedAllRow
 import { RenderedColumnsCalculationType } from "./calculationType/renderedColumns.mjs";
 import { RenderedRowsCalculationType } from "./calculationType/renderedRows.mjs";
 import { ViewportColumnsCalculator, DEFAULT_WIDTH } from "./viewportColumns.mjs";
-import { ViewportRowsCalculator, DEFAULT_HEIGHT } from "./viewportRows.mjs";
-export { DEFAULT_HEIGHT as DEFAULT_ROW_HEIGHT, DEFAULT_WIDTH as DEFAULT_COLUMN_WIDTH, FullyVisibleColumnsCalculationType, FullyVisibleRowsCalculationType, PartiallyVisibleColumnsCalculationType, PartiallyVisibleRowsCalculationType, RenderedAllColumnsCalculationType, RenderedAllRowsCalculationType, RenderedColumnsCalculationType, RenderedRowsCalculationType, ViewportColumnsCalculator, ViewportRowsCalculator };
+import { ViewportRowsCalculator } from "./viewportRows.mjs";
+export { DEFAULT_WIDTH as DEFAULT_COLUMN_WIDTH, FullyVisibleColumnsCalculationType, FullyVisibleRowsCalculationType, PartiallyVisibleColumnsCalculationType, PartiallyVisibleRowsCalculationType, RenderedAllColumnsCalculationType, RenderedAllRowsCalculationType, RenderedColumnsCalculationType, RenderedRowsCalculationType, ViewportColumnsCalculator, ViewportRowsCalculator };

package/3rdparty/walkontable/src/calculator/viewportRows.js

@@ -7,8 +7,6 @@ var _viewportBase = require("./viewportBase");
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 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); }
-const DEFAULT_HEIGHT = exports.DEFAULT_HEIGHT = 23;
-
 /**
  * @typedef {object} ViewportRowsCalculatorOptions
  * @property {Map<string, ViewportBaseCalculator>} calculationTypes The calculation types to be performed.
@@ -34,6 +32,7 @@ class ViewportRowsCalculator extends _viewportBase.ViewportBaseCalculator {
       viewportHeight,
       scrollOffset,
       totalRows,
+      defaultRowHeight,
       rowHeightFn,
       overrideFn,
       horizontalScrollbarHeight
@@ -51,6 +50,7 @@ class ViewportRowsCalculator extends _viewportBase.ViewportBaseCalculator {
     _defineProperty(this, "totalCalculatedHeight", 0);
     _defineProperty(this, "startPositions", []);
     _defineProperty(this, "needReverse", true);
+    this.defaultHeight = defaultRowHeight;
     this.viewportHeight = viewportHeight;
     this.scrollOffset = scrollOffset;
     this.zeroBasedScrollOffset = Math.max(scrollOffset, 0);
@@ -89,7 +89,7 @@ class ViewportRowsCalculator extends _viewportBase.ViewportBaseCalculator {
   getRowHeight(row) {
     const rowHeight = this.rowHeightFn(row);
     if (isNaN(rowHeight)) {
-      return DEFAULT_HEIGHT;
+      return this.defaultHeight;
     }
     return rowHeight;
   }

package/3rdparty/walkontable/src/calculator/viewportRows.mjs

@@ -4,8 +4,6 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 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); }
 import { ViewportBaseCalculator } from "./viewportBase.mjs";
-export const DEFAULT_HEIGHT = 23;
-
 /**
  * @typedef {object} ViewportRowsCalculatorOptions
  * @property {Map<string, ViewportBaseCalculator>} calculationTypes The calculation types to be performed.
@@ -31,6 +29,7 @@ export class ViewportRowsCalculator extends ViewportBaseCalculator {
       viewportHeight,
       scrollOffset,
       totalRows,
+      defaultRowHeight,
       rowHeightFn,
       overrideFn,
       horizontalScrollbarHeight
@@ -48,6 +47,7 @@ export class ViewportRowsCalculator extends ViewportBaseCalculator {
     _defineProperty(this, "totalCalculatedHeight", 0);
     _defineProperty(this, "startPositions", []);
     _defineProperty(this, "needReverse", true);
+    this.defaultHeight = defaultRowHeight;
     this.viewportHeight = viewportHeight;
     this.scrollOffset = scrollOffset;
     this.zeroBasedScrollOffset = Math.max(scrollOffset, 0);
@@ -86,7 +86,7 @@ export class ViewportRowsCalculator extends ViewportBaseCalculator {
   getRowHeight(row) {
     const rowHeight = this.rowHeightFn(row);
     if (isNaN(rowHeight)) {
-      return DEFAULT_HEIGHT;
+      return this.defaultHeight;
     }
     return rowHeight;
   }

package/3rdparty/walkontable/src/core/_base.js

@@ -309,6 +309,9 @@ class CoreAbstract {
       get selectionManager() {
         return wot.selectionManager; // TODO refactoring: move outside dao, use IOC
       },
+      get stylesHandler() {
+        return wot.stylesHandler;
+      },
       get drawn() {
         return wot.drawn;
       },

package/3rdparty/walkontable/src/core/_base.mjs

@@ -305,6 +305,9 @@ export default class CoreAbstract {
       get selectionManager() {
         return wot.selectionManager; // TODO refactoring: move outside dao, use IOC
       },
+      get stylesHandler() {
+        return wot.stylesHandler;
+      },
       get drawn() {
         return wot.drawn;
       },

package/3rdparty/walkontable/src/core/clone.js

@@ -30,6 +30,7 @@ class Clone extends _base.default {
     const facadeGetter = this.wtSettings.getSetting('facade', this);
     this.cloneSource = clone.source;
     this.cloneOverlay = clone.overlay;
+    this.stylesHandler = clone.stylesHandler;
     this.wtTable = this.cloneOverlay.createTable(this.getTableDao(), facadeGetter, this.domBindings, this.wtSettings);
     this.wtViewport = clone.viewport;
     this.selectionManager = clone.selectionManager;

package/3rdparty/walkontable/src/core/clone.mjs

@@ -26,6 +26,7 @@ export default class Clone extends CoreAbstract {
     const facadeGetter = this.wtSettings.getSetting('facade', this);
     this.cloneSource = clone.source;
     this.cloneOverlay = clone.overlay;
+    this.stylesHandler = clone.stylesHandler;
     this.wtTable = this.cloneOverlay.createTable(this.getTableDao(), facadeGetter, this.domBindings, this.wtSettings);
     this.wtViewport = clone.viewport;
     this.selectionManager = clone.selectionManager;

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

@@ -12,6 +12,7 @@ var _base = _interopRequireDefault(require("./_base"));
 var _manager = require("../selection/manager");
 var _object = require("../../../../helpers/object");
 var _element = require("../../../../helpers/dom/element");
+var _stylesHandler = require("../utils/stylesHandler");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /**
  * @class Walkontable
@@ -23,6 +24,7 @@ class Walkontable extends _base.default {
    */
   constructor(table, settings) {
     super(table, new _settings.default(settings));
+    this.stylesHandler = new _stylesHandler.StylesHandler(this.domBindings);
     const facadeGetter = this.wtSettings.getSetting('facade', this); // todo rethink. I would like to have no access to facade from the internal scope.
 
     this.wtTable = new _master.default(this.getTableDao(), facadeGetter, this.domBindings, this.wtSettings);

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

@@ -9,6 +9,7 @@ import CoreAbstract from "./_base.mjs";
 import { SelectionManager } from "../selection/manager.mjs";
 import { objectEach } from "../../../../helpers/object.mjs";
 import { addClass, removeClass } from "../../../../helpers/dom/element.mjs";
+import { StylesHandler } from "../utils/stylesHandler.mjs";
 /**
  * @class Walkontable
  */
@@ -19,6 +20,7 @@ export default class Walkontable extends CoreAbstract {
    */
   constructor(table, settings) {
     super(table, new Settings(settings));
+    this.stylesHandler = new StylesHandler(this.domBindings);
     const facadeGetter = this.wtSettings.getSetting('facade', this); // todo rethink. I would like to have no access to facade from the internal scope.
 
     this.wtTable = new MasterTable(this.getTableDao(), facadeGetter, this.domBindings, this.wtSettings);

package/3rdparty/walkontable/src/facade/core.js

@@ -110,6 +110,9 @@ class WalkontableFacade {
   get eventManager() {
     return this._wot.eventManager;
   }
+  get stylesHandler() {
+    return this._wot.stylesHandler;
+  }
   createCellCoords(row, column) {
     return this._wot.createCellCoords(row, column);
   }

package/3rdparty/walkontable/src/facade/core.mjs

@@ -106,6 +106,9 @@ export default class WalkontableFacade {
   get eventManager() {
     return this._wot.eventManager;
   }
+  get stylesHandler() {
+    return this._wot.stylesHandler;
+  }
   createCellCoords(row, column) {
     return this._wot.createCellCoords(row, column);
   }

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

@@ -4,7 +4,6 @@ exports.__esModule = true;
 var _calculator = require("./calculator");
 exports.ViewportColumnsCalculator = _calculator.ViewportColumnsCalculator;
 exports.ViewportRowsCalculator = _calculator.ViewportRowsCalculator;
-exports.DEFAULT_ROW_HEIGHT = _calculator.DEFAULT_ROW_HEIGHT;
 exports.DEFAULT_COLUMN_WIDTH = _calculator.DEFAULT_COLUMN_WIDTH;
 var _coords = _interopRequireDefault(require("./cell/coords"));
 exports.CellCoords = _coords.default;

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

@@ -1,4 +1,4 @@
-import { ViewportColumnsCalculator, ViewportRowsCalculator, DEFAULT_ROW_HEIGHT, DEFAULT_COLUMN_WIDTH } from "./calculator/index.mjs";
+import { ViewportColumnsCalculator, ViewportRowsCalculator, DEFAULT_COLUMN_WIDTH } from "./calculator/index.mjs";
 import CellCoords from "./cell/coords.mjs";
 import CellRange from "./cell/range.mjs";
 import Walkontable from "./facade/core.mjs";
@@ -6,4 +6,4 @@ import { Selection, ACTIVE_HEADER_TYPE, AREA_TYPE, FOCUS_TYPE, FILL_TYPE, HEADER
 import * as Renderer from "./renderer/index.mjs";
 import { OrderView, SharedOrderView } from "./utils/orderView/index.mjs";
 import { getListenersCounter } from "../../../eventManager.mjs";
-export { DEFAULT_ROW_HEIGHT, DEFAULT_COLUMN_WIDTH, ViewportColumnsCalculator, ViewportRowsCalculator, CellCoords, CellRange, Walkontable as default, Walkontable as Core, Selection, ACTIVE_HEADER_TYPE as HIGHLIGHT_ACTIVE_HEADER_TYPE, AREA_TYPE as HIGHLIGHT_AREA_TYPE, FOCUS_TYPE as HIGHLIGHT_FOCUS_TYPE, FILL_TYPE as HIGHLIGHT_FILL_TYPE, HEADER_TYPE as HIGHLIGHT_HEADER_TYPE, ROW_TYPE as HIGHLIGHT_ROW_TYPE, COLUMN_TYPE as HIGHLIGHT_COLUMN_TYPE, CUSTOM_SELECTION_TYPE as HIGHLIGHT_CUSTOM_SELECTION_TYPE, Renderer, OrderView, SharedOrderView, getListenersCounter };
+export { DEFAULT_COLUMN_WIDTH, ViewportColumnsCalculator, ViewportRowsCalculator, CellCoords, CellRange, Walkontable as default, Walkontable as Core, Selection, ACTIVE_HEADER_TYPE as HIGHLIGHT_ACTIVE_HEADER_TYPE, AREA_TYPE as HIGHLIGHT_AREA_TYPE, FOCUS_TYPE as HIGHLIGHT_FOCUS_TYPE, FILL_TYPE as HIGHLIGHT_FILL_TYPE, HEADER_TYPE as HIGHLIGHT_HEADER_TYPE, ROW_TYPE as HIGHLIGHT_ROW_TYPE, COLUMN_TYPE as HIGHLIGHT_COLUMN_TYPE, CUSTOM_SELECTION_TYPE as HIGHLIGHT_CUSTOM_SELECTION_TYPE, Renderer, OrderView, SharedOrderView, getListenersCounter };

package/3rdparty/walkontable/src/overlay/_base.js

@@ -302,7 +302,9 @@ class Overlay {
       // todo ioc , or factor func if used only here
       event: this.wot.wtEvent,
       // todo ioc , or factory func if used only here
-      selectionManager: this.wot.selectionManager // todo ioc , or factory func if used only here
+      selectionManager: this.wot.selectionManager,
+      // todo ioc , or factory func if used only here
+      stylesHandler: this.wot.stylesHandler
     });
   }
 

package/3rdparty/walkontable/src/overlay/_base.mjs

@@ -298,7 +298,9 @@ export class Overlay {
       // todo ioc , or factor func if used only here
       event: this.wot.wtEvent,
       // todo ioc , or factory func if used only here
-      selectionManager: this.wot.selectionManager // todo ioc , or factory func if used only here
+      selectionManager: this.wot.selectionManager,
+      // todo ioc , or factory func if used only here
+      stylesHandler: this.wot.stylesHandler
     });
   }
 

package/3rdparty/walkontable/src/overlay/bottom.js

@@ -144,9 +144,9 @@ class BottomOverlay extends _base.Overlay {
   sumCellSizes(from, to) {
     const {
       wtTable,
-      wtSettings
+      stylesHandler
     } = this.wot;
-    const defaultRowHeight = wtSettings.getSetting('defaultRowHeight');
+    const defaultRowHeight = stylesHandler.getDefaultRowHeight();
     let row = from;
     let sum = 0;
     while (row < to) {

package/3rdparty/walkontable/src/overlay/bottom.mjs

@@ -140,9 +140,9 @@ export class BottomOverlay extends Overlay {
   sumCellSizes(from, to) {
     const {
       wtTable,
-      wtSettings
+      stylesHandler
     } = this.wot;
-    const defaultRowHeight = wtSettings.getSetting('defaultRowHeight');
+    const defaultRowHeight = stylesHandler.getDefaultRowHeight();
     let row = from;
     let sum = 0;
     while (row < to) {

package/3rdparty/walkontable/src/overlay/top.js

@@ -138,7 +138,7 @@ class TopOverlay extends _base.Overlay {
    * @returns {number} Height sum.
    */
   sumCellSizes(from, to) {
-    const defaultRowHeight = this.wtSettings.getSetting('defaultRowHeight');
+    const defaultRowHeight = this.wot.stylesHandler.getDefaultRowHeight();
     let row = from;
     let sum = 0;
     while (row < to) {

package/3rdparty/walkontable/src/overlay/top.mjs

@@ -134,7 +134,7 @@ export class TopOverlay extends Overlay {
    * @returns {number} Height sum.
    */
   sumCellSizes(from, to) {
-    const defaultRowHeight = this.wtSettings.getSetting('defaultRowHeight');
+    const defaultRowHeight = this.wot.stylesHandler.getDefaultRowHeight();
     let row = from;
     let sum = 0;
     while (row < to) {

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

@@ -28,7 +28,8 @@ class Renderer {
       TBODY,
       rowUtils,
       columnUtils,
-      cellRenderer
+      cellRenderer,
+      stylesHandler
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     /**
      * General renderer class used to render Walkontable content on screen.
@@ -36,7 +37,8 @@ class Renderer {
      * @type {TableRenderer}
      */
     this.renderer = new _table.default(TABLE, {
-      cellRenderer
+      cellRenderer,
+      stylesHandler
     });
     this.renderer.setRenderers({
       rowHeaders: new _rowHeaders.default(),

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

@@ -18,7 +18,8 @@ class Renderer {
       TBODY,
       rowUtils,
       columnUtils,
-      cellRenderer
+      cellRenderer,
+      stylesHandler
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     /**
      * General renderer class used to render Walkontable content on screen.
@@ -26,7 +27,8 @@ class Renderer {
      * @type {TableRenderer}
      */
     this.renderer = new TableRenderer(TABLE, {
-      cellRenderer
+      cellRenderer,
+      stylesHandler
     });
     this.renderer.setRenderers({
       rowHeaders: new RowHeadersRenderer(),

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/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

@@ -115,7 +115,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
     });
   }
 
@@ -351,7 +352,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;
@@ -629,10 +630,13 @@ 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;
     let previousRowHeight;
-    let rowInnerHeight;
+    let rowCurrentHeight;
     let sourceRowIndex;
     let currentTr;
     let rowHeader;
@@ -647,13 +651,15 @@ class Table {
       currentTr = this.getTrForRow(sourceRowIndex);
       rowHeader = currentTr.querySelector('th');
       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 || previousRowHeight < rowCurrentHeight) {
+        if (!borderBoxSizing) {
+          rowCurrentHeight += 1;
+        }
+        this.dataAccessObject.wtViewport.oversizedRows[sourceRowIndex] = rowCurrentHeight;
       }
     }
   }

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

@@ -111,7 +111,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
     });
   }
 
@@ -347,7 +348,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;
@@ -625,10 +626,13 @@ 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;
     let previousRowHeight;
-    let rowInnerHeight;
+    let rowCurrentHeight;
     let sourceRowIndex;
     let currentTr;
     let rowHeader;
@@ -643,13 +647,15 @@ class Table {
       currentTr = this.getTrForRow(sourceRowIndex);
       rowHeader = currentTr.querySelector('th');
       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 || 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;