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

package/plugins/hiddenRows/hiddenRows.mjs

@@ -1,4 +1,12 @@
 import "core-js/modules/es.array.push.js";
+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 { BasePlugin } from "../base/index.mjs";
 import { addClass } from "../../helpers/dom/element.mjs";
 import { rangeEach } from "../../helpers/number.mjs";
@@ -123,29 +131,38 @@ export const PLUGIN_PRIORITY = 320;
  * ```
  * :::
  */
+var _settings = /*#__PURE__*/new WeakMap();
+var _hiddenRowsMap = /*#__PURE__*/new WeakMap();
 export class HiddenRows extends BasePlugin {
+  constructor() {
+    super(...arguments);
+    /**
+     * Cached settings from Handsontable settings.
+     *
+     * @private
+     * @type {object}
+     */
+    _classPrivateFieldInitSpec(this, _settings, {
+      writable: true,
+      value: {}
+    });
+    /**
+     * Map of hidden rows by the plugin.
+     *
+     * @private
+     * @type {HidingMap|null}
+     */
+    _classPrivateFieldInitSpec(this, _hiddenRowsMap, {
+      writable: true,
+      value: null
+    });
+  }
   static get PLUGIN_KEY() {
     return PLUGIN_KEY;
   }
   static get PLUGIN_PRIORITY() {
     return PLUGIN_PRIORITY;
   }
-
-  /**
-   * Cached settings from Handsontable settings.
-   *
-   * @private
-   * @type {object}
-   */
-  #settings = {};
-  /**
-   * Map of hidden rows by the plugin.
-   *
-   * @private
-   * @type {HidingMap|null}
-   */
-  #hiddenRowsMap = null;
-
   /**
    * Checks if the plugin is enabled in the handsontable settings. This method is executed in {@link Hooks#beforeInit}
    * hook and if it returns `true` then the {@link HiddenRows#enablePlugin} method is called.
@@ -166,14 +183,14 @@ export class HiddenRows extends BasePlugin {
     }
     const pluginSettings = this.hot.getSettings()[PLUGIN_KEY];
     if (isObject(pluginSettings)) {
-      this.#settings = pluginSettings;
+      _classPrivateFieldSet(this, _settings, pluginSettings);
       if (isUndefined(pluginSettings.copyPasteEnabled)) {
         pluginSettings.copyPasteEnabled = true;
       }
     }
-    this.#hiddenRowsMap = new HidingMap();
-    this.#hiddenRowsMap.addLocalHook('init', () => this.onMapInit());
-    this.hot.rowIndexMapper.registerMap(this.pluginName, this.#hiddenRowsMap);
+    _classPrivateFieldSet(this, _hiddenRowsMap, new HidingMap());
+    _classPrivateFieldGet(this, _hiddenRowsMap).addLocalHook('init', () => this.onMapInit());
+    this.hot.rowIndexMapper.registerMap(this.pluginName, _classPrivateFieldGet(this, _hiddenRowsMap));
     this.addHook('afterContextMenuDefaultOptions', function () {
       return _this.onAfterContextMenuDefaultOptions(...arguments);
     });
@@ -203,7 +220,7 @@ export class HiddenRows extends BasePlugin {
    */
   disablePlugin() {
     this.hot.rowIndexMapper.unregisterMap(this.pluginName);
-    this.#settings = {};
+    _classPrivateFieldSet(this, _settings, {});
     super.disablePlugin();
     this.resetCellsMeta();
   }
@@ -217,7 +234,7 @@ export class HiddenRows extends BasePlugin {
     const currentHideConfig = this.getHiddenRows();
     const isValidConfig = this.isValidConfig(rows);
     let destinationHideConfig = currentHideConfig;
-    const hidingMapValues = this.#hiddenRowsMap.getValues().slice();
+    const hidingMapValues = _classPrivateFieldGet(this, _hiddenRowsMap).getValues().slice();
     const isAnyRowShowed = rows.length > 0;
     if (isValidConfig && isAnyRowShowed) {
       const physicalRows = rows.map(visualRow => this.hot.toPhysicalRow(visualRow));
@@ -240,7 +257,7 @@ export class HiddenRows extends BasePlugin {
       return;
     }
     if (isValidConfig && isAnyRowShowed) {
-      this.#hiddenRowsMap.setValues(hidingMapValues);
+      _classPrivateFieldGet(this, _hiddenRowsMap).setValues(hidingMapValues);
     }
     this.hot.runHooks('afterUnhideRows', currentHideConfig, destinationHideConfig, isValidConfig && isAnyRowShowed, isValidConfig && destinationHideConfig.length < currentHideConfig.length);
   }
@@ -276,7 +293,7 @@ export class HiddenRows extends BasePlugin {
     if (isConfigValid) {
       this.hot.batchExecution(() => {
         arrayEach(rows, visualRow => {
-          this.#hiddenRowsMap.setValueAtIndex(this.hot.toPhysicalRow(visualRow), true);
+          _classPrivateFieldGet(this, _hiddenRowsMap).setValueAtIndex(this.hot.toPhysicalRow(visualRow), true);
         });
       }, true);
     }
@@ -301,7 +318,7 @@ export class HiddenRows extends BasePlugin {
    * @returns {number[]}
    */
   getHiddenRows() {
-    return arrayMap(this.#hiddenRowsMap.getHiddenIndexes(), physicalRowIndex => {
+    return arrayMap(_classPrivateFieldGet(this, _hiddenRowsMap).getHiddenIndexes(), physicalRowIndex => {
       return this.hot.toVisualRow(physicalRowIndex);
     });
   }
@@ -313,7 +330,7 @@ export class HiddenRows extends BasePlugin {
    * @returns {boolean}
    */
   isHidden(row) {
-    return this.#hiddenRowsMap.getValueAtIndex(this.hot.toPhysicalRow(row)) || false;
+    return _classPrivateFieldGet(this, _hiddenRowsMap).getValueAtIndex(this.hot.toPhysicalRow(row)) || false;
   }
 
   /**
@@ -369,7 +386,7 @@ export class HiddenRows extends BasePlugin {
    * @param {object} cellProperties Object containing the cell properties.
    */
   onAfterGetCellMeta(row, column, cellProperties) {
-    if (this.#settings.copyPasteEnabled === false && this.isHidden(row)) {
+    if (_classPrivateFieldGet(this, _settings).copyPasteEnabled === false && this.isHidden(row)) {
       // Cell property handled by the `Autofill` and the `CopyPaste` plugins.
       cellProperties.skipRowOnPaste = true;
     }
@@ -399,7 +416,7 @@ export class HiddenRows extends BasePlugin {
    */
   onModifyCopyableRange(ranges) {
     // Ranges shouldn't be modified when `copyPasteEnabled` option is set to `true` (by default).
-    if (this.#settings.copyPasteEnabled) {
+    if (_classPrivateFieldGet(this, _settings).copyPasteEnabled) {
       return ranges;
     }
     const newRanges = [];
@@ -442,7 +459,7 @@ export class HiddenRows extends BasePlugin {
    * @param {HTMLElement} TH Header's TH element.
    */
   onAfterGetRowHeader(row, TH) {
-    if (!this.#settings.indicators || row < 0) {
+    if (!_classPrivateFieldGet(this, _settings).indicators || row < 0) {
       return;
     }
     const classList = [];
@@ -473,8 +490,8 @@ export class HiddenRows extends BasePlugin {
    * @private
    */
   onMapInit() {
-    if (Array.isArray(this.#settings.rows)) {
-      this.hideRows(this.#settings.rows);
+    if (Array.isArray(_classPrivateFieldGet(this, _settings).rows)) {
+      this.hideRows(_classPrivateFieldGet(this, _settings).rows);
     }
   }
 
@@ -482,8 +499,8 @@ export class HiddenRows extends BasePlugin {
    * Destroys the plugin instance.
    */
   destroy() {
-    this.#settings = null;
-    this.#hiddenRowsMap = null;
+    _classPrivateFieldSet(this, _settings, null);
+    _classPrivateFieldSet(this, _hiddenRowsMap, null);
     super.destroy();
   }
 }

package/plugins/manualRowResize/manualRowResize.js

@@ -292,8 +292,9 @@ class ManualRowResize extends _base.BasePlugin {
    * @returns {boolean}
    */
   checkIfRowHeader(element) {
+    var _element$parentNode;
     const thElement = (0, _element.closest)(element, ['TH'], this.hot.rootElement);
-    return thElement && element.parentNode?.parentNode?.tagName === 'TBODY';
+    return thElement && ((_element$parentNode = element.parentNode) === null || _element$parentNode === void 0 || (_element$parentNode = _element$parentNode.parentNode) === null || _element$parentNode === void 0 ? void 0 : _element$parentNode.tagName) === 'TBODY';
   }
 
   /**

package/plugins/manualRowResize/manualRowResize.mjs

@@ -284,8 +284,9 @@ export class ManualRowResize extends BasePlugin {
    * @returns {boolean}
    */
   checkIfRowHeader(element) {
+    var _element$parentNode;
     const thElement = closest(element, ['TH'], this.hot.rootElement);
-    return thElement && element.parentNode?.parentNode?.tagName === 'TBODY';
+    return thElement && ((_element$parentNode = element.parentNode) === null || _element$parentNode === void 0 || (_element$parentNode = _element$parentNode.parentNode) === null || _element$parentNode === void 0 ? void 0 : _element$parentNode.tagName) === 'TBODY';
   }
 
   /**

package/plugins/mergeCells/mergeCells.js

@@ -188,9 +188,6 @@ class MergeCells extends _base.BasePlugin {
     this.addHook('afterDrawSelection', function () {
       return _this.onAfterDrawSelection(...arguments);
     });
-    this.addHook('beforeRemoveCellClassNames', function () {
-      return _this.onBeforeRemoveCellClassNames(...arguments);
-    });
     this.addHook('beforeUndoStackChange', (action, source) => {
       if (source === 'MergeCells') {
         return false;
@@ -252,7 +249,7 @@ class MergeCells extends _base.BasePlugin {
     rowIndexesToRefresh = [...new Set(rowIndexesToRefresh)];
     rowIndexesToRefresh.forEach(rowIndex => {
       const renderableRowIndex = this.hot.rowIndexMapper.getRenderableFromVisualIndex(rowIndex);
-      this.hot.view._wt.wtOverlays.getOverlays(true).map(overlay => overlay?.name === 'master' ? overlay : overlay.clone.wtTable).forEach(wtTableRef => {
+      this.hot.view._wt.wtOverlays.getOverlays(true).map(overlay => (overlay === null || overlay === void 0 ? void 0 : overlay.name) === 'master' ? overlay : overlay.clone.wtTable).forEach(wtTableRef => {
         const rowToRefresh = wtTableRef.getRow(renderableRowIndex);
         if (rowToRefresh) {
           // Modify the TR's `background` property to later modify it asynchronously.
@@ -574,8 +571,11 @@ class MergeCells extends _base.BasePlugin {
     gridContext.addShortcut({
       keys: [['Control', 'm']],
       callback: () => {
-        this.toggleMerge(this.hot.getSelectedRangeLast());
-        this.hot.render();
+        const range = this.hot.getSelectedRangeLast();
+        if (range && !range.isSingleHeader()) {
+          this.toggleMerge(range);
+          this.hot.render();
+        }
       },
       runOnlyIf: event => !event.altKey,
       // right ALT in some systems triggers ALT+CTRL
@@ -1198,16 +1198,5 @@ class MergeCells extends _base.BasePlugin {
     }
     return this.selectionCalculations.getSelectedMergedCellClassName(currentRow, currentColumn, cornersOfSelection, layerLevel);
   }
-
-  /**
-   * `beforeRemoveCellClassNames` hook callback. Used to remove additional class name from all cells in the table.
-   *
-   * @private
-   * @returns {string[]} An `Array` of `String`s. Each of these strings will act like class names to be removed from
-   *   all the cells in the table.
-   */
-  onBeforeRemoveCellClassNames() {
-    return this.selectionCalculations.getSelectedMergedCellClassNameToRemove();
-  }
 }
 exports.MergeCells = MergeCells;

package/plugins/mergeCells/mergeCells.mjs

@@ -182,9 +182,6 @@ export class MergeCells extends BasePlugin {
     this.addHook('afterDrawSelection', function () {
       return _this.onAfterDrawSelection(...arguments);
     });
-    this.addHook('beforeRemoveCellClassNames', function () {
-      return _this.onBeforeRemoveCellClassNames(...arguments);
-    });
     this.addHook('beforeUndoStackChange', (action, source) => {
       if (source === 'MergeCells') {
         return false;
@@ -246,7 +243,7 @@ export class MergeCells extends BasePlugin {
     rowIndexesToRefresh = [...new Set(rowIndexesToRefresh)];
     rowIndexesToRefresh.forEach(rowIndex => {
       const renderableRowIndex = this.hot.rowIndexMapper.getRenderableFromVisualIndex(rowIndex);
-      this.hot.view._wt.wtOverlays.getOverlays(true).map(overlay => overlay?.name === 'master' ? overlay : overlay.clone.wtTable).forEach(wtTableRef => {
+      this.hot.view._wt.wtOverlays.getOverlays(true).map(overlay => (overlay === null || overlay === void 0 ? void 0 : overlay.name) === 'master' ? overlay : overlay.clone.wtTable).forEach(wtTableRef => {
         const rowToRefresh = wtTableRef.getRow(renderableRowIndex);
         if (rowToRefresh) {
           // Modify the TR's `background` property to later modify it asynchronously.
@@ -568,8 +565,11 @@ export class MergeCells extends BasePlugin {
     gridContext.addShortcut({
       keys: [['Control', 'm']],
       callback: () => {
-        this.toggleMerge(this.hot.getSelectedRangeLast());
-        this.hot.render();
+        const range = this.hot.getSelectedRangeLast();
+        if (range && !range.isSingleHeader()) {
+          this.toggleMerge(range);
+          this.hot.render();
+        }
       },
       runOnlyIf: event => !event.altKey,
       // right ALT in some systems triggers ALT+CTRL
@@ -1192,15 +1192,4 @@ export class MergeCells extends BasePlugin {
     }
     return this.selectionCalculations.getSelectedMergedCellClassName(currentRow, currentColumn, cornersOfSelection, layerLevel);
   }
-
-  /**
-   * `beforeRemoveCellClassNames` hook callback. Used to remove additional class name from all cells in the table.
-   *
-   * @private
-   * @returns {string[]} An `Array` of `String`s. Each of these strings will act like class names to be removed from
-   *   all the cells in the table.
-   */
-  onBeforeRemoveCellClassNames() {
-    return this.selectionCalculations.getSelectedMergedCellClassNameToRemove();
-  }
 }

package/plugins/multiColumnSorting/multiColumnSorting.js

@@ -12,8 +12,8 @@ const PLUGIN_KEY = 'multiColumnSorting';
 exports.PLUGIN_KEY = PLUGIN_KEY;
 const PLUGIN_PRIORITY = 170;
 exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
-const APPEND_COLUMN_CONFIG_STRATEGY = 'append';
 const CONFLICTED_PLUGIN_KEY = 'columnSorting';
+const SHORTCUTS_GROUP = PLUGIN_KEY;
 (0, _sortService.registerRootComparator)(PLUGIN_KEY, _rootComparator.rootComparator);
 
 /**
@@ -113,6 +113,41 @@ class MultiColumnSorting extends _columnSorting.ColumnSorting {
     super.disablePlugin();
   }
 
+  /**
+   * Register shortcuts responsible for toggling column sorting functionality.
+   *
+   * @private
+   */
+  registerShortcuts() {
+    super.registerShortcuts();
+    this.hot.getShortcutManager().getContext('grid').addShortcut({
+      keys: [['Control/Meta', 'Enter']],
+      callback: () => {
+        const {
+          highlight
+        } = this.hot.getSelectedRangeLast();
+        if (highlight.row === -1 && highlight.col >= 0) {
+          this.sort(this.getNextSortConfig(highlight.col, _columnSorting.APPEND_COLUMN_CONFIG_STRATEGY));
+        }
+      },
+      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 column sorting functionality.
+   *
+   * @private
+   */
+  unregisterShortcuts() {
+    super.unregisterShortcuts();
+    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+  }
+
   /**
    * Sorts the table by chosen columns and orders.
    *
@@ -262,7 +297,7 @@ class MultiColumnSorting extends _columnSorting.ColumnSorting {
       if (this.hot.getShortcutManager().isCtrlPressed()) {
         this.hot.deselectCell();
         this.hot.selectColumns(coords.col);
-        this.sort(this.getNextSortConfig(coords.col, APPEND_COLUMN_CONFIG_STRATEGY));
+        this.sort(this.getNextSortConfig(coords.col, _columnSorting.APPEND_COLUMN_CONFIG_STRATEGY));
       } else {
         this.sort(this.getColumnNextConfig(coords.col));
       }

package/plugins/multiColumnSorting/multiColumnSorting.mjs

@@ -1,4 +1,4 @@
-import { ColumnSorting } from "../columnSorting/index.mjs";
+import { APPEND_COLUMN_CONFIG_STRATEGY, ColumnSorting } from "../columnSorting/index.mjs";
 import { registerRootComparator } from "../columnSorting/sortService/index.mjs";
 import { wasHeaderClickedProperly } from "../columnSorting/utils.mjs";
 import { addClass, removeClass } from "../../helpers/dom/element.mjs";
@@ -7,8 +7,8 @@ import { warnAboutPluginsConflict } from "./utils.mjs";
 import { getClassesToAdd, getClassesToRemove } from "./domHelpers.mjs";
 export const PLUGIN_KEY = 'multiColumnSorting';
 export const PLUGIN_PRIORITY = 170;
-const APPEND_COLUMN_CONFIG_STRATEGY = 'append';
 const CONFLICTED_PLUGIN_KEY = 'columnSorting';
+const SHORTCUTS_GROUP = PLUGIN_KEY;
 registerRootComparator(PLUGIN_KEY, rootComparator);
 
 /**
@@ -108,6 +108,41 @@ export class MultiColumnSorting extends ColumnSorting {
     super.disablePlugin();
   }
 
+  /**
+   * Register shortcuts responsible for toggling column sorting functionality.
+   *
+   * @private
+   */
+  registerShortcuts() {
+    super.registerShortcuts();
+    this.hot.getShortcutManager().getContext('grid').addShortcut({
+      keys: [['Control/Meta', 'Enter']],
+      callback: () => {
+        const {
+          highlight
+        } = this.hot.getSelectedRangeLast();
+        if (highlight.row === -1 && highlight.col >= 0) {
+          this.sort(this.getNextSortConfig(highlight.col, APPEND_COLUMN_CONFIG_STRATEGY));
+        }
+      },
+      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 column sorting functionality.
+   *
+   * @private
+   */
+  unregisterShortcuts() {
+    super.unregisterShortcuts();
+    this.hot.getShortcutManager().getContext('grid').removeShortcutsByGroup(SHORTCUTS_GROUP);
+  }
+
   /**
    * Sorts the table by chosen columns and orders.
    *