handsontable 0.0.0-next-44acfea-20231127 → 0.0.0-next-301795f-20231127

package/focusManager.js

@@ -33,7 +33,6 @@ var _hot = /*#__PURE__*/new WeakMap();
 var _focusMode = /*#__PURE__*/new WeakMap();
 var _refocusDelay = /*#__PURE__*/new WeakMap();
 var _refocusElementGetter = /*#__PURE__*/new WeakMap();
-var _getCurrentHighlightCoords = /*#__PURE__*/new WeakSet();
 var _getSelectedCell = /*#__PURE__*/new WeakSet();
 var _manageFocus = /*#__PURE__*/new WeakSet();
 var _onUpdateSettings = /*#__PURE__*/new WeakSet();
@@ -57,15 +56,9 @@ class FocusManager {
      * Get and return the currently selected and highlighted cell/header element.
      *
      * @private
-     * @returns {HTMLTableCellElement}
+     * @param {Function} [callback] Callback function to be called after the cell element is retrieved.
      */
     _classPrivateMethodInitSpec(this, _getSelectedCell);
-    /**
-     * Get the coordinates of the highlight of the currently selected cell/header.
-     *
-     * @returns {CellCoords}
-     */
-    _classPrivateMethodInitSpec(this, _getCurrentHighlightCoords);
     /**
      * The Handsontable instance.
      */
@@ -195,17 +188,26 @@ class FocusManager {
    * @param {HTMLTableCellElement} [selectedCell] The highlighted cell/header element.
    */
   focusOnHighlightedCell(selectedCell) {
-    var _classPrivateFieldGet3;
-    const currentHighlightCoords = _classPrivateMethodGet(this, _getCurrentHighlightCoords, _getCurrentHighlightCoords2).call(this);
-    const currentlySelectedHighlight = selectedCell || _classPrivateMethodGet(this, _getSelectedCell, _getSelectedCell2).call(this);
-    let elementToBeFocused = _classPrivateFieldGet(this, _hot).runHooks('modifyFocusedElement', currentHighlightCoords.row, currentHighlightCoords.col, currentlySelectedHighlight);
-    if (!(elementToBeFocused instanceof HTMLElement)) {
-      elementToBeFocused = currentlySelectedHighlight;
-    }
-    if (elementToBeFocused && !((_classPrivateFieldGet3 = _classPrivateFieldGet(this, _hot).getActiveEditor()) !== null && _classPrivateFieldGet3 !== void 0 && _classPrivateFieldGet3.isOpened())) {
-      elementToBeFocused.focus({
-        preventScroll: true
-      });
+    const focusElement = element => {
+      var _classPrivateFieldGet3, _classPrivateFieldGet4;
+      const currentHighlightCoords = (_classPrivateFieldGet3 = _classPrivateFieldGet(this, _hot).getSelectedRangeLast()) === null || _classPrivateFieldGet3 === void 0 ? void 0 : _classPrivateFieldGet3.highlight;
+      if (!currentHighlightCoords || !element) {
+        return;
+      }
+      let elementToBeFocused = _classPrivateFieldGet(this, _hot).runHooks('modifyFocusedElement', currentHighlightCoords.row, currentHighlightCoords.col, element);
+      if (!(elementToBeFocused instanceof HTMLElement)) {
+        elementToBeFocused = element;
+      }
+      if (elementToBeFocused && !((_classPrivateFieldGet4 = _classPrivateFieldGet(this, _hot).getActiveEditor()) !== null && _classPrivateFieldGet4 !== void 0 && _classPrivateFieldGet4.isOpened())) {
+        elementToBeFocused.focus({
+          preventScroll: true
+        });
+      }
+    };
+    if (selectedCell) {
+      focusElement(selectedCell);
+    } else {
+      _classPrivateMethodGet(this, _getSelectedCell, _getSelectedCell2).call(this, element => focusElement(element));
     }
   }
 
@@ -216,12 +218,12 @@ class FocusManager {
    * @param {number} delay Delay in milliseconds.
    */
   refocusToEditorTextarea() {
-    var _classPrivateFieldGet4;
+    var _classPrivateFieldGet5;
     let delay = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _classPrivateFieldGet(this, _refocusDelay);
     const refocusElement = this.getRefocusElement();
 
     // Re-focus on the editor's `TEXTAREA` element (or a predefined element) if the `imeFastEdit` option is enabled.
-    if (_classPrivateFieldGet(this, _hot).getSettings().imeFastEdit && !((_classPrivateFieldGet4 = _classPrivateFieldGet(this, _hot).getActiveEditor()) !== null && _classPrivateFieldGet4 !== void 0 && _classPrivateFieldGet4.isOpened()) && !!refocusElement) {
+    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);
@@ -229,34 +231,44 @@ class FocusManager {
   }
 }
 exports.FocusManager = FocusManager;
-function _getCurrentHighlightCoords2() {
-  const lastSelectedRange = _classPrivateFieldGet(this, _hot).getSelectedRangeLast();
-  return lastSelectedRange.highlight;
-}
 function _getSelectedCell2() {
-  const selectedCellCoords = _classPrivateMethodGet(this, _getCurrentHighlightCoords, _getCurrentHighlightCoords2).call(this);
-  return _classPrivateFieldGet(this, _hot).getCell(selectedCellCoords.row, selectedCellCoords.col, true);
-}
-function _manageFocus2() {
-  const selectedCell = _classPrivateMethodGet(this, _getSelectedCell, _getSelectedCell2).call(this);
-  const {
-    activeElement
-  } = _classPrivateFieldGet(this, _hot).rootDocument;
-
-  // Blurring the `activeElement` removes the unwanted border around the focusable element (#6877)
-  // and resets the `document.activeElement` property. The blurring should happen only when the
-  // previously selected input element has not belonged to the Handsontable editor. If blurring is
-  // triggered for all elements, there is a problem with the disappearing IME editor (#9672).
-  if (activeElement && (0, _element.isOutsideInput)(activeElement)) {
-    activeElement.blur();
+  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));
+    return;
   }
-  this.focusOnHighlightedCell(selectedCell);
-  if (this.getFocusMode() === FOCUS_MODES.MIXED && selectedCell.nodeName === 'TD') {
-    _classPrivateFieldGet(this, _hot).addHookOnce('afterSelectionEnd', () => {
-      this.refocusToEditorTextarea();
+  const cell = _classPrivateFieldGet(this, _hot).getCell(highlight.row, highlight.col, true);
+  if (cell === null) {
+    _classPrivateFieldGet(this, _hot).addHookOnce('afterScroll', () => {
+      callback(_classPrivateFieldGet(this, _hot).getCell(highlight.row, highlight.col, true));
     });
+  } else {
+    callback(cell);
   }
 }
+function _manageFocus2() {
+  _classPrivateMethodGet(this, _getSelectedCell, _getSelectedCell2).call(this, selectedCell => {
+    const {
+      activeElement
+    } = _classPrivateFieldGet(this, _hot).rootDocument;
+
+    // Blurring the `activeElement` removes the unwanted border around the focusable element (#6877)
+    // and resets the `document.activeElement` property. The blurring should happen only when the
+    // previously selected input element has not belonged to the Handsontable editor. If blurring is
+    // triggered for all elements, there is a problem with the disappearing IME editor (#9672).
+    if (activeElement && (0, _element.isOutsideInput)(activeElement)) {
+      activeElement.blur();
+    }
+    this.focusOnHighlightedCell(selectedCell);
+    if (this.getFocusMode() === FOCUS_MODES.MIXED && selectedCell.nodeName === 'TD') {
+      _classPrivateFieldGet(this, _hot).addHookOnce('afterSelectionEnd', () => {
+        this.refocusToEditorTextarea();
+      });
+    }
+  });
+}
 function _onUpdateSettings2(newSettings) {
   if (newSettings.imeFastEdit && this.getFocusMode() !== FOCUS_MODES.MIXED) {
     this.setFocusMode(FOCUS_MODES.MIXED);

package/focusManager.mjs

@@ -30,7 +30,6 @@ var _hot = /*#__PURE__*/new WeakMap();
 var _focusMode = /*#__PURE__*/new WeakMap();
 var _refocusDelay = /*#__PURE__*/new WeakMap();
 var _refocusElementGetter = /*#__PURE__*/new WeakMap();
-var _getCurrentHighlightCoords = /*#__PURE__*/new WeakSet();
 var _getSelectedCell = /*#__PURE__*/new WeakSet();
 var _manageFocus = /*#__PURE__*/new WeakSet();
 var _onUpdateSettings = /*#__PURE__*/new WeakSet();
@@ -54,15 +53,9 @@ export class FocusManager {
      * Get and return the currently selected and highlighted cell/header element.
      *
      * @private
-     * @returns {HTMLTableCellElement}
+     * @param {Function} [callback] Callback function to be called after the cell element is retrieved.
      */
     _classPrivateMethodInitSpec(this, _getSelectedCell);
-    /**
-     * Get the coordinates of the highlight of the currently selected cell/header.
-     *
-     * @returns {CellCoords}
-     */
-    _classPrivateMethodInitSpec(this, _getCurrentHighlightCoords);
     /**
      * The Handsontable instance.
      */
@@ -192,17 +185,26 @@ export class FocusManager {
    * @param {HTMLTableCellElement} [selectedCell] The highlighted cell/header element.
    */
   focusOnHighlightedCell(selectedCell) {
-    var _classPrivateFieldGet3;
-    const currentHighlightCoords = _classPrivateMethodGet(this, _getCurrentHighlightCoords, _getCurrentHighlightCoords2).call(this);
-    const currentlySelectedHighlight = selectedCell || _classPrivateMethodGet(this, _getSelectedCell, _getSelectedCell2).call(this);
-    let elementToBeFocused = _classPrivateFieldGet(this, _hot).runHooks('modifyFocusedElement', currentHighlightCoords.row, currentHighlightCoords.col, currentlySelectedHighlight);
-    if (!(elementToBeFocused instanceof HTMLElement)) {
-      elementToBeFocused = currentlySelectedHighlight;
-    }
-    if (elementToBeFocused && !((_classPrivateFieldGet3 = _classPrivateFieldGet(this, _hot).getActiveEditor()) !== null && _classPrivateFieldGet3 !== void 0 && _classPrivateFieldGet3.isOpened())) {
-      elementToBeFocused.focus({
-        preventScroll: true
-      });
+    const focusElement = element => {
+      var _classPrivateFieldGet3, _classPrivateFieldGet4;
+      const currentHighlightCoords = (_classPrivateFieldGet3 = _classPrivateFieldGet(this, _hot).getSelectedRangeLast()) === null || _classPrivateFieldGet3 === void 0 ? void 0 : _classPrivateFieldGet3.highlight;
+      if (!currentHighlightCoords || !element) {
+        return;
+      }
+      let elementToBeFocused = _classPrivateFieldGet(this, _hot).runHooks('modifyFocusedElement', currentHighlightCoords.row, currentHighlightCoords.col, element);
+      if (!(elementToBeFocused instanceof HTMLElement)) {
+        elementToBeFocused = element;
+      }
+      if (elementToBeFocused && !((_classPrivateFieldGet4 = _classPrivateFieldGet(this, _hot).getActiveEditor()) !== null && _classPrivateFieldGet4 !== void 0 && _classPrivateFieldGet4.isOpened())) {
+        elementToBeFocused.focus({
+          preventScroll: true
+        });
+      }
+    };
+    if (selectedCell) {
+      focusElement(selectedCell);
+    } else {
+      _classPrivateMethodGet(this, _getSelectedCell, _getSelectedCell2).call(this, element => focusElement(element));
     }
   }
 
@@ -213,46 +215,56 @@ export class FocusManager {
    * @param {number} delay Delay in milliseconds.
    */
   refocusToEditorTextarea() {
-    var _classPrivateFieldGet4;
+    var _classPrivateFieldGet5;
     let delay = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : _classPrivateFieldGet(this, _refocusDelay);
     const refocusElement = this.getRefocusElement();
 
     // Re-focus on the editor's `TEXTAREA` element (or a predefined element) if the `imeFastEdit` option is enabled.
-    if (_classPrivateFieldGet(this, _hot).getSettings().imeFastEdit && !((_classPrivateFieldGet4 = _classPrivateFieldGet(this, _hot).getActiveEditor()) !== null && _classPrivateFieldGet4 !== void 0 && _classPrivateFieldGet4.isOpened()) && !!refocusElement) {
+    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);
     }
   }
 }
-function _getCurrentHighlightCoords2() {
-  const lastSelectedRange = _classPrivateFieldGet(this, _hot).getSelectedRangeLast();
-  return lastSelectedRange.highlight;
-}
 function _getSelectedCell2() {
-  const selectedCellCoords = _classPrivateMethodGet(this, _getCurrentHighlightCoords, _getCurrentHighlightCoords2).call(this);
-  return _classPrivateFieldGet(this, _hot).getCell(selectedCellCoords.row, selectedCellCoords.col, true);
-}
-function _manageFocus2() {
-  const selectedCell = _classPrivateMethodGet(this, _getSelectedCell, _getSelectedCell2).call(this);
-  const {
-    activeElement
-  } = _classPrivateFieldGet(this, _hot).rootDocument;
-
-  // Blurring the `activeElement` removes the unwanted border around the focusable element (#6877)
-  // and resets the `document.activeElement` property. The blurring should happen only when the
-  // previously selected input element has not belonged to the Handsontable editor. If blurring is
-  // triggered for all elements, there is a problem with the disappearing IME editor (#9672).
-  if (activeElement && isOutsideInput(activeElement)) {
-    activeElement.blur();
+  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));
+    return;
   }
-  this.focusOnHighlightedCell(selectedCell);
-  if (this.getFocusMode() === FOCUS_MODES.MIXED && selectedCell.nodeName === 'TD') {
-    _classPrivateFieldGet(this, _hot).addHookOnce('afterSelectionEnd', () => {
-      this.refocusToEditorTextarea();
+  const cell = _classPrivateFieldGet(this, _hot).getCell(highlight.row, highlight.col, true);
+  if (cell === null) {
+    _classPrivateFieldGet(this, _hot).addHookOnce('afterScroll', () => {
+      callback(_classPrivateFieldGet(this, _hot).getCell(highlight.row, highlight.col, true));
     });
+  } else {
+    callback(cell);
   }
 }
+function _manageFocus2() {
+  _classPrivateMethodGet(this, _getSelectedCell, _getSelectedCell2).call(this, selectedCell => {
+    const {
+      activeElement
+    } = _classPrivateFieldGet(this, _hot).rootDocument;
+
+    // Blurring the `activeElement` removes the unwanted border around the focusable element (#6877)
+    // and resets the `document.activeElement` property. The blurring should happen only when the
+    // previously selected input element has not belonged to the Handsontable editor. If blurring is
+    // triggered for all elements, there is a problem with the disappearing IME editor (#9672).
+    if (activeElement && isOutsideInput(activeElement)) {
+      activeElement.blur();
+    }
+    this.focusOnHighlightedCell(selectedCell);
+    if (this.getFocusMode() === FOCUS_MODES.MIXED && selectedCell.nodeName === 'TD') {
+      _classPrivateFieldGet(this, _hot).addHookOnce('afterSelectionEnd', () => {
+        this.refocusToEditorTextarea();
+      });
+    }
+  });
+}
 function _onUpdateSettings2(newSettings) {
   if (newSettings.imeFastEdit && this.getFocusMode() !== FOCUS_MODES.MIXED) {
     this.setFocusMode(FOCUS_MODES.MIXED);

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-44acfea-20231127";
+  const hotVersion = "0.0.0-next-301795f-20231127";
   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-44acfea-20231127";
+  const hotVersion = "0.0.0-next-301795f-20231127";
   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-44acfea-20231127",
+  "version": "0.0.0-next-301795f-20231127",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",