handsontable 0.0.0-next-a148bc1-20241121 → 0.0.0-next-3058de1-20241122

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

@@ -1,9 +1,9 @@
-import { RowHeadersRenderer } from "./rowHeaders.mjs";
-import { ColumnHeadersRenderer } from "./columnHeaders.mjs";
-import { ColGroupRenderer } from "./colGroup.mjs";
-import { RowsRenderer } from "./rows.mjs";
-import { CellsRenderer } from "./cells.mjs";
-import { TableRenderer } from "./table.mjs";
+import RowHeadersRenderer from "./rowHeaders.mjs";
+import ColumnHeadersRenderer from "./columnHeaders.mjs";
+import ColGroupRenderer from "./colGroup.mjs";
+import RowsRenderer from "./rows.mjs";
+import CellsRenderer from "./cells.mjs";
+import TableRenderer from "./table.mjs";
 /**
  * Content renderer.
  *
@@ -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/rowHeaders.js

@@ -2,10 +2,11 @@
 
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
-var _orderView = require("../utils/orderView");
-var _base = require("./_base");
+var _orderView = require("./../utils/orderView");
+var _base = _interopRequireDefault(require("./_base"));
 var _element = require("../../../../helpers/dom/element");
 var _a11y = require("../../../../helpers/a11y");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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); }
@@ -22,7 +23,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
  *
  * @class {CellsRenderer}
  */
-class RowHeadersRenderer extends _base.BaseRenderer {
+class RowHeadersRenderer extends _base.default {
   constructor() {
     super('TH');
     /**
@@ -50,7 +51,7 @@ class RowHeadersRenderer extends _base.BaseRenderer {
     if (this.orderViews.has(rootNode)) {
       orderView = this.orderViews.get(rootNode);
     } else {
-      orderView = new _orderView.SharedOrderView(rootNode, sourceColumnIndex => this.nodesPool.obtain(this.sourceRowIndex, sourceColumnIndex));
+      orderView = new _orderView.SharedOrderView(rootNode, sourceColumnIndex => this.nodesPool.obtain(this.sourceRowIndex, sourceColumnIndex), this.nodeType);
       this.orderViews.set(rootNode, orderView);
     }
     return orderView;
@@ -91,4 +92,4 @@ class RowHeadersRenderer extends _base.BaseRenderer {
     }
   }
 }
-exports.RowHeadersRenderer = RowHeadersRenderer;
+exports.default = RowHeadersRenderer;

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

@@ -2,8 +2,8 @@ import "core-js/modules/es.error.cause.js";
 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); }
-import { SharedOrderView } from "../utils/orderView/index.mjs";
-import { BaseRenderer } from "./_base.mjs";
+import { SharedOrderView } from "./../utils/orderView/index.mjs";
+import BaseRenderer from "./_base.mjs";
 import { setAttribute, removeAttribute } from "../../../../helpers/dom/element.mjs";
 import { A11Y_COLINDEX, A11Y_ROWHEADER, A11Y_SCOPE_ROW, A11Y_TABINDEX } from "../../../../helpers/a11y.mjs";
 /**
@@ -19,7 +19,7 @@ import { A11Y_COLINDEX, A11Y_ROWHEADER, A11Y_SCOPE_ROW, A11Y_TABINDEX } from "..
  *
  * @class {CellsRenderer}
  */
-export class RowHeadersRenderer extends BaseRenderer {
+export default class RowHeadersRenderer extends BaseRenderer {
   constructor() {
     super('TH');
     /**
@@ -47,7 +47,7 @@ export class RowHeadersRenderer extends BaseRenderer {
     if (this.orderViews.has(rootNode)) {
       orderView = this.orderViews.get(rootNode);
     } else {
-      orderView = new SharedOrderView(rootNode, sourceColumnIndex => this.nodesPool.obtain(this.sourceRowIndex, sourceColumnIndex));
+      orderView = new SharedOrderView(rootNode, sourceColumnIndex => this.nodesPool.obtain(this.sourceRowIndex, sourceColumnIndex), this.nodeType);
       this.orderViews.set(rootNode, orderView);
     }
     return orderView;

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

@@ -2,12 +2,13 @@
 
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
-var _base = require("./_base");
-var _console = require("../../../../helpers/console");
-var _templateLiteralTag = require("../../../../helpers/templateLiteralTag");
-var _orderView = require("../utils/orderView");
+var _base = _interopRequireDefault(require("./_base"));
+var _console = require("./../../../../helpers/console");
+var _templateLiteralTag = require("./../../../../helpers/templateLiteralTag");
+var _orderView = require("./../utils/orderView");
 var _element = require("../../../../helpers/dom/element");
 var _a11y = require("../../../../helpers/a11y");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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); }
@@ -29,7 +30,7 @@ let performanceWarningAppeared = false;
  *
  * @class {RowsRenderer}
  */
-class RowsRenderer extends _base.BaseRenderer {
+class RowsRenderer extends _base.default {
   constructor(rootNode) {
     super('TR', rootNode);
     /**
@@ -38,7 +39,7 @@ class RowsRenderer extends _base.BaseRenderer {
      * @type {WeakMap}
      */
     _defineProperty(this, "orderView", void 0);
-    this.orderView = new _orderView.OrderView(rootNode, sourceRowIndex => this.nodesPool.obtain(sourceRowIndex));
+    this.orderView = new _orderView.OrderView(rootNode, sourceRowIndex => this.nodesPool.obtain(sourceRowIndex), this.nodeType);
   }
 
   /**
@@ -51,16 +52,6 @@ class RowsRenderer extends _base.BaseRenderer {
     return this.orderView.getNode(visualIndex);
   }
 
-  /**
-   * Checks if the the row is marked as "stale" and has to be rerendered.
-   *
-   * @param {number} visualIndex Visual index of the rendered node (it always goeas from 0 to N).
-   * @returns {boolean}
-   */
-  hasStaleContent(visualIndex) {
-    return this.orderView.hasStaleContent(visualIndex);
-  }
-
   /**
    * Renders the cells.
    */
@@ -88,17 +79,14 @@ class RowsRenderer extends _base.BaseRenderer {
         // `aria-rowindex` is incremented by both tbody and thead rows.
         (0, _a11y.A11Y_ROWINDEX)(sourceRowIndex + ((_this$table$rowUtils$ = (_this$table$rowUtils = this.table.rowUtils) === null || _this$table$rowUtils === void 0 || (_this$table$rowUtils = _this$table$rowUtils.dataAccessObject) === null || _this$table$rowUtils === void 0 ? void 0 : _this$table$rowUtils.columnHeaders.length) !== null && _this$table$rowUtils$ !== void 0 ? _this$table$rowUtils$ : 0) + 1)]);
       }
+      (0, _element.removeClass)(TR, [ROW_CLASSNAMES.rowEven, ROW_CLASSNAMES.rowOdd]);
       if ((sourceRowIndex + 1) % 2 === 0) {
-        if (!(0, _element.hasClass)(TR, ROW_CLASSNAMES.rowEven)) {
-          (0, _element.removeClass)(TR, ROW_CLASSNAMES.rowOdd);
-          (0, _element.addClass)(TR, ROW_CLASSNAMES.rowEven);
-        }
-      } else if (!(0, _element.hasClass)(TR, ROW_CLASSNAMES.rowOdd)) {
-        (0, _element.removeClass)(TR, ROW_CLASSNAMES.rowEven);
+        (0, _element.addClass)(TR, ROW_CLASSNAMES.rowEven);
+      } else {
         (0, _element.addClass)(TR, ROW_CLASSNAMES.rowOdd);
       }
     }
     this.orderView.end();
   }
 }
-exports.RowsRenderer = RowsRenderer;
+exports.default = RowsRenderer;

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

@@ -2,11 +2,11 @@ import "core-js/modules/es.error.cause.js";
 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); }
-import { BaseRenderer } from "./_base.mjs";
-import { warn } from "../../../../helpers/console.mjs";
-import { toSingleLine } from "../../../../helpers/templateLiteralTag.mjs";
-import { OrderView } from "../utils/orderView/index.mjs";
-import { addClass, hasClass, removeClass, setAttribute } from "../../../../helpers/dom/element.mjs";
+import BaseRenderer from "./_base.mjs";
+import { warn } from "./../../../../helpers/console.mjs";
+import { toSingleLine } from "./../../../../helpers/templateLiteralTag.mjs";
+import { OrderView } from "./../utils/orderView/index.mjs";
+import { addClass, removeClass, setAttribute } from "../../../../helpers/dom/element.mjs";
 import { A11Y_ROW, A11Y_ROWGROUP, A11Y_ROWINDEX } from "../../../../helpers/a11y.mjs";
 const ROW_CLASSNAMES = {
   rowEven: 'ht__row_even',
@@ -26,7 +26,7 @@ let performanceWarningAppeared = false;
  *
  * @class {RowsRenderer}
  */
-export class RowsRenderer extends BaseRenderer {
+export default class RowsRenderer extends BaseRenderer {
   constructor(rootNode) {
     super('TR', rootNode);
     /**
@@ -35,7 +35,7 @@ export class RowsRenderer extends BaseRenderer {
      * @type {WeakMap}
      */
     _defineProperty(this, "orderView", void 0);
-    this.orderView = new OrderView(rootNode, sourceRowIndex => this.nodesPool.obtain(sourceRowIndex));
+    this.orderView = new OrderView(rootNode, sourceRowIndex => this.nodesPool.obtain(sourceRowIndex), this.nodeType);
   }
 
   /**
@@ -48,16 +48,6 @@ export class RowsRenderer extends BaseRenderer {
     return this.orderView.getNode(visualIndex);
   }
 
-  /**
-   * Checks if the the row is marked as "stale" and has to be rerendered.
-   *
-   * @param {number} visualIndex Visual index of the rendered node (it always goeas from 0 to N).
-   * @returns {boolean}
-   */
-  hasStaleContent(visualIndex) {
-    return this.orderView.hasStaleContent(visualIndex);
-  }
-
   /**
    * Renders the cells.
    */
@@ -85,13 +75,10 @@ export class RowsRenderer extends BaseRenderer {
         // `aria-rowindex` is incremented by both tbody and thead rows.
         A11Y_ROWINDEX(sourceRowIndex + ((_this$table$rowUtils$ = (_this$table$rowUtils = this.table.rowUtils) === null || _this$table$rowUtils === void 0 || (_this$table$rowUtils = _this$table$rowUtils.dataAccessObject) === null || _this$table$rowUtils === void 0 ? void 0 : _this$table$rowUtils.columnHeaders.length) !== null && _this$table$rowUtils$ !== void 0 ? _this$table$rowUtils$ : 0) + 1)]);
       }
+      removeClass(TR, [ROW_CLASSNAMES.rowEven, ROW_CLASSNAMES.rowOdd]);
       if ((sourceRowIndex + 1) % 2 === 0) {
-        if (!hasClass(TR, ROW_CLASSNAMES.rowEven)) {
-          removeClass(TR, ROW_CLASSNAMES.rowOdd);
-          addClass(TR, ROW_CLASSNAMES.rowEven);
-        }
-      } else if (!hasClass(TR, ROW_CLASSNAMES.rowOdd)) {
-        removeClass(TR, ROW_CLASSNAMES.rowEven);
+        addClass(TR, ROW_CLASSNAMES.rowEven);
+      } else {
         addClass(TR, ROW_CLASSNAMES.rowOdd);
       }
     }

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 = '';
         }
@@ -326,4 +335,4 @@ class TableRenderer {
     }
   }
 }
-exports.TableRenderer = TableRenderer;
+exports.default = TableRenderer;

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

@@ -46,10 +46,11 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
  *
  * @class {RowsRenderer}
  */
-export class TableRenderer {
+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 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 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

@@ -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;

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

@@ -13,24 +13,18 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 class NodesPool {
   constructor(nodeType) {
     /**
-     * Node type to generate (e.g. 'TH', 'TD').
+     * Node type to generate (ew 'th', 'td').
      *
      * @type {string}
      */
     _defineProperty(this, "nodeType", void 0);
-    /**
-     * The holder for all created DOM nodes (THs, TDs).
-     *
-     * @type {Map<string, HTMLElement>}
-     */
-    _defineProperty(this, "pool", new Map());
     this.nodeType = nodeType.toUpperCase();
   }
 
   /**
    * Set document owner for this instance.
    *
-   * @param {Document} rootDocument The document window owner.
+   * @param {HTMLDocument} rootDocument The document window owner.
    */
   setRootDocument(rootDocument) {
     this.rootDocument = rootDocument;
@@ -39,21 +33,10 @@ class NodesPool {
   /**
    * Obtains an element. The returned elements in the feature can be cached.
    *
-   * @param {number} rowIndex The row index.
-   * @param {number} [columnIndex] The column index.
    * @returns {HTMLElement}
    */
-  obtain(rowIndex, columnIndex) {
-    const hasColumnIndex = typeof columnIndex === 'number';
-    const key = hasColumnIndex ? `${rowIndex}x${columnIndex}` : rowIndex.toString();
-    if (this.pool.has(key)) {
-      return this.pool.get(key);
-    }
-    const node = this.rootDocument.createElement(this.nodeType);
-
-    // node.dataset.id = key; // Uncomment for debug purposes
-    this.pool.set(key, node);
-    return node;
+  obtain() {
+    return this.rootDocument.createElement(this.nodeType);
   }
 }
-exports.NodesPool = NodesPool;
+exports.default = NodesPool;

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

@@ -7,27 +7,21 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
  *
  * @class {NodesPool}
  */
-export class NodesPool {
+export default class NodesPool {
   constructor(nodeType) {
     /**
-     * Node type to generate (e.g. 'TH', 'TD').
+     * Node type to generate (ew 'th', 'td').
      *
      * @type {string}
      */
     _defineProperty(this, "nodeType", void 0);
-    /**
-     * The holder for all created DOM nodes (THs, TDs).
-     *
-     * @type {Map<string, HTMLElement>}
-     */
-    _defineProperty(this, "pool", new Map());
     this.nodeType = nodeType.toUpperCase();
   }
 
   /**
    * Set document owner for this instance.
    *
-   * @param {Document} rootDocument The document window owner.
+   * @param {HTMLDocument} rootDocument The document window owner.
    */
   setRootDocument(rootDocument) {
     this.rootDocument = rootDocument;
@@ -36,20 +30,9 @@ export class NodesPool {
   /**
    * Obtains an element. The returned elements in the feature can be cached.
    *
-   * @param {number} rowIndex The row index.
-   * @param {number} [columnIndex] The column index.
    * @returns {HTMLElement}
    */
-  obtain(rowIndex, columnIndex) {
-    const hasColumnIndex = typeof columnIndex === 'number';
-    const key = hasColumnIndex ? `${rowIndex}x${columnIndex}` : rowIndex.toString();
-    if (this.pool.has(key)) {
-      return this.pool.get(key);
-    }
-    const node = this.rootDocument.createElement(this.nodeType);
-
-    // node.dataset.id = key; // Uncomment for debug purposes
-    this.pool.set(key, node);
-    return node;
+  obtain() {
+    return this.rootDocument.createElement(this.nodeType);
   }
 }

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

@@ -1,7 +1,8 @@
 "use strict";
 
 exports.__esModule = true;
-var _view = require("./view");
-exports.OrderView = _view.OrderView;
-var _sharedView = require("./sharedView");
-exports.SharedOrderView = _sharedView.SharedOrderView;
+var _view = _interopRequireDefault(require("./view"));
+exports.OrderView = _view.default;
+var _sharedView = _interopRequireDefault(require("./sharedView"));
+exports.SharedOrderView = _sharedView.default;
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }