handsontable 0.0.0-next-301795f-20231127 → 0.0.0-next-1aba9db-20231128

package/focusManager.js

@@ -4,6 +4,7 @@ exports.__esModule = true;
 require("core-js/modules/es.error.cause.js");
 var _console = require("./helpers/console");
 var _element = require("./helpers/dom/element");
+var _function = require("./helpers/function");
 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"); } }
@@ -33,8 +34,10 @@ var _hot = /*#__PURE__*/new WeakMap();
 var _focusMode = /*#__PURE__*/new WeakMap();
 var _refocusDelay = /*#__PURE__*/new WeakMap();
 var _refocusElementGetter = /*#__PURE__*/new WeakMap();
+var _debouncedSelect = /*#__PURE__*/new WeakMap();
 var _getSelectedCell = /*#__PURE__*/new WeakSet();
-var _manageFocus = /*#__PURE__*/new WeakSet();
+var _focusCell = /*#__PURE__*/new WeakSet();
+var _focusEditorElement = /*#__PURE__*/new WeakSet();
 var _onUpdateSettings = /*#__PURE__*/new WeakSet();
 class FocusManager {
   constructor(hotInstance) {
@@ -42,21 +45,21 @@ class FocusManager {
     /**
      * Update the manager configuration after calling `updateSettings`.
      *
-     * @private
      * @param {object} newSettings The new settings passed to the `updateSettings` method.
      */
     _classPrivateMethodInitSpec(this, _onUpdateSettings);
     /**
-     * Manage the browser's focus after cell selection.
-     *
-     * @private
+     * Manage the browser's focus after cell selection end.
+     */
+    _classPrivateMethodInitSpec(this, _focusEditorElement);
+    /**
+     * Manage the browser's focus after each cell selection change.
      */
-    _classPrivateMethodInitSpec(this, _manageFocus);
+    _classPrivateMethodInitSpec(this, _focusCell);
     /**
      * Get and return the currently selected and highlighted cell/header element.
      *
-     * @private
-     * @param {Function} [callback] Callback function to be called after the cell element is retrieved.
+     * @param {Function} callback Callback function to be called after the cell element is retrieved.
      */
     _classPrivateMethodInitSpec(this, _getSelectedCell);
     /**
@@ -74,7 +77,7 @@ class FocusManager {
      * - 'mixed' - The browser's focus switches from the lastly selected cell element to the currently active editor's
      * `TEXTAREA` element after a delay defined in the manager.
      *
-     * @type {string}
+     * @type {'cell' | 'mixed'}
      */
     _classPrivateFieldInitSpec(this, _focusMode, {
       writable: true,
@@ -100,6 +103,15 @@ class FocusManager {
       writable: true,
       value: null
     });
+    /**
+     * Map of the debounced `select` functions.
+     *
+     * @type {Map<number, Function>}
+     */
+    _classPrivateFieldInitSpec(this, _debouncedSelect, {
+      writable: true,
+      value: new Map()
+    });
     const hotSettings = hotInstance.getSettings();
     _classPrivateFieldSet(this, _hot, hotInstance);
     _classPrivateFieldSet(this, _focusMode, hotSettings.imeFastEdit ? FOCUS_MODES.MIXED : FOCUS_MODES.CELL);
@@ -113,7 +125,13 @@ class FocusManager {
       for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
         args[_key2] = arguments[_key2];
       }
-      return _classPrivateMethodGet(_this, _manageFocus, _manageFocus2).call(_this, ...args);
+      return _classPrivateMethodGet(_this, _focusCell, _focusCell2).call(_this, ...args);
+    });
+    _classPrivateFieldGet(this, _hot).addHook('afterSelectionEnd', function () {
+      for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+        args[_key3] = arguments[_key3];
+      }
+      return _classPrivateMethodGet(_this, _focusEditorElement, _focusEditorElement2).call(_this, ...args);
     });
   }
 
@@ -215,7 +233,7 @@ class FocusManager {
    * Set the focus to the active editor's `TEXTAREA` element after the provided delay. If no delay is provided, it
    * will be taken from the manager's configuration.
    *
-   * @param {number} delay Delay in milliseconds.
+   * @param {number} [delay] Delay in milliseconds.
    */
   refocusToEditorTextarea() {
     var _classPrivateFieldGet5;
@@ -224,19 +242,21 @@ class FocusManager {
 
     // Re-focus on the editor's `TEXTAREA` element (or a predefined element) if the `imeFastEdit` option is enabled.
     if (_classPrivateFieldGet(this, _hot).getSettings().imeFastEdit && !((_classPrivateFieldGet5 = _classPrivateFieldGet(this, _hot).getActiveEditor()) !== null && _classPrivateFieldGet5 !== void 0 && _classPrivateFieldGet5.isOpened()) && !!refocusElement) {
-      _classPrivateFieldGet(this, _hot)._registerTimeout(() => {
-        refocusElement.select();
-      }, delay);
+      if (!_classPrivateFieldGet(this, _debouncedSelect).has(delay)) {
+        _classPrivateFieldGet(this, _debouncedSelect).set(delay, (0, _function.debounce)(() => {
+          refocusElement.select();
+        }, delay));
+      }
+      _classPrivateFieldGet(this, _debouncedSelect).get(delay)();
     }
   }
 }
 exports.FocusManager = FocusManager;
-function _getSelectedCell2() {
+function _getSelectedCell2(callback) {
   var _classPrivateFieldGet6;
-  let callback = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : () => {};
   const highlight = (_classPrivateFieldGet6 = _classPrivateFieldGet(this, _hot).getSelectedRangeLast()) === null || _classPrivateFieldGet6 === void 0 ? void 0 : _classPrivateFieldGet6.highlight;
   if (!highlight) {
-    _classPrivateFieldGet(this, _hot)._registerTimeout(() => callback(null));
+    callback(null);
     return;
   }
   const cell = _classPrivateFieldGet(this, _hot).getCell(highlight.row, highlight.col, true);
@@ -248,7 +268,7 @@ function _getSelectedCell2() {
     callback(cell);
   }
 }
-function _manageFocus2() {
+function _focusCell2() {
   _classPrivateMethodGet(this, _getSelectedCell, _getSelectedCell2).call(this, selectedCell => {
     const {
       activeElement
@@ -262,10 +282,12 @@ function _manageFocus2() {
       activeElement.blur();
     }
     this.focusOnHighlightedCell(selectedCell);
+  });
+}
+function _focusEditorElement2() {
+  _classPrivateMethodGet(this, _getSelectedCell, _getSelectedCell2).call(this, selectedCell => {
     if (this.getFocusMode() === FOCUS_MODES.MIXED && selectedCell.nodeName === 'TD') {
-      _classPrivateFieldGet(this, _hot).addHookOnce('afterSelectionEnd', () => {
-        this.refocusToEditorTextarea();
-      });
+      this.refocusToEditorTextarea();
     }
   });
 }

package/focusManager.mjs

@@ -10,6 +10,7 @@ function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!priva
 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 { warn } from "./helpers/console.mjs";
 import { isOutsideInput } from "./helpers/dom/element.mjs";
+import { debounce } from "./helpers/function.mjs";
 /**
  * Possible focus modes.
  * - CELL - The browser's focus stays on the lastly selected cell element.
@@ -30,8 +31,10 @@ var _hot = /*#__PURE__*/new WeakMap();
 var _focusMode = /*#__PURE__*/new WeakMap();
 var _refocusDelay = /*#__PURE__*/new WeakMap();
 var _refocusElementGetter = /*#__PURE__*/new WeakMap();
+var _debouncedSelect = /*#__PURE__*/new WeakMap();
 var _getSelectedCell = /*#__PURE__*/new WeakSet();
-var _manageFocus = /*#__PURE__*/new WeakSet();
+var _focusCell = /*#__PURE__*/new WeakSet();
+var _focusEditorElement = /*#__PURE__*/new WeakSet();
 var _onUpdateSettings = /*#__PURE__*/new WeakSet();
 export class FocusManager {
   constructor(hotInstance) {
@@ -39,21 +42,21 @@ export class FocusManager {
     /**
      * Update the manager configuration after calling `updateSettings`.
      *
-     * @private
      * @param {object} newSettings The new settings passed to the `updateSettings` method.
      */
     _classPrivateMethodInitSpec(this, _onUpdateSettings);
     /**
-     * Manage the browser's focus after cell selection.
-     *
-     * @private
+     * Manage the browser's focus after cell selection end.
+     */
+    _classPrivateMethodInitSpec(this, _focusEditorElement);
+    /**
+     * Manage the browser's focus after each cell selection change.
      */
-    _classPrivateMethodInitSpec(this, _manageFocus);
+    _classPrivateMethodInitSpec(this, _focusCell);
     /**
      * Get and return the currently selected and highlighted cell/header element.
      *
-     * @private
-     * @param {Function} [callback] Callback function to be called after the cell element is retrieved.
+     * @param {Function} callback Callback function to be called after the cell element is retrieved.
      */
     _classPrivateMethodInitSpec(this, _getSelectedCell);
     /**
@@ -71,7 +74,7 @@ export class FocusManager {
      * - 'mixed' - The browser's focus switches from the lastly selected cell element to the currently active editor's
      * `TEXTAREA` element after a delay defined in the manager.
      *
-     * @type {string}
+     * @type {'cell' | 'mixed'}
      */
     _classPrivateFieldInitSpec(this, _focusMode, {
       writable: true,
@@ -97,6 +100,15 @@ export class FocusManager {
       writable: true,
       value: null
     });
+    /**
+     * Map of the debounced `select` functions.
+     *
+     * @type {Map<number, Function>}
+     */
+    _classPrivateFieldInitSpec(this, _debouncedSelect, {
+      writable: true,
+      value: new Map()
+    });
     const hotSettings = hotInstance.getSettings();
     _classPrivateFieldSet(this, _hot, hotInstance);
     _classPrivateFieldSet(this, _focusMode, hotSettings.imeFastEdit ? FOCUS_MODES.MIXED : FOCUS_MODES.CELL);
@@ -110,7 +122,13 @@ export class FocusManager {
       for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
         args[_key2] = arguments[_key2];
       }
-      return _classPrivateMethodGet(_this, _manageFocus, _manageFocus2).call(_this, ...args);
+      return _classPrivateMethodGet(_this, _focusCell, _focusCell2).call(_this, ...args);
+    });
+    _classPrivateFieldGet(this, _hot).addHook('afterSelectionEnd', function () {
+      for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+        args[_key3] = arguments[_key3];
+      }
+      return _classPrivateMethodGet(_this, _focusEditorElement, _focusEditorElement2).call(_this, ...args);
     });
   }
 
@@ -212,7 +230,7 @@ export class FocusManager {
    * Set the focus to the active editor's `TEXTAREA` element after the provided delay. If no delay is provided, it
    * will be taken from the manager's configuration.
    *
-   * @param {number} delay Delay in milliseconds.
+   * @param {number} [delay] Delay in milliseconds.
    */
   refocusToEditorTextarea() {
     var _classPrivateFieldGet5;
@@ -221,18 +239,20 @@ export class FocusManager {
 
     // Re-focus on the editor's `TEXTAREA` element (or a predefined element) if the `imeFastEdit` option is enabled.
     if (_classPrivateFieldGet(this, _hot).getSettings().imeFastEdit && !((_classPrivateFieldGet5 = _classPrivateFieldGet(this, _hot).getActiveEditor()) !== null && _classPrivateFieldGet5 !== void 0 && _classPrivateFieldGet5.isOpened()) && !!refocusElement) {
-      _classPrivateFieldGet(this, _hot)._registerTimeout(() => {
-        refocusElement.select();
-      }, delay);
+      if (!_classPrivateFieldGet(this, _debouncedSelect).has(delay)) {
+        _classPrivateFieldGet(this, _debouncedSelect).set(delay, debounce(() => {
+          refocusElement.select();
+        }, delay));
+      }
+      _classPrivateFieldGet(this, _debouncedSelect).get(delay)();
     }
   }
 }
-function _getSelectedCell2() {
+function _getSelectedCell2(callback) {
   var _classPrivateFieldGet6;
-  let callback = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : () => {};
   const highlight = (_classPrivateFieldGet6 = _classPrivateFieldGet(this, _hot).getSelectedRangeLast()) === null || _classPrivateFieldGet6 === void 0 ? void 0 : _classPrivateFieldGet6.highlight;
   if (!highlight) {
-    _classPrivateFieldGet(this, _hot)._registerTimeout(() => callback(null));
+    callback(null);
     return;
   }
   const cell = _classPrivateFieldGet(this, _hot).getCell(highlight.row, highlight.col, true);
@@ -244,7 +264,7 @@ function _getSelectedCell2() {
     callback(cell);
   }
 }
-function _manageFocus2() {
+function _focusCell2() {
   _classPrivateMethodGet(this, _getSelectedCell, _getSelectedCell2).call(this, selectedCell => {
     const {
       activeElement
@@ -258,10 +278,12 @@ function _manageFocus2() {
       activeElement.blur();
     }
     this.focusOnHighlightedCell(selectedCell);
+  });
+}
+function _focusEditorElement2() {
+  _classPrivateMethodGet(this, _getSelectedCell, _getSelectedCell2).call(this, selectedCell => {
     if (this.getFocusMode() === FOCUS_MODES.MIXED && selectedCell.nodeName === 'TD') {
-      _classPrivateFieldGet(this, _hot).addHookOnce('afterSelectionEnd', () => {
-        this.refocusToEditorTextarea();
-      });
+      this.refocusToEditorTextarea();
     }
   });
 }

package/helpers/mixed.js

@@ -134,7 +134,7 @@ const domMessages = {
 function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-301795f-20231127";
+  const hotVersion = "0.0.0-next-1aba9db-20231128";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/helpers/mixed.mjs

@@ -124,7 +124,7 @@ const domMessages = {
 export function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "0.0.0-next-301795f-20231127";
+  const hotVersion = "0.0.0-next-1aba9db-20231128";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/handsontable/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "0.0.0-next-301795f-20231127",
+  "version": "0.0.0-next-1aba9db-20231128",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/plugins/contextMenu/contextMenu.js

@@ -192,7 +192,7 @@ class ContextMenu extends _base.BasePlugin {
    */
   registerShortcuts() {
     this.hot.getShortcutManager().getContext('grid').addShortcut({
-      keys: [['Control/Meta', 'Shift', '\\'], ['Shift', 'F10']],
+      keys: [['Control/Meta', 'Shift', 'Backslash'], ['Shift', 'F10']],
       callback: () => {
         const {
           highlight

package/plugins/contextMenu/contextMenu.mjs

@@ -186,7 +186,7 @@ export class ContextMenu extends BasePlugin {
    */
   registerShortcuts() {
     this.hot.getShortcutManager().getContext('grid').addShortcut({
-      keys: [['Control/Meta', 'Shift', '\\'], ['Shift', 'F10']],
+      keys: [['Control/Meta', 'Shift', 'Backslash'], ['Shift', 'F10']],
       callback: () => {
         const {
           highlight

package/shortcuts/utils.js

@@ -42,6 +42,7 @@ const getKeysList = normalizedKeys => {
  */
 exports.getKeysList = getKeysList;
 const codeToKeyRegExp = new RegExp('^(?:Key|Digit)([A-Z0-9])$');
+const keyCodeNames = new Set(['Backquote', 'Minus', 'Equal', 'BracketLeft', 'BracketRight', 'Backslash', 'Semicolon', 'Quote', 'Comma', 'Period', 'Slash']);
 
 /**
  * Normalizes a keyboard event key value to a key before its modification. When the keyboard event
@@ -58,6 +59,12 @@ const normalizeEventKey = _ref => {
     key,
     code
   } = _ref;
-  return (codeToKeyRegExp.test(code) ? code.replace(codeToKeyRegExp, '$1') : key).toLowerCase();
+  let normalizedKey = key;
+  if (codeToKeyRegExp.test(code)) {
+    normalizedKey = code.replace(codeToKeyRegExp, '$1');
+  } else if (keyCodeNames.has(code)) {
+    normalizedKey = code;
+  }
+  return normalizedKey.toLowerCase();
 };
 exports.normalizeEventKey = normalizeEventKey;

package/shortcuts/utils.mjs

@@ -37,6 +37,7 @@ export const getKeysList = normalizedKeys => {
  * the string.
  */
 const codeToKeyRegExp = new RegExp('^(?:Key|Digit)([A-Z0-9])$');
+const keyCodeNames = new Set(['Backquote', 'Minus', 'Equal', 'BracketLeft', 'BracketRight', 'Backslash', 'Semicolon', 'Quote', 'Comma', 'Period', 'Slash']);
 
 /**
  * Normalizes a keyboard event key value to a key before its modification. When the keyboard event
@@ -53,5 +54,11 @@ export const normalizeEventKey = _ref => {
     key,
     code
   } = _ref;
-  return (codeToKeyRegExp.test(code) ? code.replace(codeToKeyRegExp, '$1') : key).toLowerCase();
+  let normalizedKey = key;
+  if (codeToKeyRegExp.test(code)) {
+    normalizedKey = code.replace(codeToKeyRegExp, '$1');
+  } else if (keyCodeNames.has(code)) {
+    normalizedKey = code;
+  }
+  return normalizedKey.toLowerCase();
 };