handsontable 13.1.0 → 14.0.0-next-d97b156-20231027

package/plugins/manualRowResize/manualRowResize.js

@@ -12,10 +12,8 @@ var _src = require("../../3rdparty/walkontable/src");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // Developer note! Whenever you make a change in this file, make an analogous change in manualColumnResize.js
 
-const PLUGIN_KEY = 'manualRowResize';
-exports.PLUGIN_KEY = PLUGIN_KEY;
-const PLUGIN_PRIORITY = 30;
-exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
+const PLUGIN_KEY = exports.PLUGIN_KEY = 'manualRowResize';
+const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 30;
 const PERSISTENT_STATE_KEY = 'manualRowHeights';
 const privatePool = new WeakMap();
 

package/plugins/mergeCells/calculations/autofill.js

@@ -389,5 +389,4 @@ class AutofillCalculations {
     return !!this.mergedCellsCollection.getWithinRange(dragRange, true);
   }
 }
-var _default = AutofillCalculations;
-exports.default = _default;
+var _default = exports.default = AutofillCalculations;

package/plugins/mergeCells/calculations/selection.js

@@ -179,5 +179,4 @@ class SelectionCalculations {
     return classNames;
   }
 }
-var _default = SelectionCalculations;
-exports.default = _default;
+var _default = exports.default = SelectionCalculations;

package/plugins/mergeCells/cellCoords.js

@@ -303,5 +303,4 @@ class MergedCellCoords {
     return this.cellRangeFactory(this.cellCoordsFactory(this.row, this.col), this.cellCoordsFactory(this.row, this.col), this.cellCoordsFactory(this.getLastRow(), this.getLastColumn()));
   }
 }
-var _default = MergedCellCoords;
-exports.default = _default;
+var _default = exports.default = MergedCellCoords;

package/plugins/mergeCells/cellsCollection.js

@@ -288,5 +288,4 @@ class MergedCellsCollection {
     });
   }
 }
-var _default = MergedCellsCollection;
-exports.default = _default;
+var _default = exports.default = MergedCellsCollection;

package/plugins/mergeCells/contextMenuItem/toggleMerge.js

@@ -5,8 +5,8 @@ exports.default = toggleMergeItem;
 var C = _interopRequireWildcard(require("../../../i18n/constants"));
 var _cellCoords = _interopRequireDefault(require("../cellCoords"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 /**
  * @param {*} plugin The plugin instance.
  * @returns {object}

package/plugins/mergeCells/mergeCells.js

@@ -21,10 +21,8 @@ _pluginHooks.default.getSingleton().register('beforeMergeCells');
 _pluginHooks.default.getSingleton().register('afterMergeCells');
 _pluginHooks.default.getSingleton().register('beforeUnmergeCells');
 _pluginHooks.default.getSingleton().register('afterUnmergeCells');
-const PLUGIN_KEY = 'mergeCells';
-exports.PLUGIN_KEY = PLUGIN_KEY;
-const PLUGIN_PRIORITY = 150;
-exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
+const PLUGIN_KEY = exports.PLUGIN_KEY = 'mergeCells';
+const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 150;
 const privatePool = new WeakMap();
 const SHORTCUTS_GROUP = PLUGIN_KEY;
 
@@ -188,9 +186,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 +570,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 +1197,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

@@ -8,12 +8,12 @@ var _element = require("../../helpers/dom/element");
 var _rootComparator = require("./rootComparator");
 var _utils2 = require("./utils");
 var _domHelpers = require("./domHelpers");
-const PLUGIN_KEY = 'multiColumnSorting';
-exports.PLUGIN_KEY = PLUGIN_KEY;
-const PLUGIN_PRIORITY = 170;
-exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
-const APPEND_COLUMN_CONFIG_STRATEGY = 'append';
+var _a11y = require("../../helpers/a11y");
+var _constants = require("../../i18n/constants");
+const PLUGIN_KEY = exports.PLUGIN_KEY = 'multiColumnSorting';
+const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 170;
 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.
    *
@@ -233,6 +268,25 @@ class MultiColumnSorting extends _columnSorting.ColumnSorting {
     }
   }
 
+  /**
+   * Update sorting indicator.
+   *
+   * @private
+   * @param {number} column Visual column index.
+   * @param {HTMLElement} headerSpanElement Header span element.
+   */
+  updateSortingIndicator(column, headerSpanElement) {
+    super.updateSortingIndicator(column, headerSpanElement);
+    const indicatorElement = headerSpanElement.querySelector('.columnSortingIndicator');
+    if (!indicatorElement || !this.hot.getSettings().ariaTags || !this.columnStatesManager.isColumnSorted(column) || this.columnStatesManager.getNumberOfSortedColumns() <= 1) {
+      return;
+    }
+    const multiColumnSortingOrder = this.columnStatesManager.getIndexOfColumnInSortQueue(column) + 1;
+    const a11yLabelAttribute = (0, _a11y.A11Y_LABEL)(`${this.hot.getTranslatedPhrase(_constants.COLUMN_HEADER_LABEL_MULTI_COLUMN_SORT_ORDER)} ${multiColumnSortingOrder}.`);
+    (0, _element.removeAttribute)(indicatorElement, (0, _a11y.A11Y_HIDDEN)()[0]);
+    (0, _element.setAttribute)(indicatorElement, ...a11yLabelAttribute);
+  }
+
   /**
    * Overwriting base plugin's `onUpdateSettings` method. Please keep in mind that `onAfterUpdateSettings` isn't called
    * for `updateSettings` in specific situations.
@@ -262,7 +316,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,14 +1,16 @@
-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";
+import { addClass, removeClass, setAttribute, removeAttribute } from "../../helpers/dom/element.mjs";
 import { rootComparator } from "./rootComparator.mjs";
 import { warnAboutPluginsConflict } from "./utils.mjs";
 import { getClassesToAdd, getClassesToRemove } from "./domHelpers.mjs";
+import { A11Y_HIDDEN, A11Y_LABEL } from "../../helpers/a11y.mjs";
+import { COLUMN_HEADER_LABEL_MULTI_COLUMN_SORT_ORDER } from "../../i18n/constants.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 +110,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.
    *
@@ -228,6 +265,25 @@ export class MultiColumnSorting extends ColumnSorting {
     }
   }
 
+  /**
+   * Update sorting indicator.
+   *
+   * @private
+   * @param {number} column Visual column index.
+   * @param {HTMLElement} headerSpanElement Header span element.
+   */
+  updateSortingIndicator(column, headerSpanElement) {
+    super.updateSortingIndicator(column, headerSpanElement);
+    const indicatorElement = headerSpanElement.querySelector('.columnSortingIndicator');
+    if (!indicatorElement || !this.hot.getSettings().ariaTags || !this.columnStatesManager.isColumnSorted(column) || this.columnStatesManager.getNumberOfSortedColumns() <= 1) {
+      return;
+    }
+    const multiColumnSortingOrder = this.columnStatesManager.getIndexOfColumnInSortQueue(column) + 1;
+    const a11yLabelAttribute = A11Y_LABEL(`${this.hot.getTranslatedPhrase(COLUMN_HEADER_LABEL_MULTI_COLUMN_SORT_ORDER)} ${multiColumnSortingOrder}.`);
+    removeAttribute(indicatorElement, A11Y_HIDDEN()[0]);
+    setAttribute(indicatorElement, ...a11yLabelAttribute);
+  }
+
   /**
    * Overwriting base plugin's `onUpdateSettings` method. Please keep in mind that `onAfterUpdateSettings` isn't called
    * for `updateSettings` in specific situations.

package/plugins/multipleSelectionHandles/multipleSelectionHandles.js

@@ -7,16 +7,14 @@ var _browser = require("../../helpers/browser");
 var _base = require("../base");
 var _eventManager = _interopRequireDefault(require("../../eventManager"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const PLUGIN_KEY = 'multipleSelectionHandles';
-exports.PLUGIN_KEY = PLUGIN_KEY;
-const PLUGIN_PRIORITY = 160;
+const PLUGIN_KEY = exports.PLUGIN_KEY = 'multipleSelectionHandles';
+const PLUGIN_PRIORITY = exports.PLUGIN_PRIORITY = 160;
 
 /**
  * @private
  * @plugin MultipleSelectionHandles
  * @class MultipleSelectionHandles
  */
-exports.PLUGIN_PRIORITY = PLUGIN_PRIORITY;
 class MultipleSelectionHandles extends _base.BasePlugin {
   static get PLUGIN_KEY() {
     return PLUGIN_KEY;