handsontable 14.2.0 → 14.3.0-next-3fa6b18-20240410

package/plugins/bindRowsWithHeaders/bindRowsWithHeaders.mjs

@@ -2,9 +2,9 @@ import "core-js/modules/es.error.cause.js";
 function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
 function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 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 _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
+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 LooseBindsMap from "./maps/looseBindsMap.mjs";
 import StrictBindsMap from "./maps/strictBindsMap.mjs";
@@ -45,7 +45,7 @@ const bindTypeToMapStrategy = new Map([['loose', LooseBindsMap], ['strict', Stri
  * ```
  * :::
  */
-var _onModifyRowHeader = /*#__PURE__*/new WeakSet();
+var _BindRowsWithHeaders_brand = /*#__PURE__*/new WeakSet();
 export class BindRowsWithHeaders extends BasePlugin {
   constructor() {
     super(...arguments);
@@ -55,7 +55,7 @@ export class BindRowsWithHeaders extends BasePlugin {
      * @param {number} row Row index.
      * @returns {number}
      */
-    _classPrivateMethodInitSpec(this, _onModifyRowHeader);
+    _classPrivateMethodInitSpec(this, _BindRowsWithHeaders_brand);
     /**
      * Plugin indexes cache.
      *
@@ -93,7 +93,7 @@ export class BindRowsWithHeaders extends BasePlugin {
     }
     const MapStrategy = bindTypeToMapStrategy.get(bindType);
     this.headerIndexes = this.hot.rowIndexMapper.registerMap('bindRowsWithHeaders', new MapStrategy());
-    this.addHook('modifyRowHeader', row => _classPrivateMethodGet(this, _onModifyRowHeader, _onModifyRowHeader2).call(this, row));
+    this.addHook('modifyRowHeader', row => _assertClassBrand(_BindRowsWithHeaders_brand, this, _onModifyRowHeader).call(this, row));
     super.enablePlugin();
   }
 
@@ -111,6 +111,6 @@ export class BindRowsWithHeaders extends BasePlugin {
     super.destroy();
   }
 }
-function _onModifyRowHeader2(row) {
+function _onModifyRowHeader(row) {
   return this.headerIndexes.getValueAtIndex(this.hot.toPhysicalRow(row));
 }

package/plugins/collapsibleColumns/collapsibleColumns.js

@@ -9,19 +9,17 @@ var _number = require("../../helpers/number");
 var _console = require("../../helpers/console");
 var _element = require("../../helpers/dom/element");
 var _event = require("../../helpers/dom/event");
+var _shortcutContexts = require("../../shortcutContexts");
 var _a11y = require("../../helpers/a11y");
 function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
 function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
 function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 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 _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
-function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
-function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
-function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
-function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
-function _classApplyDescriptorSet(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 _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"); }
 const PLUGIN_KEY = exports.PLUGIN_KEY = 'collapsibleColumns';
 const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 290;
 const SETTING_KEYS = ['nestedHeaders'];
@@ -109,32 +107,10 @@ const actionDictionary = new Map([['collapse', {
  * :::
  */
 var _collapsedColumnsMap = /*#__PURE__*/new WeakMap();
-var _onAfterGetColHeader = /*#__PURE__*/new WeakSet();
-var _onBeforeOnCellMouseDown = /*#__PURE__*/new WeakSet();
-var _onInit = /*#__PURE__*/new WeakSet();
-var _onAfterLoadData = /*#__PURE__*/new WeakSet();
+var _CollapsibleColumns_brand = /*#__PURE__*/new WeakSet();
 class CollapsibleColumns extends _base.BasePlugin {
   constructor() {
     super(...arguments);
-    /**
-     * Updates the plugin state after new dataset load.
-     *
-     * @param {Array[]} sourceData Array of arrays or array of objects containing data.
-     * @param {boolean} initialLoad Flag that determines whether the data has been loaded
-     *                              during the initialization.
-     */
-    _classPrivateMethodInitSpec(this, _onAfterLoadData);
-    /**
-     * Updates the plugin state after HoT initialization.
-     */
-    _classPrivateMethodInitSpec(this, _onInit);
-    /**
-     * Indicator mouse event callback.
-     *
-     * @param {object} event Mouse event.
-     * @param {object} coords Event coordinates.
-     */
-    _classPrivateMethodInitSpec(this, _onBeforeOnCellMouseDown);
     /**
      * Adds the indicator to the headers.
      *
@@ -143,7 +119,7 @@ class CollapsibleColumns extends _base.BasePlugin {
      * @param {number} headerLevel The index of header level counting from the top (positive
      *                             values counting from 0 to N).
      */
-    _classPrivateMethodInitSpec(this, _onAfterGetColHeader);
+    _classPrivateMethodInitSpec(this, _CollapsibleColumns_brand);
     /**
      * Cached reference to the NestedHeaders plugin.
      *
@@ -164,10 +140,7 @@ class CollapsibleColumns extends _base.BasePlugin {
      * @private
      * @type {HidingMap|null}
      */
-    _classPrivateFieldInitSpec(this, _collapsedColumnsMap, {
-      writable: true,
-      value: null
-    });
+    _classPrivateFieldInitSpec(this, _collapsedColumnsMap, null);
   }
   static get PLUGIN_KEY() {
     return PLUGIN_KEY;
@@ -205,23 +178,23 @@ class CollapsibleColumns extends _base.BasePlugin {
     if (!nestedHeaders) {
       (0, _console.warn)('You need to configure the Nested Headers plugin in order to use collapsible headers.');
     }
-    _classPrivateFieldSet(this, _collapsedColumnsMap, this.hot.columnIndexMapper.createAndRegisterIndexMap(this.pluginName, 'hiding'));
+    _classPrivateFieldSet(_collapsedColumnsMap, this, this.hot.columnIndexMapper.createAndRegisterIndexMap(this.pluginName, 'hiding'));
     this.nestedHeadersPlugin = this.hot.getPlugin('nestedHeaders');
     this.headerStateManager = this.nestedHeadersPlugin.getStateManager();
-    this.addHook('init', () => _classPrivateMethodGet(this, _onInit, _onInit2).call(this));
+    this.addHook('init', () => _assertClassBrand(_CollapsibleColumns_brand, this, _onInit).call(this));
     this.addHook('afterLoadData', function () {
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
-      return _classPrivateMethodGet(_this, _onAfterLoadData, _onAfterLoadData2).call(_this, ...args);
+      return _assertClassBrand(_CollapsibleColumns_brand, _this, _onAfterLoadData).call(_this, ...args);
     });
     this.addHook('afterGetColHeader', function () {
       for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
         args[_key2] = arguments[_key2];
       }
-      return _classPrivateMethodGet(_this, _onAfterGetColHeader, _onAfterGetColHeader2).call(_this, ...args);
+      return _assertClassBrand(_CollapsibleColumns_brand, _this, _onAfterGetColHeader).call(_this, ...args);
     });
-    this.addHook('beforeOnCellMouseDown', (event, coords, TD) => _classPrivateMethodGet(this, _onBeforeOnCellMouseDown, _onBeforeOnCellMouseDown2).call(this, event, coords, TD));
+    this.addHook('beforeOnCellMouseDown', (event, coords, TD) => _assertClassBrand(_CollapsibleColumns_brand, this, _onBeforeOnCellMouseDown).call(this, event, coords, TD));
     this.registerShortcuts();
     super.enablePlugin();
     // @TODO: Workaround for broken plugin initialization abstraction (#6806).
@@ -268,7 +241,7 @@ class CollapsibleColumns extends _base.BasePlugin {
    */
   disablePlugin() {
     this.hot.columnIndexMapper.unregisterMap(this.pluginName);
-    _classPrivateFieldSet(this, _collapsedColumnsMap, null);
+    _classPrivateFieldSet(_collapsedColumnsMap, this, null);
     this.nestedHeadersPlugin = null;
     this.unregisterShortcuts();
     this.clearButtons();
@@ -308,12 +281,17 @@ class CollapsibleColumns extends _base.BasePlugin {
             col: columnIndex
           });
         }
+
+        // prevent default Enter behavior (move to the next row within a selection range)
+        return false;
       },
       runOnlyIf: () => {
-        var _this$hot$getSelected;
-        return (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight.isHeader();
+        var _this$hot$getSelected, _this$hot$getSelected2;
+        return ((_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.isSingle()) && ((_this$hot$getSelected2 = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.highlight.isHeader());
       },
-      group: SHORTCUTS_GROUP
+      group: SHORTCUTS_GROUP,
+      relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
+      position: 'before'
     });
   }
 
@@ -497,10 +475,25 @@ class CollapsibleColumns extends _base.BasePlugin {
     }
     this.hot.batchExecution(() => {
       (0, _array.arrayEach)(affectedColumnsIndexes, visualColumn => {
-        _classPrivateFieldGet(this, _collapsedColumnsMap).setValueAtIndex(this.hot.toPhysicalColumn(visualColumn), actionTranslator.hideColumn);
+        _classPrivateFieldGet(_collapsedColumnsMap, this).setValueAtIndex(this.hot.toPhysicalColumn(visualColumn), actionTranslator.hideColumn);
       });
     }, true);
     const isActionPerformed = this.getCollapsedColumns().length !== currentCollapsedColumns.length;
+    const selectionRange = this.hot.getSelectedRangeLast();
+    if (action === 'collapse' && isActionPerformed && selectionRange) {
+      const {
+        row,
+        col
+      } = selectionRange.highlight;
+      const isHidden = this.hot.rowIndexMapper.isHidden(row) || this.hot.columnIndexMapper.isHidden(col);
+      if (isHidden && affectedColumnsIndexes.includes(col)) {
+        const nextRow = row >= 0 ? this.hot.rowIndexMapper.getNearestNotHiddenIndex(row, 1, true) : row;
+        const nextColumn = col >= 0 ? this.hot.columnIndexMapper.getNearestNotHiddenIndex(col, 1, true) : col;
+        if (nextRow !== null && nextColumn !== null) {
+          this.hot.selectCell(nextRow, nextColumn);
+        }
+      }
+    }
     this.hot.runHooks(actionTranslator.afterHook, currentCollapsedColumns, destinationCollapsedColumns, isActionPossible, isActionPerformed);
     this.hot.render();
     this.hot.view.adjustElementsSize(true);
@@ -513,18 +506,18 @@ class CollapsibleColumns extends _base.BasePlugin {
    * @returns {number[]}
    */
   getCollapsedColumns() {
-    return _classPrivateFieldGet(this, _collapsedColumnsMap).getHiddenIndexes();
+    return _classPrivateFieldGet(_collapsedColumnsMap, this).getHiddenIndexes();
   }
   /**
    * Destroys the plugin instance.
    */
   destroy() {
-    _classPrivateFieldSet(this, _collapsedColumnsMap, null);
+    _classPrivateFieldSet(_collapsedColumnsMap, this, null);
     super.destroy();
   }
 }
 exports.CollapsibleColumns = CollapsibleColumns;
-function _onAfterGetColHeader2(column, TH, headerLevel) {
+function _onAfterGetColHeader(column, TH, headerLevel) {
   var _this$headerStateMana3;
   const {
     collapsible,
@@ -567,7 +560,13 @@ function _onAfterGetColHeader2(column, TH, headerLevel) {
     (_collapsibleElement = collapsibleElement) === null || _collapsibleElement === void 0 || _collapsibleElement.remove();
   }
 }
-function _onBeforeOnCellMouseDown2(event, coords) {
+/**
+ * Indicator mouse event callback.
+ *
+ * @param {object} event Mouse event.
+ * @param {object} coords Event coordinates.
+ */
+function _onBeforeOnCellMouseDown(event, coords) {
   if ((0, _element.hasClass)(event.target, COLLAPSIBLE_ELEMENT_CLASS)) {
     if ((0, _element.hasClass)(event.target, 'expanded')) {
       this.eventManager.fireEvent(event.target, 'mouseup');
@@ -579,11 +578,21 @@ function _onBeforeOnCellMouseDown2(event, coords) {
     (0, _event.stopImmediatePropagation)(event);
   }
 }
-function _onInit2() {
+/**
+ * Updates the plugin state after HoT initialization.
+ */
+function _onInit() {
   // @TODO: Workaround for broken plugin initialization abstraction (#6806).
   this.updatePlugin();
 }
-function _onAfterLoadData2(sourceData, initialLoad) {
+/**
+ * Updates the plugin state after new dataset load.
+ *
+ * @param {Array[]} sourceData Array of arrays or array of objects containing data.
+ * @param {boolean} initialLoad Flag that determines whether the data has been loaded
+ *                              during the initialization.
+ */
+function _onAfterLoadData(sourceData, initialLoad) {
   if (!initialLoad) {
     this.updatePlugin();
   }

package/plugins/collapsibleColumns/collapsibleColumns.mjs

@@ -4,20 +4,18 @@ function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclarati
 function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
 function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 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 _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
-function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
-function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
-function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
-function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
-function _classApplyDescriptorSet(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 _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 { arrayEach, arrayFilter, arrayUnique } from "../../helpers/array.mjs";
 import { rangeEach } from "../../helpers/number.mjs";
 import { warn } from "../../helpers/console.mjs";
 import { addClass, hasClass, removeClass, fastInnerText, removeAttribute, setAttribute } from "../../helpers/dom/element.mjs";
 import { stopImmediatePropagation } from "../../helpers/dom/event.mjs";
+import { EDITOR_EDIT_GROUP as SHORTCUTS_GROUP_EDITOR } from "../../shortcutContexts/index.mjs";
 import { A11Y_EXPANDED, A11Y_HIDDEN } from "../../helpers/a11y.mjs";
 export const PLUGIN_KEY = 'collapsibleColumns';
 export const PLUGIN_PRIORITY = 290;
@@ -106,32 +104,10 @@ const actionDictionary = new Map([['collapse', {
  * :::
  */
 var _collapsedColumnsMap = /*#__PURE__*/new WeakMap();
-var _onAfterGetColHeader = /*#__PURE__*/new WeakSet();
-var _onBeforeOnCellMouseDown = /*#__PURE__*/new WeakSet();
-var _onInit = /*#__PURE__*/new WeakSet();
-var _onAfterLoadData = /*#__PURE__*/new WeakSet();
+var _CollapsibleColumns_brand = /*#__PURE__*/new WeakSet();
 export class CollapsibleColumns extends BasePlugin {
   constructor() {
     super(...arguments);
-    /**
-     * Updates the plugin state after new dataset load.
-     *
-     * @param {Array[]} sourceData Array of arrays or array of objects containing data.
-     * @param {boolean} initialLoad Flag that determines whether the data has been loaded
-     *                              during the initialization.
-     */
-    _classPrivateMethodInitSpec(this, _onAfterLoadData);
-    /**
-     * Updates the plugin state after HoT initialization.
-     */
-    _classPrivateMethodInitSpec(this, _onInit);
-    /**
-     * Indicator mouse event callback.
-     *
-     * @param {object} event Mouse event.
-     * @param {object} coords Event coordinates.
-     */
-    _classPrivateMethodInitSpec(this, _onBeforeOnCellMouseDown);
     /**
      * Adds the indicator to the headers.
      *
@@ -140,7 +116,7 @@ export class CollapsibleColumns extends BasePlugin {
      * @param {number} headerLevel The index of header level counting from the top (positive
      *                             values counting from 0 to N).
      */
-    _classPrivateMethodInitSpec(this, _onAfterGetColHeader);
+    _classPrivateMethodInitSpec(this, _CollapsibleColumns_brand);
     /**
      * Cached reference to the NestedHeaders plugin.
      *
@@ -161,10 +137,7 @@ export class CollapsibleColumns extends BasePlugin {
      * @private
      * @type {HidingMap|null}
      */
-    _classPrivateFieldInitSpec(this, _collapsedColumnsMap, {
-      writable: true,
-      value: null
-    });
+    _classPrivateFieldInitSpec(this, _collapsedColumnsMap, null);
   }
   static get PLUGIN_KEY() {
     return PLUGIN_KEY;
@@ -202,23 +175,23 @@ export class CollapsibleColumns extends BasePlugin {
     if (!nestedHeaders) {
       warn('You need to configure the Nested Headers plugin in order to use collapsible headers.');
     }
-    _classPrivateFieldSet(this, _collapsedColumnsMap, this.hot.columnIndexMapper.createAndRegisterIndexMap(this.pluginName, 'hiding'));
+    _classPrivateFieldSet(_collapsedColumnsMap, this, this.hot.columnIndexMapper.createAndRegisterIndexMap(this.pluginName, 'hiding'));
     this.nestedHeadersPlugin = this.hot.getPlugin('nestedHeaders');
     this.headerStateManager = this.nestedHeadersPlugin.getStateManager();
-    this.addHook('init', () => _classPrivateMethodGet(this, _onInit, _onInit2).call(this));
+    this.addHook('init', () => _assertClassBrand(_CollapsibleColumns_brand, this, _onInit).call(this));
     this.addHook('afterLoadData', function () {
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
         args[_key] = arguments[_key];
       }
-      return _classPrivateMethodGet(_this, _onAfterLoadData, _onAfterLoadData2).call(_this, ...args);
+      return _assertClassBrand(_CollapsibleColumns_brand, _this, _onAfterLoadData).call(_this, ...args);
     });
     this.addHook('afterGetColHeader', function () {
       for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
         args[_key2] = arguments[_key2];
       }
-      return _classPrivateMethodGet(_this, _onAfterGetColHeader, _onAfterGetColHeader2).call(_this, ...args);
+      return _assertClassBrand(_CollapsibleColumns_brand, _this, _onAfterGetColHeader).call(_this, ...args);
     });
-    this.addHook('beforeOnCellMouseDown', (event, coords, TD) => _classPrivateMethodGet(this, _onBeforeOnCellMouseDown, _onBeforeOnCellMouseDown2).call(this, event, coords, TD));
+    this.addHook('beforeOnCellMouseDown', (event, coords, TD) => _assertClassBrand(_CollapsibleColumns_brand, this, _onBeforeOnCellMouseDown).call(this, event, coords, TD));
     this.registerShortcuts();
     super.enablePlugin();
     // @TODO: Workaround for broken plugin initialization abstraction (#6806).
@@ -265,7 +238,7 @@ export class CollapsibleColumns extends BasePlugin {
    */
   disablePlugin() {
     this.hot.columnIndexMapper.unregisterMap(this.pluginName);
-    _classPrivateFieldSet(this, _collapsedColumnsMap, null);
+    _classPrivateFieldSet(_collapsedColumnsMap, this, null);
     this.nestedHeadersPlugin = null;
     this.unregisterShortcuts();
     this.clearButtons();
@@ -305,12 +278,17 @@ export class CollapsibleColumns extends BasePlugin {
             col: columnIndex
           });
         }
+
+        // prevent default Enter behavior (move to the next row within a selection range)
+        return false;
       },
       runOnlyIf: () => {
-        var _this$hot$getSelected;
-        return (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight.isHeader();
+        var _this$hot$getSelected, _this$hot$getSelected2;
+        return ((_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.isSingle()) && ((_this$hot$getSelected2 = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.highlight.isHeader());
       },
-      group: SHORTCUTS_GROUP
+      group: SHORTCUTS_GROUP,
+      relativeToGroup: SHORTCUTS_GROUP_EDITOR,
+      position: 'before'
     });
   }
 
@@ -494,10 +472,25 @@ export class CollapsibleColumns extends BasePlugin {
     }
     this.hot.batchExecution(() => {
       arrayEach(affectedColumnsIndexes, visualColumn => {
-        _classPrivateFieldGet(this, _collapsedColumnsMap).setValueAtIndex(this.hot.toPhysicalColumn(visualColumn), actionTranslator.hideColumn);
+        _classPrivateFieldGet(_collapsedColumnsMap, this).setValueAtIndex(this.hot.toPhysicalColumn(visualColumn), actionTranslator.hideColumn);
       });
     }, true);
     const isActionPerformed = this.getCollapsedColumns().length !== currentCollapsedColumns.length;
+    const selectionRange = this.hot.getSelectedRangeLast();
+    if (action === 'collapse' && isActionPerformed && selectionRange) {
+      const {
+        row,
+        col
+      } = selectionRange.highlight;
+      const isHidden = this.hot.rowIndexMapper.isHidden(row) || this.hot.columnIndexMapper.isHidden(col);
+      if (isHidden && affectedColumnsIndexes.includes(col)) {
+        const nextRow = row >= 0 ? this.hot.rowIndexMapper.getNearestNotHiddenIndex(row, 1, true) : row;
+        const nextColumn = col >= 0 ? this.hot.columnIndexMapper.getNearestNotHiddenIndex(col, 1, true) : col;
+        if (nextRow !== null && nextColumn !== null) {
+          this.hot.selectCell(nextRow, nextColumn);
+        }
+      }
+    }
     this.hot.runHooks(actionTranslator.afterHook, currentCollapsedColumns, destinationCollapsedColumns, isActionPossible, isActionPerformed);
     this.hot.render();
     this.hot.view.adjustElementsSize(true);
@@ -510,17 +503,17 @@ export class CollapsibleColumns extends BasePlugin {
    * @returns {number[]}
    */
   getCollapsedColumns() {
-    return _classPrivateFieldGet(this, _collapsedColumnsMap).getHiddenIndexes();
+    return _classPrivateFieldGet(_collapsedColumnsMap, this).getHiddenIndexes();
   }
   /**
    * Destroys the plugin instance.
    */
   destroy() {
-    _classPrivateFieldSet(this, _collapsedColumnsMap, null);
+    _classPrivateFieldSet(_collapsedColumnsMap, this, null);
     super.destroy();
   }
 }
-function _onAfterGetColHeader2(column, TH, headerLevel) {
+function _onAfterGetColHeader(column, TH, headerLevel) {
   var _this$headerStateMana3;
   const {
     collapsible,
@@ -563,7 +556,13 @@ function _onAfterGetColHeader2(column, TH, headerLevel) {
     (_collapsibleElement = collapsibleElement) === null || _collapsibleElement === void 0 || _collapsibleElement.remove();
   }
 }
-function _onBeforeOnCellMouseDown2(event, coords) {
+/**
+ * Indicator mouse event callback.
+ *
+ * @param {object} event Mouse event.
+ * @param {object} coords Event coordinates.
+ */
+function _onBeforeOnCellMouseDown(event, coords) {
   if (hasClass(event.target, COLLAPSIBLE_ELEMENT_CLASS)) {
     if (hasClass(event.target, 'expanded')) {
       this.eventManager.fireEvent(event.target, 'mouseup');
@@ -575,11 +574,21 @@ function _onBeforeOnCellMouseDown2(event, coords) {
     stopImmediatePropagation(event);
   }
 }
-function _onInit2() {
+/**
+ * Updates the plugin state after HoT initialization.
+ */
+function _onInit() {
   // @TODO: Workaround for broken plugin initialization abstraction (#6806).
   this.updatePlugin();
 }
-function _onAfterLoadData2(sourceData, initialLoad) {
+/**
+ * Updates the plugin state after new dataset load.
+ *
+ * @param {Array[]} sourceData Array of arrays or array of objects containing data.
+ * @param {boolean} initialLoad Flag that determines whether the data has been loaded
+ *                              during the initialization.
+ */
+function _onAfterLoadData(sourceData, initialLoad) {
   if (!initialLoad) {
     this.updatePlugin();
   }