handsontable 0.0.0-next-b66c79f-20230713 → 0.0.0-next-08765b9-20230714

package/plugins/nestedHeaders/stateManager/headersTree.mjs

@@ -1,3 +1,11 @@
+import "core-js/modules/es.error.cause.js";
+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 _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 { arrayEach } from "../../../helpers/array.mjs";
 import TreeNode from "../../../utils/dataStructures/tree.mjs";
 /* eslint-disable jsdoc/require-description-complete-sentence */
@@ -36,32 +44,44 @@ import TreeNode from "../../../utils/dataStructures/tree.mjs";
  *
  */
 /* eslint-enable jsdoc/require-description-complete-sentence */
+var _rootNodes = /*#__PURE__*/new WeakMap();
+var _rootsIndex = /*#__PURE__*/new WeakMap();
+var _sourceSettings = /*#__PURE__*/new WeakMap();
 export default class HeadersTree {
-  /**
-   * The collection of nested headers settings structured into trees. The root trees are stored
-   * under the visual column index.
-   *
-   * @private
-   * @type {Map<number, TreeNode>}
-   */
-  #rootNodes = new Map();
-  /**
-   * A map that translates the visual column indexes that intersect the range
-   * defined by the header colspan width to the root index.
-   *
-   * @private
-   * @type {Map<number, number>}
-   */
-  #rootsIndex = new Map();
-  /**
-   * The instance of the SourceSettings class.
-   *
-   * @private
-   * @type {SourceSettings}
-   */
-  #sourceSettings = null;
   constructor(sourceSettings) {
-    this.#sourceSettings = sourceSettings;
+    /**
+     * The collection of nested headers settings structured into trees. The root trees are stored
+     * under the visual column index.
+     *
+     * @private
+     * @type {Map<number, TreeNode>}
+     */
+    _classPrivateFieldInitSpec(this, _rootNodes, {
+      writable: true,
+      value: new Map()
+    });
+    /**
+     * A map that translates the visual column indexes that intersect the range
+     * defined by the header colspan width to the root index.
+     *
+     * @private
+     * @type {Map<number, number>}
+     */
+    _classPrivateFieldInitSpec(this, _rootsIndex, {
+      writable: true,
+      value: new Map()
+    });
+    /**
+     * The instance of the SourceSettings class.
+     *
+     * @private
+     * @type {SourceSettings}
+     */
+    _classPrivateFieldInitSpec(this, _sourceSettings, {
+      writable: true,
+      value: null
+    });
+    _classPrivateFieldSet(this, _sourceSettings, sourceSettings);
   }
 
   /**
@@ -70,7 +90,7 @@ export default class HeadersTree {
    * @returns {TreeNode[]}
    */
   getRoots() {
-    return Array.from(this.#rootNodes.values());
+    return Array.from(_classPrivateFieldGet(this, _rootNodes).values());
   }
 
   /**
@@ -81,8 +101,8 @@ export default class HeadersTree {
    */
   getRootByColumn(columnIndex) {
     let node;
-    if (this.#rootsIndex.has(columnIndex)) {
-      node = this.#rootNodes.get(this.#rootsIndex.get(columnIndex));
+    if (_classPrivateFieldGet(this, _rootsIndex).has(columnIndex)) {
+      node = _classPrivateFieldGet(this, _rootNodes).get(_classPrivateFieldGet(this, _rootsIndex).get(columnIndex));
     }
     return node;
   }
@@ -102,7 +122,7 @@ export default class HeadersTree {
 
     // Normalize the visual column index to a 0-based system for a specific "box" defined
     // by root node colspan width.
-    const normColumnIndex = columnIndex - this.#rootsIndex.get(columnIndex);
+    const normColumnIndex = columnIndex - _classPrivateFieldGet(this, _rootsIndex).get(columnIndex);
     let columnCursor = 0;
     let treeNode;
 
@@ -132,8 +152,8 @@ export default class HeadersTree {
    */
   rebuildTreeIndex() {
     let columnIndex = 0;
-    this.#rootsIndex.clear();
-    arrayEach(this.#rootNodes, _ref => {
+    _classPrivateFieldGet(this, _rootsIndex).clear();
+    arrayEach(_classPrivateFieldGet(this, _rootNodes), _ref => {
       let [, {
         data: {
           colspan
@@ -141,7 +161,7 @@ export default class HeadersTree {
       }] = _ref;
       // Map tree range (colspan range/width) into visual column index of the root node.
       for (let i = columnIndex; i < columnIndex + colspan; i++) {
-        this.#rootsIndex.set(i, columnIndex);
+        _classPrivateFieldGet(this, _rootsIndex).set(i, columnIndex);
       }
       columnIndex += colspan;
     });
@@ -153,12 +173,12 @@ export default class HeadersTree {
    */
   buildTree() {
     this.clear();
-    const columnsCount = this.#sourceSettings.getColumnsCount();
+    const columnsCount = _classPrivateFieldGet(this, _sourceSettings).getColumnsCount();
     let columnIndex = 0;
     while (columnIndex < columnsCount) {
-      const columnSettings = this.#sourceSettings.getHeaderSettings(0, columnIndex);
+      const columnSettings = _classPrivateFieldGet(this, _sourceSettings).getHeaderSettings(0, columnIndex);
       const rootNode = new TreeNode();
-      this.#rootNodes.set(columnIndex, rootNode);
+      _classPrivateFieldGet(this, _rootNodes).set(columnIndex, rootNode);
       this.buildLeaves(rootNode, columnIndex, 0, columnSettings.origColspan);
       columnIndex += columnSettings.origColspan;
     }
@@ -175,7 +195,7 @@ export default class HeadersTree {
    */
   buildLeaves(parentNode, columnIndex, headerLevel) {
     let extractionLength = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
-    const columnsSettings = this.#sourceSettings.getHeadersSettings(headerLevel, columnIndex, extractionLength);
+    const columnsSettings = _classPrivateFieldGet(this, _sourceSettings).getHeadersSettings(headerLevel, columnIndex, extractionLength);
     headerLevel += 1;
     arrayEach(columnsSettings, columnSettings => {
       const nodeData = {
@@ -202,7 +222,7 @@ export default class HeadersTree {
         node = new TreeNode(nodeData);
         parentNode.addChild(node);
       }
-      if (headerLevel < this.#sourceSettings.getLayersCount()) {
+      if (headerLevel < _classPrivateFieldGet(this, _sourceSettings).getLayersCount()) {
         this.buildLeaves(node, columnIndex, headerLevel, columnSettings.origColspan);
       }
       columnIndex += columnSettings.origColspan;
@@ -213,7 +233,7 @@ export default class HeadersTree {
    * Clears the tree to the initial state.
    */
   clear() {
-    this.#rootNodes.clear();
-    this.#rootsIndex.clear();
+    _classPrivateFieldGet(this, _rootNodes).clear();
+    _classPrivateFieldGet(this, _rootsIndex).clear();
   }
 }

package/plugins/nestedHeaders/stateManager/index.js

@@ -1,13 +1,21 @@
 "use strict";
 
+require("core-js/modules/es.error.cause.js");
 exports.__esModule = true;
 require("core-js/modules/es.array.push.js");
 var _array = require("../../../helpers/array");
-var _sourceSettings = _interopRequireDefault(require("./sourceSettings"));
-var _headersTree = _interopRequireDefault(require("./headersTree"));
+var _sourceSettings2 = _interopRequireDefault(require("./sourceSettings"));
+var _headersTree2 = _interopRequireDefault(require("./headersTree"));
 var _nodeModifiers = require("./nodeModifiers");
 var _matrixGenerator = require("./matrixGenerator");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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 _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
+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(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
+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 _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
 /**
  * The state manager is a source of truth for nested headers configuration.
  * The state generation process is divided into three stages.
@@ -36,29 +44,42 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
  *
  * @class StateManager
  */
+var _sourceSettings = /*#__PURE__*/new WeakMap();
+var _headersTree = /*#__PURE__*/new WeakMap();
+var _stateMatrix = /*#__PURE__*/new WeakMap();
 class StateManager {
-  /**
-   * The instance of the source settings class.
-   *
-   * @private
-   * @type {SourceSettings}
-   */
-  #sourceSettings = new _sourceSettings.default();
-  /**
-   * The instance of the headers tree. The tree is generated after setting new configuration data.
-   *
-   * @private
-   * @type {HeadersTree}
-   */
-  #headersTree = new _headersTree.default(this.#sourceSettings);
-  /**
-   * Cached matrix which is generated from the tree structure.
-   *
-   * @private
-   * @type {Array[]}
-   */
-  #stateMatrix = [[]];
-
+  constructor() {
+    /**
+     * The instance of the source settings class.
+     *
+     * @private
+     * @type {SourceSettings}
+     */
+    _classPrivateFieldInitSpec(this, _sourceSettings, {
+      writable: true,
+      value: new _sourceSettings2.default()
+    });
+    /**
+     * The instance of the headers tree. The tree is generated after setting new configuration data.
+     *
+     * @private
+     * @type {HeadersTree}
+     */
+    _classPrivateFieldInitSpec(this, _headersTree, {
+      writable: true,
+      value: new _headersTree2.default(_classPrivateFieldGet(this, _sourceSettings))
+    });
+    /**
+     * Cached matrix which is generated from the tree structure.
+     *
+     * @private
+     * @type {Array[]}
+     */
+    _classPrivateFieldInitSpec(this, _stateMatrix, {
+      writable: true,
+      value: [[]]
+    });
+  }
   /**
    * Sets a new state for the nested headers plugin based on settings passed
    * directly to the plugin.
@@ -67,16 +88,16 @@ class StateManager {
    * @returns {boolean} Returns `true` if the settings are processed correctly, `false` otherwise.
    */
   setState(nestedHeadersSettings) {
-    this.#sourceSettings.setData(nestedHeadersSettings);
+    _classPrivateFieldGet(this, _sourceSettings).setData(nestedHeadersSettings);
     let hasError = false;
     try {
-      this.#headersTree.buildTree();
+      _classPrivateFieldGet(this, _headersTree).buildTree();
     } catch (ex) {
-      this.#headersTree.clear();
-      this.#sourceSettings.clear();
+      _classPrivateFieldGet(this, _headersTree).clear();
+      _classPrivateFieldGet(this, _sourceSettings).clear();
       hasError = true;
     }
-    this.#stateMatrix = (0, _matrixGenerator.generateMatrix)(this.#headersTree.getRoots());
+    _classPrivateFieldSet(this, _stateMatrix, (0, _matrixGenerator.generateMatrix)(_classPrivateFieldGet(this, _headersTree).getRoots()));
     return hasError;
   }
 
@@ -87,7 +108,7 @@ class StateManager {
    * @param {number} columnsCount The number of columns to limit to.
    */
   setColumnsLimit(columnsCount) {
-    this.#sourceSettings.setColumnsLimit(columnsCount);
+    _classPrivateFieldGet(this, _sourceSettings).setColumnsLimit(columnsCount);
   }
 
   /**
@@ -111,9 +132,9 @@ class StateManager {
         ...rest
       };
     });
-    this.#sourceSettings.mergeWith(transformedSettings);
-    this.#headersTree.buildTree();
-    this.#stateMatrix = (0, _matrixGenerator.generateMatrix)(this.#headersTree.getRoots());
+    _classPrivateFieldGet(this, _sourceSettings).mergeWith(transformedSettings);
+    _classPrivateFieldGet(this, _headersTree).buildTree();
+    _classPrivateFieldSet(this, _stateMatrix, (0, _matrixGenerator.generateMatrix)(_classPrivateFieldGet(this, _headersTree).getRoots()));
   }
 
   /**
@@ -128,9 +149,9 @@ class StateManager {
    *                            header settings.
    */
   mapState(callback) {
-    this.#sourceSettings.map(callback);
-    this.#headersTree.buildTree();
-    this.#stateMatrix = (0, _matrixGenerator.generateMatrix)(this.#headersTree.getRoots());
+    _classPrivateFieldGet(this, _sourceSettings).map(callback);
+    _classPrivateFieldGet(this, _headersTree).buildTree();
+    _classPrivateFieldSet(this, _stateMatrix, (0, _matrixGenerator.generateMatrix)(_classPrivateFieldGet(this, _headersTree).getRoots()));
   }
 
   /**
@@ -143,7 +164,7 @@ class StateManager {
    * @returns {Array}
    */
   mapNodes(callback) {
-    return (0, _array.arrayReduce)(this.#headersTree.getRoots(), (acc, rootNode) => {
+    return (0, _array.arrayReduce)(_classPrivateFieldGet(this, _headersTree).getRoots(), (acc, rootNode) => {
       rootNode.walkDown(node => {
         const result = callback(node.data);
         if (result !== void 0) {
@@ -168,13 +189,13 @@ class StateManager {
     if (headerLevel < 0) {
       headerLevel = this.rowCoordsToLevel(headerLevel);
     }
-    const nodeToProcess = this.#headersTree.getNode(headerLevel, columnIndex);
+    const nodeToProcess = _classPrivateFieldGet(this, _headersTree).getNode(headerLevel, columnIndex);
     let actionResult;
     if (nodeToProcess) {
       actionResult = (0, _nodeModifiers.triggerNodeModification)(action, nodeToProcess, columnIndex);
 
       // TODO (perf-tip): Trigger matrix generation once after multiple node modifications.
-      this.#stateMatrix = (0, _matrixGenerator.generateMatrix)(this.#headersTree.getRoots());
+      _classPrivateFieldSet(this, _stateMatrix, (0, _matrixGenerator.generateMatrix)(_classPrivateFieldGet(this, _headersTree).getRoots()));
     }
     return actionResult;
   }
@@ -276,14 +297,14 @@ class StateManager {
    * @returns {object|null}
    */
   getHeaderSettings(headerLevel, columnIndex) {
-    var _this$stateMatrix$hea;
+    var _classPrivateFieldGet2, _classPrivateFieldGet3;
     if (headerLevel < 0) {
       headerLevel = this.rowCoordsToLevel(headerLevel);
     }
     if (headerLevel === null || headerLevel >= this.getLayersCount()) {
       return null;
     }
-    return (_this$stateMatrix$hea = this.#stateMatrix[headerLevel]?.[columnIndex]) != null ? _this$stateMatrix$hea : null;
+    return (_classPrivateFieldGet2 = (_classPrivateFieldGet3 = _classPrivateFieldGet(this, _stateMatrix)[headerLevel]) === null || _classPrivateFieldGet3 === void 0 ? void 0 : _classPrivateFieldGet3[columnIndex]) !== null && _classPrivateFieldGet2 !== void 0 ? _classPrivateFieldGet2 : null;
   }
 
   /**
@@ -302,7 +323,7 @@ class StateManager {
     if (headerLevel === null || headerLevel >= this.getLayersCount()) {
       return null;
     }
-    const node = this.#headersTree.getNode(headerLevel, columnIndex);
+    const node = _classPrivateFieldGet(this, _headersTree).getNode(headerLevel, columnIndex);
     if (!node) {
       return null;
     }
@@ -324,7 +345,7 @@ class StateManager {
     var _this$getHeaderSettin;
     const {
       isRoot
-    } = (_this$getHeaderSettin = this.getHeaderSettings(headerLevel, columnIndex)) != null ? _this$getHeaderSettin : {
+    } = (_this$getHeaderSettin = this.getHeaderSettings(headerLevel, columnIndex)) !== null && _this$getHeaderSettin !== void 0 ? _this$getHeaderSettin : {
       isRoot: true
     };
     if (isRoot) {
@@ -335,7 +356,7 @@ class StateManager {
       var _this$getHeaderSettin2;
       const {
         isRoot: isRootNode
-      } = (_this$getHeaderSettin2 = this.getHeaderSettings(headerLevel, stepBackColumn)) != null ? _this$getHeaderSettin2 : {
+      } = (_this$getHeaderSettin2 = this.getHeaderSettings(headerLevel, stepBackColumn)) !== null && _this$getHeaderSettin2 !== void 0 ? _this$getHeaderSettin2 : {
         isRoot: true
       };
       if (isRootNode) {
@@ -346,13 +367,50 @@ class StateManager {
     return stepBackColumn;
   }
 
+  /**
+   * The method is helpful in cases where the column index targets in-between currently
+   * collapsed column. In that case, the method returns the right-most column index
+   * where the nested header ends.
+   *
+   * @param {number} headerLevel Header level (there is support for negative and positive values).
+   * @param {number} columnIndex A visual column index.
+   * @returns {number}
+   */
+  findRightMostColumnIndex(headerLevel, columnIndex) {
+    var _this$getHeaderSettin3;
+    const {
+      isRoot,
+      origColspan
+    } = (_this$getHeaderSettin3 = this.getHeaderSettings(headerLevel, columnIndex)) !== null && _this$getHeaderSettin3 !== void 0 ? _this$getHeaderSettin3 : {
+      isRoot: true,
+      origColspan: 1
+    };
+    if (isRoot) {
+      return columnIndex + origColspan - 1;
+    }
+    let stepForthColumn = columnIndex + 1;
+    while (stepForthColumn < this.getColumnsCount()) {
+      var _this$getHeaderSettin4;
+      const {
+        isRoot: isRootNode
+      } = (_this$getHeaderSettin4 = this.getHeaderSettings(headerLevel, stepForthColumn)) !== null && _this$getHeaderSettin4 !== void 0 ? _this$getHeaderSettin4 : {
+        isRoot: true
+      };
+      if (isRootNode) {
+        break;
+      }
+      stepForthColumn += 1;
+    }
+    return stepForthColumn - 1;
+  }
+
   /**
    * Gets a total number of headers levels.
    *
    * @returns {number}
    */
   getLayersCount() {
-    return this.#sourceSettings.getLayersCount();
+    return _classPrivateFieldGet(this, _sourceSettings).getLayersCount();
   }
 
   /**
@@ -361,16 +419,16 @@ class StateManager {
    * @returns {number}
    */
   getColumnsCount() {
-    return this.#sourceSettings.getColumnsCount();
+    return _classPrivateFieldGet(this, _sourceSettings).getColumnsCount();
   }
 
   /**
    * Clears the column state manager to the initial state.
    */
   clear() {
-    this.#stateMatrix = [];
-    this.#sourceSettings.clear();
-    this.#headersTree.clear();
+    _classPrivateFieldSet(this, _stateMatrix, []);
+    _classPrivateFieldGet(this, _sourceSettings).clear();
+    _classPrivateFieldGet(this, _headersTree).clear();
   }
 }
 exports.default = StateManager;