handsontable 0.0.0-next-9059914-20231025 → 0.0.0-next-cecf979-20231026

package/plugins/filters/ui/select.mjs

@@ -1,45 +1,121 @@
-import Menu from "../../../plugins/contextMenu/menu.mjs";
+import "core-js/modules/es.error.cause.js";
+function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
+function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
+function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
+function _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 _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
+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; }
+import { Menu } from "../../../plugins/contextMenu/menu/index.mjs";
 import { clone, extend } from "../../../helpers/object.mjs";
 import { arrayEach } from "../../../helpers/array.mjs";
 import * as C from "../../../i18n/constants.mjs";
-import { SEPARATOR } from "../../../plugins/contextMenu/predefinedItems.mjs";
-import BaseUI from "./_base.mjs";
-const privatePool = new WeakMap();
-
+import { SEPARATOR } from "../../../plugins/contextMenu/predefinedItems/index.mjs";
+import { BaseUI } from "./_base.mjs";
 /**
  * @private
  * @class SelectUI
  */
-class SelectUI extends BaseUI {
+var _menu = /*#__PURE__*/new WeakMap();
+var _items = /*#__PURE__*/new WeakMap();
+var _caption = /*#__PURE__*/new WeakMap();
+var _captionElement = /*#__PURE__*/new WeakMap();
+var _dropdown = /*#__PURE__*/new WeakMap();
+var _onMenuSelect = /*#__PURE__*/new WeakSet();
+var _onMenuClosed = /*#__PURE__*/new WeakSet();
+var _onClick = /*#__PURE__*/new WeakSet();
+export class SelectUI extends BaseUI {
   static get DEFAULTS() {
     return clone({
       className: 'htUISelect',
-      wrapIt: false
+      wrapIt: false,
+      tabIndex: -1
     });
   }
+
+  /**
+   * Instance of {@link Menu}.
+   *
+   * @type {Menu}
+   */
+
   constructor(hotInstance, options) {
     super(hotInstance, extend(SelectUI.DEFAULTS, options));
-    privatePool.set(this, {});
     /**
-     * Instance of {@link Menu}.
+     * On element click listener.
      *
-     * @type {Menu}
+     * @private
      */
-    this.menu = null;
+    _classPrivateMethodInitSpec(this, _onClick);
+    /**
+     * On menu closed listener.
+     */
+    _classPrivateMethodInitSpec(this, _onMenuClosed);
+    /**
+     * On menu selected listener.
+     *
+     * @param {object} command Selected item.
+     */
+    _classPrivateMethodInitSpec(this, _onMenuSelect);
+    _classPrivateFieldInitSpec(this, _menu, {
+      writable: true,
+      value: null
+    });
     /**
      * List of available select options.
      *
      * @type {Array}
      */
-    this.items = [];
+    _classPrivateFieldInitSpec(this, _items, {
+      writable: true,
+      value: []
+    });
+    /**
+     * The reference to the BaseUI instance of the caption.
+     *
+     * @type {BaseUI}
+     */
+    _classPrivateFieldInitSpec(this, _caption, {
+      writable: true,
+      value: void 0
+    });
+    /**
+     * The reference to the table caption element.
+     *
+     * @type {HTMLTableCaptionElement}
+     */
+    _classPrivateFieldInitSpec(this, _captionElement, {
+      writable: true,
+      value: void 0
+    });
+    /**
+     * The reference to the BaseUI instance of the dropdown.
+     *
+     * @type {BaseUI}
+     */
+    _classPrivateFieldInitSpec(this, _dropdown, {
+      writable: true,
+      value: void 0
+    });
     this.registerHooks();
   }
 
+  /**
+   * Gets the instance of the Menu.
+   *
+   * @returns {Menu}
+   */
+  getMenu() {
+    return _classPrivateFieldGet(this, _menu);
+  }
+
   /**
    * Register all necessary hooks.
    */
   registerHooks() {
-    this.addLocalHook('click', () => this.onClick());
+    this.addLocalHook('click', () => _classPrivateMethodGet(this, _onClick, _onClick2).call(this));
   }
 
   /**
@@ -48,9 +124,9 @@ class SelectUI extends BaseUI {
    * @param {Array} items Array of objects with required keys `key` and `name`.
    */
   setItems(items) {
-    this.items = this.translateNames(items);
-    if (this.menu) {
-      this.menu.setMenuItems(this.items);
+    _classPrivateFieldSet(this, _items, this.translateNames(items));
+    if (_classPrivateFieldGet(this, _menu)) {
+      _classPrivateFieldGet(this, _menu).setMenuItems(_classPrivateFieldGet(this, _items));
     }
   }
 
@@ -72,26 +148,25 @@ class SelectUI extends BaseUI {
    */
   build() {
     super.build();
-    this.menu = new Menu(this.hot, {
+    _classPrivateFieldSet(this, _menu, new Menu(this.hot, {
       className: 'htSelectUI htFiltersConditionsMenu',
       keepInViewport: false,
       standalone: true,
       container: this.options.menuContainer
-    });
-    this.menu.setMenuItems(this.items);
+    }));
+    _classPrivateFieldGet(this, _menu).setMenuItems(_classPrivateFieldGet(this, _items));
     const caption = new BaseUI(this.hot, {
       className: 'htUISelectCaption'
     });
     const dropdown = new BaseUI(this.hot, {
       className: 'htUISelectDropdown'
     });
-    const priv = privatePool.get(this);
-    priv.caption = caption;
-    priv.captionElement = caption.element;
-    priv.dropdown = dropdown;
+    _classPrivateFieldSet(this, _caption, caption);
+    _classPrivateFieldSet(this, _captionElement, caption.element);
+    _classPrivateFieldSet(this, _dropdown, dropdown);
     arrayEach([caption, dropdown], element => this._element.appendChild(element.element));
-    this.menu.addLocalHook('select', command => this.onMenuSelect(command));
-    this.menu.addLocalHook('afterClose', () => this.onMenuClosed());
+    _classPrivateFieldGet(this, _menu).addLocalHook('select', command => _classPrivateMethodGet(this, _onMenuSelect, _onMenuSelect2).call(this, command));
+    _classPrivateFieldGet(this, _menu).addLocalHook('afterClose', () => _classPrivateMethodGet(this, _onMenuClosed, _onMenuClosed2).call(this));
     this.update();
   }
 
@@ -106,9 +181,9 @@ class SelectUI extends BaseUI {
     if (this.options.value) {
       conditionName = this.options.value.name;
     } else {
-      conditionName = this.menu.hot.getTranslatedPhrase(C.FILTERS_CONDITIONS_NONE);
+      conditionName = _classPrivateFieldGet(this, _menu).hot.getTranslatedPhrase(C.FILTERS_CONDITIONS_NONE);
     }
-    privatePool.get(this).captionElement.textContent = conditionName;
+    _classPrivateFieldGet(this, _captionElement).textContent = conditionName;
     super.update();
   }
 
@@ -117,14 +192,25 @@ class SelectUI extends BaseUI {
    */
   openOptions() {
     const rect = this.element.getBoundingClientRect();
-    if (this.menu) {
-      this.menu.open();
-      this.menu.setPosition({
+    if (_classPrivateFieldGet(this, _menu)) {
+      _classPrivateFieldGet(this, _menu).open();
+      _classPrivateFieldGet(this, _menu).setPosition({
         left: this.hot.isLtr() ? rect.left - 5 : rect.left - 31,
         top: rect.top - 1,
         width: rect.width,
         height: rect.height
       });
+      _classPrivateFieldGet(this, _menu).getNavigator().toFirstItem();
+      _classPrivateFieldGet(this, _menu).getKeyboardShortcutsCtrl().addCustomShortcuts([{
+        keys: [['Tab'], ['Shift', 'Tab']],
+        callback: event => {
+          this.closeOptions();
+          this.runLocalHooks('tabKeydown', event);
+        }
+      }, {
+        keys: [['Control/Meta', 'A']],
+        callback: () => false
+      }]);
     }
   }
 
@@ -132,62 +218,46 @@ class SelectUI extends BaseUI {
    * Close select dropdown menu.
    */
   closeOptions() {
-    if (this.menu) {
-      this.menu.close();
+    if (_classPrivateFieldGet(this, _menu)) {
+      _classPrivateFieldGet(this, _menu).close();
     }
   }
 
   /**
-   * On menu selected listener.
-   *
-   * @private
-   * @param {object} command Selected item.
+   * Focus element.
    */
-  onMenuSelect(command) {
-    if (command.name !== SEPARATOR) {
-      this.options.value = command;
-      this.update();
-      this.runLocalHooks('select', this.options.value);
+  focus() {
+    if (this.isBuilt()) {
+      this.element.focus();
     }
   }
-
-  /**
-   * On menu closed listener.
-   *
-   * @private
-   */
-  onMenuClosed() {
-    this.runLocalHooks('afterClose');
-  }
-
-  /**
-   * On element click listener.
-   *
-   * @private
-   */
-  onClick() {
-    this.openOptions();
-  }
-
   /**
    * Destroy instance.
    */
   destroy() {
-    if (this.menu) {
-      this.menu.destroy();
-      this.menu = null;
+    if (_classPrivateFieldGet(this, _menu)) {
+      _classPrivateFieldGet(this, _menu).destroy();
+      _classPrivateFieldSet(this, _menu, null);
     }
-    const {
-      caption,
-      dropdown
-    } = privatePool.get(this);
-    if (caption) {
-      caption.destroy();
+    if (_classPrivateFieldGet(this, _caption)) {
+      _classPrivateFieldGet(this, _caption).destroy();
     }
-    if (dropdown) {
-      dropdown.destroy();
+    if (_classPrivateFieldGet(this, _dropdown)) {
+      _classPrivateFieldGet(this, _dropdown).destroy();
     }
     super.destroy();
   }
 }
-export default SelectUI;
+function _onMenuSelect2(command) {
+  if (command.name !== SEPARATOR) {
+    this.options.value = command;
+    this.update();
+    this.runLocalHooks('select', this.options.value);
+  }
+}
+function _onMenuClosed2() {
+  this.runLocalHooks('afterClose');
+}
+function _onClick2() {
+  this.openOptions();
+}

package/plugins/hiddenColumns/hiddenColumns.mjs

@@ -13,7 +13,7 @@ import { rangeEach } from "../../helpers/number.mjs";
 import { arrayEach, arrayMap, arrayReduce } from "../../helpers/array.mjs";
 import { isObject } from "../../helpers/object.mjs";
 import { isUndefined } from "../../helpers/mixed.mjs";
-import { SEPARATOR } from "../contextMenu/predefinedItems.mjs";
+import { SEPARATOR } from "../contextMenu/predefinedItems/index.mjs";
 import Hooks from "../../pluginHooks.mjs";
 import hideColumnItem from "./contextMenuItem/hideColumn.mjs";
 import showColumnItem from "./contextMenuItem/showColumn.mjs";

package/plugins/hiddenRows/hiddenRows.mjs

@@ -13,7 +13,7 @@ import { rangeEach } from "../../helpers/number.mjs";
 import { arrayEach, arrayMap, arrayReduce } from "../../helpers/array.mjs";
 import { isObject } from "../../helpers/object.mjs";
 import { isUndefined } from "../../helpers/mixed.mjs";
-import { SEPARATOR } from "../contextMenu/predefinedItems.mjs";
+import { SEPARATOR } from "../contextMenu/predefinedItems/index.mjs";
 import Hooks from "../../pluginHooks.mjs";
 import hideRowItem from "./contextMenuItem/hideRow.mjs";
 import showRowItem from "./contextMenuItem/showRow.mjs";

package/plugins/manualColumnMove/manualColumnMove.js

@@ -387,7 +387,9 @@ class ManualColumnMove extends _base.BasePlugin {
     const priv = privatePool.get(this);
     const firstVisible = this.hot.view.getFirstFullyVisibleColumn();
     if (this.isFixedColumnsStart(priv.hoveredColumn) && firstVisible > 0) {
-      this.hot.scrollViewportTo(void 0, this.hot.columnIndexMapper.getNearestNotHiddenIndex(firstVisible - 1, -1));
+      this.hot.scrollViewportTo({
+        col: this.hot.columnIndexMapper.getNearestNotHiddenIndex(firstVisible - 1, -1)
+      });
     }
     const wtTable = this.hot.view._wt.wtTable;
     const scrollableElement = this.hot.view._wt.wtOverlays.scrollableElement;

package/plugins/manualColumnMove/manualColumnMove.mjs

@@ -381,7 +381,9 @@ export class ManualColumnMove extends BasePlugin {
     const priv = privatePool.get(this);
     const firstVisible = this.hot.view.getFirstFullyVisibleColumn();
     if (this.isFixedColumnsStart(priv.hoveredColumn) && firstVisible > 0) {
-      this.hot.scrollViewportTo(void 0, this.hot.columnIndexMapper.getNearestNotHiddenIndex(firstVisible - 1, -1));
+      this.hot.scrollViewportTo({
+        col: this.hot.columnIndexMapper.getNearestNotHiddenIndex(firstVisible - 1, -1)
+      });
     }
     const wtTable = this.hot.view._wt.wtTable;
     const scrollableElement = this.hot.view._wt.wtOverlays.scrollableElement;

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;
@@ -575,8 +572,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
@@ -1199,16 +1199,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;
@@ -569,8 +566,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
@@ -1193,15 +1193,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: [['Shift', '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: [['Shift', '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.
    *