handsontable 14.3.0 → 14.4.0-next-0a79a1f-20240521

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

@@ -99,6 +99,7 @@ class ViewportRowsCalculator {
     } = _classPrivateFieldGet(_options, this);
     const zeroBasedScrollOffset = Math.max(_classPrivateFieldGet(_options, this).scrollOffset, 0);
     const horizontalScrollbarHeight = _classPrivateFieldGet(_options, this).horizontalScrollbarHeight || 0;
+    const innerViewportHeight = zeroBasedScrollOffset + viewportHeight - horizontalScrollbarHeight;
     let sum = 0;
     let needReverse = true;
     const startPositions = [];
@@ -116,8 +117,7 @@ class ViewportRowsCalculator {
         this.startRow = i;
         firstVisibleRowHeight = rowHeight;
       }
-      if (sum >= zeroBasedScrollOffset && sum + (calculationType === _constants.FULLY_VISIBLE_TYPE ? rowHeight : 0) <= zeroBasedScrollOffset + viewportHeight - horizontalScrollbarHeight) {
-        // eslint-disable-line max-len
+      if (sum >= zeroBasedScrollOffset && sum + (calculationType === _constants.FULLY_VISIBLE_TYPE ? rowHeight : 0) <= innerViewportHeight) {
         if (this.startRow === null) {
           this.startRow = i;
           firstVisibleRowHeight = rowHeight;
@@ -130,7 +130,7 @@ class ViewportRowsCalculator {
       if (calculationType !== _constants.FULLY_VISIBLE_TYPE) {
         this.endRow = i;
       }
-      if (sum >= zeroBasedScrollOffset + viewportHeight - horizontalScrollbarHeight) {
+      if (sum >= innerViewportHeight) {
         needReverse = false;
         break;
       }

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

@@ -96,6 +96,7 @@ export class ViewportRowsCalculator {
     } = _classPrivateFieldGet(_options, this);
     const zeroBasedScrollOffset = Math.max(_classPrivateFieldGet(_options, this).scrollOffset, 0);
     const horizontalScrollbarHeight = _classPrivateFieldGet(_options, this).horizontalScrollbarHeight || 0;
+    const innerViewportHeight = zeroBasedScrollOffset + viewportHeight - horizontalScrollbarHeight;
     let sum = 0;
     let needReverse = true;
     const startPositions = [];
@@ -113,8 +114,7 @@ export class ViewportRowsCalculator {
         this.startRow = i;
         firstVisibleRowHeight = rowHeight;
       }
-      if (sum >= zeroBasedScrollOffset && sum + (calculationType === FULLY_VISIBLE_TYPE ? rowHeight : 0) <= zeroBasedScrollOffset + viewportHeight - horizontalScrollbarHeight) {
-        // eslint-disable-line max-len
+      if (sum >= zeroBasedScrollOffset && sum + (calculationType === FULLY_VISIBLE_TYPE ? rowHeight : 0) <= innerViewportHeight) {
         if (this.startRow === null) {
           this.startRow = i;
           firstVisibleRowHeight = rowHeight;
@@ -127,7 +127,7 @@ export class ViewportRowsCalculator {
       if (calculationType !== FULLY_VISIBLE_TYPE) {
         this.endRow = i;
       }
-      if (sum >= zeroBasedScrollOffset + viewportHeight - horizontalScrollbarHeight) {
+      if (sum >= innerViewportHeight) {
         needReverse = false;
         break;
       }

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

@@ -114,7 +114,7 @@ class CoreAbstract {
   draw() {
     let fastDraw = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     this.drawInterrupted = false;
-    if (!fastDraw && !this.wtTable.isVisible()) {
+    if (!this.wtTable.isVisible()) {
       // draw interrupted because TABLE is not visible
       this.drawInterrupted = true;
     } else {

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

@@ -110,7 +110,7 @@ export default class CoreAbstract {
   draw() {
     let fastDraw = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     this.drawInterrupted = false;
-    if (!fastDraw && !this.wtTable.isVisible()) {
+    if (!this.wtTable.isVisible()) {
       // draw interrupted because TABLE is not visible
       this.drawInterrupted = true;
     } else {

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

@@ -4,7 +4,6 @@ exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
 var _element = require("../../../../helpers/dom/element");
 var _object = require("../../../../helpers/object");
-var _array = require("../../../../helpers/array");
 var _console = require("../../../../helpers/console");
 var _constants = require("./constants");
 var _clone = _interopRequireDefault(require("../core/clone"));
@@ -61,24 +60,35 @@ class Overlay {
     this.holder = holder;
     this.wtRootElement = wtRootElement;
     this.trimmingContainer = (0, _element.getTrimmingContainer)(this.hider.parentNode.parentNode);
-    this.updateStateOfRendering();
+    this.needFullRender = this.shouldBeRendered();
     this.clone = this.makeClone();
   }
 
   /**
-   * Update internal state of object with an information about the need of full rendering of the overlay.
+   * Checks if the overlay rendering state has changed.
    *
-   * @returns {boolean} Returns `true` if the state has changed since the last check.
+   * @returns {boolean}
    */
-  updateStateOfRendering() {
-    // todo refactoring: conceive introducing final state machine, normal -> changed (once) -> needs-full-render -> ...? -> normal
-    const previousState = this.needFullRender;
-    this.needFullRender = this.shouldBeRendered();
-    const changed = previousState !== this.needFullRender;
-    if (changed && !this.needFullRender) {
-      this.reset();
+  hasRenderingStateChanged() {
+    return this.needFullRender !== this.shouldBeRendered();
+  }
+
+  /**
+   * Updates internal state with an information about the need of full rendering of the overlay in the next draw cycles.
+   *
+   * If the state is changed to render the overlay, the `needFullRender` property is set to `true` which means that
+   * the overlay will be fully rendered in the current draw cycle. If the state is changed to not render the overlay,
+   * the `needFullRender` property is set to `false` which means that the overlay will be fully rendered in the
+   * current draw cycle but it will not be rendered in the next draw cycles.
+   *
+   * @param {'before' | 'after'} drawPhase The phase of the rendering process.
+   */
+  updateStateOfRendering(drawPhase) {
+    if (drawPhase === 'before' && this.shouldBeRendered()) {
+      this.needFullRender = true;
+    } else if (drawPhase === 'after' && !this.shouldBeRendered()) {
+      this.needFullRender = false;
     }
-    return changed;
   }
 
   /**
@@ -305,27 +315,21 @@ class Overlay {
    */
   refresh() {
     let fastDraw = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    // When hot settings are changed we allow to refresh overlay once before blocking
-    const nextCycleRenderFlag = this.shouldBeRendered();
-    if (this.clone && (this.needFullRender || nextCycleRenderFlag)) {
+    if (this.needFullRender) {
       this.clone.draw(fastDraw);
     }
-    this.needFullRender = nextCycleRenderFlag;
   }
 
   /**
    * Reset overlay styles to initial values.
    */
   reset() {
-    if (!this.clone) {
-      return;
-    }
     const holder = this.clone.wtTable.holder; // todo refactoring: DEMETER
     const hider = this.clone.wtTable.hider; // todo refactoring: DEMETER
     const holderStyle = holder.style;
     const hiderStyle = hider.style;
     const rootStyle = holder.parentNode.style;
-    (0, _array.arrayEach)([holderStyle, hiderStyle, rootStyle], style => {
+    [holderStyle, hiderStyle, rootStyle].forEach(style => {
       style.width = '';
       style.height = '';
     });

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

@@ -4,7 +4,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { getScrollableElement, getTrimmingContainer, getScrollbarWidth, setAttribute } from "../../../../helpers/dom/element.mjs";
 import { defineGetter } from "../../../../helpers/object.mjs";
-import { arrayEach } from "../../../../helpers/array.mjs";
 import { warn } from "../../../../helpers/console.mjs";
 import { CLONE_TYPES, CLONE_CLASS_NAMES, CLONE_TOP, CLONE_INLINE_START } from "./constants.mjs";
 import Clone from "../core/clone.mjs";
@@ -57,24 +56,35 @@ export class Overlay {
     this.holder = holder;
     this.wtRootElement = wtRootElement;
     this.trimmingContainer = getTrimmingContainer(this.hider.parentNode.parentNode);
-    this.updateStateOfRendering();
+    this.needFullRender = this.shouldBeRendered();
     this.clone = this.makeClone();
   }
 
   /**
-   * Update internal state of object with an information about the need of full rendering of the overlay.
+   * Checks if the overlay rendering state has changed.
    *
-   * @returns {boolean} Returns `true` if the state has changed since the last check.
+   * @returns {boolean}
    */
-  updateStateOfRendering() {
-    // todo refactoring: conceive introducing final state machine, normal -> changed (once) -> needs-full-render -> ...? -> normal
-    const previousState = this.needFullRender;
-    this.needFullRender = this.shouldBeRendered();
-    const changed = previousState !== this.needFullRender;
-    if (changed && !this.needFullRender) {
-      this.reset();
+  hasRenderingStateChanged() {
+    return this.needFullRender !== this.shouldBeRendered();
+  }
+
+  /**
+   * Updates internal state with an information about the need of full rendering of the overlay in the next draw cycles.
+   *
+   * If the state is changed to render the overlay, the `needFullRender` property is set to `true` which means that
+   * the overlay will be fully rendered in the current draw cycle. If the state is changed to not render the overlay,
+   * the `needFullRender` property is set to `false` which means that the overlay will be fully rendered in the
+   * current draw cycle but it will not be rendered in the next draw cycles.
+   *
+   * @param {'before' | 'after'} drawPhase The phase of the rendering process.
+   */
+  updateStateOfRendering(drawPhase) {
+    if (drawPhase === 'before' && this.shouldBeRendered()) {
+      this.needFullRender = true;
+    } else if (drawPhase === 'after' && !this.shouldBeRendered()) {
+      this.needFullRender = false;
     }
-    return changed;
   }
 
   /**
@@ -301,27 +311,21 @@ export class Overlay {
    */
   refresh() {
     let fastDraw = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
-    // When hot settings are changed we allow to refresh overlay once before blocking
-    const nextCycleRenderFlag = this.shouldBeRendered();
-    if (this.clone && (this.needFullRender || nextCycleRenderFlag)) {
+    if (this.needFullRender) {
       this.clone.draw(fastDraw);
     }
-    this.needFullRender = nextCycleRenderFlag;
   }
 
   /**
    * Reset overlay styles to initial values.
    */
   reset() {
-    if (!this.clone) {
-      return;
-    }
     const holder = this.clone.wtTable.holder; // todo refactoring: DEMETER
     const hider = this.clone.wtTable.hider; // todo refactoring: DEMETER
     const holderStyle = holder.style;
     const hiderStyle = hider.style;
     const rootStyle = holder.parentNode.style;
-    arrayEach([holderStyle, hiderStyle, rootStyle], style => {
+    [holderStyle, hiderStyle, rootStyle].forEach(style => {
       style.width = '';
       style.height = '';
     });

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

@@ -61,7 +61,7 @@ class BottomOverlay extends _base.Overlay {
    * @returns {boolean}
    */
   resetFixedPosition() {
-    if (!this.needFullRender || !this.wot.wtTable.holder.parentNode) {
+    if (!this.needFullRender || !this.shouldBeRendered() || !this.wot.wtTable.holder.parentNode) {
       // removed from DOM
       return false;
     }
@@ -158,14 +158,11 @@ class BottomOverlay extends _base.Overlay {
   }
 
   /**
-   * Adjust overlay root element, childs and master table element sizes (width, height).
-   *
-   * @param {boolean} [force=false] When `true`, it adjusts the DOM nodes sizes for that overlay.
+   * Adjust overlay root element, children and master table element sizes (width, height).
    */
   adjustElementsSize() {
-    let force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     this.updateTrimmingContainer();
-    if (this.needFullRender || force) {
+    if (this.needFullRender) {
       this.adjustRootElementSize();
       this.adjustRootChildrenSize();
     }

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

@@ -57,7 +57,7 @@ export class BottomOverlay extends Overlay {
    * @returns {boolean}
    */
   resetFixedPosition() {
-    if (!this.needFullRender || !this.wot.wtTable.holder.parentNode) {
+    if (!this.needFullRender || !this.shouldBeRendered() || !this.wot.wtTable.holder.parentNode) {
       // removed from DOM
       return false;
     }
@@ -154,14 +154,11 @@ export class BottomOverlay extends Overlay {
   }
 
   /**
-   * Adjust overlay root element, childs and master table element sizes (width, height).
-   *
-   * @param {boolean} [force=false] When `true`, it adjusts the DOM nodes sizes for that overlay.
+   * Adjust overlay root element, children and master table element sizes (width, height).
    */
   adjustElementsSize() {
-    let force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     this.updateTrimmingContainer();
-    if (this.needFullRender || force) {
+    if (this.needFullRender) {
       this.adjustRootElementSize();
       this.adjustRootChildrenSize();
     }

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

@@ -54,7 +54,7 @@ class InlineStartOverlay extends _base.Overlay {
     const {
       wtTable
     } = this.wot;
-    if (!this.needFullRender || !wtTable.holder.parentNode) {
+    if (!this.needFullRender || !this.shouldBeRendered() || !wtTable.holder.parentNode) {
       // removed from DOM
       return false;
     }
@@ -126,14 +126,11 @@ class InlineStartOverlay extends _base.Overlay {
   }
 
   /**
-   * Adjust overlay root element, childs and master table element sizes (width, height).
-   *
-   * @param {boolean} [force=false] When `true`, it adjusts the DOM nodes sizes for that overlay.
+   * Adjust overlay root element, children and master table element sizes (width, height).
    */
   adjustElementsSize() {
-    let force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     this.updateTrimmingContainer();
-    if (this.needFullRender || force) {
+    if (this.needFullRender) {
       this.adjustRootElementSize();
       this.adjustRootChildrenSize();
     }
@@ -322,27 +319,33 @@ class InlineStartOverlay extends _base.Overlay {
    * @returns {boolean}
    */
   adjustHeaderBordersPosition(position) {
+    const {
+      wtSettings
+    } = this;
     const masterParent = this.wot.wtTable.holder.parentNode;
-    const rowHeaders = this.wtSettings.getSetting('rowHeaders');
-    const fixedColumnsStart = this.wtSettings.getSetting('fixedColumnsStart');
-    const totalRows = this.wtSettings.getSetting('totalRows');
+    const rowHeaders = wtSettings.getSetting('rowHeaders');
+    const fixedColumnsStart = wtSettings.getSetting('fixedColumnsStart');
+    const totalRows = wtSettings.getSetting('totalRows');
+    const preventVerticalOverflow = wtSettings.getSetting('preventOverflow') === 'vertical';
     if (totalRows) {
       (0, _element.removeClass)(masterParent, 'emptyRows');
     } else {
       (0, _element.addClass)(masterParent, 'emptyRows');
     }
     let positionChanged = false;
-    if (fixedColumnsStart && !rowHeaders.length) {
-      // "innerBorderLeft" is for backward compatibility
-      (0, _element.addClass)(masterParent, 'innerBorderLeft innerBorderInlineStart');
-    } else if (!fixedColumnsStart && rowHeaders.length) {
-      const previousState = (0, _element.hasClass)(masterParent, 'innerBorderInlineStart');
-      if (position) {
+    if (!preventVerticalOverflow) {
+      if (fixedColumnsStart && !rowHeaders.length) {
+        // "innerBorderLeft" is for backward compatibility
         (0, _element.addClass)(masterParent, 'innerBorderLeft innerBorderInlineStart');
-        positionChanged = !previousState;
-      } else {
-        (0, _element.removeClass)(masterParent, 'innerBorderLeft innerBorderInlineStart');
-        positionChanged = previousState;
+      } else if (!fixedColumnsStart && rowHeaders.length) {
+        const previousState = (0, _element.hasClass)(masterParent, 'innerBorderInlineStart');
+        if (position) {
+          (0, _element.addClass)(masterParent, 'innerBorderLeft innerBorderInlineStart');
+          positionChanged = !previousState;
+        } else {
+          (0, _element.removeClass)(masterParent, 'innerBorderLeft innerBorderInlineStart');
+          positionChanged = previousState;
+        }
       }
     }
     return positionChanged;

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

@@ -50,7 +50,7 @@ export class InlineStartOverlay extends Overlay {
     const {
       wtTable
     } = this.wot;
-    if (!this.needFullRender || !wtTable.holder.parentNode) {
+    if (!this.needFullRender || !this.shouldBeRendered() || !wtTable.holder.parentNode) {
       // removed from DOM
       return false;
     }
@@ -122,14 +122,11 @@ export class InlineStartOverlay extends Overlay {
   }
 
   /**
-   * Adjust overlay root element, childs and master table element sizes (width, height).
-   *
-   * @param {boolean} [force=false] When `true`, it adjusts the DOM nodes sizes for that overlay.
+   * Adjust overlay root element, children and master table element sizes (width, height).
    */
   adjustElementsSize() {
-    let force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     this.updateTrimmingContainer();
-    if (this.needFullRender || force) {
+    if (this.needFullRender) {
       this.adjustRootElementSize();
       this.adjustRootChildrenSize();
     }
@@ -318,27 +315,33 @@ export class InlineStartOverlay extends Overlay {
    * @returns {boolean}
    */
   adjustHeaderBordersPosition(position) {
+    const {
+      wtSettings
+    } = this;
     const masterParent = this.wot.wtTable.holder.parentNode;
-    const rowHeaders = this.wtSettings.getSetting('rowHeaders');
-    const fixedColumnsStart = this.wtSettings.getSetting('fixedColumnsStart');
-    const totalRows = this.wtSettings.getSetting('totalRows');
+    const rowHeaders = wtSettings.getSetting('rowHeaders');
+    const fixedColumnsStart = wtSettings.getSetting('fixedColumnsStart');
+    const totalRows = wtSettings.getSetting('totalRows');
+    const preventVerticalOverflow = wtSettings.getSetting('preventOverflow') === 'vertical';
     if (totalRows) {
       removeClass(masterParent, 'emptyRows');
     } else {
       addClass(masterParent, 'emptyRows');
     }
     let positionChanged = false;
-    if (fixedColumnsStart && !rowHeaders.length) {
-      // "innerBorderLeft" is for backward compatibility
-      addClass(masterParent, 'innerBorderLeft innerBorderInlineStart');
-    } else if (!fixedColumnsStart && rowHeaders.length) {
-      const previousState = hasClass(masterParent, 'innerBorderInlineStart');
-      if (position) {
+    if (!preventVerticalOverflow) {
+      if (fixedColumnsStart && !rowHeaders.length) {
+        // "innerBorderLeft" is for backward compatibility
         addClass(masterParent, 'innerBorderLeft innerBorderInlineStart');
-        positionChanged = !previousState;
-      } else {
-        removeClass(masterParent, 'innerBorderLeft innerBorderInlineStart');
-        positionChanged = previousState;
+      } else if (!fixedColumnsStart && rowHeaders.length) {
+        const previousState = hasClass(masterParent, 'innerBorderInlineStart');
+        if (position) {
+          addClass(masterParent, 'innerBorderLeft innerBorderInlineStart');
+          positionChanged = !previousState;
+        } else {
+          removeClass(masterParent, 'innerBorderLeft innerBorderInlineStart');
+          positionChanged = previousState;
+        }
       }
     }
     return positionChanged;

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

@@ -62,7 +62,7 @@ class TopOverlay extends _base.Overlay {
    * @returns {boolean}
    */
   resetFixedPosition() {
-    if (!this.needFullRender || !this.wot.wtTable.holder.parentNode) {
+    if (!this.needFullRender || !this.shouldBeRendered() || !this.wot.wtTable.holder.parentNode) {
       // removed from DOM
       return false;
     }
@@ -150,14 +150,11 @@ class TopOverlay extends _base.Overlay {
   }
 
   /**
-   * Adjust overlay root element, childs and master table element sizes (width, height).
-   *
-   * @param {boolean} [force=false] When `true`, it adjusts the DOM nodes sizes for that overlay.
+   * Adjust overlay root element, children and master table element sizes (width, height).
    */
   adjustElementsSize() {
-    let force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     this.updateTrimmingContainer();
-    if (this.needFullRender || force) {
+    if (this.needFullRender) {
       this.adjustRootElementSize();
       this.adjustRootChildrenSize();
     }
@@ -349,22 +346,26 @@ class TopOverlay extends _base.Overlay {
    */
   adjustHeaderBordersPosition(position) {
     let skipInnerBorderAdjusting = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    const {
+      wtSettings
+    } = this;
     const masterParent = this.wot.wtTable.holder.parentNode;
-    const totalColumns = this.wtSettings.getSetting('totalColumns');
+    const totalColumns = wtSettings.getSetting('totalColumns');
+    const preventHorizontalOverflow = wtSettings.getSetting('preventOverflow') === 'horizontal';
     if (totalColumns) {
       (0, _element.removeClass)(masterParent, 'emptyColumns');
     } else {
       (0, _element.addClass)(masterParent, 'emptyColumns');
     }
     let positionChanged = false;
-    if (!skipInnerBorderAdjusting) {
-      const fixedRowsTop = this.wtSettings.getSetting('fixedRowsTop');
+    if (!skipInnerBorderAdjusting && !preventHorizontalOverflow) {
+      const fixedRowsTop = wtSettings.getSetting('fixedRowsTop');
       const areFixedRowsTopChanged = this.cachedFixedRowsTop !== fixedRowsTop;
-      const columnHeaders = this.wtSettings.getSetting('columnHeaders');
+      const columnHeaders = wtSettings.getSetting('columnHeaders');
       if ((areFixedRowsTopChanged || fixedRowsTop === 0) && columnHeaders.length > 0) {
         const previousState = (0, _element.hasClass)(masterParent, 'innerBorderTop');
-        this.cachedFixedRowsTop = this.wtSettings.getSetting('fixedRowsTop');
-        if (position || this.wtSettings.getSetting('totalRows') === 0) {
+        this.cachedFixedRowsTop = wtSettings.getSetting('fixedRowsTop');
+        if (position || wtSettings.getSetting('totalRows') === 0) {
           (0, _element.addClass)(masterParent, 'innerBorderTop');
           positionChanged = !previousState;
         } else {

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

@@ -58,7 +58,7 @@ export class TopOverlay extends Overlay {
    * @returns {boolean}
    */
   resetFixedPosition() {
-    if (!this.needFullRender || !this.wot.wtTable.holder.parentNode) {
+    if (!this.needFullRender || !this.shouldBeRendered() || !this.wot.wtTable.holder.parentNode) {
       // removed from DOM
       return false;
     }
@@ -146,14 +146,11 @@ export class TopOverlay extends Overlay {
   }
 
   /**
-   * Adjust overlay root element, childs and master table element sizes (width, height).
-   *
-   * @param {boolean} [force=false] When `true`, it adjusts the DOM nodes sizes for that overlay.
+   * Adjust overlay root element, children and master table element sizes (width, height).
    */
   adjustElementsSize() {
-    let force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
     this.updateTrimmingContainer();
-    if (this.needFullRender || force) {
+    if (this.needFullRender) {
       this.adjustRootElementSize();
       this.adjustRootChildrenSize();
     }
@@ -345,22 +342,26 @@ export class TopOverlay extends Overlay {
    */
   adjustHeaderBordersPosition(position) {
     let skipInnerBorderAdjusting = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    const {
+      wtSettings
+    } = this;
     const masterParent = this.wot.wtTable.holder.parentNode;
-    const totalColumns = this.wtSettings.getSetting('totalColumns');
+    const totalColumns = wtSettings.getSetting('totalColumns');
+    const preventHorizontalOverflow = wtSettings.getSetting('preventOverflow') === 'horizontal';
     if (totalColumns) {
       removeClass(masterParent, 'emptyColumns');
     } else {
       addClass(masterParent, 'emptyColumns');
     }
     let positionChanged = false;
-    if (!skipInnerBorderAdjusting) {
-      const fixedRowsTop = this.wtSettings.getSetting('fixedRowsTop');
+    if (!skipInnerBorderAdjusting && !preventHorizontalOverflow) {
+      const fixedRowsTop = wtSettings.getSetting('fixedRowsTop');
       const areFixedRowsTopChanged = this.cachedFixedRowsTop !== fixedRowsTop;
-      const columnHeaders = this.wtSettings.getSetting('columnHeaders');
+      const columnHeaders = wtSettings.getSetting('columnHeaders');
       if ((areFixedRowsTopChanged || fixedRowsTop === 0) && columnHeaders.length > 0) {
         const previousState = hasClass(masterParent, 'innerBorderTop');
-        this.cachedFixedRowsTop = this.wtSettings.getSetting('fixedRowsTop');
-        if (position || this.wtSettings.getSetting('totalRows') === 0) {
+        this.cachedFixedRowsTop = wtSettings.getSetting('fixedRowsTop');
+        if (position || wtSettings.getSetting('totalRows') === 0) {
           addClass(masterParent, 'innerBorderTop');
           positionChanged = !previousState;
         } else {