handsontable 14.6.1 → 15.0.0-next-4472a60-20241203

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

@@ -1,4 +1,6 @@
 import "core-js/modules/es.error.cause.js";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.for-each.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); }
@@ -298,7 +300,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
     });
   }
 
@@ -312,7 +316,10 @@ export class Overlay {
   refresh() {
     let fastDraw = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     if (this.needFullRender) {
+      const cloneSource = this.clone.cloneSource;
+      cloneSource.activeOverlayName = this.clone.wtTable.name;
       this.clone.draw(fastDraw);
+      cloneSource.activeOverlayName = 'master';
     }
   }
 

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) {
@@ -180,14 +180,13 @@ class BottomOverlay extends _base.Overlay {
       rootDocument,
       rootWindow
     } = this.domBindings;
-    const scrollbarWidth = (0, _element.getScrollbarWidth)(rootDocument);
     const overlayRoot = this.clone.wtTable.holder.parentNode;
     const overlayRootStyle = overlayRoot.style;
     const preventOverflow = this.wtSettings.getSetting('preventOverflow');
     if (this.trimmingContainer !== rootWindow || preventOverflow === 'horizontal') {
       let width = wtViewport.getWorkspaceWidth();
-      if (this.wot.wtOverlays.hasScrollbarRight) {
-        width -= scrollbarWidth;
+      if (wtViewport.hasVerticalScroll()) {
+        width -= (0, _element.getScrollbarWidth)(rootDocument);
       }
       width = Math.min(width, wtTable.wtRootElement.scrollWidth);
       overlayRootStyle.width = `${width}px`;
@@ -196,7 +195,7 @@ class BottomOverlay extends _base.Overlay {
     }
     this.clone.wtTable.holder.style.width = overlayRootStyle.width;
     let tableHeight = (0, _element.outerHeight)(this.clone.wtTable.TABLE);
-    if (!this.wot.wtTable.hasDefinedSize()) {
+    if (!wtTable.hasDefinedSize()) {
       tableHeight = 0;
     }
     overlayRootStyle.height = `${tableHeight}px`;

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) {
@@ -176,14 +176,13 @@ export class BottomOverlay extends Overlay {
       rootDocument,
       rootWindow
     } = this.domBindings;
-    const scrollbarWidth = getScrollbarWidth(rootDocument);
     const overlayRoot = this.clone.wtTable.holder.parentNode;
     const overlayRootStyle = overlayRoot.style;
     const preventOverflow = this.wtSettings.getSetting('preventOverflow');
     if (this.trimmingContainer !== rootWindow || preventOverflow === 'horizontal') {
       let width = wtViewport.getWorkspaceWidth();
-      if (this.wot.wtOverlays.hasScrollbarRight) {
-        width -= scrollbarWidth;
+      if (wtViewport.hasVerticalScroll()) {
+        width -= getScrollbarWidth(rootDocument);
       }
       width = Math.min(width, wtTable.wtRootElement.scrollWidth);
       overlayRootStyle.width = `${width}px`;
@@ -192,7 +191,7 @@ export class BottomOverlay extends Overlay {
     }
     this.clone.wtTable.holder.style.width = overlayRootStyle.width;
     let tableHeight = outerHeight(this.clone.wtTable.TABLE);
-    if (!this.wot.wtTable.hasDefinedSize()) {
+    if (!wtTable.hasDefinedSize()) {
       tableHeight = 0;
     }
     overlayRootStyle.height = `${tableHeight}px`;

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

@@ -1,5 +1,7 @@
 "use strict";
 
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
 exports.__esModule = true;
 var _exportNames = {
   BottomInlineStartCornerOverlay: true,

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

@@ -119,7 +119,7 @@ class InlineStartOverlay extends _base.Overlay {
     let column = from;
     let sum = 0;
     while (column < to) {
-      sum += this.wot.wtTable.getStretchedColumnWidth(column) || defaultColumnWidth;
+      sum += this.wot.wtTable.getColumnWidth(column) || defaultColumnWidth;
       column += 1;
     }
     return sum;
@@ -141,20 +141,20 @@ class InlineStartOverlay extends _base.Overlay {
    */
   adjustRootElementSize() {
     const {
-      wtTable
+      wtTable,
+      wtViewport
     } = this.wot;
     const {
       rootDocument,
       rootWindow
     } = this.domBindings;
-    const scrollbarHeight = (0, _element.getScrollbarWidth)(rootDocument);
     const overlayRoot = this.clone.wtTable.holder.parentNode;
     const overlayRootStyle = overlayRoot.style;
     const preventOverflow = this.wtSettings.getSetting('preventOverflow');
     if (this.trimmingContainer !== rootWindow || preventOverflow === 'vertical') {
-      let height = this.wot.wtViewport.getWorkspaceHeight();
-      if (this.wot.wtOverlays.hasScrollbarBottom) {
-        height -= scrollbarHeight;
+      let height = wtViewport.getWorkspaceHeight();
+      if (wtViewport.hasHorizontalScroll()) {
+        height -= (0, _element.getScrollbarWidth)(rootDocument);
       }
       height = Math.min(height, wtTable.wtRootElement.scrollHeight);
       overlayRootStyle.height = `${height}px`;
@@ -173,7 +173,8 @@ class InlineStartOverlay extends _base.Overlay {
     const {
       holder
     } = this.clone.wtTable;
-    const selectionCornerOffset = this.wot.selectionManager.getFocusSelection() ? parseInt(_selection.CORNER_DEFAULT_STYLE.width, 10) / 2 : 0;
+    const cornerStyle = (0, _selection.getCornerStyle)(this.wot);
+    const selectionCornerOffset = this.wot.selectionManager.getFocusSelection() ? parseInt(cornerStyle.width, 10) / 2 : 0;
     this.clone.wtTable.hider.style.height = this.hider.style.height;
     holder.style.height = holder.parentNode.style.height;
     // Add selection corner protruding part to the holder total width to make sure that

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

@@ -2,7 +2,7 @@ import "core-js/modules/es.error.cause.js";
 import { addClass, getScrollbarWidth, getScrollLeft, getMaximumScrollLeft, getWindowScrollTop, hasClass, outerWidth, removeClass, setOverlayPosition, resetCssTransform } from "../../../../helpers/dom/element.mjs";
 import InlineStartOverlayTable from "../table/inlineStart.mjs";
 import { Overlay } from "./_base.mjs";
-import { CORNER_DEFAULT_STYLE } from "../selection/index.mjs";
+import { getCornerStyle } from "../selection/index.mjs";
 import { CLONE_INLINE_START } from "./constants.mjs";
 /**
  * @class InlineStartOverlay
@@ -115,7 +115,7 @@ export class InlineStartOverlay extends Overlay {
     let column = from;
     let sum = 0;
     while (column < to) {
-      sum += this.wot.wtTable.getStretchedColumnWidth(column) || defaultColumnWidth;
+      sum += this.wot.wtTable.getColumnWidth(column) || defaultColumnWidth;
       column += 1;
     }
     return sum;
@@ -137,20 +137,20 @@ export class InlineStartOverlay extends Overlay {
    */
   adjustRootElementSize() {
     const {
-      wtTable
+      wtTable,
+      wtViewport
     } = this.wot;
     const {
       rootDocument,
       rootWindow
     } = this.domBindings;
-    const scrollbarHeight = getScrollbarWidth(rootDocument);
     const overlayRoot = this.clone.wtTable.holder.parentNode;
     const overlayRootStyle = overlayRoot.style;
     const preventOverflow = this.wtSettings.getSetting('preventOverflow');
     if (this.trimmingContainer !== rootWindow || preventOverflow === 'vertical') {
-      let height = this.wot.wtViewport.getWorkspaceHeight();
-      if (this.wot.wtOverlays.hasScrollbarBottom) {
-        height -= scrollbarHeight;
+      let height = wtViewport.getWorkspaceHeight();
+      if (wtViewport.hasHorizontalScroll()) {
+        height -= getScrollbarWidth(rootDocument);
       }
       height = Math.min(height, wtTable.wtRootElement.scrollHeight);
       overlayRootStyle.height = `${height}px`;
@@ -169,7 +169,8 @@ export class InlineStartOverlay extends Overlay {
     const {
       holder
     } = this.clone.wtTable;
-    const selectionCornerOffset = this.wot.selectionManager.getFocusSelection() ? parseInt(CORNER_DEFAULT_STYLE.width, 10) / 2 : 0;
+    const cornerStyle = getCornerStyle(this.wot);
+    const selectionCornerOffset = this.wot.selectionManager.getFocusSelection() ? parseInt(cornerStyle.width, 10) / 2 : 0;
     this.clone.wtTable.hider.style.height = this.hider.style.height;
     holder.style.height = holder.parentNode.style.height;
     // Add selection corner protruding part to the holder total width to make sure that

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) {
@@ -165,20 +165,20 @@ class TopOverlay extends _base.Overlay {
    */
   adjustRootElementSize() {
     const {
-      wtTable
+      wtTable,
+      wtViewport
     } = this.wot;
     const {
       rootDocument,
       rootWindow
     } = this.domBindings;
-    const scrollbarWidth = (0, _element.getScrollbarWidth)(rootDocument);
     const overlayRoot = this.clone.wtTable.holder.parentNode;
     const overlayRootStyle = overlayRoot.style;
     const preventOverflow = this.wtSettings.getSetting('preventOverflow');
     if (this.trimmingContainer !== rootWindow || preventOverflow === 'horizontal') {
-      let width = this.wot.wtViewport.getWorkspaceWidth();
-      if (this.wot.wtOverlays.hasScrollbarRight) {
-        width -= scrollbarWidth;
+      let width = wtViewport.getWorkspaceWidth();
+      if (wtViewport.hasVerticalScroll()) {
+        width -= (0, _element.getScrollbarWidth)(rootDocument);
       }
       width = Math.min(width, wtTable.wtRootElement.scrollWidth);
       overlayRootStyle.width = `${width}px`;
@@ -187,7 +187,7 @@ class TopOverlay extends _base.Overlay {
     }
     this.clone.wtTable.holder.style.width = overlayRootStyle.width;
     let tableHeight = (0, _element.outerHeight)(this.clone.wtTable.TABLE);
-    if (!this.wot.wtTable.hasDefinedSize()) {
+    if (!wtTable.hasDefinedSize()) {
       tableHeight = 0;
     }
     overlayRootStyle.height = `${tableHeight}px`;
@@ -200,7 +200,8 @@ class TopOverlay extends _base.Overlay {
     const {
       holder
     } = this.clone.wtTable;
-    const selectionCornerOffset = this.wot.selectionManager.getFocusSelection() ? parseInt(_selection.CORNER_DEFAULT_STYLE.height, 10) / 2 : 0;
+    const cornerStyle = (0, _selection.getCornerStyle)(this.wot);
+    const selectionCornerOffset = this.wot.selectionManager.getFocusSelection() ? parseInt(cornerStyle.height, 10) / 2 : 0;
     this.clone.wtTable.hider.style.width = this.hider.style.width;
     holder.style.width = holder.parentNode.style.width;
     // Add selection corner protruding part to the holder total height to make sure that

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

@@ -5,7 +5,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 import { addClass, getMaximumScrollTop, getScrollbarWidth, getScrollTop, getWindowScrollLeft, hasClass, outerHeight, removeClass, setOverlayPosition, resetCssTransform } from "../../../../helpers/dom/element.mjs";
 import TopOverlayTable from "./../table/top.mjs";
 import { Overlay } from "./_base.mjs";
-import { CORNER_DEFAULT_STYLE } from "../selection/index.mjs";
+import { getCornerStyle } from "../selection/index.mjs";
 import { CLONE_TOP } from "./constants.mjs";
 /**
  * @class TopOverlay
@@ -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) {
@@ -161,20 +161,20 @@ export class TopOverlay extends Overlay {
    */
   adjustRootElementSize() {
     const {
-      wtTable
+      wtTable,
+      wtViewport
     } = this.wot;
     const {
       rootDocument,
       rootWindow
     } = this.domBindings;
-    const scrollbarWidth = getScrollbarWidth(rootDocument);
     const overlayRoot = this.clone.wtTable.holder.parentNode;
     const overlayRootStyle = overlayRoot.style;
     const preventOverflow = this.wtSettings.getSetting('preventOverflow');
     if (this.trimmingContainer !== rootWindow || preventOverflow === 'horizontal') {
-      let width = this.wot.wtViewport.getWorkspaceWidth();
-      if (this.wot.wtOverlays.hasScrollbarRight) {
-        width -= scrollbarWidth;
+      let width = wtViewport.getWorkspaceWidth();
+      if (wtViewport.hasVerticalScroll()) {
+        width -= getScrollbarWidth(rootDocument);
       }
       width = Math.min(width, wtTable.wtRootElement.scrollWidth);
       overlayRootStyle.width = `${width}px`;
@@ -183,7 +183,7 @@ export class TopOverlay extends Overlay {
     }
     this.clone.wtTable.holder.style.width = overlayRootStyle.width;
     let tableHeight = outerHeight(this.clone.wtTable.TABLE);
-    if (!this.wot.wtTable.hasDefinedSize()) {
+    if (!wtTable.hasDefinedSize()) {
       tableHeight = 0;
     }
     overlayRootStyle.height = `${tableHeight}px`;
@@ -196,7 +196,8 @@ export class TopOverlay extends Overlay {
     const {
       holder
     } = this.clone.wtTable;
-    const selectionCornerOffset = this.wot.selectionManager.getFocusSelection() ? parseInt(CORNER_DEFAULT_STYLE.height, 10) / 2 : 0;
+    const cornerStyle = getCornerStyle(this.wot);
+    const selectionCornerOffset = this.wot.selectionManager.getFocusSelection() ? parseInt(cornerStyle.height, 10) / 2 : 0;
     this.clone.wtTable.hider.style.width = this.hider.style.width;
     holder.style.width = holder.parentNode.style.width;
     // Add selection corner protruding part to the holder total height to make sure that

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

@@ -3,6 +3,9 @@
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.for-each.js");
+require("core-js/modules/esnext.iterator.reduce.js");
 var _element = require("../../../helpers/dom/element");
 var _feature = require("../../../helpers/feature");
 var _array = require("../../../helpers/array");
@@ -163,8 +166,6 @@ class Overlays {
     const isOverflowHidden = rootWindow.getComputedStyle(wtTable.wtRootElement.parentNode).getPropertyValue('overflow') === 'hidden';
     this.scrollableElement = isOverflowHidden ? wtTable.holder : (0, _element.getScrollableElement)(wtTable.TABLE);
     this.initOverlays();
-    this.hasScrollbarBottom = false;
-    this.hasScrollbarRight = false;
     this.destroyed = false;
     this.keyPressed = false;
     this.spreaderLastSize = {
@@ -329,13 +330,14 @@ class Overlays {
     });
     let resizeTimeout;
     this.eventManager.addEventListener(rootWindow, 'resize', () => {
-      clearTimeout(resizeTimeout);
-      resizeTimeout = setTimeout(() => {
+      (0, _feature.requestAnimationFrame)(() => {
+        clearTimeout(resizeTimeout);
         this.wtSettings.getSetting('onWindowResize');
-
-        // Remove resizing the window from the ResizeObserver's endless-loop-blocking logic.
-        _classPrivateFieldSet(_containerDomResizeCount, this, 0);
-      }, 200);
+        resizeTimeout = setTimeout(() => {
+          // Remove resizing the window from the ResizeObserver's endless-loop-blocking logic.
+          _classPrivateFieldSet(_containerDomResizeCount, this, 0);
+        }, 200);
+      });
     });
     if (!isScrollOnWindow) {
       this.resizeObserver.observe(this.wtTable.wtRootElement.parentElement);
@@ -641,24 +643,6 @@ class Overlays {
     // we need to adjust the hider dimensions by the header border size. (https://github.com/handsontable/dev-handsontable/issues/1772)
     hiderStyle.width = `${proposedHiderWidth + rowHeaderBorderCompensation}px`;
     hiderStyle.height = `${proposedHiderHeight + columnHeaderBorderCompensation}px`;
-    if (this.scrollbarSize > 0) {
-      // todo refactoring, looking as a part of logic which should be moved outside the class
-      const {
-        scrollHeight: rootElemScrollHeight,
-        scrollWidth: rootElemScrollWidth
-      } = wtTable.wtRootElement;
-      const {
-        scrollHeight: holderScrollHeight,
-        scrollWidth: holderScrollWidth
-      } = wtTable.holder;
-      this.hasScrollbarRight = rootElemScrollHeight < holderScrollHeight;
-      this.hasScrollbarBottom = rootElemScrollWidth < holderScrollWidth;
-      if (this.hasScrollbarRight && wtTable.hider.scrollWidth + this.scrollbarSize > rootElemScrollWidth) {
-        this.hasScrollbarBottom = true;
-      } else if (this.hasScrollbarBottom && wtTable.hider.scrollHeight + this.scrollbarSize > rootElemScrollHeight) {
-        this.hasScrollbarRight = true;
-      }
-    }
     this.topOverlay.adjustElementsSize();
     this.inlineStartOverlay.adjustElementsSize();
     this.bottomOverlay.adjustElementsSize();

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

@@ -1,5 +1,8 @@
 import "core-js/modules/es.error.cause.js";
 import "core-js/modules/es.array.push.js";
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.for-each.js";
+import "core-js/modules/esnext.iterator.reduce.js";
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 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; }
@@ -160,8 +163,6 @@ class Overlays {
     const isOverflowHidden = rootWindow.getComputedStyle(wtTable.wtRootElement.parentNode).getPropertyValue('overflow') === 'hidden';
     this.scrollableElement = isOverflowHidden ? wtTable.holder : getScrollableElement(wtTable.TABLE);
     this.initOverlays();
-    this.hasScrollbarBottom = false;
-    this.hasScrollbarRight = false;
     this.destroyed = false;
     this.keyPressed = false;
     this.spreaderLastSize = {
@@ -326,13 +327,14 @@ class Overlays {
     });
     let resizeTimeout;
     this.eventManager.addEventListener(rootWindow, 'resize', () => {
-      clearTimeout(resizeTimeout);
-      resizeTimeout = setTimeout(() => {
+      requestAnimationFrame(() => {
+        clearTimeout(resizeTimeout);
         this.wtSettings.getSetting('onWindowResize');
-
-        // Remove resizing the window from the ResizeObserver's endless-loop-blocking logic.
-        _classPrivateFieldSet(_containerDomResizeCount, this, 0);
-      }, 200);
+        resizeTimeout = setTimeout(() => {
+          // Remove resizing the window from the ResizeObserver's endless-loop-blocking logic.
+          _classPrivateFieldSet(_containerDomResizeCount, this, 0);
+        }, 200);
+      });
     });
     if (!isScrollOnWindow) {
       this.resizeObserver.observe(this.wtTable.wtRootElement.parentElement);
@@ -638,24 +640,6 @@ class Overlays {
     // we need to adjust the hider dimensions by the header border size. (https://github.com/handsontable/dev-handsontable/issues/1772)
     hiderStyle.width = `${proposedHiderWidth + rowHeaderBorderCompensation}px`;
     hiderStyle.height = `${proposedHiderHeight + columnHeaderBorderCompensation}px`;
-    if (this.scrollbarSize > 0) {
-      // todo refactoring, looking as a part of logic which should be moved outside the class
-      const {
-        scrollHeight: rootElemScrollHeight,
-        scrollWidth: rootElemScrollWidth
-      } = wtTable.wtRootElement;
-      const {
-        scrollHeight: holderScrollHeight,
-        scrollWidth: holderScrollWidth
-      } = wtTable.holder;
-      this.hasScrollbarRight = rootElemScrollHeight < holderScrollHeight;
-      this.hasScrollbarBottom = rootElemScrollWidth < holderScrollWidth;
-      if (this.hasScrollbarRight && wtTable.hider.scrollWidth + this.scrollbarSize > rootElemScrollWidth) {
-        this.hasScrollbarBottom = true;
-      } else if (this.hasScrollbarBottom && wtTable.hider.scrollHeight + this.scrollbarSize > rootElemScrollHeight) {
-        this.hasScrollbarRight = true;
-      }
-    }
     this.topOverlay.adjustElementsSize();
     this.inlineStartOverlay.adjustElementsSize();
     this.bottomOverlay.adjustElementsSize();

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

@@ -70,7 +70,7 @@ class ColGroupRenderer extends _base.default {
     // Render column nodes for cells
     for (let visibleColumnIndex = 0; visibleColumnIndex < columnsToRender; visibleColumnIndex++) {
       const sourceColumnIndex = this.table.renderedColumnToSource(visibleColumnIndex);
-      const width = this.table.columnUtils.getStretchedColumnWidth(sourceColumnIndex);
+      const width = this.table.columnUtils.getWidth(sourceColumnIndex);
       this.rootNode.childNodes[visibleColumnIndex + rowHeadersCount].style.width = `${width}px`;
     }
     const firstChild = this.rootNode.firstChild;

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

@@ -66,7 +66,7 @@ export default class ColGroupRenderer extends BaseRenderer {
     // Render column nodes for cells
     for (let visibleColumnIndex = 0; visibleColumnIndex < columnsToRender; visibleColumnIndex++) {
       const sourceColumnIndex = this.table.renderedColumnToSource(visibleColumnIndex);
-      const width = this.table.columnUtils.getStretchedColumnWidth(sourceColumnIndex);
+      const width = this.table.columnUtils.getWidth(sourceColumnIndex);
       this.rootNode.childNodes[visibleColumnIndex + rowHeadersCount].style.width = `${width}px`;
     }
     const firstChild = this.rootNode.firstChild;

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;
   }
 
   /**
@@ -301,7 +307,7 @@ class TableRenderer {
     this.rowHeaders.render();
     this.cells.render();
 
-    // After the cells are rendered calculate columns width (or columns stretch width) to prepare proper values
+    // After the cells are rendered calculate columns width to prepare proper values
     // for colGroup renderer (which renders COL elements).
     this.columnUtils.calculateWidths();
     this.colGroup.render();
@@ -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;
   }
 
   /**
@@ -298,7 +304,7 @@ export default class TableRenderer {
     this.rowHeaders.render();
     this.cells.render();
 
-    // After the cells are rendered calculate columns width (or columns stretch width) to prepare proper values
+    // After the cells are rendered calculate columns width to prepare proper values
     // for colGroup renderer (which renders COL elements).
     this.columnUtils.calculateWidths();
     this.colGroup.render();
@@ -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 = '';
         }