handsontable 18.0.0 → 18.1.0-rc1

package/3rdparty/walkontable/src/{scroll.js → scroll/scroll.js}

@@ -2,30 +2,82 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "default", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get createScrollDeps () {
+        return createScrollDeps;
+    },
+    get default () {
         return _default;
     }
 });
-const _element = require("../../../helpers/dom/element");
-const _object = require("../../../helpers/object");
+const _object = require("../../../../helpers/object");
+const _element = require("../../../../helpers/dom/element");
 function _check_private_redeclaration(obj, privateCollection) {
     if (privateCollection.has(obj)) {
         throw new TypeError("Cannot initialize the same private elements twice on an object");
     }
 }
-function _class_private_method_get(receiver, privateSet, fn) {
-    if (!privateSet.has(receiver)) {
-        throw new TypeError("attempted to get private field on non-instance");
+function _class_apply_descriptor_get(receiver, descriptor) {
+    if (descriptor.get) return descriptor.get.call(receiver);
+    return descriptor.value;
+}
+function _class_apply_descriptor_set(receiver, descriptor, value) {
+    if (descriptor.set) descriptor.set.call(receiver, value);
+    else {
+        if (!descriptor.writable) {
+            throw new TypeError("attempted to set read only private field");
+        }
+        descriptor.value = value;
     }
+}
+function _class_extract_field_descriptor(receiver, privateMap, action) {
+    if (!privateMap.has(receiver)) throw new TypeError("attempted to " + action + " private field on non-instance");
+    return privateMap.get(receiver);
+}
+function _class_private_field_get(receiver, privateMap) {
+    var descriptor = _class_extract_field_descriptor(receiver, privateMap, "get");
+    return _class_apply_descriptor_get(receiver, descriptor);
+}
+function _class_private_field_init(obj, privateMap, value) {
+    _check_private_redeclaration(obj, privateMap);
+    privateMap.set(obj, value);
+}
+function _class_private_field_set(receiver, privateMap, value) {
+    var descriptor = _class_extract_field_descriptor(receiver, privateMap, "set");
+    _class_apply_descriptor_set(receiver, descriptor, value);
+    return value;
+}
+function _class_private_method_get(receiver, privateSet, fn) {
+    if (!privateSet.has(receiver)) throw new TypeError("attempted to get private field on non-instance");
     return fn;
 }
 function _class_private_method_init(obj, privateSet) {
     _check_private_redeclaration(obj, privateSet);
     privateSet.add(obj);
 }
+function createScrollDeps(ctx) {
+    return {
+        wtSettings: ctx.wtSettings,
+        rootWindow: ctx.rootWindow,
+        geometryReader: ctx.geometryReader,
+        isDrawn: ctx.isDrawn,
+        getWtTable: ctx.getWtTable,
+        getWtViewport: ctx.getWtViewport,
+        getTopOverlay: ctx.getTopOverlay,
+        getInlineStartOverlay: ctx.getInlineStartOverlay
+    };
+}
 var /**
+   * The Scroll module dependencies.
+   *
+   * @type {ScrollDeps}
+   */ _deps = /*#__PURE__*/ new WeakMap(), /**
    * Get last visible column based on virtual dom and how table is visible in browser window viewport.
    *
    * @param {number} lastColumnIndex The last visible column index.
@@ -67,17 +119,19 @@ var /**
    * the table. When `'auto'`, the viewport is scrolled only when the column is outside of the viewport.
    * @returns {boolean}
    */ scrollViewportHorizontally(column, snapping = 'auto') {
-        const { drawn, totalColumns } = this.dataAccessObject;
-        if (!drawn) {
+        const { wtSettings } = _class_private_field_get(this, _deps);
+        if (!_class_private_field_get(this, _deps).isDrawn()) {
             return false;
         }
+        const totalColumns = wtSettings.getSetting('totalColumns');
         const snappingObject = (0, _object.createObjectPropListener)(snapping);
-        column = this.dataAccessObject.wtSettings.getSetting('onBeforeViewportScrollHorizontally', column, snappingObject);
+        column = wtSettings.getSetting('onBeforeViewportScrollHorizontally', column, snappingObject);
         if (!Number.isInteger(column) || column < 0 || column > totalColumns) {
             return false;
         }
         snapping = snappingObject.value;
-        const { fixedColumnsStart, inlineStartOverlay } = this.dataAccessObject;
+        const fixedColumnsStart = wtSettings.getSetting('fixedColumnsStart');
+        const inlineStartOverlay = _class_private_field_get(this, _deps).getInlineStartOverlay();
         const autoSnapping = snapping === 'auto';
         // for auto-snapping do not scroll the viewport when the columns points to the overlays
         if (autoSnapping && column < fixedColumnsStart) {
@@ -103,17 +157,20 @@ var /**
    * the viewport.
    * @returns {boolean}
    */ scrollViewportVertically(row, snapping = 'auto') {
-        const { drawn, totalRows } = this.dataAccessObject;
-        if (!drawn) {
+        const { wtSettings } = _class_private_field_get(this, _deps);
+        if (!_class_private_field_get(this, _deps).isDrawn()) {
             return false;
         }
+        const totalRows = wtSettings.getSetting('totalRows');
         const snappingObject = (0, _object.createObjectPropListener)(snapping);
-        row = this.dataAccessObject.wtSettings.getSetting('onBeforeViewportScrollVertically', row, snappingObject);
+        row = wtSettings.getSetting('onBeforeViewportScrollVertically', row, snappingObject);
         if (!Number.isInteger(row) || row < 0 || row > totalRows) {
             return false;
         }
         snapping = snappingObject.value;
-        const { fixedRowsBottom, fixedRowsTop, topOverlay } = this.dataAccessObject;
+        const fixedRowsBottom = wtSettings.getSetting('fixedRowsBottom');
+        const fixedRowsTop = wtSettings.getSetting('fixedRowsTop');
+        const topOverlay = _class_private_field_get(this, _deps).getTopOverlay();
         const autoSnapping = snapping === 'auto';
         // for auto-snapping do not scroll the viewport when the rows points to the overlays
         if (autoSnapping && (row < fixedRowsTop || row > totalRows - fixedRowsBottom - 1)) {
@@ -134,83 +191,91 @@ var /**
    *
    * @returns {number}
    */ getFirstVisibleRow() {
-        return this.dataAccessObject.wtTable.getFirstVisibleRow();
+        return _class_private_field_get(this, _deps).getWtTable().getFirstVisibleRow();
     }
     /**
    * Get last visible row based on virtual dom and how table is visible in browser window viewport.
    *
    * @returns {number}
    */ getLastVisibleRow() {
-        return _class_private_method_get(this, _getLastRowIndex, getLastRowIndex).call(this, this.dataAccessObject.wtTable.getLastVisibleRow());
+        return _class_private_method_get(this, _getLastRowIndex, getLastRowIndex).call(this, _class_private_field_get(this, _deps).getWtTable().getLastVisibleRow());
     }
     /**
    * Get first partially visible row based on virtual dom and how table is visible in browser window viewport.
    *
    * @returns {number}
    */ getFirstPartiallyVisibleRow() {
-        return this.dataAccessObject.wtTable.getFirstPartiallyVisibleRow();
+        return _class_private_field_get(this, _deps).getWtTable().getFirstPartiallyVisibleRow();
     }
     /**
    * Get last visible row based on virtual dom and how table is visible in browser window viewport.
    *
    * @returns {number}
    */ getLastPartiallyVisibleRow() {
-        return _class_private_method_get(this, _getLastRowIndex, getLastRowIndex).call(this, this.dataAccessObject.wtTable.getLastPartiallyVisibleRow());
+        return _class_private_method_get(this, _getLastRowIndex, getLastRowIndex).call(this, _class_private_field_get(this, _deps).getWtTable().getLastPartiallyVisibleRow());
     }
     /**
    * Get first visible column based on virtual dom and how table is visible in browser window viewport.
    *
    * @returns {number}
    */ getFirstVisibleColumn() {
-        return this.dataAccessObject.wtTable.getFirstVisibleColumn();
+        return _class_private_field_get(this, _deps).getWtTable().getFirstVisibleColumn();
     }
     /**
    * Get last visible column based on virtual dom and how table is visible in browser window viewport.
    *
    * @returns {number}
    */ getLastVisibleColumn() {
-        return _class_private_method_get(this, _getLastColumnIndex, getLastColumnIndex).call(this, this.dataAccessObject.wtTable.getLastVisibleColumn());
+        return _class_private_method_get(this, _getLastColumnIndex, getLastColumnIndex).call(this, _class_private_field_get(this, _deps).getWtTable().getLastVisibleColumn());
     }
     /**
    * Get first partially visible column based on virtual dom and how table is visible in browser window viewport.
    *
    * @returns {number}
    */ getFirstPartiallyVisibleColumn() {
-        return this.dataAccessObject.wtTable.getFirstPartiallyVisibleColumn();
+        return _class_private_field_get(this, _deps).getWtTable().getFirstPartiallyVisibleColumn();
     }
     /**
    * Get last partially visible column based on virtual dom and how table is visible in browser window viewport.
    *
    * @returns {number}
    */ getLastPartiallyVisibleColumn() {
-        return _class_private_method_get(this, _getLastColumnIndex, getLastColumnIndex).call(this, this.dataAccessObject.wtTable.getLastPartiallyVisibleColumn());
+        return _class_private_method_get(this, _getLastColumnIndex, getLastColumnIndex).call(this, _class_private_field_get(this, _deps).getWtTable().getLastPartiallyVisibleColumn());
     }
     /**
-   * @param {ScrollDao} dataAccessObject Tha data access object.
-   */ constructor(dataAccessObject){
+   * @param {ScrollDeps} deps The Scroll module dependencies.
+   */ constructor(deps){
         _class_private_method_init(this, _getLastColumnIndex);
         _class_private_method_init(this, _getLastRowIndex);
-        this.dataAccessObject = dataAccessObject;
+        _class_private_field_init(this, _deps, {
+            writable: true,
+            value: void 0
+        });
+        _class_private_field_set(this, _deps, deps);
     }
 }
 function getLastColumnIndex(lastColumnIndex) {
-    const { wtSettings, inlineStartOverlay, wtTable, wtViewport, totalColumns, rootWindow } = this.dataAccessObject;
+    const { wtSettings, rootWindow, geometryReader } = _class_private_field_get(this, _deps);
+    const inlineStartOverlay = _class_private_field_get(this, _deps).getInlineStartOverlay();
+    const wtTable = _class_private_field_get(this, _deps).getWtTable();
+    const wtViewport = _class_private_field_get(this, _deps).getWtViewport();
+    const totalColumns = wtSettings.getSetting('totalColumns');
     if (inlineStartOverlay.mainTableScrollableElement === rootWindow) {
         const isRtl = wtSettings.getSetting('rtlMode');
         let inlineStartRootElementOffset = null;
         if (isRtl) {
-            const tableRect = wtTable.TABLE.getBoundingClientRect();
+            const tableRect = geometryReader.getBoundingClientRect(wtTable.TABLE);
             const rootDocument = rootWindow.document;
-            const docOffsetWidth = rootDocument.documentElement.offsetWidth;
+            const docOffsetWidth = geometryReader.offsetWidth(rootDocument.documentElement);
             inlineStartRootElementOffset = Math.abs(tableRect.right - docOffsetWidth);
         } else {
-            const rootElementOffset = (0, _element.offset)(wtTable.wtRootElement);
+            const rootElementOffset = geometryReader.offset(wtTable.wtRootElement);
             inlineStartRootElementOffset = rootElementOffset.left;
         }
         const windowScrollLeft = Math.abs((0, _element.getScrollLeft)(rootWindow, rootWindow));
         // Only calculate lastColumnIndex when table didn't filled (from right) whole viewport space
         if (inlineStartRootElementOffset > windowScrollLeft) {
-            const windowWidth = (0, _element.innerWidth)(rootWindow);
+            const windowWidth = geometryReader.innerWidth(rootWindow);
             let columnsWidth = wtViewport.getRowHeaderWidth();
             for(let column = 1; column <= totalColumns; column++){
                 columnsWidth += inlineStartOverlay.sumCellSizes(column - 1, column);
@@ -225,13 +290,17 @@ function getLastColumnIndex(lastColumnIndex) {
     return lastColumnIndex;
 }
 function getLastRowIndex(lastRowIndex) {
-    const { topOverlay, wtTable, wtViewport, totalRows, rootWindow } = this.dataAccessObject;
+    const { wtSettings, rootWindow, geometryReader } = _class_private_field_get(this, _deps);
+    const topOverlay = _class_private_field_get(this, _deps).getTopOverlay();
+    const wtTable = _class_private_field_get(this, _deps).getWtTable();
+    const wtViewport = _class_private_field_get(this, _deps).getWtViewport();
+    const totalRows = wtSettings.getSetting('totalRows');
     if (topOverlay.mainTableScrollableElement === rootWindow) {
-        const rootElementOffset = (0, _element.offset)(wtTable.wtRootElement);
+        const rootElementOffset = geometryReader.offset(wtTable.wtRootElement);
         const windowScrollTop = (0, _element.getScrollTop)(rootWindow, rootWindow);
         // Only calculate lastRowIndex when table didn't filled (from bottom) whole viewport space
         if (rootElementOffset.top > windowScrollTop) {
-            const windowHeight = (0, _element.innerHeight)(rootWindow);
+            const windowHeight = geometryReader.innerHeight(rootWindow);
             let rowsHeight = wtViewport.getColumnHeaderHeight();
             for(let row = 1; row <= totalRows; row++){
                 rowsHeight += topOverlay.sumCellSizes(row - 1, row);

package/3rdparty/walkontable/src/{scroll.mjs → scroll/scroll.mjs}

@@ -3,19 +3,72 @@ function _check_private_redeclaration(obj, privateCollection) {
         throw new TypeError("Cannot initialize the same private elements twice on an object");
     }
 }
-function _class_private_method_get(receiver, privateSet, fn) {
-    if (!privateSet.has(receiver)) {
-        throw new TypeError("attempted to get private field on non-instance");
+function _class_apply_descriptor_get(receiver, descriptor) {
+    if (descriptor.get) return descriptor.get.call(receiver);
+    return descriptor.value;
+}
+function _class_apply_descriptor_set(receiver, descriptor, value) {
+    if (descriptor.set) descriptor.set.call(receiver, value);
+    else {
+        if (!descriptor.writable) {
+            throw new TypeError("attempted to set read only private field");
+        }
+        descriptor.value = value;
     }
+}
+function _class_extract_field_descriptor(receiver, privateMap, action) {
+    if (!privateMap.has(receiver)) throw new TypeError("attempted to " + action + " private field on non-instance");
+    return privateMap.get(receiver);
+}
+function _class_private_field_get(receiver, privateMap) {
+    var descriptor = _class_extract_field_descriptor(receiver, privateMap, "get");
+    return _class_apply_descriptor_get(receiver, descriptor);
+}
+function _class_private_field_init(obj, privateMap, value) {
+    _check_private_redeclaration(obj, privateMap);
+    privateMap.set(obj, value);
+}
+function _class_private_field_set(receiver, privateMap, value) {
+    var descriptor = _class_extract_field_descriptor(receiver, privateMap, "set");
+    _class_apply_descriptor_set(receiver, descriptor, value);
+    return value;
+}
+function _class_private_method_get(receiver, privateSet, fn) {
+    if (!privateSet.has(receiver)) throw new TypeError("attempted to get private field on non-instance");
     return fn;
 }
 function _class_private_method_init(obj, privateSet) {
     _check_private_redeclaration(obj, privateSet);
     privateSet.add(obj);
 }
-import { innerHeight, innerWidth, getScrollLeft, getScrollTop, offset } from '../../../helpers/dom/element.mjs';
-import { createObjectPropListener } from '../../../helpers/object.mjs';
+import { createObjectPropListener } from '../../../../helpers/object.mjs';
+import { getScrollLeft, getScrollTop } from '../../../../helpers/dom/element.mjs';
+/**
+ * Assembles the Scroll module's dependencies from the engine composition context.
+ *
+ * This factory is the single source of truth for what Scroll depends on: adding or removing a
+ * dependency is a one-line edit here, and the `ScrollDeps` type is inferred from the return value,
+ * so there is no separate hand-written interface to keep in sync.
+ *
+ * @param {EngineContext} ctx The engine composition context.
+ * @returns {object} The Scroll dependency set.
+ */ export function createScrollDeps(ctx) {
+    return {
+        wtSettings: ctx.wtSettings,
+        rootWindow: ctx.rootWindow,
+        geometryReader: ctx.geometryReader,
+        isDrawn: ctx.isDrawn,
+        getWtTable: ctx.getWtTable,
+        getWtViewport: ctx.getWtViewport,
+        getTopOverlay: ctx.getTopOverlay,
+        getInlineStartOverlay: ctx.getInlineStartOverlay
+    };
+}
 var /**
+   * The Scroll module dependencies.
+   *
+   * @type {ScrollDeps}
+   */ _deps = /*#__PURE__*/ new WeakMap(), /**
    * Get last visible column based on virtual dom and how table is visible in browser window viewport.
    *
    * @param {number} lastColumnIndex The last visible column index.
@@ -57,17 +110,19 @@ var /**
    * the table. When `'auto'`, the viewport is scrolled only when the column is outside of the viewport.
    * @returns {boolean}
    */ scrollViewportHorizontally(column, snapping = 'auto') {
-        const { drawn, totalColumns } = this.dataAccessObject;
-        if (!drawn) {
+        const { wtSettings } = _class_private_field_get(this, _deps);
+        if (!_class_private_field_get(this, _deps).isDrawn()) {
             return false;
         }
+        const totalColumns = wtSettings.getSetting('totalColumns');
         const snappingObject = createObjectPropListener(snapping);
-        column = this.dataAccessObject.wtSettings.getSetting('onBeforeViewportScrollHorizontally', column, snappingObject);
+        column = wtSettings.getSetting('onBeforeViewportScrollHorizontally', column, snappingObject);
         if (!Number.isInteger(column) || column < 0 || column > totalColumns) {
             return false;
         }
         snapping = snappingObject.value;
-        const { fixedColumnsStart, inlineStartOverlay } = this.dataAccessObject;
+        const fixedColumnsStart = wtSettings.getSetting('fixedColumnsStart');
+        const inlineStartOverlay = _class_private_field_get(this, _deps).getInlineStartOverlay();
         const autoSnapping = snapping === 'auto';
         // for auto-snapping do not scroll the viewport when the columns points to the overlays
         if (autoSnapping && column < fixedColumnsStart) {
@@ -93,17 +148,20 @@ var /**
    * the viewport.
    * @returns {boolean}
    */ scrollViewportVertically(row, snapping = 'auto') {
-        const { drawn, totalRows } = this.dataAccessObject;
-        if (!drawn) {
+        const { wtSettings } = _class_private_field_get(this, _deps);
+        if (!_class_private_field_get(this, _deps).isDrawn()) {
             return false;
         }
+        const totalRows = wtSettings.getSetting('totalRows');
         const snappingObject = createObjectPropListener(snapping);
-        row = this.dataAccessObject.wtSettings.getSetting('onBeforeViewportScrollVertically', row, snappingObject);
+        row = wtSettings.getSetting('onBeforeViewportScrollVertically', row, snappingObject);
         if (!Number.isInteger(row) || row < 0 || row > totalRows) {
             return false;
         }
         snapping = snappingObject.value;
-        const { fixedRowsBottom, fixedRowsTop, topOverlay } = this.dataAccessObject;
+        const fixedRowsBottom = wtSettings.getSetting('fixedRowsBottom');
+        const fixedRowsTop = wtSettings.getSetting('fixedRowsTop');
+        const topOverlay = _class_private_field_get(this, _deps).getTopOverlay();
         const autoSnapping = snapping === 'auto';
         // for auto-snapping do not scroll the viewport when the rows points to the overlays
         if (autoSnapping && (row < fixedRowsTop || row > totalRows - fixedRowsBottom - 1)) {
@@ -124,83 +182,91 @@ var /**
    *
    * @returns {number}
    */ getFirstVisibleRow() {
-        return this.dataAccessObject.wtTable.getFirstVisibleRow();
+        return _class_private_field_get(this, _deps).getWtTable().getFirstVisibleRow();
     }
     /**
    * Get last visible row based on virtual dom and how table is visible in browser window viewport.
    *
    * @returns {number}
    */ getLastVisibleRow() {
-        return _class_private_method_get(this, _getLastRowIndex, getLastRowIndex).call(this, this.dataAccessObject.wtTable.getLastVisibleRow());
+        return _class_private_method_get(this, _getLastRowIndex, getLastRowIndex).call(this, _class_private_field_get(this, _deps).getWtTable().getLastVisibleRow());
     }
     /**
    * Get first partially visible row based on virtual dom and how table is visible in browser window viewport.
    *
    * @returns {number}
    */ getFirstPartiallyVisibleRow() {
-        return this.dataAccessObject.wtTable.getFirstPartiallyVisibleRow();
+        return _class_private_field_get(this, _deps).getWtTable().getFirstPartiallyVisibleRow();
     }
     /**
    * Get last visible row based on virtual dom and how table is visible in browser window viewport.
    *
    * @returns {number}
    */ getLastPartiallyVisibleRow() {
-        return _class_private_method_get(this, _getLastRowIndex, getLastRowIndex).call(this, this.dataAccessObject.wtTable.getLastPartiallyVisibleRow());
+        return _class_private_method_get(this, _getLastRowIndex, getLastRowIndex).call(this, _class_private_field_get(this, _deps).getWtTable().getLastPartiallyVisibleRow());
     }
     /**
    * Get first visible column based on virtual dom and how table is visible in browser window viewport.
    *
    * @returns {number}
    */ getFirstVisibleColumn() {
-        return this.dataAccessObject.wtTable.getFirstVisibleColumn();
+        return _class_private_field_get(this, _deps).getWtTable().getFirstVisibleColumn();
     }
     /**
    * Get last visible column based on virtual dom and how table is visible in browser window viewport.
    *
    * @returns {number}
    */ getLastVisibleColumn() {
-        return _class_private_method_get(this, _getLastColumnIndex, getLastColumnIndex).call(this, this.dataAccessObject.wtTable.getLastVisibleColumn());
+        return _class_private_method_get(this, _getLastColumnIndex, getLastColumnIndex).call(this, _class_private_field_get(this, _deps).getWtTable().getLastVisibleColumn());
     }
     /**
    * Get first partially visible column based on virtual dom and how table is visible in browser window viewport.
    *
    * @returns {number}
    */ getFirstPartiallyVisibleColumn() {
-        return this.dataAccessObject.wtTable.getFirstPartiallyVisibleColumn();
+        return _class_private_field_get(this, _deps).getWtTable().getFirstPartiallyVisibleColumn();
     }
     /**
    * Get last partially visible column based on virtual dom and how table is visible in browser window viewport.
    *
    * @returns {number}
    */ getLastPartiallyVisibleColumn() {
-        return _class_private_method_get(this, _getLastColumnIndex, getLastColumnIndex).call(this, this.dataAccessObject.wtTable.getLastPartiallyVisibleColumn());
+        return _class_private_method_get(this, _getLastColumnIndex, getLastColumnIndex).call(this, _class_private_field_get(this, _deps).getWtTable().getLastPartiallyVisibleColumn());
     }
     /**
-   * @param {ScrollDao} dataAccessObject Tha data access object.
-   */ constructor(dataAccessObject){
+   * @param {ScrollDeps} deps The Scroll module dependencies.
+   */ constructor(deps){
         _class_private_method_init(this, _getLastColumnIndex);
         _class_private_method_init(this, _getLastRowIndex);
-        this.dataAccessObject = dataAccessObject;
+        _class_private_field_init(this, _deps, {
+            writable: true,
+            value: void 0
+        });
+        _class_private_field_set(this, _deps, deps);
     }
 }
 function getLastColumnIndex(lastColumnIndex) {
-    const { wtSettings, inlineStartOverlay, wtTable, wtViewport, totalColumns, rootWindow } = this.dataAccessObject;
+    const { wtSettings, rootWindow, geometryReader } = _class_private_field_get(this, _deps);
+    const inlineStartOverlay = _class_private_field_get(this, _deps).getInlineStartOverlay();
+    const wtTable = _class_private_field_get(this, _deps).getWtTable();
+    const wtViewport = _class_private_field_get(this, _deps).getWtViewport();
+    const totalColumns = wtSettings.getSetting('totalColumns');
     if (inlineStartOverlay.mainTableScrollableElement === rootWindow) {
         const isRtl = wtSettings.getSetting('rtlMode');
         let inlineStartRootElementOffset = null;
         if (isRtl) {
-            const tableRect = wtTable.TABLE.getBoundingClientRect();
+            const tableRect = geometryReader.getBoundingClientRect(wtTable.TABLE);
             const rootDocument = rootWindow.document;
-            const docOffsetWidth = rootDocument.documentElement.offsetWidth;
+            const docOffsetWidth = geometryReader.offsetWidth(rootDocument.documentElement);
             inlineStartRootElementOffset = Math.abs(tableRect.right - docOffsetWidth);
         } else {
-            const rootElementOffset = offset(wtTable.wtRootElement);
+            const rootElementOffset = geometryReader.offset(wtTable.wtRootElement);
             inlineStartRootElementOffset = rootElementOffset.left;
         }
         const windowScrollLeft = Math.abs(getScrollLeft(rootWindow, rootWindow));
         // Only calculate lastColumnIndex when table didn't filled (from right) whole viewport space
         if (inlineStartRootElementOffset > windowScrollLeft) {
-            const windowWidth = innerWidth(rootWindow);
+            const windowWidth = geometryReader.innerWidth(rootWindow);
             let columnsWidth = wtViewport.getRowHeaderWidth();
             for(let column = 1; column <= totalColumns; column++){
                 columnsWidth += inlineStartOverlay.sumCellSizes(column - 1, column);
@@ -215,13 +281,17 @@ function getLastColumnIndex(lastColumnIndex) {
     return lastColumnIndex;
 }
 function getLastRowIndex(lastRowIndex) {
-    const { topOverlay, wtTable, wtViewport, totalRows, rootWindow } = this.dataAccessObject;
+    const { wtSettings, rootWindow, geometryReader } = _class_private_field_get(this, _deps);
+    const topOverlay = _class_private_field_get(this, _deps).getTopOverlay();
+    const wtTable = _class_private_field_get(this, _deps).getWtTable();
+    const wtViewport = _class_private_field_get(this, _deps).getWtViewport();
+    const totalRows = wtSettings.getSetting('totalRows');
     if (topOverlay.mainTableScrollableElement === rootWindow) {
-        const rootElementOffset = offset(wtTable.wtRootElement);
+        const rootElementOffset = geometryReader.offset(wtTable.wtRootElement);
         const windowScrollTop = getScrollTop(rootWindow, rootWindow);
         // Only calculate lastRowIndex when table didn't filled (from bottom) whole viewport space
         if (rootElementOffset.top > windowScrollTop) {
-            const windowHeight = innerHeight(rootWindow);
+            const windowHeight = geometryReader.innerHeight(rootWindow);
             let rowsHeight = wtViewport.getColumnHeaderHeight();
             for(let row = 1; row <= totalRows; row++){
                 rowsHeight += topOverlay.sumCellSizes(row - 1, row);