handsontable 16.0.1 → 16.1.0-next-91b8a0f-20250905

package/plugins/contextMenu/contextMenu.js

@@ -138,6 +138,7 @@ class ContextMenu extends _base.BasePlugin {
       return _this.executeCommand.call(_this, ...params);
     });
     this.addHook('afterOnCellContextMenu', event => _assertClassBrand(_ContextMenu_brand, this, _onAfterOnCellContextMenu).call(this, event));
+    this.addHook('beforeDialogShow', () => this.close());
     this.registerShortcuts();
     super.enablePlugin();
   }
@@ -178,7 +179,7 @@ class ContextMenu extends _base.BasePlugin {
       callback: () => {
         const {
           highlight
-        } = this.hot.getSelectedRangeLast();
+        } = this.hot.getSelectedRangeActive();
         this.hot.scrollToFocusedCell();
         const rect = this.hot.getCell(highlight.row, highlight.col, true).getBoundingClientRect();
         const offset = (0, _utils.getDocumentOffsetByElement)(this.menu.container, this.hot.rootDocument);
@@ -195,7 +196,7 @@ class ContextMenu extends _base.BasePlugin {
       },
       runOnlyIf: () => {
         var _this$hot$getSelected;
-        const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
+        const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeActive()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
         return highlight && this.hot.selection.isCellVisible(highlight) && !this.menu.isOpened();
       },
       group: SHORTCUTS_GROUP
@@ -236,10 +237,8 @@ class ContextMenu extends _base.BasePlugin {
     }
     this.prepareMenuItems();
     this.menu.open();
-    const themeHasTableBorder = this.menu.tableBorderWidth > 0;
     (0, _object.objectEach)(offset, (value, key) => {
-      const valueWithoutBorder = ['below', 'right'].includes(key) ? value + 1 : value - 1;
-      this.menu.setOffset(key, themeHasTableBorder ? value : valueWithoutBorder);
+      this.menu.setOffset(key, value);
     });
     this.menu.setPosition(position);
   }

package/plugins/contextMenu/contextMenu.mjs

@@ -135,6 +135,7 @@ export class ContextMenu extends BasePlugin {
       return _this.executeCommand.call(_this, ...params);
     });
     this.addHook('afterOnCellContextMenu', event => _assertClassBrand(_ContextMenu_brand, this, _onAfterOnCellContextMenu).call(this, event));
+    this.addHook('beforeDialogShow', () => this.close());
     this.registerShortcuts();
     super.enablePlugin();
   }
@@ -175,7 +176,7 @@ export class ContextMenu extends BasePlugin {
       callback: () => {
         const {
           highlight
-        } = this.hot.getSelectedRangeLast();
+        } = this.hot.getSelectedRangeActive();
         this.hot.scrollToFocusedCell();
         const rect = this.hot.getCell(highlight.row, highlight.col, true).getBoundingClientRect();
         const offset = getDocumentOffsetByElement(this.menu.container, this.hot.rootDocument);
@@ -192,7 +193,7 @@ export class ContextMenu extends BasePlugin {
       },
       runOnlyIf: () => {
         var _this$hot$getSelected;
-        const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
+        const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeActive()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
         return highlight && this.hot.selection.isCellVisible(highlight) && !this.menu.isOpened();
       },
       group: SHORTCUTS_GROUP
@@ -233,10 +234,8 @@ export class ContextMenu extends BasePlugin {
     }
     this.prepareMenuItems();
     this.menu.open();
-    const themeHasTableBorder = this.menu.tableBorderWidth > 0;
     objectEach(offset, (value, key) => {
-      const valueWithoutBorder = ['below', 'right'].includes(key) ? value + 1 : value - 1;
-      this.menu.setOffset(key, themeHasTableBorder ? value : valueWithoutBorder);
+      this.menu.setOffset(key, value);
     });
     this.menu.setPosition(position);
   }

package/plugins/contextMenu/menu/cursor.js

@@ -126,7 +126,7 @@ class Cursor {
    * @returns {boolean}
    */
   fitsOnRight(element) {
-    let viewportWidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.rootWindow.innerWidth;
+    let viewportWidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.rootWindow.document.documentElement.clientWidth;
     return this.leftRelative + this.cellWidth + element.offsetWidth <= viewportWidth;
   }
 

package/plugins/contextMenu/menu/cursor.mjs

@@ -123,7 +123,7 @@ export class Cursor {
    * @returns {boolean}
    */
   fitsOnRight(element) {
-    let viewportWidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.rootWindow.innerWidth;
+    let viewportWidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.rootWindow.document.documentElement.clientWidth;
     return this.leftRelative + this.cellWidth + element.offsetWidth <= viewportWidth;
   }
 

package/plugins/contextMenu/menu/defaultShortcutsList.js

@@ -41,7 +41,7 @@ function createDefaultShortcutsList(menu) {
   }, {
     keys: [[hot.isRtl() ? 'ArrowLeft' : 'ArrowRight']],
     callback: () => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedActive();
       if (selection) {
         const subMenu = menu.openSubMenu(selection[0]);
         if (subMenu) {
@@ -52,7 +52,7 @@ function createDefaultShortcutsList(menu) {
   }, {
     keys: [[hot.isRtl() ? 'ArrowRight' : 'ArrowLeft']],
     callback: () => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedActive();
       if (selection && menu.isSubMenu()) {
         menu.close();
         if (menu.isSubMenu()) {
@@ -69,7 +69,7 @@ function createDefaultShortcutsList(menu) {
   }, {
     keys: [['Enter'], ['Space']],
     callback: event => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedActive();
       if (!selection) {
         return;
       }
@@ -83,7 +83,7 @@ function createDefaultShortcutsList(menu) {
   }, {
     keys: [['PageUp']],
     callback: () => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedActive();
       if (selection) {
         hotMenu.selection.transformStart(-hotMenu.countVisibleRows(), 0);
       } else {
@@ -93,7 +93,7 @@ function createDefaultShortcutsList(menu) {
   }, {
     keys: [['PageDown']],
     callback: () => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedActive();
       if (selection) {
         hotMenu.selection.transformStart(hotMenu.countVisibleRows(), 0);
       } else {

package/plugins/contextMenu/menu/defaultShortcutsList.mjs

@@ -37,7 +37,7 @@ export function createDefaultShortcutsList(menu) {
   }, {
     keys: [[hot.isRtl() ? 'ArrowLeft' : 'ArrowRight']],
     callback: () => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedActive();
       if (selection) {
         const subMenu = menu.openSubMenu(selection[0]);
         if (subMenu) {
@@ -48,7 +48,7 @@ export function createDefaultShortcutsList(menu) {
   }, {
     keys: [[hot.isRtl() ? 'ArrowRight' : 'ArrowLeft']],
     callback: () => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedActive();
       if (selection && menu.isSubMenu()) {
         menu.close();
         if (menu.isSubMenu()) {
@@ -65,7 +65,7 @@ export function createDefaultShortcutsList(menu) {
   }, {
     keys: [['Enter'], ['Space']],
     callback: event => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedActive();
       if (!selection) {
         return;
       }
@@ -79,7 +79,7 @@ export function createDefaultShortcutsList(menu) {
   }, {
     keys: [['PageUp']],
     callback: () => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedActive();
       if (selection) {
         hotMenu.selection.transformStart(-hotMenu.countVisibleRows(), 0);
       } else {
@@ -89,7 +89,7 @@ export function createDefaultShortcutsList(menu) {
   }, {
     keys: [['PageDown']],
     callback: () => {
-      const selection = hotMenu.getSelectedLast();
+      const selection = hotMenu.getSelectedActive();
       if (selection) {
         hotMenu.selection.transformStart(hotMenu.countVisibleRows(), 0);
       } else {

package/plugins/contextMenu/menu/menu.js

@@ -221,7 +221,7 @@ class Menu {
    * @returns {object|null}
    */
   getSelectedItem() {
-    return this.hasSelectedItem() ? this.hotMenu.getSourceDataAtRow(this.hotMenu.getSelectedLast()[0]) : null;
+    return this.hasSelectedItem() ? this.hotMenu.getSourceDataAtRow(this.hotMenu.getSelectedActive()[0]) : null;
   }
 
   /**
@@ -230,7 +230,7 @@ class Menu {
    * @returns {boolean}
    */
   hasSelectedItem() {
-    return Array.isArray(this.hotMenu.getSelectedLast());
+    return Array.isArray(this.hotMenu.getSelectedActive());
   }
 
   /**
@@ -395,7 +395,7 @@ class Menu {
       this.runLocalHooks('afterClose');
       if (this.isSubMenu()) {
         if (this.hot.getSettings().ariaTags) {
-          const selection = this.parentMenu.hotMenu.getSelectedLast();
+          const selection = this.parentMenu.hotMenu.getSelectedActive();
           if (selection) {
             const cell = this.parentMenu.hotMenu.getCell(selection[0], 0);
             (0, _element.setAttribute)(cell, [(0, _a11y.A11Y_EXPANDED)(false)]);

package/plugins/contextMenu/menu/menu.mjs

@@ -217,7 +217,7 @@ export class Menu {
    * @returns {object|null}
    */
   getSelectedItem() {
-    return this.hasSelectedItem() ? this.hotMenu.getSourceDataAtRow(this.hotMenu.getSelectedLast()[0]) : null;
+    return this.hasSelectedItem() ? this.hotMenu.getSourceDataAtRow(this.hotMenu.getSelectedActive()[0]) : null;
   }
 
   /**
@@ -226,7 +226,7 @@ export class Menu {
    * @returns {boolean}
    */
   hasSelectedItem() {
-    return Array.isArray(this.hotMenu.getSelectedLast());
+    return Array.isArray(this.hotMenu.getSelectedActive());
   }
 
   /**
@@ -391,7 +391,7 @@ export class Menu {
       this.runLocalHooks('afterClose');
       if (this.isSubMenu()) {
         if (this.hot.getSettings().ariaTags) {
-          const selection = this.parentMenu.hotMenu.getSelectedLast();
+          const selection = this.parentMenu.hotMenu.getSelectedActive();
           if (selection) {
             const cell = this.parentMenu.hotMenu.getCell(selection[0], 0);
             setAttribute(cell, [A11Y_EXPANDED(false)]);

package/plugins/contextMenu/menu/positioner.js

@@ -162,7 +162,7 @@ class Positioner {
       const style = rootWindow.getComputedStyle(_classPrivateFieldGet(_parentContainer, this).querySelector('.ht_master'));
       const paddingTop = Number.parseInt(style.paddingTop, 10);
       const borderTop = Number.parseInt(style.borderTop, 10);
-      top = _classPrivateFieldGet(_cursor, this).top - paddingTop - borderTop - 1;
+      top = _classPrivateFieldGet(_cursor, this).top - paddingTop - borderTop;
     }
     _classPrivateFieldGet(_container, this).style.top = `${top}px`;
   }

package/plugins/contextMenu/menu/positioner.mjs

@@ -159,7 +159,7 @@ export class Positioner {
       const style = rootWindow.getComputedStyle(_classPrivateFieldGet(_parentContainer, this).querySelector('.ht_master'));
       const paddingTop = Number.parseInt(style.paddingTop, 10);
       const borderTop = Number.parseInt(style.borderTop, 10);
-      top = _classPrivateFieldGet(_cursor, this).top - paddingTop - borderTop - 1;
+      top = _classPrivateFieldGet(_cursor, this).top - paddingTop - borderTop;
     }
     _classPrivateFieldGet(_container, this).style.top = `${top}px`;
   }

package/plugins/contextMenu/predefinedItems/alignment.js

@@ -21,7 +21,7 @@ function alignmentItem() {
       if (this.countRows() === 0 || this.countCols() === 0) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/alignment.mjs

@@ -16,7 +16,7 @@ export default function alignmentItem() {
       if (this.countRows() === 0 || this.countCols() === 0) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/clearColumn.js

@@ -23,7 +23,7 @@ function clearColumnItem() {
       }
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range || range.isSingleHeader() && range.highlight.col < 0 || !this.selection.isSelectedByColumnHeader()) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/clearColumn.mjs

@@ -18,7 +18,7 @@ export default function clearColumnItem() {
       }
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range || range.isSingleHeader() && range.highlight.col < 0 || !this.selection.isSelectedByColumnHeader()) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/columnLeft.js

@@ -16,15 +16,15 @@ function columnLeftItem() {
       return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_INSERT_LEFT);
     },
     callback() {
-      const latestSelection = this.getSelectedRangeLast().getTopLeftCorner();
+      const activeSelection = this.getSelectedRangeActive().getTopLeftCorner();
       const alterAction = this.isRtl() ? 'insert_col_end' : 'insert_col_start';
-      this.alter(alterAction, latestSelection.col, 1, 'ContextMenu.columnLeft');
+      this.alter(alterAction, activeSelection.col, 1, 'ContextMenu.columnLeft');
     },
     disabled() {
       if (!this.isColumnModificationAllowed()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range || this.selection.isSelectedByRowHeader() || range.isSingleHeader() && range.highlight.col < 0 || this.countSourceCols() >= this.getSettings().maxCols) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/columnLeft.mjs

@@ -11,15 +11,15 @@ export default function columnLeftItem() {
       return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_INSERT_LEFT);
     },
     callback() {
-      const latestSelection = this.getSelectedRangeLast().getTopLeftCorner();
+      const activeSelection = this.getSelectedRangeActive().getTopLeftCorner();
       const alterAction = this.isRtl() ? 'insert_col_end' : 'insert_col_start';
-      this.alter(alterAction, latestSelection.col, 1, 'ContextMenu.columnLeft');
+      this.alter(alterAction, activeSelection.col, 1, 'ContextMenu.columnLeft');
     },
     disabled() {
       if (!this.isColumnModificationAllowed()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range || this.selection.isSelectedByRowHeader() || range.isSingleHeader() && range.highlight.col < 0 || this.countSourceCols() >= this.getSettings().maxCols) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/columnRight.js

@@ -16,15 +16,15 @@ function columnRightItem() {
       return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_INSERT_RIGHT);
     },
     callback() {
-      const latestSelection = this.getSelectedRangeLast().getTopRightCorner();
+      const activeSelection = this.getSelectedRangeActive().getTopRightCorner();
       const alterAction = this.isRtl() ? 'insert_col_start' : 'insert_col_end';
-      this.alter(alterAction, latestSelection.col, 1, 'ContextMenu.columnRight');
+      this.alter(alterAction, activeSelection.col, 1, 'ContextMenu.columnRight');
     },
     disabled() {
       if (!this.isColumnModificationAllowed()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range || this.selection.isSelectedByRowHeader() || range.isSingleHeader() && range.highlight.col < 0 || this.countSourceCols() >= this.getSettings().maxCols) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/columnRight.mjs

@@ -11,15 +11,15 @@ export default function columnRightItem() {
       return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_INSERT_RIGHT);
     },
     callback() {
-      const latestSelection = this.getSelectedRangeLast().getTopRightCorner();
+      const activeSelection = this.getSelectedRangeActive().getTopRightCorner();
       const alterAction = this.isRtl() ? 'insert_col_start' : 'insert_col_end';
-      this.alter(alterAction, latestSelection.col, 1, 'ContextMenu.columnRight');
+      this.alter(alterAction, activeSelection.col, 1, 'ContextMenu.columnRight');
     },
     disabled() {
       if (!this.isColumnModificationAllowed()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range || this.selection.isSelectedByRowHeader() || range.isSingleHeader() && range.highlight.col < 0 || this.countSourceCols() >= this.getSettings().maxCols) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/readOnly.js

@@ -43,7 +43,7 @@ function readOnlyItem() {
       this.render();
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/readOnly.mjs

@@ -38,7 +38,7 @@ export default function readOnlyItem() {
       this.render();
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/removeColumn.js

@@ -35,7 +35,7 @@ function removeColumnItem() {
       if (!this.isColumnModificationAllowed()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/removeColumn.mjs

@@ -30,7 +30,7 @@ export default function removeColumnItem() {
       if (!this.isColumnModificationAllowed()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/removeRow.js

@@ -34,7 +34,7 @@ function removeRowItem() {
       this.alter('remove_row', (0, _utils.transformSelectionToRowDistance)(this), 1, 'ContextMenu.removeRow');
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/removeRow.mjs

@@ -29,7 +29,7 @@ export default function removeRowItem() {
       this.alter('remove_row', transformSelectionToRowDistance(this), 1, 'ContextMenu.removeRow');
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/rowAbove.js

@@ -16,11 +16,11 @@ function rowAboveItem() {
       return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_ROW_ABOVE);
     },
     callback() {
-      const latestSelection = this.getSelectedRangeLast().getTopLeftCorner();
-      this.alter('insert_row_above', latestSelection.row, 1, 'ContextMenu.rowAbove');
+      const activeSelection = this.getSelectedRangeActive().getTopLeftCorner();
+      this.alter('insert_row_above', activeSelection.row, 1, 'ContextMenu.rowAbove');
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range || this.selection.isSelectedByColumnHeader() || range.isSingleHeader() && range.highlight.row < 0 || this.countSourceRows() >= this.getSettings().maxRows) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/rowAbove.mjs

@@ -11,11 +11,11 @@ export default function rowAboveItem() {
       return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_ROW_ABOVE);
     },
     callback() {
-      const latestSelection = this.getSelectedRangeLast().getTopLeftCorner();
-      this.alter('insert_row_above', latestSelection.row, 1, 'ContextMenu.rowAbove');
+      const activeSelection = this.getSelectedRangeActive().getTopLeftCorner();
+      this.alter('insert_row_above', activeSelection.row, 1, 'ContextMenu.rowAbove');
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range || this.selection.isSelectedByColumnHeader() || range.isSingleHeader() && range.highlight.row < 0 || this.countSourceRows() >= this.getSettings().maxRows) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/rowBelow.js

@@ -16,11 +16,11 @@ function rowBelowItem() {
       return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_ROW_BELOW);
     },
     callback() {
-      const latestSelection = this.getSelectedRangeLast().getBottomRightCorner();
-      this.alter('insert_row_below', latestSelection.row, 1, 'ContextMenu.rowBelow');
+      const activeSelection = this.getSelectedRangeActive().getBottomRightCorner();
+      this.alter('insert_row_below', activeSelection.row, 1, 'ContextMenu.rowBelow');
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range || this.selection.isSelectedByColumnHeader() || range.isSingleHeader() && range.highlight.row < 0 || this.countSourceRows() >= this.getSettings().maxRows) {
         return true;
       }

package/plugins/contextMenu/predefinedItems/rowBelow.mjs

@@ -11,11 +11,11 @@ export default function rowBelowItem() {
       return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_ROW_BELOW);
     },
     callback() {
-      const latestSelection = this.getSelectedRangeLast().getBottomRightCorner();
-      this.alter('insert_row_below', latestSelection.row, 1, 'ContextMenu.rowBelow');
+      const activeSelection = this.getSelectedRangeActive().getBottomRightCorner();
+      this.alter('insert_row_below', activeSelection.row, 1, 'ContextMenu.rowBelow');
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range || this.selection.isSelectedByColumnHeader() || range.isSingleHeader() && range.highlight.row < 0 || this.countSourceRows() >= this.getSettings().maxRows) {
         return true;
       }

package/plugins/copyPaste/contextMenuItem/copy.js

@@ -20,7 +20,7 @@ function copyItem(copyPastePlugin) {
       if (this.countRows() === 0 || this.countCols() === 0) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range) {
         return true;
       }

package/plugins/copyPaste/contextMenuItem/copy.mjs

@@ -16,7 +16,7 @@ export default function copyItem(copyPastePlugin) {
       if (this.countRows() === 0 || this.countCols() === 0) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range) {
         return true;
       }

package/plugins/copyPaste/contextMenuItem/copyColumnHeadersOnly.js

@@ -12,8 +12,8 @@ function copyColumnHeadersOnlyItem(copyPastePlugin) {
   return {
     key: 'copy_column_headers_only',
     name() {
-      const selectedRange = this.getSelectedRangeLast();
-      const nounForm = selectedRange ? (0, _number.clamp)(selectedRange.getWidth() - 1, 0, 1) : 0;
+      const activeSelectedRange = this.getSelectedRangeActive();
+      const nounForm = activeSelectedRange ? (0, _number.clamp)(activeSelectedRange.getWidth() - 1, 0, 1) : 0;
       return this.getTranslatedPhrase(_constants.CONTEXTMENU_ITEMS_COPY_COLUMN_HEADERS_ONLY, nounForm);
     },
     callback() {
@@ -23,7 +23,7 @@ function copyColumnHeadersOnlyItem(copyPastePlugin) {
       if (!this.hasColHeaders()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range) {
         return true;
       }

package/plugins/copyPaste/contextMenuItem/copyColumnHeadersOnly.mjs

@@ -8,8 +8,8 @@ export default function copyColumnHeadersOnlyItem(copyPastePlugin) {
   return {
     key: 'copy_column_headers_only',
     name() {
-      const selectedRange = this.getSelectedRangeLast();
-      const nounForm = selectedRange ? clamp(selectedRange.getWidth() - 1, 0, 1) : 0;
+      const activeSelectedRange = this.getSelectedRangeActive();
+      const nounForm = activeSelectedRange ? clamp(activeSelectedRange.getWidth() - 1, 0, 1) : 0;
       return this.getTranslatedPhrase(CONTEXTMENU_ITEMS_COPY_COLUMN_HEADERS_ONLY, nounForm);
     },
     callback() {
@@ -19,7 +19,7 @@ export default function copyColumnHeadersOnlyItem(copyPastePlugin) {
       if (!this.hasColHeaders()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range) {
         return true;
       }

package/plugins/copyPaste/contextMenuItem/copyWithColumnGroupHeaders.js

@@ -12,8 +12,8 @@ function copyWithColumnGroupHeadersItem(copyPastePlugin) {
   return {
     key: 'copy_with_column_group_headers',
     name() {
-      const selectedRange = this.getSelectedRangeLast();
-      const nounForm = selectedRange ? (0, _number.clamp)(selectedRange.getWidth() - 1, 0, 1) : 0;
+      const activeSelectedRange = this.getSelectedRangeActive();
+      const nounForm = activeSelectedRange ? (0, _number.clamp)(activeSelectedRange.getWidth() - 1, 0, 1) : 0;
       return this.getTranslatedPhrase(_constants.CONTEXTMENU_ITEMS_COPY_WITH_COLUMN_GROUP_HEADERS, nounForm);
     },
     callback() {
@@ -23,7 +23,7 @@ function copyWithColumnGroupHeadersItem(copyPastePlugin) {
       if (!this.hasColHeaders() || !this.getSettings().nestedHeaders) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range) {
         return true;
       }

package/plugins/copyPaste/contextMenuItem/copyWithColumnGroupHeaders.mjs

@@ -8,8 +8,8 @@ export default function copyWithColumnGroupHeadersItem(copyPastePlugin) {
   return {
     key: 'copy_with_column_group_headers',
     name() {
-      const selectedRange = this.getSelectedRangeLast();
-      const nounForm = selectedRange ? clamp(selectedRange.getWidth() - 1, 0, 1) : 0;
+      const activeSelectedRange = this.getSelectedRangeActive();
+      const nounForm = activeSelectedRange ? clamp(activeSelectedRange.getWidth() - 1, 0, 1) : 0;
       return this.getTranslatedPhrase(CONTEXTMENU_ITEMS_COPY_WITH_COLUMN_GROUP_HEADERS, nounForm);
     },
     callback() {
@@ -19,7 +19,7 @@ export default function copyWithColumnGroupHeadersItem(copyPastePlugin) {
       if (!this.hasColHeaders() || !this.getSettings().nestedHeaders) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range) {
         return true;
       }

package/plugins/copyPaste/contextMenuItem/copyWithColumnHeaders.js

@@ -12,8 +12,8 @@ function copyWithColumnHeadersItem(copyPastePlugin) {
   return {
     key: 'copy_with_column_headers',
     name() {
-      const selectedRange = this.getSelectedRangeLast();
-      const nounForm = selectedRange ? (0, _number.clamp)(selectedRange.getWidth() - 1, 0, 1) : 0;
+      const activeSelectedRange = this.getSelectedRangeActive();
+      const nounForm = activeSelectedRange ? (0, _number.clamp)(activeSelectedRange.getWidth() - 1, 0, 1) : 0;
       return this.getTranslatedPhrase(_constants.CONTEXTMENU_ITEMS_COPY_WITH_COLUMN_HEADERS, nounForm);
     },
     callback() {
@@ -23,7 +23,7 @@ function copyWithColumnHeadersItem(copyPastePlugin) {
       if (!this.hasColHeaders()) {
         return true;
       }
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range) {
         return true;
       }