handsontable 12.1.3 → 12.3.0-next-bb1a7c2-20221208

package/plugins/collapsibleColumns/collapsibleColumns.mjs

@@ -1,57 +1,32 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
-
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-
 function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get.bind(); } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
-
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
-
 function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
 function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
-
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
-
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
 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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+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(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 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 _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; } }
-
 import "core-js/modules/es.array.iterator.js";
 import "core-js/modules/es.map.js";
 import "core-js/modules/es.object.to-string.js";
@@ -59,15 +34,17 @@ import "core-js/modules/es.string.iterator.js";
 import "core-js/modules/web.dom-collections.iterator.js";
 import "core-js/modules/es.array.concat.js";
 import "core-js/modules/es.array.includes.js";
-import "core-js/modules/es.array.index-of.js";
 import "core-js/modules/es.weak-map.js";
+import "core-js/modules/es.symbol.to-primitive.js";
+import "core-js/modules/es.date.to-primitive.js";
+import "core-js/modules/es.symbol.js";
+import "core-js/modules/es.symbol.description.js";
+import "core-js/modules/es.number.constructor.js";
 import "core-js/modules/es.object.set-prototype-of.js";
 import "core-js/modules/es.object.get-prototype-of.js";
 import "core-js/modules/es.reflect.construct.js";
 import "core-js/modules/es.reflect.get.js";
 import "core-js/modules/es.object.get-own-property-descriptor.js";
-import "core-js/modules/es.symbol.js";
-import "core-js/modules/es.symbol.description.js";
 import "core-js/modules/es.symbol.iterator.js";
 import "core-js/modules/es.array.from.js";
 import "core-js/modules/es.array.slice.js";
@@ -77,12 +54,13 @@ 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, fastInnerText } from "../../helpers/dom/element.mjs";
+import { addClass, hasClass, removeClass, fastInnerText } from "../../helpers/dom/element.mjs";
 import EventManager from "../../eventManager.mjs";
 import { stopImmediatePropagation } from "../../helpers/dom/event.mjs";
 export var PLUGIN_KEY = 'collapsibleColumns';
 export var PLUGIN_PRIORITY = 290;
 var SETTING_KEYS = ['nestedHeaders'];
+var COLLAPSIBLE_ELEMENT_CLASS = 'collapsibleIndicator';
 var actionDictionary = new Map([['collapse', {
   hideColumn: true,
   beforeHook: 'beforeColumnCollapse',
@@ -92,6 +70,7 @@ var actionDictionary = new Map([['collapse', {
   beforeHook: 'beforeColumnExpand',
   afterHook: 'afterColumnExpand'
 }]]);
+
 /* eslint-disable jsdoc/require-description-complete-sentence */
 
 /**
@@ -110,6 +89,7 @@ var actionDictionary = new Map([['collapse', {
  * of objects, as in the example below.
  *
  * @example
+ * ::: only-for javascript
  * ```js
  * const container = document.getElementById('example');
  * const hot = new Handsontable(container, {
@@ -134,74 +114,83 @@ var actionDictionary = new Map([['collapse', {
  *   ],
  * });
  * ```
+ * :::
+ *
+ * ::: only-for react
+ * ```jsx
+ * <HotTable
+ *   data={generateDataObj()}
+ *   colHeaders={true}
+ *   rowHeaders={true}
+ *   nestedHeaders={true}
+ *   // enable plugin
+ *   collapsibleColumns={true}
+ * />
+ *
+ * // or
+ * <HotTable
+ *   data={generateDataObj()}
+ *   colHeaders={true}
+ *   rowHeaders={true}
+ *   nestedHeaders={true}
+ *   // enable and configure which columns can be collapsed
+ *   collapsibleColumns={[
+ *     {row: -4, col: 1, collapsible: true},
+ *     {row: -3, col: 5, collapsible: true}
+ *   ]}
+ * />
+ * ```
+ * :::
  */
-
 var _collapsedColumnsMap = /*#__PURE__*/new WeakMap();
-
 export var CollapsibleColumns = /*#__PURE__*/function (_BasePlugin) {
   _inherits(CollapsibleColumns, _BasePlugin);
-
   var _super = _createSuper(CollapsibleColumns);
-
   function CollapsibleColumns() {
     var _this;
-
     _classCallCheck(this, CollapsibleColumns);
-
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
     _this = _super.call.apply(_super, [this].concat(args));
-
     _defineProperty(_assertThisInitialized(_this), "nestedHeadersPlugin", null);
-
     _defineProperty(_assertThisInitialized(_this), "eventManager", new EventManager(_assertThisInitialized(_this)));
-
     _defineProperty(_assertThisInitialized(_this), "headerStateManager", null);
-
     _classPrivateFieldInitSpec(_assertThisInitialized(_this), _collapsedColumnsMap, {
       writable: true,
       value: null
     });
-
     return _this;
   }
-
   _createClass(CollapsibleColumns, [{
     key: "isEnabled",
     value:
     /**
      * Checks if the plugin is enabled in the handsontable settings. This method is executed in {@link Hooks#beforeInit}
-     * hook and if it returns `true` than the {@link CollapsibleColumns#enablePlugin} method is called.
+     * hook and if it returns `true` then the {@link CollapsibleColumns#enablePlugin} method is called.
      *
      * @returns {boolean}
      */
     function isEnabled() {
       return !!this.hot.getSettings()[PLUGIN_KEY];
     }
+
     /**
      * Enables the plugin functionality for this Handsontable instance.
      */
-
   }, {
     key: "enablePlugin",
     value: function enablePlugin() {
       var _this2 = this;
-
       if (this.enabled) {
         return;
       }
-
       var _this$hot$getSettings = this.hot.getSettings(),
-          nestedHeaders = _this$hot$getSettings.nestedHeaders;
-
+        nestedHeaders = _this$hot$getSettings.nestedHeaders;
       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'));
-
       this.nestedHeadersPlugin = this.hot.getPlugin('nestedHeaders');
       this.headerStateManager = this.nestedHeadersPlugin.getStateManager();
       this.addHook('init', function () {
@@ -210,18 +199,17 @@ export var CollapsibleColumns = /*#__PURE__*/function (_BasePlugin) {
       this.addHook('afterLoadData', function () {
         return _this2.onAfterLoadData.apply(_this2, arguments);
       });
-      this.addHook('afterGetColHeader', function (col, TH) {
-        return _this2.onAfterGetColHeader(col, TH);
+      this.addHook('afterGetColHeader', function () {
+        return _this2.onAfterGetColHeader.apply(_this2, arguments);
       });
       this.addHook('beforeOnCellMouseDown', function (event, coords, TD) {
         return _this2.onBeforeOnCellMouseDown(event, coords, TD);
       });
-
-      _get(_getPrototypeOf(CollapsibleColumns.prototype), "enablePlugin", this).call(this); // @TODO: Workaround for broken plugin initialization abstraction (#6806).
-
-
+      _get(_getPrototypeOf(CollapsibleColumns.prototype), "enablePlugin", this).call(this);
+      // @TODO: Workaround for broken plugin initialization abstraction (#6806).
       this.updatePlugin();
     }
+
     /**
      * Updates the plugin's state.
      *
@@ -229,7 +217,6 @@ export var CollapsibleColumns = /*#__PURE__*/function (_BasePlugin) {
      *   - [`collapsibleColumns`](@/api/options.md#collapsiblecolumns)
      *   - [`nestedHeaders`](@/api/options.md#nestedheaders)
      */
-
   }, {
     key: "updatePlugin",
     value: function updatePlugin() {
@@ -237,11 +224,9 @@ export var CollapsibleColumns = /*#__PURE__*/function (_BasePlugin) {
       if (!this.hot.view) {
         return;
       }
-
       if (!this.nestedHeadersPlugin.detectedOverlappedHeaders) {
         var _this$hot$getSettings2 = this.hot.getSettings(),
-            collapsibleColumns = _this$hot$getSettings2.collapsibleColumns;
-
+          collapsibleColumns = _this$hot$getSettings2.collapsibleColumns;
         if (typeof collapsibleColumns === 'boolean') {
           // Add `collapsible: true` attribute to all headers with colspan higher than 1.
           this.headerStateManager.mapState(function (headerSettings) {
@@ -258,110 +243,98 @@ export var CollapsibleColumns = /*#__PURE__*/function (_BasePlugin) {
           this.headerStateManager.mergeStateWith(collapsibleColumns);
         }
       }
-
       _get(_getPrototypeOf(CollapsibleColumns.prototype), "updatePlugin", this).call(this);
     }
+
     /**
      * Disables the plugin functionality for this Handsontable instance.
      */
-
   }, {
     key: "disablePlugin",
     value: function disablePlugin() {
       this.hot.columnIndexMapper.unregisterMap(this.pluginName);
-
       _classPrivateFieldSet(this, _collapsedColumnsMap, null);
-
       this.nestedHeadersPlugin = null;
       this.clearButtons();
-
       _get(_getPrototypeOf(CollapsibleColumns.prototype), "disablePlugin", this).call(this);
     }
+
     /**
      * Clears the expand/collapse buttons.
      *
      * @private
      */
-
   }, {
     key: "clearButtons",
     value: function clearButtons() {
       if (!this.hot.view) {
         return;
       }
-
       var headerLevels = this.hot.view._wt.getSetting('columnHeaders').length;
-
       var mainHeaders = this.hot.view._wt.wtTable.THEAD;
       var topHeaders = this.hot.view._wt.wtOverlays.topOverlay.clone.wtTable.THEAD;
       var topLeftCornerHeaders = this.hot.view._wt.wtOverlays.topInlineStartCornerOverlay ? this.hot.view._wt.wtOverlays.topInlineStartCornerOverlay.clone.wtTable.THEAD : null;
-
       var removeButton = function removeButton(button) {
         if (button) {
           button.parentNode.removeChild(button);
         }
       };
-
       rangeEach(0, headerLevels - 1, function (i) {
         var masterLevel = mainHeaders.childNodes[i];
         var topLevel = topHeaders.childNodes[i];
         var topLeftCornerLevel = topLeftCornerHeaders ? topLeftCornerHeaders.childNodes[i] : null;
         rangeEach(0, masterLevel.childNodes.length - 1, function (j) {
-          var button = masterLevel.childNodes[j].querySelector('.collapsibleIndicator');
+          var button = masterLevel.childNodes[j].querySelector(".".concat(COLLAPSIBLE_ELEMENT_CLASS));
           removeButton(button);
-
           if (topLevel && topLevel.childNodes[j]) {
-            button = topLevel.childNodes[j].querySelector('.collapsibleIndicator');
+            button = topLevel.childNodes[j].querySelector(".".concat(COLLAPSIBLE_ELEMENT_CLASS));
             removeButton(button);
           }
-
           if (topLeftCornerHeaders && topLeftCornerLevel && topLeftCornerLevel.childNodes[j]) {
-            button = topLeftCornerLevel.childNodes[j].querySelector('.collapsibleIndicator');
+            button = topLeftCornerLevel.childNodes[j].querySelector(".".concat(COLLAPSIBLE_ELEMENT_CLASS));
             removeButton(button);
           }
         });
       }, true);
     }
+
     /**
      * Expands section at the provided coords.
      *
      * @param {object} coords Contains coordinates information. (`coords.row`, `coords.col`).
      */
-
   }, {
     key: "expandSection",
     value: function expandSection(coords) {
       this.toggleCollapsibleSection([coords], 'expand');
     }
+
     /**
      * Collapses section at the provided coords.
      *
      * @param {object} coords Contains coordinates information. (`coords.row`, `coords.col`).
      */
-
   }, {
     key: "collapseSection",
     value: function collapseSection(coords) {
       this.toggleCollapsibleSection([coords], 'collapse');
     }
+
     /**
      * Collapses or expand all collapsible sections, depending on the action parameter.
      *
      * @param {string} action 'collapse' or 'expand'.
      */
-
   }, {
     key: "toggleAllCollapsibleSections",
     value: function toggleAllCollapsibleSections(action) {
       var _this3 = this;
-
       var coords = this.headerStateManager.mapNodes(function (headerSettings) {
         var collapsible = headerSettings.collapsible,
-            origColspan = headerSettings.origColspan,
-            headerLevel = headerSettings.headerLevel,
-            columnIndex = headerSettings.columnIndex,
-            isCollapsed = headerSettings.isCollapsed;
-
+          origColspan = headerSettings.origColspan,
+          headerLevel = headerSettings.headerLevel,
+          columnIndex = headerSettings.columnIndex,
+          isCollapsed = headerSettings.isCollapsed;
         if (collapsible === true && origColspan > 1 && (isCollapsed && action === 'expand' || !isCollapsed && action === 'collapse')) {
           return {
             row: _this3.headerStateManager.levelToRowCoords(headerLevel),
@@ -371,24 +344,25 @@ export var CollapsibleColumns = /*#__PURE__*/function (_BasePlugin) {
       });
       this.toggleCollapsibleSection(coords, action);
     }
+
     /**
      * Collapses all collapsible sections.
      */
-
   }, {
     key: "collapseAll",
     value: function collapseAll() {
       this.toggleAllCollapsibleSections('collapse');
     }
+
     /**
      * Expands all collapsible sections.
      */
-
   }, {
     key: "expandAll",
     value: function expandAll() {
       this.toggleAllCollapsibleSections('expand');
     }
+
     /**
      * Collapses/Expands a section.
      *
@@ -399,21 +373,18 @@ export var CollapsibleColumns = /*#__PURE__*/function (_BasePlugin) {
      * @fires Hooks#afterColumnCollapse
      * @fires Hooks#afterColumnExpand
      */
-
   }, {
     key: "toggleCollapsibleSection",
     value: function toggleCollapsibleSection(coords, action) {
       var _this4 = this;
-
       if (!actionDictionary.has(action)) {
         throw new Error("Unsupported action is passed (".concat(action, ")."));
       }
-
       if (!Array.isArray(coords)) {
         return;
-      } // Ignore coordinates which points to the cells range.
-
+      }
 
+      // Ignore coordinates which points to the cells range.
       var filteredCoords = arrayFilter(coords, function (_ref) {
         var row = _ref.row;
         return row < 0;
@@ -421,14 +392,11 @@ export var CollapsibleColumns = /*#__PURE__*/function (_BasePlugin) {
       var isActionPossible = filteredCoords.length > 0;
       arrayEach(filteredCoords, function (_ref2) {
         var _this4$headerStateMan;
-
         var row = _ref2.row,
-            column = _ref2.col;
-
+          column = _ref2.col;
         var _ref3 = (_this4$headerStateMan = _this4.headerStateManager.getHeaderSettings(row, column)) !== null && _this4$headerStateMan !== void 0 ? _this4$headerStateMan : {},
-            collapsible = _ref3.collapsible,
-            isCollapsed = _ref3.isCollapsed;
-
+          collapsible = _ref3.collapsible,
+          isCollapsed = _ref3.isCollapsed;
         if (!collapsible || isCollapsed && action === 'collapse' || !isCollapsed && action === 'expand') {
           isActionPossible = false;
           return false;
@@ -436,27 +404,22 @@ export var CollapsibleColumns = /*#__PURE__*/function (_BasePlugin) {
       });
       var nodeModRollbacks = [];
       var affectedColumnsIndexes = [];
-
       if (isActionPossible) {
         arrayEach(filteredCoords, function (_ref4) {
           var row = _ref4.row,
-              column = _ref4.col;
-
+            column = _ref4.col;
           var _this4$headerStateMan2 = _this4.headerStateManager.triggerNodeModification(action, row, column),
-              colspanCompensation = _this4$headerStateMan2.colspanCompensation,
-              affectedColumns = _this4$headerStateMan2.affectedColumns,
-              rollbackModification = _this4$headerStateMan2.rollbackModification;
-
+            colspanCompensation = _this4$headerStateMan2.colspanCompensation,
+            affectedColumns = _this4$headerStateMan2.affectedColumns,
+            rollbackModification = _this4$headerStateMan2.rollbackModification;
           if (colspanCompensation > 0) {
             affectedColumnsIndexes.push.apply(affectedColumnsIndexes, _toConsumableArray(affectedColumns));
             nodeModRollbacks.push(rollbackModification);
           }
         });
       }
-
       var currentCollapsedColumns = this.getCollapsedColumns();
       var destinationCollapsedColumns = [];
-
       if (action === 'collapse') {
         destinationCollapsedColumns = arrayUnique([].concat(_toConsumableArray(currentCollapsedColumns), affectedColumnsIndexes));
       } else if (action === 'expand') {
@@ -464,10 +427,8 @@ export var CollapsibleColumns = /*#__PURE__*/function (_BasePlugin) {
           return !affectedColumnsIndexes.includes(index);
         });
       }
-
       var actionTranslator = actionDictionary.get(action);
       var isActionAllowed = this.hot.runHooks(actionTranslator.beforeHook, currentCollapsedColumns, destinationCollapsedColumns, isActionPossible);
-
       if (isActionAllowed === false) {
         // Rollback all header nodes modification (collapse or expand).
         arrayEach(nodeModRollbacks, function (nodeModRollback) {
@@ -475,7 +436,6 @@ export var CollapsibleColumns = /*#__PURE__*/function (_BasePlugin) {
         });
         return;
       }
-
       this.hot.batchExecution(function () {
         arrayEach(affectedColumnsIndexes, function (visualColumn) {
           _classPrivateFieldGet(_this4, _collapsedColumnsMap).setValueAtIndex(_this4.hot.toPhysicalColumn(visualColumn), actionTranslator.hideColumn);
@@ -486,70 +446,58 @@ export var CollapsibleColumns = /*#__PURE__*/function (_BasePlugin) {
       this.hot.render();
       this.hot.view.adjustElementsSize(true);
     }
+
     /**
      * Gets an array of physical indexes of collapsed columns.
      *
      * @private
      * @returns {number[]}
      */
-
   }, {
     key: "getCollapsedColumns",
     value: function getCollapsedColumns() {
       return _classPrivateFieldGet(this, _collapsedColumnsMap).getHiddenIndexes();
     }
-    /**
-     * Generates the indicator element.
-     *
-     * @private
-     * @param {number} row Row index.
-     * @param {number} column Column index.
-     * @returns {HTMLElement}
-     */
-
-  }, {
-    key: "generateIndicator",
-    value: function generateIndicator(row, column) {
-      var divEl = this.hot.rootDocument.createElement('div');
-      var columnSettings = this.headerStateManager.getHeaderSettings(row, column);
-      addClass(divEl, 'collapsibleIndicator');
 
-      if (columnSettings.isCollapsed) {
-        addClass(divEl, 'collapsed');
-        fastInnerText(divEl, '+');
-      } else {
-        addClass(divEl, 'expanded');
-        fastInnerText(divEl, '-');
-      }
-
-      return divEl;
-    }
     /**
      * Adds the indicator to the headers.
      *
      * @private
      * @param {number} column Column index.
      * @param {HTMLElement} TH TH element.
+     * @param {number} headerLevel The index of header level counting from the top (positive
+     *                             values counting from 0 to N).
      */
-
   }, {
     key: "onAfterGetColHeader",
-    value: function onAfterGetColHeader(column, TH) {
+    value: function onAfterGetColHeader(column, TH, headerLevel) {
       var _this$headerStateMana;
-
-      var TR = TH.parentNode;
-      var THEAD = TR.parentNode;
-      var row = -1 * THEAD.childNodes.length + Array.prototype.indexOf.call(THEAD.childNodes, TR);
-
-      var _ref5 = (_this$headerStateMana = this.headerStateManager.getHeaderSettings(row, column)) !== null && _this$headerStateMana !== void 0 ? _this$headerStateMana : {},
-          collapsible = _ref5.collapsible,
-          origColspan = _ref5.origColspan;
-
-      if (collapsible && origColspan > 1 && column >= this.hot.getSettings().fixedColumnsStart) {
-        var button = this.generateIndicator(row, column);
-        TH.querySelector('div:first-child').appendChild(button);
+      var _ref5 = (_this$headerStateMana = this.headerStateManager.getHeaderSettings(headerLevel, column)) !== null && _this$headerStateMana !== void 0 ? _this$headerStateMana : {},
+        collapsible = _ref5.collapsible,
+        origColspan = _ref5.origColspan,
+        isCollapsed = _ref5.isCollapsed;
+      var isNodeCollapsible = collapsible && origColspan > 1 && column >= this.hot.getSettings().fixedColumnsStart;
+      var collapsibleElement = TH.querySelector(".".concat(COLLAPSIBLE_ELEMENT_CLASS));
+      if (isNodeCollapsible) {
+        if (!collapsibleElement) {
+          collapsibleElement = this.hot.rootDocument.createElement('div');
+          addClass(collapsibleElement, COLLAPSIBLE_ELEMENT_CLASS);
+          TH.querySelector('div:first-child').appendChild(collapsibleElement);
+        }
+        removeClass(collapsibleElement, ['collapsed', 'expanded']);
+        if (isCollapsed) {
+          addClass(collapsibleElement, 'collapsed');
+          fastInnerText(collapsibleElement, '+');
+        } else {
+          addClass(collapsibleElement, 'expanded');
+          fastInnerText(collapsibleElement, '-');
+        }
+      } else {
+        var _collapsibleElement;
+        (_collapsibleElement = collapsibleElement) === null || _collapsibleElement === void 0 ? void 0 : _collapsibleElement.remove();
       }
     }
+
     /**
      * Indicator mouse event callback.
      *
@@ -557,11 +505,10 @@ export var CollapsibleColumns = /*#__PURE__*/function (_BasePlugin) {
      * @param {object} event Mouse event.
      * @param {object} coords Event coordinates.
      */
-
   }, {
     key: "onBeforeOnCellMouseDown",
     value: function onBeforeOnCellMouseDown(event, coords) {
-      if (hasClass(event.target, 'collapsibleIndicator')) {
+      if (hasClass(event.target, COLLAPSIBLE_ELEMENT_CLASS)) {
         if (hasClass(event.target, 'expanded')) {
           this.eventManager.fireEvent(event.target, 'mouseup');
           this.toggleCollapsibleSection([coords], 'collapse');
@@ -569,22 +516,22 @@ export var CollapsibleColumns = /*#__PURE__*/function (_BasePlugin) {
           this.eventManager.fireEvent(event.target, 'mouseup');
           this.toggleCollapsibleSection([coords], 'expand');
         }
-
         stopImmediatePropagation(event);
       }
     }
+
     /**
      * Updates the plugin state after HoT initialization.
      *
      * @private
      */
-
   }, {
     key: "onInit",
     value: function onInit() {
       // @TODO: Workaround for broken plugin initialization abstraction (#6806).
       this.updatePlugin();
     }
+
     /**
      * Updates the plugin state after new dataset load.
      *
@@ -593,7 +540,6 @@ export var CollapsibleColumns = /*#__PURE__*/function (_BasePlugin) {
      * @param {boolean} initialLoad Flag that determines whether the data has been loaded
      *                              during the initialization.
      */
-
   }, {
     key: "onAfterLoadData",
     value: function onAfterLoadData(sourceData, initialLoad) {
@@ -601,15 +547,14 @@ export var CollapsibleColumns = /*#__PURE__*/function (_BasePlugin) {
         this.updatePlugin();
       }
     }
+
     /**
      * Destroys the plugin instance.
      */
-
   }, {
     key: "destroy",
     value: function destroy() {
       _classPrivateFieldSet(this, _collapsedColumnsMap, null);
-
       _get(_getPrototypeOf(CollapsibleColumns.prototype), "destroy", this).call(this);
     }
   }], [{
@@ -632,14 +577,13 @@ export var CollapsibleColumns = /*#__PURE__*/function (_BasePlugin) {
     get: function get() {
       return [PLUGIN_KEY].concat(SETTING_KEYS);
     }
+
     /**
      * Cached reference to the NestedHeaders plugin.
      *
      * @private
      * @type {NestedHeaders}
      */
-
   }]);
-
   return CollapsibleColumns;
 }(BasePlugin);