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

package/editorManager.js

@@ -2,16 +2,14 @@
 
 exports.__esModule = true;
 var _unicode = require("./helpers/unicode");
-var _event = require("./helpers/dom/event");
 var _element = require("./helpers/dom/element");
+var _event = require("./helpers/dom/event");
 var _registry = require("./editors/registry");
 var _eventManager = _interopRequireDefault(require("./eventManager"));
 var _mixed = require("./helpers/mixed");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const SHORTCUTS_GROUP_NAVIGATION = 'editorManager.navigation';
 exports.SHORTCUTS_GROUP_NAVIGATION = SHORTCUTS_GROUP_NAVIGATION;
-const SHORTCUTS_GROUP_EDITOR = 'editorManager.handlingEditor';
-exports.SHORTCUTS_GROUP_EDITOR = SHORTCUTS_GROUP_EDITOR;
 class EditorManager {
   /**
    * @param {Core} instance The Handsontable instance.
@@ -74,9 +72,6 @@ class EditorManager {
      * @type {object}
      */
     this.cellProperties = void 0;
-    const shortcutManager = this.instance.getShortcutManager();
-    shortcutManager.addContext('editor');
-    this.registerShortcuts();
     this.instance.addHook('afterDocumentKeyDown', event => this.onAfterDocumentKeyDown(event));
 
     // Open editor when text composition is started (IME editor)
@@ -88,62 +83,6 @@ class EditorManager {
     this.instance.view._wt.update('onCellDblClick', (event, coords, elem) => this.onCellDblClick(event, coords, elem));
   }
 
-  /**
-   * Register shortcuts responsible for handling some actions related to an editor.
-   *
-   * @private
-   */
-  registerShortcuts() {
-    const shortcutManager = this.instance.getShortcutManager();
-    const gridContext = shortcutManager.getContext('grid');
-    const editorContext = shortcutManager.getContext('editor');
-    const config = {
-      group: SHORTCUTS_GROUP_EDITOR
-    };
-    editorContext.addShortcuts([{
-      keys: [['Enter'], ['Enter', 'Shift'], ['Enter', 'Control/Meta'], ['Enter', 'Control/Meta', 'Shift']],
-      callback: (event, keys) => {
-        this.closeEditorAndSaveChanges(shortcutManager.isCtrlPressed());
-        this.moveSelectionAfterEnter(keys.includes('shift'));
-      }
-    }, {
-      keys: [['Escape'], ['Escape', 'Control/Meta']],
-      callback: () => {
-        this.closeEditorAndRestoreOriginalValue(shortcutManager.isCtrlPressed());
-        this.activeEditor.focus();
-      }
-    }], config);
-    gridContext.addShortcuts([{
-      keys: [['F2']],
-      callback: event => {
-        this.openEditor(null, event, true);
-      }
-    }, {
-      keys: [['Backspace'], ['Delete']],
-      callback: () => {
-        this.instance.emptySelectedCells();
-        this.prepareEditor();
-      }
-    }, {
-      keys: [['Enter'], ['Enter', 'Shift']],
-      callback: (event, keys) => {
-        if (this.instance.getSettings().enterBeginsEditing) {
-          if (this.cellProperties.readOnly) {
-            this.moveSelectionAfterEnter();
-          } else {
-            this.openEditor(null, event, true);
-          }
-        } else {
-          this.moveSelectionAfterEnter(keys.includes('shift'));
-        }
-        (0, _event.stopImmediatePropagation)(event); // required by HandsontableEditor
-      }
-    }], {
-      ...config,
-      runOnlyIf: () => (0, _mixed.isDefined)(this.instance.getSelected())
-    });
-  }
-
   /**
    * Lock the editor from being prepared and closed. Locking the editor prevents its closing and
    * reinitialized after selecting the new cell. This feature is necessary for a mobile editor.
@@ -196,10 +135,16 @@ class EditorManager {
       });
       return;
     }
+    const {
+      highlight
+    } = this.instance.getSelectedRangeLast();
+    if (highlight.isHeader()) {
+      return;
+    }
     const {
       row,
       col
-    } = this.instance.getSelectedRangeLast().highlight;
+    } = highlight;
     const modifiedCellCoords = this.instance.runHooks('modifyGetCellCoords', row, col);
     let visualRowToCheck = row;
     let visualColumnToCheck = col;
@@ -263,14 +208,7 @@ class EditorManager {
       return;
     }
     if (!this.activeEditor) {
-      const {
-        row,
-        col
-      } = this.instance.getSelectedRangeLast().highlight;
-      const renderableRowIndex = this.instance.rowIndexMapper.getRenderableFromVisualIndex(row);
-      const renderableColumnIndex = this.instance.columnIndexMapper.getRenderableFromVisualIndex(col);
-      this.instance.view.scrollViewport(this.instance._createCellCoords(renderableRowIndex, renderableColumnIndex));
-      this.instance.view.render();
+      this.instance.scrollToFocusedCell();
       this.prepareEditor();
     }
     if (this.activeEditor) {
@@ -374,15 +312,13 @@ class EditorManager {
    * @param {KeyboardEvent} event The keyboard event object.
    */
   onAfterDocumentKeyDown(event) {
-    if (!this.instance.isListening()) {
+    const selection = this.instance.getSelectedRangeLast();
+    if (!this.instance.isListening() || !selection || selection.highlight.isHeader() || (0, _event.isImmediatePropagationStopped)(event)) {
       return;
     }
     const {
       keyCode
     } = event;
-    if (!this.selection.isSelected()) {
-      return;
-    }
 
     // catch CTRL but not right ALT (which in some systems triggers ALT+CTRL)
     const isCtrlPressed = (event.ctrlKey || event.metaKey) && !event.altKey;

package/editorManager.mjs

@@ -1,11 +1,10 @@
 import { isFunctionKey, isCtrlMetaKey } from "./helpers/unicode.mjs";
-import { stopImmediatePropagation } from "./helpers/dom/event.mjs";
 import { isOutsideInput } from "./helpers/dom/element.mjs";
+import { isImmediatePropagationStopped } from "./helpers/dom/event.mjs";
 import { getEditorInstance } from "./editors/registry.mjs";
 import EventManager from "./eventManager.mjs";
 import { isDefined } from "./helpers/mixed.mjs";
 export const SHORTCUTS_GROUP_NAVIGATION = 'editorManager.navigation';
-export const SHORTCUTS_GROUP_EDITOR = 'editorManager.handlingEditor';
 class EditorManager {
   /**
    * @param {Core} instance The Handsontable instance.
@@ -68,9 +67,6 @@ class EditorManager {
      * @type {object}
      */
     this.cellProperties = void 0;
-    const shortcutManager = this.instance.getShortcutManager();
-    shortcutManager.addContext('editor');
-    this.registerShortcuts();
     this.instance.addHook('afterDocumentKeyDown', event => this.onAfterDocumentKeyDown(event));
 
     // Open editor when text composition is started (IME editor)
@@ -82,62 +78,6 @@ class EditorManager {
     this.instance.view._wt.update('onCellDblClick', (event, coords, elem) => this.onCellDblClick(event, coords, elem));
   }
 
-  /**
-   * Register shortcuts responsible for handling some actions related to an editor.
-   *
-   * @private
-   */
-  registerShortcuts() {
-    const shortcutManager = this.instance.getShortcutManager();
-    const gridContext = shortcutManager.getContext('grid');
-    const editorContext = shortcutManager.getContext('editor');
-    const config = {
-      group: SHORTCUTS_GROUP_EDITOR
-    };
-    editorContext.addShortcuts([{
-      keys: [['Enter'], ['Enter', 'Shift'], ['Enter', 'Control/Meta'], ['Enter', 'Control/Meta', 'Shift']],
-      callback: (event, keys) => {
-        this.closeEditorAndSaveChanges(shortcutManager.isCtrlPressed());
-        this.moveSelectionAfterEnter(keys.includes('shift'));
-      }
-    }, {
-      keys: [['Escape'], ['Escape', 'Control/Meta']],
-      callback: () => {
-        this.closeEditorAndRestoreOriginalValue(shortcutManager.isCtrlPressed());
-        this.activeEditor.focus();
-      }
-    }], config);
-    gridContext.addShortcuts([{
-      keys: [['F2']],
-      callback: event => {
-        this.openEditor(null, event, true);
-      }
-    }, {
-      keys: [['Backspace'], ['Delete']],
-      callback: () => {
-        this.instance.emptySelectedCells();
-        this.prepareEditor();
-      }
-    }, {
-      keys: [['Enter'], ['Enter', 'Shift']],
-      callback: (event, keys) => {
-        if (this.instance.getSettings().enterBeginsEditing) {
-          if (this.cellProperties.readOnly) {
-            this.moveSelectionAfterEnter();
-          } else {
-            this.openEditor(null, event, true);
-          }
-        } else {
-          this.moveSelectionAfterEnter(keys.includes('shift'));
-        }
-        stopImmediatePropagation(event); // required by HandsontableEditor
-      }
-    }], {
-      ...config,
-      runOnlyIf: () => isDefined(this.instance.getSelected())
-    });
-  }
-
   /**
    * Lock the editor from being prepared and closed. Locking the editor prevents its closing and
    * reinitialized after selecting the new cell. This feature is necessary for a mobile editor.
@@ -190,10 +130,16 @@ class EditorManager {
       });
       return;
     }
+    const {
+      highlight
+    } = this.instance.getSelectedRangeLast();
+    if (highlight.isHeader()) {
+      return;
+    }
     const {
       row,
       col
-    } = this.instance.getSelectedRangeLast().highlight;
+    } = highlight;
     const modifiedCellCoords = this.instance.runHooks('modifyGetCellCoords', row, col);
     let visualRowToCheck = row;
     let visualColumnToCheck = col;
@@ -257,14 +203,7 @@ class EditorManager {
       return;
     }
     if (!this.activeEditor) {
-      const {
-        row,
-        col
-      } = this.instance.getSelectedRangeLast().highlight;
-      const renderableRowIndex = this.instance.rowIndexMapper.getRenderableFromVisualIndex(row);
-      const renderableColumnIndex = this.instance.columnIndexMapper.getRenderableFromVisualIndex(col);
-      this.instance.view.scrollViewport(this.instance._createCellCoords(renderableRowIndex, renderableColumnIndex));
-      this.instance.view.render();
+      this.instance.scrollToFocusedCell();
       this.prepareEditor();
     }
     if (this.activeEditor) {
@@ -368,15 +307,13 @@ class EditorManager {
    * @param {KeyboardEvent} event The keyboard event object.
    */
   onAfterDocumentKeyDown(event) {
-    if (!this.instance.isListening()) {
+    const selection = this.instance.getSelectedRangeLast();
+    if (!this.instance.isListening() || !selection || selection.highlight.isHeader() || isImmediatePropagationStopped(event)) {
       return;
     }
     const {
       keyCode
     } = event;
-    if (!this.selection.isSelected()) {
-      return;
-    }
 
     // catch CTRL but not right ALT (which in some systems triggers ALT+CTRL)
     const isCtrlPressed = (event.ctrlKey || event.metaKey) && !event.altKey;

package/editors/autocompleteEditor/autocompleteEditor.js

@@ -2,6 +2,7 @@
 
 exports.__esModule = true;
 require("core-js/modules/es.array.push.js");
+require("core-js/modules/es.error.cause.js");
 var _handsontableEditor = require("../handsontableEditor");
 var _array = require("../../helpers/array");
 var _element = require("../../helpers/dom/element");
@@ -9,6 +10,9 @@ var _mixed = require("../../helpers/mixed");
 var _string = require("../../helpers/string");
 var _unicode = require("../../helpers/unicode");
 var _textRenderer = require("../../renderers/textRenderer");
+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); }
 const privatePool = new WeakMap();
 const EDITOR_TYPE = 'autocomplete';
 
@@ -28,6 +32,72 @@ class AutocompleteEditor extends _handsontableEditor.HandsontableEditor {
      *
      * @type {string}
      */
+    /**
+     * Filters and sorts by relevance.
+     *
+     * @param {*} value The selected value.
+     * @param {string[]} choices The list of available choices.
+     * @param {boolean} caseSensitive Indicates if it's sorted by case.
+     * @returns {number[]} Array of indexes in original choices array.
+     */
+    _defineProperty(this, "sortByRelevance", function (value, choices, caseSensitive) {
+      const choicesRelevance = [];
+      const result = [];
+      const valueLength = value.length;
+      let choicesCount = choices.length;
+      let charsLeft;
+      let currentItem;
+      let i;
+      let valueIndex;
+      if (valueLength === 0) {
+        for (i = 0; i < choicesCount; i++) {
+          result.push(i);
+        }
+        return result;
+      }
+      for (i = 0; i < choicesCount; i++) {
+        currentItem = (0, _string.stripTags)((0, _mixed.stringify)(choices[i]));
+        if (caseSensitive) {
+          valueIndex = currentItem.indexOf(value);
+        } else {
+          const locale = this.cellProperties.locale;
+          valueIndex = currentItem.toLocaleLowerCase(locale).indexOf(value.toLocaleLowerCase(locale));
+        }
+        if (valueIndex !== -1) {
+          charsLeft = currentItem.length - valueIndex - valueLength;
+          choicesRelevance.push({
+            baseIndex: i,
+            index: valueIndex,
+            charsLeft,
+            value: currentItem
+          });
+        }
+      }
+      choicesRelevance.sort((a, b) => {
+        if (b.index === -1) {
+          return -1;
+        }
+        if (a.index === -1) {
+          return 1;
+        }
+        if (a.index < b.index) {
+          return -1;
+        } else if (b.index < a.index) {
+          return 1;
+        } else if (a.index === b.index) {
+          if (a.charsLeft < b.charsLeft) {
+            return -1;
+          } else if (a.charsLeft > b.charsLeft) {
+            return 1;
+          }
+        }
+        return 0;
+      });
+      for (i = 0, choicesCount = choicesRelevance.length; i < choicesCount; i++) {
+        result.push(choicesRelevance[i].baseIndex);
+      }
+      return result;
+    });
     this.query = null;
     /**
      * Contains stripped choices.
@@ -426,72 +496,5 @@ class AutocompleteEditor extends _handsontableEditor.HandsontableEditor {
       }
     }
   }
-
-  /**
-   * Filters and sorts by relevance.
-   *
-   * @param {*} value The selected value.
-   * @param {string[]} choices The list of available choices.
-   * @param {boolean} caseSensitive Indicates if it's sorted by case.
-   * @returns {number[]} Array of indexes in original choices array.
-   */
-  sortByRelevance = function (value, choices, caseSensitive) {
-    const choicesRelevance = [];
-    const result = [];
-    const valueLength = value.length;
-    let choicesCount = choices.length;
-    let charsLeft;
-    let currentItem;
-    let i;
-    let valueIndex;
-    if (valueLength === 0) {
-      for (i = 0; i < choicesCount; i++) {
-        result.push(i);
-      }
-      return result;
-    }
-    for (i = 0; i < choicesCount; i++) {
-      currentItem = (0, _string.stripTags)((0, _mixed.stringify)(choices[i]));
-      if (caseSensitive) {
-        valueIndex = currentItem.indexOf(value);
-      } else {
-        const locale = this.cellProperties.locale;
-        valueIndex = currentItem.toLocaleLowerCase(locale).indexOf(value.toLocaleLowerCase(locale));
-      }
-      if (valueIndex !== -1) {
-        charsLeft = currentItem.length - valueIndex - valueLength;
-        choicesRelevance.push({
-          baseIndex: i,
-          index: valueIndex,
-          charsLeft,
-          value: currentItem
-        });
-      }
-    }
-    choicesRelevance.sort((a, b) => {
-      if (b.index === -1) {
-        return -1;
-      }
-      if (a.index === -1) {
-        return 1;
-      }
-      if (a.index < b.index) {
-        return -1;
-      } else if (b.index < a.index) {
-        return 1;
-      } else if (a.index === b.index) {
-        if (a.charsLeft < b.charsLeft) {
-          return -1;
-        } else if (a.charsLeft > b.charsLeft) {
-          return 1;
-        }
-      }
-      return 0;
-    });
-    for (i = 0, choicesCount = choicesRelevance.length; i < choicesCount; i++) {
-      result.push(choicesRelevance[i].baseIndex);
-    }
-    return result;
-  };
 }
 exports.AutocompleteEditor = AutocompleteEditor;

package/editors/autocompleteEditor/autocompleteEditor.mjs

@@ -1,4 +1,8 @@
 import "core-js/modules/es.array.push.js";
+import "core-js/modules/es.error.cause.js";
+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); }
 import { HandsontableEditor } from "../handsontableEditor/index.mjs";
 import { arrayMap, pivot } from "../../helpers/array.mjs";
 import { addClass, getCaretPosition, getScrollbarWidth, getSelectionEndPosition, getTrimmingContainer, offset, outerHeight, outerWidth, setCaretPosition } from "../../helpers/dom/element.mjs";
@@ -24,6 +28,72 @@ export class AutocompleteEditor extends HandsontableEditor {
      *
      * @type {string}
      */
+    /**
+     * Filters and sorts by relevance.
+     *
+     * @param {*} value The selected value.
+     * @param {string[]} choices The list of available choices.
+     * @param {boolean} caseSensitive Indicates if it's sorted by case.
+     * @returns {number[]} Array of indexes in original choices array.
+     */
+    _defineProperty(this, "sortByRelevance", function (value, choices, caseSensitive) {
+      const choicesRelevance = [];
+      const result = [];
+      const valueLength = value.length;
+      let choicesCount = choices.length;
+      let charsLeft;
+      let currentItem;
+      let i;
+      let valueIndex;
+      if (valueLength === 0) {
+        for (i = 0; i < choicesCount; i++) {
+          result.push(i);
+        }
+        return result;
+      }
+      for (i = 0; i < choicesCount; i++) {
+        currentItem = stripTags(stringify(choices[i]));
+        if (caseSensitive) {
+          valueIndex = currentItem.indexOf(value);
+        } else {
+          const locale = this.cellProperties.locale;
+          valueIndex = currentItem.toLocaleLowerCase(locale).indexOf(value.toLocaleLowerCase(locale));
+        }
+        if (valueIndex !== -1) {
+          charsLeft = currentItem.length - valueIndex - valueLength;
+          choicesRelevance.push({
+            baseIndex: i,
+            index: valueIndex,
+            charsLeft,
+            value: currentItem
+          });
+        }
+      }
+      choicesRelevance.sort((a, b) => {
+        if (b.index === -1) {
+          return -1;
+        }
+        if (a.index === -1) {
+          return 1;
+        }
+        if (a.index < b.index) {
+          return -1;
+        } else if (b.index < a.index) {
+          return 1;
+        } else if (a.index === b.index) {
+          if (a.charsLeft < b.charsLeft) {
+            return -1;
+          } else if (a.charsLeft > b.charsLeft) {
+            return 1;
+          }
+        }
+        return 0;
+      });
+      for (i = 0, choicesCount = choicesRelevance.length; i < choicesCount; i++) {
+        result.push(choicesRelevance[i].baseIndex);
+      }
+      return result;
+    });
     this.query = null;
     /**
      * Contains stripped choices.
@@ -422,71 +492,4 @@ export class AutocompleteEditor extends HandsontableEditor {
       }
     }
   }
-
-  /**
-   * Filters and sorts by relevance.
-   *
-   * @param {*} value The selected value.
-   * @param {string[]} choices The list of available choices.
-   * @param {boolean} caseSensitive Indicates if it's sorted by case.
-   * @returns {number[]} Array of indexes in original choices array.
-   */
-  sortByRelevance = function (value, choices, caseSensitive) {
-    const choicesRelevance = [];
-    const result = [];
-    const valueLength = value.length;
-    let choicesCount = choices.length;
-    let charsLeft;
-    let currentItem;
-    let i;
-    let valueIndex;
-    if (valueLength === 0) {
-      for (i = 0; i < choicesCount; i++) {
-        result.push(i);
-      }
-      return result;
-    }
-    for (i = 0; i < choicesCount; i++) {
-      currentItem = stripTags(stringify(choices[i]));
-      if (caseSensitive) {
-        valueIndex = currentItem.indexOf(value);
-      } else {
-        const locale = this.cellProperties.locale;
-        valueIndex = currentItem.toLocaleLowerCase(locale).indexOf(value.toLocaleLowerCase(locale));
-      }
-      if (valueIndex !== -1) {
-        charsLeft = currentItem.length - valueIndex - valueLength;
-        choicesRelevance.push({
-          baseIndex: i,
-          index: valueIndex,
-          charsLeft,
-          value: currentItem
-        });
-      }
-    }
-    choicesRelevance.sort((a, b) => {
-      if (b.index === -1) {
-        return -1;
-      }
-      if (a.index === -1) {
-        return 1;
-      }
-      if (a.index < b.index) {
-        return -1;
-      } else if (b.index < a.index) {
-        return 1;
-      } else if (a.index === b.index) {
-        if (a.charsLeft < b.charsLeft) {
-          return -1;
-        } else if (a.charsLeft > b.charsLeft) {
-          return 1;
-        }
-      }
-      return 0;
-    });
-    for (i = 0, choicesCount = choicesRelevance.length; i < choicesCount; i++) {
-      result.push(choicesRelevance[i].baseIndex);
-    }
-    return result;
-  };
 }

package/editors/baseEditor/baseEditor.js

@@ -452,7 +452,7 @@ class BaseEditor {
     const gridMostRightPos = rootWindow.innerWidth - containerOffset.left - containerWidth;
     const {
       wtTable: overlayTable
-    } = (_wtOverlays$getParent = wtOverlays.getParentOverlay(TD)) != null ? _wtOverlays$getParent : this.hot.view._wt;
+    } = (_wtOverlays$getParent = wtOverlays.getParentOverlay(TD)) !== null && _wtOverlays$getParent !== void 0 ? _wtOverlays$getParent : this.hot.view._wt;
     const overlayName = overlayTable.name;
     const scrollTop = ['master', 'inline_start'].includes(overlayName) ? containerScrollTop : 0;
     const scrollLeft = ['master', 'top', 'bottom'].includes(overlayName) ? containerScrollLeft : 0;

package/editors/baseEditor/baseEditor.mjs

@@ -445,7 +445,7 @@ export class BaseEditor {
     const gridMostRightPos = rootWindow.innerWidth - containerOffset.left - containerWidth;
     const {
       wtTable: overlayTable
-    } = (_wtOverlays$getParent = wtOverlays.getParentOverlay(TD)) != null ? _wtOverlays$getParent : this.hot.view._wt;
+    } = (_wtOverlays$getParent = wtOverlays.getParentOverlay(TD)) !== null && _wtOverlays$getParent !== void 0 ? _wtOverlays$getParent : this.hot.view._wt;
     const overlayName = overlayTable.name;
     const scrollTop = ['master', 'inline_start'].includes(overlayName) ? containerScrollTop : 0;
     const scrollLeft = ['master', 'top', 'bottom'].includes(overlayName) ? containerScrollLeft : 0;

package/editors/dateEditor/dateEditor.js

@@ -125,10 +125,11 @@ class DateEditor extends _textEditor.TextEditor {
    * Close editor.
    */
   close() {
+    var _this$$datePicker;
     this._opened = false;
 
     // If the date picker was never initialized (e.g. during autofill), there's nothing to destroy.
-    if (this.$datePicker?.destroy) {
+    if ((_this$$datePicker = this.$datePicker) !== null && _this$$datePicker !== void 0 && _this$$datePicker.destroy) {
       this.$datePicker.destroy();
     }
     this.instance._registerTimeout(() => {

package/editors/dateEditor/dateEditor.mjs

@@ -120,10 +120,11 @@ export class DateEditor extends TextEditor {
    * Close editor.
    */
   close() {
+    var _this$$datePicker;
     this._opened = false;
 
     // If the date picker was never initialized (e.g. during autofill), there's nothing to destroy.
-    if (this.$datePicker?.destroy) {
+    if ((_this$$datePicker = this.$datePicker) !== null && _this$$datePicker !== void 0 && _this$$datePicker.destroy) {
       this.$datePicker.destroy();
     }
     this.instance._registerTimeout(() => {

package/editors/textEditor/textEditor.js

@@ -416,9 +416,7 @@ class TextEditor extends _baseEditor.BaseEditor {
       runOnlyIf: event => !this.hot.selection.isMultiple() &&
       // We trigger a data population for multiple selection.
       // catch CTRL but not right ALT (which in some systems triggers ALT+CTRL)
-      !event.altKey,
-      relativeToGroup: _editorManager.SHORTCUTS_GROUP_EDITOR,
-      position: 'before'
+      !event.altKey
     }, {
       keys: [['Meta', 'Enter']],
       callback: () => {
@@ -426,19 +424,13 @@ class TextEditor extends _baseEditor.BaseEditor {
         return false; // Will block closing editor.
       },
 
-      runOnlyIf: () => !this.hot.selection.isMultiple(),
-      // We trigger a data population for multiple selection.
-      relativeToGroup: _editorManager.SHORTCUTS_GROUP_EDITOR,
-      position: 'before'
+      runOnlyIf: () => !this.hot.selection.isMultiple() // We trigger a data population for multiple selection.
     }, {
       keys: [['Alt', 'Enter']],
       callback: () => {
         insertNewLine();
         return false; // Will block closing editor.
-      },
-
-      relativeToGroup: _editorManager.SHORTCUTS_GROUP_EDITOR,
-      position: 'before'
+      }
     }, {
       // TODO: Duplicated part of code (callback to shortcut)
       keys: [['PageUp']],