handsontable 0.0.0-next-08765b9-20230714 → 0.0.0-next-6b996e8-20230714

package/plugins/nestedRows/nestedRows.mjs

@@ -10,7 +10,6 @@ import { TrimmingMap } from "../../translations/index.mjs";
 import RowMoveController from "./utils/rowMoveController.mjs";
 export const PLUGIN_KEY = 'nestedRows';
 export const PLUGIN_PRIORITY = 300;
-const SHORTCUTS_GROUP = PLUGIN_KEY;
 const privatePool = new WeakMap();
 
 /* eslint-disable jsdoc/require-description-complete-sentence */
@@ -145,7 +144,6 @@ export class NestedRows extends BasePlugin {
     });
     this.addHook('beforeLoadData', data => this.onBeforeLoadData(data));
     this.addHook('beforeUpdateData', data => this.onBeforeLoadData(data));
-    this.registerShortcuts();
     super.enablePlugin();
   }
 
@@ -154,7 +152,6 @@ export class NestedRows extends BasePlugin {
    */
   disablePlugin() {
     this.hot.rowIndexMapper.unregisterMap('nestedRows');
-    this.unregisterShortcuts();
     super.disablePlugin();
   }
 
@@ -176,44 +173,6 @@ export class NestedRows extends BasePlugin {
     super.updatePlugin();
   }
 
-  /**
-   * Register shortcuts responsible for toggling collapsible columns.
-   *
-   * @private
-   */
-  registerShortcuts() {
-    this.hot.getShortcutManager().getContext('grid').addShortcut({
-      keys: [['Enter']],
-      callback: () => {
-        const {
-          highlight
-        } = this.hot.getSelectedRangeLast();
-        if (highlight.col === -1 && highlight.row >= 0) {
-          const row = this.collapsingUI.translateTrimmedRow(highlight.row);
-          if (this.collapsingUI.areChildrenCollapsed(row)) {
-            this.collapsingUI.expandChildren(row);
-          } else {
-            this.collapsingUI.collapseChildren(row);
-          }
-        }
-      },
-      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();
-      },
-      group: SHORTCUTS_GROUP
-    });
-  }
-
-  /**
-   * Unregister shortcuts responsible for toggling collapsible columns.
-   *
-   * @private
-   */
-  unregisterShortcuts() {
-    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
-  }
-
   /**
    * `beforeRowMove` hook callback.
    *

package/renderers/checkboxRenderer/checkboxRenderer.js

@@ -7,7 +7,7 @@ var _baseRenderer = require("../baseRenderer");
 var _eventManager = _interopRequireDefault(require("../../eventManager"));
 var _element = require("../../helpers/dom/element");
 var _mixed = require("../../helpers/mixed");
-var _shortcutContexts = require("../../shortcutContexts");
+var _editorManager = require("../../editorManager");
 var _pluginHooks = _interopRequireDefault(require("../../pluginHooks"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const isListeningKeyDownEvent = new WeakMap();
@@ -158,7 +158,7 @@ function checkboxRenderer(instance, TD, row, col, prop, value, cellProperties) {
         return !areSelectedCheckboxCells(); // False blocks next action associated with the keyboard shortcut.
       },
 
-      relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
+      relativeToGroup: _editorManager.SHORTCUTS_GROUP_EDITOR,
       position: 'before'
     }], config);
   }

package/renderers/checkboxRenderer/checkboxRenderer.mjs

@@ -3,7 +3,7 @@ import { baseRenderer } from "../baseRenderer/index.mjs";
 import EventManager from "../../eventManager.mjs";
 import { empty, addClass } from "../../helpers/dom/element.mjs";
 import { isEmpty, stringify } from "../../helpers/mixed.mjs";
-import { EDITOR_EDIT_GROUP as SHORTCUTS_GROUP_EDITOR } from "../../shortcutContexts/index.mjs";
+import { SHORTCUTS_GROUP_EDITOR } from "../../editorManager.mjs";
 import Hooks from "../../pluginHooks.mjs";
 const isListeningKeyDownEvent = new WeakMap();
 const isCheckboxListenerAdded = new WeakMap();

package/selection/highlight/constants.js

@@ -0,0 +1,15 @@
+"use strict";
+
+exports.__esModule = true;
+const ACTIVE_HEADER_TYPE = 'active-header';
+exports.ACTIVE_HEADER_TYPE = ACTIVE_HEADER_TYPE;
+const AREA_TYPE = 'area';
+exports.AREA_TYPE = AREA_TYPE;
+const CELL_TYPE = 'cell';
+exports.CELL_TYPE = CELL_TYPE;
+const FILL_TYPE = 'fill';
+exports.FILL_TYPE = FILL_TYPE;
+const HEADER_TYPE = 'header';
+exports.HEADER_TYPE = HEADER_TYPE;
+const CUSTOM_SELECTION_TYPE = 'custom-selection';
+exports.CUSTOM_SELECTION_TYPE = CUSTOM_SELECTION_TYPE;

package/selection/highlight/constants.mjs

@@ -0,0 +1,6 @@
+export const ACTIVE_HEADER_TYPE = 'active-header';
+export const AREA_TYPE = 'area';
+export const CELL_TYPE = 'cell';
+export const FILL_TYPE = 'fill';
+export const HEADER_TYPE = 'header';
+export const CUSTOM_SELECTION_TYPE = 'custom-selection';

package/selection/highlight/highlight.js

@@ -2,33 +2,9 @@
 
 exports.__esModule = true;
 require("core-js/modules/es.array.push.js");
-require("core-js/modules/es.error.cause.js");
-var _activeHeader = require("./types/activeHeader");
-var _areaLayered = require("./types/areaLayered");
-var _area = require("./types/area");
-var _column = require("./types/column");
-var _focus = require("./types/focus");
-var _customSelection = require("./types/customSelection");
-var _fill = require("./types/fill");
-var _header = require("./types/header");
-var _row = require("./types/row");
-var _src = require("../../3rdparty/walkontable/src");
-exports.ACTIVE_HEADER_TYPE = _src.HIGHLIGHT_ACTIVE_HEADER_TYPE;
-exports.AREA_TYPE = _src.HIGHLIGHT_AREA_TYPE;
-exports.FOCUS_TYPE = _src.HIGHLIGHT_FOCUS_TYPE;
-exports.CUSTOM_SELECTION_TYPE = _src.HIGHLIGHT_CUSTOM_SELECTION_TYPE;
-exports.FILL_TYPE = _src.HIGHLIGHT_FILL_TYPE;
-exports.HEADER_TYPE = _src.HIGHLIGHT_HEADER_TYPE;
-exports.ROW_TYPE = _src.HIGHLIGHT_ROW_TYPE;
-exports.COLUMN_TYPE = _src.HIGHLIGHT_COLUMN_TYPE;
+var _types = require("./types");
+var _constants = require("./constants");
 var _array = require("./../../helpers/array");
-let _Symbol$iterator;
-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(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 _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 /**
  * Highlight class responsible for managing Walkontable Selection classes.
  *
@@ -44,24 +20,14 @@ function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(
  * @class Highlight
  * @util
  */
-var _createHighlight = /*#__PURE__*/new WeakSet();
-_Symbol$iterator = Symbol.iterator;
 class Highlight {
   constructor(options) {
-    /**
-     * Creates (if not exist in the cache) Walkontable Selection instance.
-     *
-     * @param {Map} cacheMap The map where the instance will be cached.
-     * @param {Function} highlightFactory The function factory.
-     * @returns {VisualSelection}
-     */
-    _classPrivateMethodInitSpec(this, _createHighlight);
     /**
      * Options consumed by Highlight class and Walkontable Selection classes.
      *
      * @type {object}
      */
-    _defineProperty(this, "options", void 0);
+    this.options = options;
     /**
      * The property which describes which layer level of the visual selection will be modified.
      * This option is valid only for `area` and `header` highlight types which occurs multiple times on
@@ -72,96 +38,49 @@ class Highlight {
      * @type {number}
      * @default 0
      */
-    _defineProperty(this, "layerLevel", 0);
+    this.layerLevel = 0;
     /**
      * `cell` highlight object which describes attributes for the currently selected cell.
      * It can only occur only once on the table.
      *
      * @type {Selection}
      */
-    _defineProperty(this, "focus", void 0);
+    this.cell = (0, _types.createHighlight)(_constants.CELL_TYPE, options);
     /**
      * `fill` highlight object which describes attributes for the borders for autofill functionality.
      * It can only occur only once on the table.
      *
      * @type {Selection}
      */
-    _defineProperty(this, "fill", void 0);
+    this.fill = (0, _types.createHighlight)(_constants.FILL_TYPE, options);
     /**
      * Collection of the `area` highlights. That objects describes attributes for the borders and selection of
      * the multiple selected cells. It can occur multiple times on the table.
      *
      * @type {Map.<number, Selection>}
      */
-    _defineProperty(this, "layeredAreas", new Map());
-    /**
-     * Collection of the `highlight` highlights. That objects describes attributes for the borders and selection of
-     * the multiple selected cells. It can occur multiple times on the table.
-     *
-     * @type {Map.<number, Selection>}
-     */
-    _defineProperty(this, "areas", new Map());
+    this.areas = new Map();
     /**
      * Collection of the `header` highlights. That objects describes attributes for the selection of
-     * the multiple selected rows in the table header. It can occur multiple times on the table.
-     *
-     * @type {Map.<number, Selection>}
-     */
-    _defineProperty(this, "rowHeaders", new Map());
-    /**
-     * Collection of the `header` highlights. That objects describes attributes for the selection of
-     * the multiple selected columns in the table header. It can occur multiple times on the table.
-     *
-     * @type {Map.<number, Selection>}
-     */
-    _defineProperty(this, "columnHeaders", new Map());
-    /**
-     * Collection of the `active-header` highlights. That objects describes attributes for the selection of
-     * the multiple selected rows in the table header. The table headers which have selected all items in
-     * a row will be marked as `active-header`.
+     * the multiple selected rows and columns in the table header. It can occur multiple times on the table.
      *
      * @type {Map.<number, Selection>}
      */
-    _defineProperty(this, "activeRowHeaders", new Map());
+    this.headers = new Map();
     /**
      * Collection of the `active-header` highlights. That objects describes attributes for the selection of
-     * the multiple selected columns in the table header. The table headers which have selected all items in
+     * the multiple selected rows and columns in the table header. The table headers which have selected all items in
      * a row will be marked as `active-header`.
      *
      * @type {Map.<number, Selection>}
      */
-    _defineProperty(this, "activeColumnHeaders", new Map());
-    /**
-     * Collection of the `active-header` highlights. That objects describes attributes for the selection of
-     * the selected corner in the table header. The table headers which have selected all items in
-     * a row will be marked as `active-header`.
-     *
-     * @type {Map.<number, Selection>}
-     */
-    _defineProperty(this, "activeCornerHeaders", new Map());
-    /**
-     * Collection of the `rows` highlights. That objects describes attributes for the selection of
-     * the multiple selected cells in a row. It can occur multiple times on the table.
-     *
-     * @type {Map.<number, Selection>}
-     */
-    _defineProperty(this, "rowHighlights", new Map());
-    /**
-     * Collection of the `columns` highlights. That objects describes attributes for the selection of
-     * the multiple selected cells in a column. It can occur multiple times on the table.
-     *
-     * @type {Map.<number, Selection>}
-     */
-    _defineProperty(this, "columnHighlights", new Map());
+    this.activeHeaders = new Map();
     /**
      * Collection of the `custom-selection`, holder for example borders added through CustomBorders plugin.
      *
      * @type {Selection[]}
      */
-    _defineProperty(this, "customSelections", []);
-    this.options = options;
-    this.focus = (0, _focus.createHighlight)(options);
-    this.fill = (0, _fill.createHighlight)(options);
+    this.customSelections = [];
   }
 
   /**
@@ -175,14 +94,11 @@ class Highlight {
     let type = highlightType;
 
     // Legacy compatibility.
-    if (highlightType === _src.HIGHLIGHT_FOCUS_TYPE) {
+    if (highlightType === _constants.CELL_TYPE) {
       type = 'current'; // One from settings for `disableVisualSelection` up to Handsontable 0.36/Handsontable Pro 1.16.0.
     }
 
-    let disableHighlight = false;
-    if (coords.isCell()) {
-      disableHighlight = this.options.disabledCellSelection(coords.row, coords.col);
-    }
+    let disableHighlight = this.options.disabledCellSelection(coords.row, coords.col);
     if (typeof disableHighlight === 'string') {
       disableHighlight = [disableHighlight];
     }
@@ -202,13 +118,12 @@ class Highlight {
   }
 
   /**
-   * Get Walkontable Selection instance created for controlling highlight of the currently
-   * focused cell (or header).
+   * Get Walkontable Selection instance created for controlling highlight of the currently selected/edited cell.
    *
    * @returns {Selection}
    */
-  getFocus() {
-    return this.focus;
+  getCell() {
+    return this.cell;
   }
 
   /**
@@ -221,32 +136,24 @@ class Highlight {
   }
 
   /**
-   * Creates (if not exist in the cache) Walkontable Selection instance created for controlling
-   * `area` highlights.
+   * Get or create (if not exist in the cache) Walkontable Selection instance created for controlling highlight
+   * of the multiple selected cells.
    *
    * @returns {Selection}
    */
-  createLayeredArea() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.layeredAreas, _areaLayered.createHighlight);
-  }
-
-  /**
-   * Get all Walkontable Selection instances which describes the state of the visual highlight of the cells.
-   *
-   * @returns {Selection[]}
-   */
-  getLayeredAreas() {
-    return [...this.layeredAreas.values()];
-  }
-
-  /**
-   * Creates (if not exist in the cache) Walkontable Selection instance created for controlling
-   * `highlight` highlights.
-   *
-   * @returns {Selection}
-   */
-  createArea() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.areas, _area.createHighlight);
+  createOrGetArea() {
+    const layerLevel = this.layerLevel;
+    let area;
+    if (this.areas.has(layerLevel)) {
+      area = this.areas.get(layerLevel);
+    } else {
+      area = (0, _types.createHighlight)(_constants.AREA_TYPE, {
+        layerLevel,
+        ...this.options
+      });
+      this.areas.set(layerLevel, area);
+    }
+    return area;
   }
 
   /**
@@ -259,32 +166,23 @@ class Highlight {
   }
 
   /**
-   * Creates (if not exist in the cache) Walkontable Selection instance created for controlling
-   * header highlight for rows.
+   * Get or create (if not exist in the cache) Walkontable Selection instance created for controlling highlight
+   * of the multiple selected header cells.
    *
    * @returns {Selection}
    */
-  createRowHeader() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.rowHeaders, _header.createHighlight);
-  }
-
-  /**
-   * Get all Walkontable Selection instances which describes the state of the visual highlight of the headers.
-   *
-   * @returns {Selection[]}
-   */
-  getRowHeaders() {
-    return [...this.rowHeaders.values()];
-  }
-
-  /**
-   * Creates (if not exist in the cache) Walkontable Selection instance created for controlling
-   * header highlight for columns.
-   *
-   * @returns {Selection}
-   */
-  createColumnHeader() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.columnHeaders, _header.createHighlight);
+  createOrGetHeader() {
+    const layerLevel = this.layerLevel;
+    let header;
+    if (this.headers.has(layerLevel)) {
+      header = this.headers.get(layerLevel);
+    } else {
+      header = (0, _types.createHighlight)(_constants.HEADER_TYPE, {
+        ...this.options
+      });
+      this.headers.set(layerLevel, header);
+    }
+    return header;
   }
 
   /**
@@ -292,37 +190,28 @@ class Highlight {
    *
    * @returns {Selection[]}
    */
-  getColumnHeaders() {
-    return [...this.columnHeaders.values()];
+  getHeaders() {
+    return [...this.headers.values()];
   }
 
   /**
-   * Creates (if not exist in the cache) Walkontable Selection instance created for controlling
-   * highlight for active row headers.
+   * Get or create (if not exist in the cache) Walkontable Selection instance created for controlling highlight
+   * of the multiple selected active header cells.
    *
    * @returns {Selection}
    */
-  createActiveRowHeader() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.activeRowHeaders, _activeHeader.createHighlight);
-  }
-
-  /**
-   * Get all Walkontable Selection instances which describes the state of the visual highlight of the active headers.
-   *
-   * @returns {Selection[]}
-   */
-  getActiveRowHeaders() {
-    return [...this.activeRowHeaders.values()];
-  }
-
-  /**
-   * Creates (if not exist in the cache) Walkontable Selection instance created for controlling
-   * highlight for active column headers.
-   *
-   * @returns {Selection}
-   */
-  createActiveColumnHeader() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.activeColumnHeaders, _activeHeader.createHighlight);
+  createOrGetActiveHeader() {
+    const layerLevel = this.layerLevel;
+    let header;
+    if (this.activeHeaders.has(layerLevel)) {
+      header = this.activeHeaders.get(layerLevel);
+    } else {
+      header = (0, _types.createHighlight)(_constants.ACTIVE_HEADER_TYPE, {
+        ...this.options
+      });
+      this.activeHeaders.set(layerLevel, header);
+    }
+    return header;
   }
 
   /**
@@ -330,65 +219,8 @@ class Highlight {
    *
    * @returns {Selection[]}
    */
-  getActiveColumnHeaders() {
-    return [...this.activeColumnHeaders.values()];
-  }
-
-  /**
-   * Creates (if not exist in the cache) Walkontable Selection instance created for controlling
-   * highlight for the headers corner.
-   *
-   * @returns {Selection}
-   */
-  createActiveCornerHeader() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.activeCornerHeaders, _activeHeader.createHighlight);
-  }
-
-  /**
-   * Get all Walkontable Selection instances which describes the state of the visual highlight of the headers corner.
-   *
-   * @returns {Selection[]}
-   */
-  getActiveCornerHeaders() {
-    return [...this.activeCornerHeaders.values()];
-  }
-
-  /**
-   * Creates (if not exist in the cache) Walkontable Selection instance created for controlling
-   * highlight cells in a row.
-   *
-   * @returns {Selection}
-   */
-  createRowHighlight() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.rowHighlights, _row.createHighlight);
-  }
-
-  /**
-   * Get all Walkontable Selection instances which describes the state of the rows highlighting.
-   *
-   * @returns {Selection[]}
-   */
-  getRowHighlights() {
-    return [...this.rowHighlights.values()];
-  }
-
-  /**
-   * Creates (if not exist in the cache) Walkontable Selection instance created for controlling
-   * highlight cells in a column.
-   *
-   * @returns {Selection}
-   */
-  createColumnHighlight() {
-    return _classPrivateMethodGet(this, _createHighlight, _createHighlight2).call(this, this.columnHighlights, _column.createHighlight);
-  }
-
-  /**
-   * Get all Walkontable Selection instances which describes the state of the columns highlighting.
-   *
-   * @returns {Selection[]}
-   */
-  getColumnHighlights() {
-    return [...this.columnHighlights.values()];
+  getActiveHeaders() {
+    return [...this.activeHeaders.values()];
   }
 
   /**
@@ -406,7 +238,7 @@ class Highlight {
    * @param {object} selectionInstance The selection instance.
    */
   addCustomSelection(selectionInstance) {
-    this.customSelections.push((0, _customSelection.createHighlight)({
+    this.customSelections.push((0, _types.createHighlight)(_constants.CUSTOM_SELECTION_TYPE, {
       ...this.options,
       ...selectionInstance
     }));
@@ -416,38 +248,21 @@ class Highlight {
    * Perform cleaning visual highlights for the whole table.
    */
   clear() {
-    this.focus.clear();
+    this.cell.clear();
     this.fill.clear();
     (0, _array.arrayEach)(this.areas.values(), highlight => void highlight.clear());
-    (0, _array.arrayEach)(this.layeredAreas.values(), highlight => void highlight.clear());
-    (0, _array.arrayEach)(this.rowHeaders.values(), highlight => void highlight.clear());
-    (0, _array.arrayEach)(this.columnHeaders.values(), highlight => void highlight.clear());
-    (0, _array.arrayEach)(this.activeRowHeaders.values(), highlight => void highlight.clear());
-    (0, _array.arrayEach)(this.activeColumnHeaders.values(), highlight => void highlight.clear());
-    (0, _array.arrayEach)(this.activeCornerHeaders.values(), highlight => void highlight.clear());
-    (0, _array.arrayEach)(this.rowHighlights.values(), highlight => void highlight.clear());
-    (0, _array.arrayEach)(this.columnHighlights.values(), highlight => void highlight.clear());
+    (0, _array.arrayEach)(this.headers.values(), highlight => void highlight.clear());
+    (0, _array.arrayEach)(this.activeHeaders.values(), highlight => void highlight.clear());
   }
+
   /**
    * This object can be iterate over using `for of` syntax or using internal `arrayEach` helper.
    *
    * @returns {Selection[]}
    */
-  [_Symbol$iterator]() {
-    return [this.focus, this.fill, ...this.areas.values(), ...this.layeredAreas.values(), ...this.rowHeaders.values(), ...this.columnHeaders.values(), ...this.activeRowHeaders.values(), ...this.activeColumnHeaders.values(), ...this.activeCornerHeaders.values(), ...this.rowHighlights.values(), ...this.columnHighlights.values(), ...this.customSelections][Symbol.iterator]();
-  }
-}
-function _createHighlight2(cacheMap, highlightFactory) {
-  const layerLevel = this.layerLevel;
-  if (cacheMap.has(layerLevel)) {
-    return cacheMap.get(layerLevel);
+  [Symbol.iterator]() {
+    return [this.cell, this.fill, ...this.areas.values(), ...this.headers.values(), ...this.activeHeaders.values(), ...this.customSelections][Symbol.iterator]();
   }
-  const highlight = highlightFactory({
-    layerLevel,
-    ...this.options
-  });
-  cacheMap.set(layerLevel, highlight);
-  return highlight;
 }
 var _default = Highlight;
 exports.default = _default;