handsontable 0.0.0-next-fad35d5-20240924 → 0.0.0-next-d7edb4b-20240927

package/plugins/hiddenRows/hiddenRows.js

@@ -14,8 +14,10 @@ var _base = require("../base");
 var _element = require("../../helpers/dom/element");
 var _number = require("../../helpers/number");
 var _array = require("../../helpers/array");
+var _object = require("../../helpers/object");
+var _mixed = require("../../helpers/mixed");
 var _predefinedItems = require("../contextMenu/predefinedItems");
-var _hooks = require("../../core/hooks");
+var _pluginHooks = _interopRequireDefault(require("../../pluginHooks"));
 var _hideRow = _interopRequireDefault(require("./contextMenuItem/hideRow"));
 var _showRow = _interopRequireDefault(require("./contextMenuItem/showRow"));
 var _translations = require("../../translations");
@@ -26,10 +28,10 @@ function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("C
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
 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"); }
-_hooks.Hooks.getSingleton().register('beforeHideRows');
-_hooks.Hooks.getSingleton().register('afterHideRows');
-_hooks.Hooks.getSingleton().register('beforeUnhideRows');
-_hooks.Hooks.getSingleton().register('afterUnhideRows');
+_pluginHooks.default.getSingleton().register('beforeHideRows');
+_pluginHooks.default.getSingleton().register('afterHideRows');
+_pluginHooks.default.getSingleton().register('beforeUnhideRows');
+_pluginHooks.default.getSingleton().register('afterUnhideRows');
 const PLUGIN_KEY = exports.PLUGIN_KEY = 'hiddenRows';
 const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 320;
 
@@ -139,6 +141,7 @@ const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 320;
  * ```
  * :::
  */
+var _settings = /*#__PURE__*/new WeakMap();
 var _hiddenRowsMap = /*#__PURE__*/new WeakMap();
 var _HiddenRows_brand = /*#__PURE__*/new WeakSet();
 class HiddenRows extends _base.BasePlugin {
@@ -152,6 +155,13 @@ class HiddenRows extends _base.BasePlugin {
      * @returns {number}
      */
     _classPrivateMethodInitSpec(this, _HiddenRows_brand);
+    /**
+     * Cached settings from Handsontable settings.
+     *
+     * @private
+     * @type {object}
+     */
+    _classPrivateFieldInitSpec(this, _settings, {});
     /**
      * Map of hidden rows by the plugin.
      *
@@ -166,13 +176,6 @@ class HiddenRows extends _base.BasePlugin {
   static get PLUGIN_PRIORITY() {
     return PLUGIN_PRIORITY;
   }
-  static get DEFAULT_SETTINGS() {
-    return {
-      copyPasteEnabled: true,
-      indicators: false,
-      rows: []
-    };
-  }
   /**
    * Checks if the plugin is enabled in the handsontable settings. This method is executed in {@link Hooks#beforeInit}
    * hook and if it returns `true` then the {@link HiddenRows#enablePlugin} method is called.
@@ -191,6 +194,13 @@ class HiddenRows extends _base.BasePlugin {
     if (this.enabled) {
       return;
     }
+    const pluginSettings = this.hot.getSettings()[PLUGIN_KEY];
+    if ((0, _object.isObject)(pluginSettings)) {
+      _classPrivateFieldSet(_settings, this, pluginSettings);
+      if ((0, _mixed.isUndefined)(pluginSettings.copyPasteEnabled)) {
+        pluginSettings.copyPasteEnabled = true;
+      }
+    }
     _classPrivateFieldSet(_hiddenRowsMap, this, new _translations.HidingMap());
     _classPrivateFieldGet(_hiddenRowsMap, this).addLocalHook('init', () => _assertClassBrand(_HiddenRows_brand, this, _onMapInit).call(this));
     this.hot.rowIndexMapper.registerMap(this.pluginName, _classPrivateFieldGet(_hiddenRowsMap, this));
@@ -229,6 +239,7 @@ class HiddenRows extends _base.BasePlugin {
    */
   disablePlugin() {
     this.hot.rowIndexMapper.unregisterMap(this.pluginName);
+    _classPrivateFieldSet(_settings, this, {});
     super.disablePlugin();
     this.resetCellsMeta();
   }
@@ -371,6 +382,7 @@ class HiddenRows extends _base.BasePlugin {
    * Destroys the plugin instance.
    */
   destroy() {
+    _classPrivateFieldSet(_settings, this, null);
     _classPrivateFieldSet(_hiddenRowsMap, this, null);
     super.destroy();
   }
@@ -392,7 +404,7 @@ function _onModifyRowHeight(height, row) {
  * @param {object} cellProperties Object containing the cell properties.
  */
 function _onAfterGetCellMeta(row, column, cellProperties) {
-  if (this.getSetting('copyPasteEnabled') === false && this.isHidden(row)) {
+  if (_classPrivateFieldGet(_settings, this).copyPasteEnabled === false && this.isHidden(row)) {
     // Cell property handled by the `Autofill` and the `CopyPaste` plugins.
     cellProperties.skipRowOnPaste = true;
   }
@@ -420,7 +432,7 @@ function _onAfterGetCellMeta(row, column, cellProperties) {
  */
 function _onModifyCopyableRange(ranges) {
   // Ranges shouldn't be modified when `copyPasteEnabled` option is set to `true` (by default).
-  if (this.getSetting('copyPasteEnabled')) {
+  if (_classPrivateFieldGet(_settings, this).copyPasteEnabled) {
     return ranges;
   }
   const newRanges = [];
@@ -461,7 +473,7 @@ function _onModifyCopyableRange(ranges) {
  * @param {HTMLElement} TH Header's TH element.
  */
 function _onAfterGetRowHeader(row, TH) {
-  if (!this.getSetting('indicators') || row < 0) {
+  if (!_classPrivateFieldGet(_settings, this).indicators || row < 0) {
     return;
   }
   const classList = [];
@@ -487,8 +499,7 @@ function _onAfterContextMenuDefaultOptions(options) {
  * On map initialized hook callback.
  */
 function _onMapInit() {
-  const rows = this.getSetting('rows');
-  if (Array.isArray(rows)) {
-    this.hideRows(rows);
+  if (Array.isArray(_classPrivateFieldGet(_settings, this).rows)) {
+    this.hideRows(_classPrivateFieldGet(_settings, this).rows);
   }
 }

package/plugins/hiddenRows/hiddenRows.mjs

@@ -17,8 +17,10 @@ import { BasePlugin } from "../base/index.mjs";
 import { addClass } from "../../helpers/dom/element.mjs";
 import { rangeEach } from "../../helpers/number.mjs";
 import { arrayEach, arrayMap, arrayReduce } from "../../helpers/array.mjs";
+import { isObject } from "../../helpers/object.mjs";
+import { isUndefined } from "../../helpers/mixed.mjs";
 import { SEPARATOR } from "../contextMenu/predefinedItems/index.mjs";
-import { Hooks } from "../../core/hooks/index.mjs";
+import Hooks from "../../pluginHooks.mjs";
 import hideRowItem from "./contextMenuItem/hideRow.mjs";
 import showRowItem from "./contextMenuItem/showRow.mjs";
 import { HidingMap } from "../../translations/index.mjs";
@@ -135,6 +137,7 @@ export const PLUGIN_PRIORITY = 320;
  * ```
  * :::
  */
+var _settings = /*#__PURE__*/new WeakMap();
 var _hiddenRowsMap = /*#__PURE__*/new WeakMap();
 var _HiddenRows_brand = /*#__PURE__*/new WeakSet();
 export class HiddenRows extends BasePlugin {
@@ -148,6 +151,13 @@ export class HiddenRows extends BasePlugin {
      * @returns {number}
      */
     _classPrivateMethodInitSpec(this, _HiddenRows_brand);
+    /**
+     * Cached settings from Handsontable settings.
+     *
+     * @private
+     * @type {object}
+     */
+    _classPrivateFieldInitSpec(this, _settings, {});
     /**
      * Map of hidden rows by the plugin.
      *
@@ -162,13 +172,6 @@ export class HiddenRows extends BasePlugin {
   static get PLUGIN_PRIORITY() {
     return PLUGIN_PRIORITY;
   }
-  static get DEFAULT_SETTINGS() {
-    return {
-      copyPasteEnabled: true,
-      indicators: false,
-      rows: []
-    };
-  }
   /**
    * Checks if the plugin is enabled in the handsontable settings. This method is executed in {@link Hooks#beforeInit}
    * hook and if it returns `true` then the {@link HiddenRows#enablePlugin} method is called.
@@ -187,6 +190,13 @@ export class HiddenRows extends BasePlugin {
     if (this.enabled) {
       return;
     }
+    const pluginSettings = this.hot.getSettings()[PLUGIN_KEY];
+    if (isObject(pluginSettings)) {
+      _classPrivateFieldSet(_settings, this, pluginSettings);
+      if (isUndefined(pluginSettings.copyPasteEnabled)) {
+        pluginSettings.copyPasteEnabled = true;
+      }
+    }
     _classPrivateFieldSet(_hiddenRowsMap, this, new HidingMap());
     _classPrivateFieldGet(_hiddenRowsMap, this).addLocalHook('init', () => _assertClassBrand(_HiddenRows_brand, this, _onMapInit).call(this));
     this.hot.rowIndexMapper.registerMap(this.pluginName, _classPrivateFieldGet(_hiddenRowsMap, this));
@@ -225,6 +235,7 @@ export class HiddenRows extends BasePlugin {
    */
   disablePlugin() {
     this.hot.rowIndexMapper.unregisterMap(this.pluginName);
+    _classPrivateFieldSet(_settings, this, {});
     super.disablePlugin();
     this.resetCellsMeta();
   }
@@ -367,6 +378,7 @@ export class HiddenRows extends BasePlugin {
    * Destroys the plugin instance.
    */
   destroy() {
+    _classPrivateFieldSet(_settings, this, null);
     _classPrivateFieldSet(_hiddenRowsMap, this, null);
     super.destroy();
   }
@@ -387,7 +399,7 @@ function _onModifyRowHeight(height, row) {
  * @param {object} cellProperties Object containing the cell properties.
  */
 function _onAfterGetCellMeta(row, column, cellProperties) {
-  if (this.getSetting('copyPasteEnabled') === false && this.isHidden(row)) {
+  if (_classPrivateFieldGet(_settings, this).copyPasteEnabled === false && this.isHidden(row)) {
     // Cell property handled by the `Autofill` and the `CopyPaste` plugins.
     cellProperties.skipRowOnPaste = true;
   }
@@ -415,7 +427,7 @@ function _onAfterGetCellMeta(row, column, cellProperties) {
  */
 function _onModifyCopyableRange(ranges) {
   // Ranges shouldn't be modified when `copyPasteEnabled` option is set to `true` (by default).
-  if (this.getSetting('copyPasteEnabled')) {
+  if (_classPrivateFieldGet(_settings, this).copyPasteEnabled) {
     return ranges;
   }
   const newRanges = [];
@@ -456,7 +468,7 @@ function _onModifyCopyableRange(ranges) {
  * @param {HTMLElement} TH Header's TH element.
  */
 function _onAfterGetRowHeader(row, TH) {
-  if (!this.getSetting('indicators') || row < 0) {
+  if (!_classPrivateFieldGet(_settings, this).indicators || row < 0) {
     return;
   }
   const classList = [];
@@ -482,8 +494,7 @@ function _onAfterContextMenuDefaultOptions(options) {
  * On map initialized hook callback.
  */
 function _onMapInit() {
-  const rows = this.getSetting('rows');
-  if (Array.isArray(rows)) {
-    this.hideRows(rows);
+  if (Array.isArray(_classPrivateFieldGet(_settings, this).rows)) {
+    this.hideRows(_classPrivateFieldGet(_settings, this).rows);
   }
 }

package/plugins/manualColumnFreeze/manualColumnFreeze.js

@@ -4,7 +4,7 @@ exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
 var _base = require("../base");
-var _hooks = require("../../core/hooks");
+var _pluginHooks = _interopRequireDefault(require("../../pluginHooks"));
 var _freezeColumn = _interopRequireDefault(require("./contextMenuItem/freezeColumn"));
 var _unfreezeColumn = _interopRequireDefault(require("./contextMenuItem/unfreezeColumn"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -14,10 +14,10 @@ function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("C
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
 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"); }
-_hooks.Hooks.getSingleton().register('beforeColumnFreeze');
-_hooks.Hooks.getSingleton().register('afterColumnFreeze');
-_hooks.Hooks.getSingleton().register('beforeColumnUnfreeze');
-_hooks.Hooks.getSingleton().register('afterColumnUnfreeze');
+_pluginHooks.default.getSingleton().register('beforeColumnFreeze');
+_pluginHooks.default.getSingleton().register('afterColumnFreeze');
+_pluginHooks.default.getSingleton().register('beforeColumnUnfreeze');
+_pluginHooks.default.getSingleton().register('afterColumnUnfreeze');
 const PLUGIN_KEY = exports.PLUGIN_KEY = 'manualColumnFreeze';
 const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 110;
 

package/plugins/manualColumnFreeze/manualColumnFreeze.mjs

@@ -7,7 +7,7 @@ function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
 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"); }
 import { BasePlugin } from "../base/index.mjs";
-import { Hooks } from "../../core/hooks/index.mjs";
+import Hooks from "../../pluginHooks.mjs";
 import freezeColumnItem from "./contextMenuItem/freezeColumn.mjs";
 import unfreezeColumnItem from "./contextMenuItem/unfreezeColumn.mjs";
 Hooks.getSingleton().register('beforeColumnFreeze');

package/plugins/manualColumnMove/manualColumnMove.js

@@ -4,7 +4,7 @@ exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
 var _base = require("../base");
-var _hooks = require("../../core/hooks");
+var _pluginHooks = _interopRequireDefault(require("../../pluginHooks"));
 var _array = require("../../helpers/array");
 var _element = require("../../helpers/dom/element");
 var _event = require("../../helpers/dom/event");
@@ -18,8 +18,8 @@ function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("C
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
 function _classPrivateFieldGet(s, a) { return s.get(_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"); }
-_hooks.Hooks.getSingleton().register('beforeColumnMove');
-_hooks.Hooks.getSingleton().register('afterColumnMove');
+_pluginHooks.default.getSingleton().register('beforeColumnMove');
+_pluginHooks.default.getSingleton().register('afterColumnMove');
 const PLUGIN_KEY = exports.PLUGIN_KEY = 'manualColumnMove';
 const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 120;
 const CSS_PLUGIN = 'ht__manualColumnMove';

package/plugins/manualColumnMove/manualColumnMove.mjs

@@ -7,7 +7,7 @@ function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a),
 function _classPrivateFieldGet(s, a) { return s.get(_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"); }
 import { BasePlugin } from "../base/index.mjs";
-import { Hooks } from "../../core/hooks/index.mjs";
+import Hooks from "../../pluginHooks.mjs";
 import { arrayReduce } from "../../helpers/array.mjs";
 import { addClass, removeClass, offset, hasClass, outerWidth } from "../../helpers/dom/element.mjs";
 import { offsetRelativeTo } from "../../helpers/dom/event.mjs";

package/plugins/manualRowMove/manualRowMove.js

@@ -4,7 +4,7 @@ exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
 require("core-js/modules/es.array.push.js");
 var _base = require("../base");
-var _hooks = require("../../core/hooks");
+var _pluginHooks = _interopRequireDefault(require("../../pluginHooks"));
 var _array = require("../../helpers/array");
 var _element = require("../../helpers/dom/element");
 var _number = require("../../helpers/number");
@@ -17,8 +17,8 @@ function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("C
 function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
 function _classPrivateFieldGet(s, a) { return s.get(_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"); }
-_hooks.Hooks.getSingleton().register('beforeRowMove');
-_hooks.Hooks.getSingleton().register('afterRowMove');
+_pluginHooks.default.getSingleton().register('beforeRowMove');
+_pluginHooks.default.getSingleton().register('afterRowMove');
 const PLUGIN_KEY = exports.PLUGIN_KEY = 'manualRowMove';
 const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 140;
 const CSS_PLUGIN = 'ht__manualRowMove';
@@ -417,8 +417,8 @@ class ManualRowMove extends _base.BasePlugin {
    */
   refreshPositions() {
     const coords = _classPrivateFieldGet(_target, this).coords;
-    const firstVisible = this.hot.getFirstFullyVisibleRow();
-    const lastVisible = this.hot.getLastFullyVisibleRow();
+    const firstVisible = this.hot.view.getFirstFullyVisibleRow();
+    const lastVisible = this.hot.view.getLastFullyVisibleRow();
     const countRows = this.hot.countRows();
     if (this.isFixedRowTop(coords.row) && firstVisible > 0) {
       this.hot.scrollViewportTo(this.hot.rowIndexMapper.getNearestNotHiddenIndex(firstVisible - 1, -1));

package/plugins/manualRowMove/manualRowMove.mjs

@@ -7,7 +7,7 @@ function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a),
 function _classPrivateFieldGet(s, a) { return s.get(_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"); }
 import { BasePlugin } from "../base/index.mjs";
-import { Hooks } from "../../core/hooks/index.mjs";
+import Hooks from "../../pluginHooks.mjs";
 import { arrayReduce } from "../../helpers/array.mjs";
 import { addClass, removeClass, offset, getTrimmingContainer } from "../../helpers/dom/element.mjs";
 import { rangeEach } from "../../helpers/number.mjs";
@@ -413,8 +413,8 @@ export class ManualRowMove extends BasePlugin {
    */
   refreshPositions() {
     const coords = _classPrivateFieldGet(_target, this).coords;
-    const firstVisible = this.hot.getFirstFullyVisibleRow();
-    const lastVisible = this.hot.getLastFullyVisibleRow();
+    const firstVisible = this.hot.view.getFirstFullyVisibleRow();
+    const lastVisible = this.hot.view.getLastFullyVisibleRow();
     const countRows = this.hot.countRows();
     if (this.isFixedRowTop(coords.row) && firstVisible > 0) {
       this.hot.scrollViewportTo(this.hot.rowIndexMapper.getNearestNotHiddenIndex(firstVisible - 1, -1));

package/plugins/mergeCells/cellsCollection.js

@@ -302,21 +302,9 @@ class MergedCellsCollection {
    */
   isFirstRenderableMergedCell(row, column) {
     const mergeParent = this.get(row, column);
-    if (!mergeParent) {
-      return false;
-    }
-    const {
-      row: mergeRow,
-      col: mergeColumn,
-      rowspan,
-      colspan
-    } = mergeParent;
-    const overlayName = this.hot.view.getActiveOverlayName();
-    const firstRenderedRow = ['top', 'top_inline_start_corner'].includes(overlayName) ? 0 : this.hot.getFirstRenderedVisibleRow();
-    const firstRenderedColumn = ['inline_start', 'top_inline_start_corner', 'bottom_inline_start_corner'].includes(overlayName) ? 0 : this.hot.getFirstRenderedVisibleColumn();
-    const mergeCellsTopRow = (0, _number.clamp)(firstRenderedRow, mergeRow, mergeRow + rowspan - 1);
-    const mergeCellsStartColumn = (0, _number.clamp)(firstRenderedColumn, mergeColumn, mergeColumn + colspan - 1);
-    return this.hot.rowIndexMapper.getNearestNotHiddenIndex(mergeCellsTopRow, 1) === row && this.hot.columnIndexMapper.getNearestNotHiddenIndex(mergeCellsStartColumn, 1) === column;
+
+    // Return if row and column indexes are within merge area and if they are first rendered indexes within the area.
+    return mergeParent && this.hot.rowIndexMapper.getNearestNotHiddenIndex(mergeParent.row, 1) === row && this.hot.columnIndexMapper.getNearestNotHiddenIndex(mergeParent.col, 1) === column;
   }
 
   /**

package/plugins/mergeCells/cellsCollection.mjs

@@ -15,7 +15,7 @@ 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); }
 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"); }
 import MergedCellCoords from "./cellCoords.mjs";
-import { rangeEach, clamp } from "../../helpers/number.mjs";
+import { rangeEach } from "../../helpers/number.mjs";
 import { warn } from "../../helpers/console.mjs";
 import { arrayEach } from "../../helpers/array.mjs";
 import { toSingleLine } from "../../helpers/templateLiteralTag.mjs";
@@ -298,21 +298,9 @@ class MergedCellsCollection {
    */
   isFirstRenderableMergedCell(row, column) {
     const mergeParent = this.get(row, column);
-    if (!mergeParent) {
-      return false;
-    }
-    const {
-      row: mergeRow,
-      col: mergeColumn,
-      rowspan,
-      colspan
-    } = mergeParent;
-    const overlayName = this.hot.view.getActiveOverlayName();
-    const firstRenderedRow = ['top', 'top_inline_start_corner'].includes(overlayName) ? 0 : this.hot.getFirstRenderedVisibleRow();
-    const firstRenderedColumn = ['inline_start', 'top_inline_start_corner', 'bottom_inline_start_corner'].includes(overlayName) ? 0 : this.hot.getFirstRenderedVisibleColumn();
-    const mergeCellsTopRow = clamp(firstRenderedRow, mergeRow, mergeRow + rowspan - 1);
-    const mergeCellsStartColumn = clamp(firstRenderedColumn, mergeColumn, mergeColumn + colspan - 1);
-    return this.hot.rowIndexMapper.getNearestNotHiddenIndex(mergeCellsTopRow, 1) === row && this.hot.columnIndexMapper.getNearestNotHiddenIndex(mergeCellsStartColumn, 1) === column;
+
+    // Return if row and column indexes are within merge area and if they are first rendered indexes within the area.
+    return mergeParent && this.hot.rowIndexMapper.getNearestNotHiddenIndex(mergeParent.row, 1) === row && this.hot.columnIndexMapper.getNearestNotHiddenIndex(mergeParent.col, 1) === column;
   }
 
   /**

package/plugins/mergeCells/mergeCells.d.ts

@@ -2,18 +2,14 @@ import Core from '../../core';
 import { BasePlugin } from '../base';
 import CellRange from '../../3rdparty/walkontable/src/cell/range';
 
-export interface MergeCellsSettings {
+export interface DetailedSettings {
   row: number;
   col: number;
   rowspan: number;
   colspan: number;
 }
-export interface DetailedSettings {
-  virtualized: boolean;
-  cells: MergeCellsSettings[];
-}
 
-export type Settings = boolean | MergeCellsSettings[] | DetailedSettings;
+export type Settings = boolean | DetailedSettings[];
 
 export class MergeCells extends BasePlugin {
   constructor(hotInstance: Core);