handsontable 16.1.1 → 16.2.0-next-90d1117-20251117

package/plugins/pagination/pagination.js

@@ -2,6 +2,8 @@
 
 exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
+require("core-js/modules/es.array.at.js");
+require("core-js/modules/es.string.at-alternative.js");
 require("core-js/modules/esnext.iterator.constructor.js");
 require("core-js/modules/esnext.iterator.for-each.js");
 require("core-js/modules/esnext.iterator.map.js");
@@ -14,8 +16,6 @@ var _a11yAnnouncer = require("../../utils/a11yAnnouncer");
 var _strategies = require("./strategies");
 var _templateLiteralTag = require("../../helpers/templateLiteralTag");
 var _console = require("../../helpers/console");
-var _focusController2 = require("./focusController");
-var _focusDetector2 = require("../../utils/focusDetector");
 function _classPrivateMethodInitSpec(e, a) { _checkPrivateRedeclaration(e, a), a.add(e); }
 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"); }
@@ -24,7 +24,6 @@ function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a),
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 const PLUGIN_KEY = exports.PLUGIN_KEY = 'pagination';
 const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 900;
-const SHORTCUTS_GROUP = PLUGIN_KEY;
 const SHORTCUTS_CONTEXT_NAME = `plugin:${PLUGIN_KEY}`;
 const AUTO_PAGE_SIZE_WARNING = (0, _templateLiteralTag.toSingleLine)`The \`auto\` page size setting requires the \`autoRowSize\`\x20
   plugin to be enabled. Set the \`autoRowSize: true\` in the configuration to ensure correct behavior.`;
@@ -110,15 +109,13 @@ var _ui = /*#__PURE__*/new WeakMap();
 var _calcStrategy = /*#__PURE__*/new WeakMap();
 var _internalExecutionCall = /*#__PURE__*/new WeakMap();
 var _internalRenderCall = /*#__PURE__*/new WeakMap();
-var _focusController = /*#__PURE__*/new WeakMap();
-var _focusDetector = /*#__PURE__*/new WeakMap();
 var _Pagination_brand = /*#__PURE__*/new WeakSet();
 var _onIndexCacheUpdate = /*#__PURE__*/new WeakMap();
 class Pagination extends _base.BasePlugin {
   constructor() {
     super(...arguments);
     /**
-     * Bind the events used by the plugin.
+     * Updates the visibility state of the pagination sections based on the current settings.
      */
     _classPrivateMethodInitSpec(this, _Pagination_brand);
     /**
@@ -168,18 +165,6 @@ class Pagination extends _base.BasePlugin {
      * @type {boolean}
      */
     _classPrivateFieldInitSpec(this, _internalRenderCall, false);
-    /**
-     * Pagination focus controller instance.
-     *
-     * @type {PaginationController}
-     */
-    _classPrivateFieldInitSpec(this, _focusController, null);
-    /**
-     * Pagination focus detector instance.
-     *
-     * @type {object}
-     */
-    _classPrivateFieldInitSpec(this, _focusDetector, null);
     /**
      * IndexMapper cache update listener. Once the cache is updated, we need to recompute
      * the pagination state.
@@ -259,35 +244,8 @@ class Pagination extends _base.BasePlugin {
         a11yAnnouncer: message => (0, _a11yAnnouncer.announce)(message)
       }));
       _assertClassBrand(_Pagination_brand, this, _updateSectionsVisibilityState).call(this);
-      _classPrivateFieldGet(_ui, this).addLocalHook('firstPageClick', () => this.firstPage()).addLocalHook('prevPageClick', () => this.prevPage()).addLocalHook('nextPageClick', () => this.nextPage()).addLocalHook('lastPageClick', () => this.lastPage()).addLocalHook('pageSizeChange', pageSize => this.setPageSize(pageSize)).addLocalHook('focus', element => {
-        _classPrivateFieldGet(_focusController, this).setCurrentPage(_classPrivateFieldGet(_ui, this).getFocusableElements().indexOf(element));
-        this.hot.unlisten();
-        this.hot.getShortcutManager().setActiveContextName(SHORTCUTS_CONTEXT_NAME);
-        this.hot.listen();
-        _classPrivateFieldGet(_focusDetector, this).deactivate();
-      });
+      _classPrivateFieldGet(_ui, this).addLocalHook('firstPageClick', () => this.firstPage()).addLocalHook('prevPageClick', () => this.prevPage()).addLocalHook('nextPageClick', () => this.nextPage()).addLocalHook('lastPageClick', () => this.lastPage()).addLocalHook('pageSizeChange', pageSize => this.setPageSize(pageSize));
     }
-    if (!_classPrivateFieldGet(_focusController, this)) {
-      _classPrivateFieldSet(_focusController, this, (0, _focusController2.createPaginationFocusController)({
-        focusableElements: () => _classPrivateFieldGet(_ui, this).getFocusableElements()
-      }));
-    }
-    if (!_classPrivateFieldGet(_focusDetector, this)) {
-      _classPrivateFieldSet(_focusDetector, this, (0, _focusDetector2.installFocusDetector)(this.hot, _classPrivateFieldGet(_ui, this).getContainer(), {
-        onFocus: from => {
-          this.hot.getShortcutManager().setActiveContextName(SHORTCUTS_CONTEXT_NAME);
-          this.hot.listen();
-          if (from === 'from_above') {
-            _classPrivateFieldGet(_focusController, this).toFirstItem();
-          } else {
-            _classPrivateFieldGet(_focusController, this).toLastItem();
-          }
-          _classPrivateFieldGet(_focusDetector, this).deactivate();
-        }
-      }));
-    }
-    _assertClassBrand(_Pagination_brand, this, _registerEvents).call(this);
-    _assertClassBrand(_Pagination_brand, this, _registerShortcuts).call(this);
 
     // Place the onInit hook before others to make sure that the pagination state is computed
     // and applied to the index mapper before AutoColumnSize plugin begins calculate the column sizes.
@@ -351,37 +309,20 @@ class Pagination extends _base.BasePlugin {
       }
       return _assertClassBrand(_Pagination_brand, _this, _onAfterLanguageChange).call(_this, ...args);
     });
-    this.addHook('modifyRowHeight', function () {
+    this.addHook('beforeHeightChange', function () {
       for (var _len1 = arguments.length, args = new Array(_len1), _key1 = 0; _key1 < _len1; _key1++) {
         args[_key1] = arguments[_key1];
       }
-      return _assertClassBrand(_Pagination_brand, _this, _onModifyRowHeight).call(_this, ...args);
-    });
-    this.addHook('beforeHeightChange', function () {
-      for (var _len10 = arguments.length, args = new Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
-        args[_key10] = arguments[_key10];
-      }
       return _assertClassBrand(_Pagination_brand, _this, _onBeforeHeightChange).call(_this, ...args);
     });
     this.addHook('afterSetTheme', function () {
-      for (var _len11 = arguments.length, args = new Array(_len11), _key11 = 0; _key11 < _len11; _key11++) {
-        args[_key11] = arguments[_key11];
+      for (var _len10 = arguments.length, args = new Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
+        args[_key10] = arguments[_key10];
       }
       return _assertClassBrand(_Pagination_brand, _this, _onAfterSetTheme).call(_this, ...args);
     });
-    this.addHook('afterDialogShow', function () {
-      for (var _len12 = arguments.length, args = new Array(_len12), _key12 = 0; _key12 < _len12; _key12++) {
-        args[_key12] = arguments[_key12];
-      }
-      return _assertClassBrand(_Pagination_brand, _this, _onAfterDialogShow).call(_this, ...args);
-    });
-    this.addHook('beforeDialogHide', function () {
-      for (var _len13 = arguments.length, args = new Array(_len13), _key13 = 0; _key13 < _len13; _key13++) {
-        args[_key13] = arguments[_key13];
-      }
-      return _assertClassBrand(_Pagination_brand, _this, _onAfterDialogHide).call(_this, ...args);
-    });
     this.hot.rowIndexMapper.addLocalHook('cacheUpdated', _classPrivateFieldGet(_onIndexCacheUpdate, this));
+    _assertClassBrand(_Pagination_brand, this, _registerFocusScope).call(this);
     super.enablePlugin();
   }
 
@@ -400,11 +341,12 @@ class Pagination extends _base.BasePlugin {
    */
   disablePlugin() {
     this.hot.rowIndexMapper.removeLocalHook('cacheUpdated', _classPrivateFieldGet(_onIndexCacheUpdate, this)).unregisterMap(this.pluginName);
+    _assertClassBrand(_Pagination_brand, this, _unregisterFocusScope).call(this);
     _classPrivateFieldGet(_ui, this).destroy();
     _classPrivateFieldSet(_ui, this, null);
-    _assertClassBrand(_Pagination_brand, this, _unregisterShortcuts).call(this);
     super.disablePlugin();
   }
+
   /**
    * Gets the pagination current state. Returns an object with the following properties:
    *  - `currentPage`: The current page number.
@@ -660,11 +602,6 @@ class Pagination extends _base.BasePlugin {
     _classPrivateFieldGet(_ui, this).setNavigationSectionVisibility(false);
     this.hot.runHooks('afterPageNavigationVisibilityChange', false);
   }
-
-  /**
-   * Updates the visibility state of the pagination sections based on the current settings.
-   */
-
   /**
    * Destroys the plugin instance.
    */
@@ -678,59 +615,6 @@ class Pagination extends _base.BasePlugin {
   }
 }
 exports.Pagination = Pagination;
-function _registerEvents() {
-  // TODO: move to general focus manager module
-  this.eventManager.addEventListener(this.hot.rootDocument, 'mouseup', event => {
-    const container = _classPrivateFieldGet(_ui, this).getContainer();
-    if (!container.contains(event.target) && this.hot.getShortcutManager().getActiveContextName() === SHORTCUTS_CONTEXT_NAME) {
-      _classPrivateFieldGet(_focusDetector, this).activate();
-      _classPrivateFieldGet(_focusController, this).clear();
-      this.hot.getShortcutManager().setActiveContextName('grid');
-    }
-  });
-}
-/**
- * Register shortcuts responsible for navigating through the pagination.
- */
-function _registerShortcuts() {
-  var _manager$getContext;
-  const manager = this.hot.getShortcutManager();
-  const pluginContext = (_manager$getContext = manager.getContext(SHORTCUTS_CONTEXT_NAME)) !== null && _manager$getContext !== void 0 ? _manager$getContext : manager.addContext(SHORTCUTS_CONTEXT_NAME, 'global');
-  pluginContext.addShortcut({
-    keys: [['Shift', 'Tab'], ['Tab']],
-    preventDefault: false,
-    callback: event => {
-      let previousIndex = _classPrivateFieldGet(_focusController, this).getCurrentPage();
-      if (event.shiftKey) {
-        _classPrivateFieldGet(_focusController, this).toPreviousItem();
-        const currentPage = _classPrivateFieldGet(_focusController, this).getCurrentPage();
-        if (currentPage >= previousIndex) {
-          _assertClassBrand(_Pagination_brand, this, _unFocusPagination).call(this);
-          return;
-        }
-        previousIndex = currentPage;
-      } else {
-        _classPrivateFieldGet(_focusController, this).toNextItem();
-        const currentPage = _classPrivateFieldGet(_focusController, this).getCurrentPage();
-        if (currentPage <= previousIndex) {
-          _assertClassBrand(_Pagination_brand, this, _unFocusPagination).call(this);
-          return;
-        }
-        previousIndex = currentPage;
-      }
-      event.preventDefault();
-    },
-    group: SHORTCUTS_GROUP
-  });
-}
-/**
- * Unregister shortcuts responsible for navigating through the pagination.
- */
-function _unregisterShortcuts() {
-  const shortcutManager = this.hot.getShortcutManager();
-  const pluginContext = shortcutManager.getContext(SHORTCUTS_CONTEXT_NAME);
-  pluginContext.removeShortcutsByGroup(SHORTCUTS_GROUP);
-}
 function _updateSectionsVisibilityState() {
   if (this.getSetting('showPageSize')) {
     this.showPageSizeSection();
@@ -778,10 +662,10 @@ function _computeAndApplyState() {
       return view.getViewportHeight() - scrollbarWidth;
     },
     itemsSizeProvider: () => {
-      const defaultRowHeight = stylesHandler.getDefaultRowHeight();
       const rowHeights = this.hot.rowIndexMapper.getRenderableIndexes().map(physicalIndex => {
         var _this$hot$getRowHeigh;
-        return (_this$hot$getRowHeigh = this.hot.getRowHeight(this.hot.toVisualRow(physicalIndex))) !== null && _this$hot$getRowHeigh !== void 0 ? _this$hot$getRowHeigh : defaultRowHeight;
+        const visualRowIndex = this.hot.toVisualRow(physicalIndex);
+        return (_this$hot$getRowHeigh = this.hot.getRowHeight(visualRowIndex)) !== null && _this$hot$getRowHeigh !== void 0 ? _this$hot$getRowHeigh : stylesHandler.getDefaultRowHeight(visualRowIndex);
       });
       return rowHeights;
     }
@@ -808,11 +692,6 @@ function _computeAndApplyState() {
     ...paginationData,
     totalRenderedRows: renderableRowsLength
   });
-  if ((this.getSetting('showPageSize') || this.getSetting('showNavigation')) && paginationData.totalPages > 1) {
-    _classPrivateFieldGet(_focusDetector, this).activate();
-  } else {
-    _classPrivateFieldGet(_focusDetector, this).deactivate();
-  }
 }
 /**
  * Based on the external factors (like the scroll position of the table, size etc.) it computes
@@ -838,6 +717,31 @@ function _computeNeedsBorder() {
   } = this.getPaginationData();
   return view.getLastFullyVisibleRow() !== lastVisibleRowIndex;
 }
+/**
+ * Registers the focus scope for the pagination plugin.
+ */
+function _registerFocusScope() {
+  this.hot.getFocusScopeManager().registerScope(PLUGIN_KEY, _classPrivateFieldGet(_ui, this).getContainer(), {
+    shortcutsContextName: SHORTCUTS_CONTEXT_NAME,
+    runOnlyIf: () => this.getSetting('showPageSize') || this.getSetting('showNavigation'),
+    onActivate: focusSource => {
+      const focusableElements = _classPrivateFieldGet(_ui, this).getFocusableElements();
+      if (focusableElements.length > 0) {
+        if (focusSource === 'tab_from_above') {
+          focusableElements.at(0).focus();
+        } else if (focusSource === 'tab_from_below') {
+          focusableElements.at(-1).focus();
+        }
+      }
+    }
+  });
+}
+/**
+ * Unregisters the focus scope for the pagination plugin.
+ */
+function _unregisterFocusScope() {
+  this.hot.getFocusScopeManager().unregisterScope(PLUGIN_KEY);
+}
 /**
  * Called before the selection of columns or all table is made. It modifies the selection rows range
  * to the range of the current page.
@@ -912,27 +816,6 @@ function _onBeforePaste(pastedData, ranges) {
     pastedData.splice(0, rowsToRemove);
   });
 }
-/**
- * Called when the row height is modified. It adds 1px border top compensation for
- * the first row of the each page to make sure that the table's hider element
- * height is correctly calculated.
- *
- * @param {number | undefined} height Row height.
- * @param {number} row Visual row index.
- * @returns {number}
- */
-function _onModifyRowHeight(height, row) {
-  if (height === undefined || !_classPrivateFieldGet(_calcStrategy, this).getState(_classPrivateFieldGet(_currentPage, this))) {
-    return;
-  }
-  const {
-    firstVisibleRowIndex
-  } = this.getPaginationData();
-  if (row !== 0 && row === firstVisibleRowIndex) {
-    height += 1; // 1px border top compensation for the first row of the page.
-  }
-  return height;
-}
 /**
  * Called after the view is rendered. It recalculates the pagination state only when
  * the `pageSize` is set to `'auto'`. In this case, the plugin will compute the
@@ -1010,25 +893,4 @@ function _onAfterLanguageChange() {
  */
 function _onAfterSetTheme(themeName) {
   _classPrivateFieldGet(_ui, this).updateTheme(themeName);
-}
-/**
- * Unfocuses the pagination and sets the active context for the shortcuts.
- */
-function _unFocusPagination() {
-  _classPrivateFieldGet(_focusDetector, this).activate();
-  _classPrivateFieldGet(_focusController, this).clear();
-  this.hot.unlisten();
-  this.hot.getShortcutManager().setActiveContextName('grid');
-}
-/**
- * Called after the dialog is shown. It sets the active context for the shortcuts.
- */
-function _onAfterDialogShow() {
-  _classPrivateFieldGet(_focusDetector, this).deactivate();
-}
-/**
- * Called after the dialog is hidden. It sets the active context for the shortcuts.
- */
-function _onAfterDialogHide() {
-  _classPrivateFieldGet(_focusDetector, this).activate();
 }

package/plugins/pagination/pagination.mjs

@@ -1,4 +1,6 @@
 import "core-js/modules/es.error.cause.js";
+import "core-js/modules/es.array.at.js";
+import "core-js/modules/es.string.at-alternative.js";
 import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
@@ -17,11 +19,8 @@ import { announce } from "../../utils/a11yAnnouncer.mjs";
 import { createPaginatorStrategy } from "./strategies/index.mjs";
 import { toSingleLine } from "../../helpers/templateLiteralTag.mjs";
 import { warn } from "../../helpers/console.mjs";
-import { createPaginationFocusController } from "./focusController.mjs";
-import { installFocusDetector } from "../../utils/focusDetector.mjs";
 export const PLUGIN_KEY = 'pagination';
 export const PLUGIN_PRIORITY = 900;
-const SHORTCUTS_GROUP = PLUGIN_KEY;
 const SHORTCUTS_CONTEXT_NAME = `plugin:${PLUGIN_KEY}`;
 const AUTO_PAGE_SIZE_WARNING = toSingleLine`The \`auto\` page size setting requires the \`autoRowSize\`\x20
   plugin to be enabled. Set the \`autoRowSize: true\` in the configuration to ensure correct behavior.`;
@@ -107,15 +106,13 @@ var _ui = /*#__PURE__*/new WeakMap();
 var _calcStrategy = /*#__PURE__*/new WeakMap();
 var _internalExecutionCall = /*#__PURE__*/new WeakMap();
 var _internalRenderCall = /*#__PURE__*/new WeakMap();
-var _focusController = /*#__PURE__*/new WeakMap();
-var _focusDetector = /*#__PURE__*/new WeakMap();
 var _Pagination_brand = /*#__PURE__*/new WeakSet();
 var _onIndexCacheUpdate = /*#__PURE__*/new WeakMap();
 export class Pagination extends BasePlugin {
   constructor() {
     super(...arguments);
     /**
-     * Bind the events used by the plugin.
+     * Updates the visibility state of the pagination sections based on the current settings.
      */
     _classPrivateMethodInitSpec(this, _Pagination_brand);
     /**
@@ -165,18 +162,6 @@ export class Pagination extends BasePlugin {
      * @type {boolean}
      */
     _classPrivateFieldInitSpec(this, _internalRenderCall, false);
-    /**
-     * Pagination focus controller instance.
-     *
-     * @type {PaginationController}
-     */
-    _classPrivateFieldInitSpec(this, _focusController, null);
-    /**
-     * Pagination focus detector instance.
-     *
-     * @type {object}
-     */
-    _classPrivateFieldInitSpec(this, _focusDetector, null);
     /**
      * IndexMapper cache update listener. Once the cache is updated, we need to recompute
      * the pagination state.
@@ -256,35 +241,8 @@ export class Pagination extends BasePlugin {
         a11yAnnouncer: message => announce(message)
       }));
       _assertClassBrand(_Pagination_brand, this, _updateSectionsVisibilityState).call(this);
-      _classPrivateFieldGet(_ui, this).addLocalHook('firstPageClick', () => this.firstPage()).addLocalHook('prevPageClick', () => this.prevPage()).addLocalHook('nextPageClick', () => this.nextPage()).addLocalHook('lastPageClick', () => this.lastPage()).addLocalHook('pageSizeChange', pageSize => this.setPageSize(pageSize)).addLocalHook('focus', element => {
-        _classPrivateFieldGet(_focusController, this).setCurrentPage(_classPrivateFieldGet(_ui, this).getFocusableElements().indexOf(element));
-        this.hot.unlisten();
-        this.hot.getShortcutManager().setActiveContextName(SHORTCUTS_CONTEXT_NAME);
-        this.hot.listen();
-        _classPrivateFieldGet(_focusDetector, this).deactivate();
-      });
+      _classPrivateFieldGet(_ui, this).addLocalHook('firstPageClick', () => this.firstPage()).addLocalHook('prevPageClick', () => this.prevPage()).addLocalHook('nextPageClick', () => this.nextPage()).addLocalHook('lastPageClick', () => this.lastPage()).addLocalHook('pageSizeChange', pageSize => this.setPageSize(pageSize));
     }
-    if (!_classPrivateFieldGet(_focusController, this)) {
-      _classPrivateFieldSet(_focusController, this, createPaginationFocusController({
-        focusableElements: () => _classPrivateFieldGet(_ui, this).getFocusableElements()
-      }));
-    }
-    if (!_classPrivateFieldGet(_focusDetector, this)) {
-      _classPrivateFieldSet(_focusDetector, this, installFocusDetector(this.hot, _classPrivateFieldGet(_ui, this).getContainer(), {
-        onFocus: from => {
-          this.hot.getShortcutManager().setActiveContextName(SHORTCUTS_CONTEXT_NAME);
-          this.hot.listen();
-          if (from === 'from_above') {
-            _classPrivateFieldGet(_focusController, this).toFirstItem();
-          } else {
-            _classPrivateFieldGet(_focusController, this).toLastItem();
-          }
-          _classPrivateFieldGet(_focusDetector, this).deactivate();
-        }
-      }));
-    }
-    _assertClassBrand(_Pagination_brand, this, _registerEvents).call(this);
-    _assertClassBrand(_Pagination_brand, this, _registerShortcuts).call(this);
 
     // Place the onInit hook before others to make sure that the pagination state is computed
     // and applied to the index mapper before AutoColumnSize plugin begins calculate the column sizes.
@@ -348,37 +306,20 @@ export class Pagination extends BasePlugin {
       }
       return _assertClassBrand(_Pagination_brand, _this, _onAfterLanguageChange).call(_this, ...args);
     });
-    this.addHook('modifyRowHeight', function () {
+    this.addHook('beforeHeightChange', function () {
       for (var _len1 = arguments.length, args = new Array(_len1), _key1 = 0; _key1 < _len1; _key1++) {
         args[_key1] = arguments[_key1];
       }
-      return _assertClassBrand(_Pagination_brand, _this, _onModifyRowHeight).call(_this, ...args);
-    });
-    this.addHook('beforeHeightChange', function () {
-      for (var _len10 = arguments.length, args = new Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
-        args[_key10] = arguments[_key10];
-      }
       return _assertClassBrand(_Pagination_brand, _this, _onBeforeHeightChange).call(_this, ...args);
     });
     this.addHook('afterSetTheme', function () {
-      for (var _len11 = arguments.length, args = new Array(_len11), _key11 = 0; _key11 < _len11; _key11++) {
-        args[_key11] = arguments[_key11];
+      for (var _len10 = arguments.length, args = new Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
+        args[_key10] = arguments[_key10];
       }
       return _assertClassBrand(_Pagination_brand, _this, _onAfterSetTheme).call(_this, ...args);
     });
-    this.addHook('afterDialogShow', function () {
-      for (var _len12 = arguments.length, args = new Array(_len12), _key12 = 0; _key12 < _len12; _key12++) {
-        args[_key12] = arguments[_key12];
-      }
-      return _assertClassBrand(_Pagination_brand, _this, _onAfterDialogShow).call(_this, ...args);
-    });
-    this.addHook('beforeDialogHide', function () {
-      for (var _len13 = arguments.length, args = new Array(_len13), _key13 = 0; _key13 < _len13; _key13++) {
-        args[_key13] = arguments[_key13];
-      }
-      return _assertClassBrand(_Pagination_brand, _this, _onAfterDialogHide).call(_this, ...args);
-    });
     this.hot.rowIndexMapper.addLocalHook('cacheUpdated', _classPrivateFieldGet(_onIndexCacheUpdate, this));
+    _assertClassBrand(_Pagination_brand, this, _registerFocusScope).call(this);
     super.enablePlugin();
   }
 
@@ -397,11 +338,12 @@ export class Pagination extends BasePlugin {
    */
   disablePlugin() {
     this.hot.rowIndexMapper.removeLocalHook('cacheUpdated', _classPrivateFieldGet(_onIndexCacheUpdate, this)).unregisterMap(this.pluginName);
+    _assertClassBrand(_Pagination_brand, this, _unregisterFocusScope).call(this);
     _classPrivateFieldGet(_ui, this).destroy();
     _classPrivateFieldSet(_ui, this, null);
-    _assertClassBrand(_Pagination_brand, this, _unregisterShortcuts).call(this);
     super.disablePlugin();
   }
+
   /**
    * Gets the pagination current state. Returns an object with the following properties:
    *  - `currentPage`: The current page number.
@@ -657,11 +599,6 @@ export class Pagination extends BasePlugin {
     _classPrivateFieldGet(_ui, this).setNavigationSectionVisibility(false);
     this.hot.runHooks('afterPageNavigationVisibilityChange', false);
   }
-
-  /**
-   * Updates the visibility state of the pagination sections based on the current settings.
-   */
-
   /**
    * Destroys the plugin instance.
    */
@@ -674,59 +611,6 @@ export class Pagination extends BasePlugin {
     super.destroy();
   }
 }
-function _registerEvents() {
-  // TODO: move to general focus manager module
-  this.eventManager.addEventListener(this.hot.rootDocument, 'mouseup', event => {
-    const container = _classPrivateFieldGet(_ui, this).getContainer();
-    if (!container.contains(event.target) && this.hot.getShortcutManager().getActiveContextName() === SHORTCUTS_CONTEXT_NAME) {
-      _classPrivateFieldGet(_focusDetector, this).activate();
-      _classPrivateFieldGet(_focusController, this).clear();
-      this.hot.getShortcutManager().setActiveContextName('grid');
-    }
-  });
-}
-/**
- * Register shortcuts responsible for navigating through the pagination.
- */
-function _registerShortcuts() {
-  var _manager$getContext;
-  const manager = this.hot.getShortcutManager();
-  const pluginContext = (_manager$getContext = manager.getContext(SHORTCUTS_CONTEXT_NAME)) !== null && _manager$getContext !== void 0 ? _manager$getContext : manager.addContext(SHORTCUTS_CONTEXT_NAME, 'global');
-  pluginContext.addShortcut({
-    keys: [['Shift', 'Tab'], ['Tab']],
-    preventDefault: false,
-    callback: event => {
-      let previousIndex = _classPrivateFieldGet(_focusController, this).getCurrentPage();
-      if (event.shiftKey) {
-        _classPrivateFieldGet(_focusController, this).toPreviousItem();
-        const currentPage = _classPrivateFieldGet(_focusController, this).getCurrentPage();
-        if (currentPage >= previousIndex) {
-          _assertClassBrand(_Pagination_brand, this, _unFocusPagination).call(this);
-          return;
-        }
-        previousIndex = currentPage;
-      } else {
-        _classPrivateFieldGet(_focusController, this).toNextItem();
-        const currentPage = _classPrivateFieldGet(_focusController, this).getCurrentPage();
-        if (currentPage <= previousIndex) {
-          _assertClassBrand(_Pagination_brand, this, _unFocusPagination).call(this);
-          return;
-        }
-        previousIndex = currentPage;
-      }
-      event.preventDefault();
-    },
-    group: SHORTCUTS_GROUP
-  });
-}
-/**
- * Unregister shortcuts responsible for navigating through the pagination.
- */
-function _unregisterShortcuts() {
-  const shortcutManager = this.hot.getShortcutManager();
-  const pluginContext = shortcutManager.getContext(SHORTCUTS_CONTEXT_NAME);
-  pluginContext.removeShortcutsByGroup(SHORTCUTS_GROUP);
-}
 function _updateSectionsVisibilityState() {
   if (this.getSetting('showPageSize')) {
     this.showPageSizeSection();
@@ -774,10 +658,10 @@ function _computeAndApplyState() {
       return view.getViewportHeight() - scrollbarWidth;
     },
     itemsSizeProvider: () => {
-      const defaultRowHeight = stylesHandler.getDefaultRowHeight();
       const rowHeights = this.hot.rowIndexMapper.getRenderableIndexes().map(physicalIndex => {
         var _this$hot$getRowHeigh;
-        return (_this$hot$getRowHeigh = this.hot.getRowHeight(this.hot.toVisualRow(physicalIndex))) !== null && _this$hot$getRowHeigh !== void 0 ? _this$hot$getRowHeigh : defaultRowHeight;
+        const visualRowIndex = this.hot.toVisualRow(physicalIndex);
+        return (_this$hot$getRowHeigh = this.hot.getRowHeight(visualRowIndex)) !== null && _this$hot$getRowHeigh !== void 0 ? _this$hot$getRowHeigh : stylesHandler.getDefaultRowHeight(visualRowIndex);
       });
       return rowHeights;
     }
@@ -804,11 +688,6 @@ function _computeAndApplyState() {
     ...paginationData,
     totalRenderedRows: renderableRowsLength
   });
-  if ((this.getSetting('showPageSize') || this.getSetting('showNavigation')) && paginationData.totalPages > 1) {
-    _classPrivateFieldGet(_focusDetector, this).activate();
-  } else {
-    _classPrivateFieldGet(_focusDetector, this).deactivate();
-  }
 }
 /**
  * Based on the external factors (like the scroll position of the table, size etc.) it computes
@@ -834,6 +713,31 @@ function _computeNeedsBorder() {
   } = this.getPaginationData();
   return view.getLastFullyVisibleRow() !== lastVisibleRowIndex;
 }
+/**
+ * Registers the focus scope for the pagination plugin.
+ */
+function _registerFocusScope() {
+  this.hot.getFocusScopeManager().registerScope(PLUGIN_KEY, _classPrivateFieldGet(_ui, this).getContainer(), {
+    shortcutsContextName: SHORTCUTS_CONTEXT_NAME,
+    runOnlyIf: () => this.getSetting('showPageSize') || this.getSetting('showNavigation'),
+    onActivate: focusSource => {
+      const focusableElements = _classPrivateFieldGet(_ui, this).getFocusableElements();
+      if (focusableElements.length > 0) {
+        if (focusSource === 'tab_from_above') {
+          focusableElements.at(0).focus();
+        } else if (focusSource === 'tab_from_below') {
+          focusableElements.at(-1).focus();
+        }
+      }
+    }
+  });
+}
+/**
+ * Unregisters the focus scope for the pagination plugin.
+ */
+function _unregisterFocusScope() {
+  this.hot.getFocusScopeManager().unregisterScope(PLUGIN_KEY);
+}
 /**
  * Called before the selection of columns or all table is made. It modifies the selection rows range
  * to the range of the current page.
@@ -908,27 +812,6 @@ function _onBeforePaste(pastedData, ranges) {
     pastedData.splice(0, rowsToRemove);
   });
 }
-/**
- * Called when the row height is modified. It adds 1px border top compensation for
- * the first row of the each page to make sure that the table's hider element
- * height is correctly calculated.
- *
- * @param {number | undefined} height Row height.
- * @param {number} row Visual row index.
- * @returns {number}
- */
-function _onModifyRowHeight(height, row) {
-  if (height === undefined || !_classPrivateFieldGet(_calcStrategy, this).getState(_classPrivateFieldGet(_currentPage, this))) {
-    return;
-  }
-  const {
-    firstVisibleRowIndex
-  } = this.getPaginationData();
-  if (row !== 0 && row === firstVisibleRowIndex) {
-    height += 1; // 1px border top compensation for the first row of the page.
-  }
-  return height;
-}
 /**
  * Called after the view is rendered. It recalculates the pagination state only when
  * the `pageSize` is set to `'auto'`. In this case, the plugin will compute the
@@ -1006,25 +889,4 @@ function _onAfterLanguageChange() {
  */
 function _onAfterSetTheme(themeName) {
   _classPrivateFieldGet(_ui, this).updateTheme(themeName);
-}
-/**
- * Unfocuses the pagination and sets the active context for the shortcuts.
- */
-function _unFocusPagination() {
-  _classPrivateFieldGet(_focusDetector, this).activate();
-  _classPrivateFieldGet(_focusController, this).clear();
-  this.hot.unlisten();
-  this.hot.getShortcutManager().setActiveContextName('grid');
-}
-/**
- * Called after the dialog is shown. It sets the active context for the shortcuts.
- */
-function _onAfterDialogShow() {
-  _classPrivateFieldGet(_focusDetector, this).deactivate();
-}
-/**
- * Called after the dialog is hidden. It sets the active context for the shortcuts.
- */
-function _onAfterDialogHide() {
-  _classPrivateFieldGet(_focusDetector, this).activate();
 }

package/plugins/pagination/strategies/autoPageSize.js

@@ -45,7 +45,7 @@ class AutoPageSizeStrategy {
     const viewportSize = viewportSizeProvider();
     const pages = [];
     let startIndex = 0;
-    let totalSize = 1; // 1px border compensation for the first row
+    let totalSize = 0;
     let pageSize = 0;
     for (let index = 0; index < itemSizes.length; index++) {
       const itemSize = itemSizes[index];
@@ -56,7 +56,7 @@ class AutoPageSizeStrategy {
           pageSize
         });
         startIndex = index;
-        totalSize = 1; // 1px border compensation for the first row
+        totalSize = 0;
         pageSize = 0;
       }
       totalSize += itemSize;