handsontable 16.0.1 → 16.1.0-next-abd8f2e-20250904

package/plugins/collapsibleColumns/collapsibleColumns.js

@@ -292,7 +292,7 @@ class CollapsibleColumns extends _base.BasePlugin {
         const {
           row,
           col
-        } = this.hot.getSelectedRangeLast().highlight;
+        } = this.hot.getSelectedRangeActive().highlight;
         const {
           collapsible,
           isCollapsed,
@@ -318,7 +318,7 @@ class CollapsibleColumns extends _base.BasePlugin {
       },
       runOnlyIf: () => {
         var _this$hot$getSelected, _this$hot$getSelected2;
-        return ((_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.isSingle()) && ((_this$hot$getSelected2 = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.highlight.isHeader());
+        return ((_this$hot$getSelected = this.hot.getSelectedRangeActive()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.isSingle()) && ((_this$hot$getSelected2 = this.hot.getSelectedRangeActive()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.highlight.isHeader());
       },
       group: SHORTCUTS_GROUP,
       relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
@@ -510,7 +510,7 @@ class CollapsibleColumns extends _base.BasePlugin {
       });
     }, true);
     const isActionPerformed = this.getCollapsedColumns().length !== currentCollapsedColumns.length;
-    const selectionRange = this.hot.getSelectedRangeLast();
+    const selectionRange = this.hot.getSelectedRangeActive();
     if (action === 'collapse' && isActionPerformed && selectionRange) {
       const {
         row,
@@ -526,8 +526,8 @@ class CollapsibleColumns extends _base.BasePlugin {
       }
     }
     this.hot.runHooks(actionTranslator.afterHook, currentCollapsedColumns, destinationCollapsedColumns, isActionPossible, isActionPerformed);
-    this.hot.render();
     this.hot.view.adjustElementsSize();
+    this.hot.render();
   }
 
   /**

package/plugins/collapsibleColumns/collapsibleColumns.mjs

@@ -289,7 +289,7 @@ export class CollapsibleColumns extends BasePlugin {
         const {
           row,
           col
-        } = this.hot.getSelectedRangeLast().highlight;
+        } = this.hot.getSelectedRangeActive().highlight;
         const {
           collapsible,
           isCollapsed,
@@ -315,7 +315,7 @@ export class CollapsibleColumns extends BasePlugin {
       },
       runOnlyIf: () => {
         var _this$hot$getSelected, _this$hot$getSelected2;
-        return ((_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.isSingle()) && ((_this$hot$getSelected2 = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.highlight.isHeader());
+        return ((_this$hot$getSelected = this.hot.getSelectedRangeActive()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.isSingle()) && ((_this$hot$getSelected2 = this.hot.getSelectedRangeActive()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.highlight.isHeader());
       },
       group: SHORTCUTS_GROUP,
       relativeToGroup: SHORTCUTS_GROUP_EDITOR,
@@ -507,7 +507,7 @@ export class CollapsibleColumns extends BasePlugin {
       });
     }, true);
     const isActionPerformed = this.getCollapsedColumns().length !== currentCollapsedColumns.length;
-    const selectionRange = this.hot.getSelectedRangeLast();
+    const selectionRange = this.hot.getSelectedRangeActive();
     if (action === 'collapse' && isActionPerformed && selectionRange) {
       const {
         row,
@@ -523,8 +523,8 @@ export class CollapsibleColumns extends BasePlugin {
       }
     }
     this.hot.runHooks(actionTranslator.afterHook, currentCollapsedColumns, destinationCollapsedColumns, isActionPossible, isActionPerformed);
-    this.hot.render();
     this.hot.view.adjustElementsSize();
+    this.hot.render();
   }
 
   /**

package/plugins/columnSorting/columnSorting.js

@@ -238,7 +238,7 @@ class ColumnSorting extends _base.BasePlugin {
       callback: () => {
         const {
           highlight
-        } = this.hot.getSelectedRangeLast();
+        } = this.hot.getSelectedRangeActive();
         this.sort(this.getColumnNextConfig(highlight.col));
 
         // prevent default Enter behavior (move to the next row within a selection range)
@@ -246,8 +246,8 @@ class ColumnSorting extends _base.BasePlugin {
       },
       runOnlyIf: () => {
         var _this$hot$getSelected, _this$hot$getSelected2;
-        const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
-        return highlight && ((_this$hot$getSelected2 = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.isSingle()) && this.hot.selection.isCellVisible(highlight) && highlight.row === -1 && highlight.col >= 0;
+        const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeActive()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
+        return highlight && ((_this$hot$getSelected2 = this.hot.getSelectedRangeActive()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.isSingle()) && this.hot.selection.isCellVisible(highlight) && highlight.row === -1 && highlight.col >= 0;
       },
       relativeToGroup: _shortcutContexts.EDITOR_EDIT_GROUP,
       position: 'before',

package/plugins/columnSorting/columnSorting.mjs

@@ -235,7 +235,7 @@ export class ColumnSorting extends BasePlugin {
       callback: () => {
         const {
           highlight
-        } = this.hot.getSelectedRangeLast();
+        } = this.hot.getSelectedRangeActive();
         this.sort(this.getColumnNextConfig(highlight.col));
 
         // prevent default Enter behavior (move to the next row within a selection range)
@@ -243,8 +243,8 @@ export class ColumnSorting extends BasePlugin {
       },
       runOnlyIf: () => {
         var _this$hot$getSelected, _this$hot$getSelected2;
-        const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
-        return highlight && ((_this$hot$getSelected2 = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.isSingle()) && this.hot.selection.isCellVisible(highlight) && highlight.row === -1 && highlight.col >= 0;
+        const highlight = (_this$hot$getSelected = this.hot.getSelectedRangeActive()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight;
+        return highlight && ((_this$hot$getSelected2 = this.hot.getSelectedRangeActive()) === null || _this$hot$getSelected2 === void 0 ? void 0 : _this$hot$getSelected2.isSingle()) && this.hot.selection.isCellVisible(highlight) && highlight.row === -1 && highlight.col >= 0;
       },
       relativeToGroup: SHORTCUTS_GROUP_EDITOR,
       position: 'before',

package/plugins/comments/comments.js

@@ -6,6 +6,7 @@ require("core-js/modules/es.array.push.js");
 var _element = require("../../helpers/dom/element");
 var _event = require("../../helpers/dom/event");
 var _object = require("../../helpers/object");
+var _src = require("../../3rdparty/walkontable/src");
 var _base = require("../base");
 var _commentEditor = _interopRequireDefault(require("./commentEditor"));
 var _displaySwitch2 = _interopRequireDefault(require("./displaySwitch"));
@@ -179,6 +180,7 @@ var _editor = /*#__PURE__*/new WeakMap();
 var _displaySwitch = /*#__PURE__*/new WeakMap();
 var _preventEditorAutoSwitch = /*#__PURE__*/new WeakMap();
 var _preventEditorHiding = /*#__PURE__*/new WeakMap();
+var _preventEditorSaveOnBlur = /*#__PURE__*/new WeakMap();
 var _cellBelowCursor = /*#__PURE__*/new WeakMap();
 var _commentValueBeforeSave = /*#__PURE__*/new WeakMap();
 var _Comments_brand = /*#__PURE__*/new WeakSet();
@@ -200,21 +202,18 @@ class Comments extends _base.BasePlugin {
     /**
      * Instance of {@link CommentEditor}.
      *
-     * @private
      * @type {CommentEditor}
      */
     _classPrivateFieldInitSpec(this, _editor, null);
     /**
      * Instance of {@link DisplaySwitch}.
      *
-     * @private
      * @type {DisplaySwitch}
      */
     _classPrivateFieldInitSpec(this, _displaySwitch, null);
     /**
      * Prevents showing/hiding editor that reacts on the logic triggered by the "mouseover" events.
      *
-     * @private
      * @type {boolean}
      */
     _classPrivateFieldInitSpec(this, _preventEditorAutoSwitch, false);
@@ -222,21 +221,24 @@ class Comments extends _base.BasePlugin {
      * Prevents hiding editor when the table viewport is scrolled and that scroll is triggered by the
      * keyboard shortcut that insert or edits the comment.
      *
-     * @private
      * @type {boolean}
      */
     _classPrivateFieldInitSpec(this, _preventEditorHiding, false);
+    /**
+     * Prevents saving the comment value when the editor is blurred.
+     *
+     * @type {boolean}
+     */
+    _classPrivateFieldInitSpec(this, _preventEditorSaveOnBlur, false);
     /**
      * The flag that allows processing mousedown event correctly when comments editor is triggered.
      *
-     * @private
      * @type {boolean}
      */
     _classPrivateFieldInitSpec(this, _cellBelowCursor, null);
     /**
      * Holds the comment value before it's actually saved to the cell meta.
      *
-     * @private
      * @type {string}
      */
     _classPrivateFieldInitSpec(this, _commentValueBeforeSave, '');
@@ -331,7 +333,7 @@ class Comments extends _base.BasePlugin {
     gridContext.addShortcut({
       keys: [['Control', 'Alt', 'M']],
       callback: () => {
-        const range = this.hot.getSelectedRangeLast();
+        const range = this.hot.getSelectedRangeActive();
         _classPrivateFieldSet(_preventEditorHiding, this, true);
         this.hot.scrollToFocusedCell(() => {
           this.setRange(range);
@@ -346,7 +348,7 @@ class Comments extends _base.BasePlugin {
       stopPropagation: true,
       runOnlyIf: () => {
         var _this$hot$getSelected;
-        return (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight.isCell();
+        return (_this$hot$getSelected = this.hot.getSelectedRangeActive()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight.isCell();
       },
       group: SHORTCUTS_GROUP
     });
@@ -373,7 +375,9 @@ class Comments extends _base.BasePlugin {
       keys: [['Shift', 'Tab'], ['Tab']],
       forwardToContext: manager.getContext('grid'),
       callback: () => {
+        _classPrivateFieldSet(_preventEditorSaveOnBlur, this, true);
         _classPrivateFieldGet(_editor, this).setValue(_classPrivateFieldGet(_editor, this).getValue());
+        this.setComment();
         this.hide();
         manager.setActiveContextName('grid');
       },
@@ -463,8 +467,10 @@ class Comments extends _base.BasePlugin {
     } else if (editorValue !== null && editorValue !== undefined) {
       comment = editorValue;
     }
-    const row = this.range.from.row;
-    const col = this.range.from.col;
+    const {
+      row,
+      col
+    } = _assertClassBrand(_Comments_brand, this, _getRangeCoords).call(this);
     this.updateCommentMeta(row, col, {
       [META_COMMENT_VALUE]: comment
     });
@@ -495,7 +501,11 @@ class Comments extends _base.BasePlugin {
     if (!this.range.from) {
       throw new Error('Before using this method, first set cell range (hot.getPlugin("comment").setRange())');
     }
-    this.hot.setCellMeta(this.range.from.row, this.range.from.col, META_COMMENT);
+    const {
+      row,
+      col
+    } = _assertClassBrand(_Comments_brand, this, _getRangeCoords).call(this);
+    this.hot.setCellMeta(row, col, META_COMMENT);
     if (forceRender) {
       this.hot.render();
     }
@@ -523,9 +533,11 @@ class Comments extends _base.BasePlugin {
    * @returns {string|undefined} Returns a content of the comment.
    */
   getComment() {
-    const row = this.range.from.row;
-    const column = this.range.from.col;
-    return this.getCommentMeta(row, column, META_COMMENT_VALUE);
+    const {
+      row,
+      col
+    } = _assertClassBrand(_Comments_brand, this, _getRangeCoords).call(this);
+    return this.getCommentMeta(row, col, META_COMMENT_VALUE);
   }
 
   /**
@@ -550,15 +562,13 @@ class Comments extends _base.BasePlugin {
       throw new Error('Before using this method, first set cell range (hot.getPlugin("comment").setRange())');
     }
     const {
-      from: {
-        row,
-        col
-      }
-    } = this.range;
+      row,
+      col
+    } = _assertClassBrand(_Comments_brand, this, _getRangeCoords).call(this);
     if (row < 0 || row > this.hot.countSourceRows() - 1 || col < 0 || col > this.hot.countSourceCols() - 1) {
       return false;
     }
-    const meta = this.hot.getCellMeta(this.range.from.row, this.range.from.col);
+    const meta = this.hot.getCellMeta(row, col);
     _classPrivateFieldGet(_displaySwitch, this).cancelHiding();
     _classPrivateFieldGet(_editor, this).setValue((_ref = meta[META_COMMENT] ? meta[META_COMMENT][META_COMMENT_VALUE] : null) !== null && _ref !== void 0 ? _ref : '');
     _classPrivateFieldGet(_editor, this).show();
@@ -604,7 +614,7 @@ class Comments extends _base.BasePlugin {
     const {
       row: visualRow,
       col: visualColumn
-    } = this.range.from;
+    } = _assertClassBrand(_Comments_brand, this, _getRangeCoords).call(this);
     let renderableRow = rowIndexMapper.getRenderableFromVisualIndex(visualRow);
     let renderableColumn = columnIndexMapper.getRenderableFromVisualIndex(visualColumn);
     // Used when the requested row is hidden, and the editor needs to be positioned on the previous row's coords.
@@ -747,6 +757,12 @@ class Comments extends _base.BasePlugin {
     return _classPrivateFieldGet(_editor, this).getInputElement();
   }
 
+  /**
+   * Gets the coords object from the range object.
+   *
+   * @returns {CellCoords} The coords object.
+   */
+
   /**
    * Destroys the plugin instance.
    */
@@ -823,6 +839,10 @@ function _onAfterRenderer(TD, cellProperties) {
  * editor content and gives back the keyboard shortcuts control by switching to the "grid" context.
  */
 function _onEditorBlur() {
+  if (_classPrivateFieldGet(_preventEditorSaveOnBlur, this)) {
+    _classPrivateFieldSet(_preventEditorSaveOnBlur, this, false);
+    return;
+  }
   _classPrivateFieldSet(_commentValueBeforeSave, this, '');
   this.hot.getShortcutManager().setActiveContextName('grid');
   this.setComment();
@@ -843,7 +863,11 @@ function _onEditorFocus() {
  * @param {number} height The new height of the editor.
  */
 function _onEditorResize(width, height) {
-  this.updateCommentMeta(this.range.from.row, this.range.from.col, {
+  const {
+    row,
+    col
+  } = _assertClassBrand(_Comments_brand, this, _getRangeCoords).call(this);
+  this.updateCommentMeta(row, col, {
     [META_STYLE]: {
       width,
       height
@@ -868,4 +892,10 @@ function _onAfterScroll() {
   if (!_classPrivateFieldGet(_preventEditorHiding, this)) {
     this.hide();
   }
+}
+function _getRangeCoords() {
+  if (this.range instanceof _src.CellRange) {
+    return this.range.highlight;
+  }
+  return this.hot._createCellCoords(this.range.from.row, this.range.from.col);
 }

package/plugins/comments/comments.mjs

@@ -12,6 +12,7 @@ function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.h
 import { addClass, closest, getScrollbarWidth, hasClass, hasVerticalScrollbar, hasHorizontalScrollbar, isChildOf, outerHeight } from "../../helpers/dom/element.mjs";
 import { stopImmediatePropagation } from "../../helpers/dom/event.mjs";
 import { deepClone, deepExtend } from "../../helpers/object.mjs";
+import { CellRange } from "../../3rdparty/walkontable/src/index.mjs";
 import { BasePlugin } from "../base/index.mjs";
 import CommentEditor from "./commentEditor.mjs";
 import DisplaySwitch from "./displaySwitch.mjs";
@@ -175,6 +176,7 @@ var _editor = /*#__PURE__*/new WeakMap();
 var _displaySwitch = /*#__PURE__*/new WeakMap();
 var _preventEditorAutoSwitch = /*#__PURE__*/new WeakMap();
 var _preventEditorHiding = /*#__PURE__*/new WeakMap();
+var _preventEditorSaveOnBlur = /*#__PURE__*/new WeakMap();
 var _cellBelowCursor = /*#__PURE__*/new WeakMap();
 var _commentValueBeforeSave = /*#__PURE__*/new WeakMap();
 var _Comments_brand = /*#__PURE__*/new WeakSet();
@@ -196,21 +198,18 @@ export class Comments extends BasePlugin {
     /**
      * Instance of {@link CommentEditor}.
      *
-     * @private
      * @type {CommentEditor}
      */
     _classPrivateFieldInitSpec(this, _editor, null);
     /**
      * Instance of {@link DisplaySwitch}.
      *
-     * @private
      * @type {DisplaySwitch}
      */
     _classPrivateFieldInitSpec(this, _displaySwitch, null);
     /**
      * Prevents showing/hiding editor that reacts on the logic triggered by the "mouseover" events.
      *
-     * @private
      * @type {boolean}
      */
     _classPrivateFieldInitSpec(this, _preventEditorAutoSwitch, false);
@@ -218,21 +217,24 @@ export class Comments extends BasePlugin {
      * Prevents hiding editor when the table viewport is scrolled and that scroll is triggered by the
      * keyboard shortcut that insert or edits the comment.
      *
-     * @private
      * @type {boolean}
      */
     _classPrivateFieldInitSpec(this, _preventEditorHiding, false);
+    /**
+     * Prevents saving the comment value when the editor is blurred.
+     *
+     * @type {boolean}
+     */
+    _classPrivateFieldInitSpec(this, _preventEditorSaveOnBlur, false);
     /**
      * The flag that allows processing mousedown event correctly when comments editor is triggered.
      *
-     * @private
      * @type {boolean}
      */
     _classPrivateFieldInitSpec(this, _cellBelowCursor, null);
     /**
      * Holds the comment value before it's actually saved to the cell meta.
      *
-     * @private
      * @type {string}
      */
     _classPrivateFieldInitSpec(this, _commentValueBeforeSave, '');
@@ -327,7 +329,7 @@ export class Comments extends BasePlugin {
     gridContext.addShortcut({
       keys: [['Control', 'Alt', 'M']],
       callback: () => {
-        const range = this.hot.getSelectedRangeLast();
+        const range = this.hot.getSelectedRangeActive();
         _classPrivateFieldSet(_preventEditorHiding, this, true);
         this.hot.scrollToFocusedCell(() => {
           this.setRange(range);
@@ -342,7 +344,7 @@ export class Comments extends BasePlugin {
       stopPropagation: true,
       runOnlyIf: () => {
         var _this$hot$getSelected;
-        return (_this$hot$getSelected = this.hot.getSelectedRangeLast()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight.isCell();
+        return (_this$hot$getSelected = this.hot.getSelectedRangeActive()) === null || _this$hot$getSelected === void 0 ? void 0 : _this$hot$getSelected.highlight.isCell();
       },
       group: SHORTCUTS_GROUP
     });
@@ -369,7 +371,9 @@ export class Comments extends BasePlugin {
       keys: [['Shift', 'Tab'], ['Tab']],
       forwardToContext: manager.getContext('grid'),
       callback: () => {
+        _classPrivateFieldSet(_preventEditorSaveOnBlur, this, true);
         _classPrivateFieldGet(_editor, this).setValue(_classPrivateFieldGet(_editor, this).getValue());
+        this.setComment();
         this.hide();
         manager.setActiveContextName('grid');
       },
@@ -459,8 +463,10 @@ export class Comments extends BasePlugin {
     } else if (editorValue !== null && editorValue !== undefined) {
       comment = editorValue;
     }
-    const row = this.range.from.row;
-    const col = this.range.from.col;
+    const {
+      row,
+      col
+    } = _assertClassBrand(_Comments_brand, this, _getRangeCoords).call(this);
     this.updateCommentMeta(row, col, {
       [META_COMMENT_VALUE]: comment
     });
@@ -491,7 +497,11 @@ export class Comments extends BasePlugin {
     if (!this.range.from) {
       throw new Error('Before using this method, first set cell range (hot.getPlugin("comment").setRange())');
     }
-    this.hot.setCellMeta(this.range.from.row, this.range.from.col, META_COMMENT);
+    const {
+      row,
+      col
+    } = _assertClassBrand(_Comments_brand, this, _getRangeCoords).call(this);
+    this.hot.setCellMeta(row, col, META_COMMENT);
     if (forceRender) {
       this.hot.render();
     }
@@ -519,9 +529,11 @@ export class Comments extends BasePlugin {
    * @returns {string|undefined} Returns a content of the comment.
    */
   getComment() {
-    const row = this.range.from.row;
-    const column = this.range.from.col;
-    return this.getCommentMeta(row, column, META_COMMENT_VALUE);
+    const {
+      row,
+      col
+    } = _assertClassBrand(_Comments_brand, this, _getRangeCoords).call(this);
+    return this.getCommentMeta(row, col, META_COMMENT_VALUE);
   }
 
   /**
@@ -546,15 +558,13 @@ export class Comments extends BasePlugin {
       throw new Error('Before using this method, first set cell range (hot.getPlugin("comment").setRange())');
     }
     const {
-      from: {
-        row,
-        col
-      }
-    } = this.range;
+      row,
+      col
+    } = _assertClassBrand(_Comments_brand, this, _getRangeCoords).call(this);
     if (row < 0 || row > this.hot.countSourceRows() - 1 || col < 0 || col > this.hot.countSourceCols() - 1) {
       return false;
     }
-    const meta = this.hot.getCellMeta(this.range.from.row, this.range.from.col);
+    const meta = this.hot.getCellMeta(row, col);
     _classPrivateFieldGet(_displaySwitch, this).cancelHiding();
     _classPrivateFieldGet(_editor, this).setValue((_ref = meta[META_COMMENT] ? meta[META_COMMENT][META_COMMENT_VALUE] : null) !== null && _ref !== void 0 ? _ref : '');
     _classPrivateFieldGet(_editor, this).show();
@@ -600,7 +610,7 @@ export class Comments extends BasePlugin {
     const {
       row: visualRow,
       col: visualColumn
-    } = this.range.from;
+    } = _assertClassBrand(_Comments_brand, this, _getRangeCoords).call(this);
     let renderableRow = rowIndexMapper.getRenderableFromVisualIndex(visualRow);
     let renderableColumn = columnIndexMapper.getRenderableFromVisualIndex(visualColumn);
     // Used when the requested row is hidden, and the editor needs to be positioned on the previous row's coords.
@@ -743,6 +753,12 @@ export class Comments extends BasePlugin {
     return _classPrivateFieldGet(_editor, this).getInputElement();
   }
 
+  /**
+   * Gets the coords object from the range object.
+   *
+   * @returns {CellCoords} The coords object.
+   */
+
   /**
    * Destroys the plugin instance.
    */
@@ -818,6 +834,10 @@ function _onAfterRenderer(TD, cellProperties) {
  * editor content and gives back the keyboard shortcuts control by switching to the "grid" context.
  */
 function _onEditorBlur() {
+  if (_classPrivateFieldGet(_preventEditorSaveOnBlur, this)) {
+    _classPrivateFieldSet(_preventEditorSaveOnBlur, this, false);
+    return;
+  }
   _classPrivateFieldSet(_commentValueBeforeSave, this, '');
   this.hot.getShortcutManager().setActiveContextName('grid');
   this.setComment();
@@ -838,7 +858,11 @@ function _onEditorFocus() {
  * @param {number} height The new height of the editor.
  */
 function _onEditorResize(width, height) {
-  this.updateCommentMeta(this.range.from.row, this.range.from.col, {
+  const {
+    row,
+    col
+  } = _assertClassBrand(_Comments_brand, this, _getRangeCoords).call(this);
+  this.updateCommentMeta(row, col, {
     [META_STYLE]: {
       width,
       height
@@ -863,4 +887,10 @@ function _onAfterScroll() {
   if (!_classPrivateFieldGet(_preventEditorHiding, this)) {
     this.hide();
   }
+}
+function _getRangeCoords() {
+  if (this.range instanceof CellRange) {
+    return this.range.highlight;
+  }
+  return this.hot._createCellCoords(this.range.from.row, this.range.from.col);
 }

package/plugins/comments/contextMenuItem/addEditComment.js

@@ -13,20 +13,20 @@ function addEditCommentItem(plugin) {
     key: 'commentsAddEdit',
     name() {
       var _this$getSelectedRang;
-      const highlight = (_this$getSelectedRang = this.getSelectedRangeLast()) === null || _this$getSelectedRang === void 0 ? void 0 : _this$getSelectedRang.highlight;
+      const highlight = (_this$getSelectedRang = this.getSelectedRangeActive()) === null || _this$getSelectedRang === void 0 ? void 0 : _this$getSelectedRang.highlight;
       if (highlight !== null && highlight !== void 0 && highlight.isCell() && plugin.getCommentAtCell(highlight.row, highlight.col)) {
         return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_EDIT_COMMENT);
       }
       return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_ADD_COMMENT);
     },
     callback() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       plugin.setRange(range);
       plugin.show();
       plugin.focusEditor();
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range || range.highlight.isHeader() || this.selection.isEntireRowSelected() && this.selection.isEntireColumnSelected() || this.countRenderedRows() === 0 || this.countRenderedCols() === 0) {
         return true;
       }

package/plugins/comments/contextMenuItem/addEditComment.mjs

@@ -8,20 +8,20 @@ export default function addEditCommentItem(plugin) {
     key: 'commentsAddEdit',
     name() {
       var _this$getSelectedRang;
-      const highlight = (_this$getSelectedRang = this.getSelectedRangeLast()) === null || _this$getSelectedRang === void 0 ? void 0 : _this$getSelectedRang.highlight;
+      const highlight = (_this$getSelectedRang = this.getSelectedRangeActive()) === null || _this$getSelectedRang === void 0 ? void 0 : _this$getSelectedRang.highlight;
       if (highlight !== null && highlight !== void 0 && highlight.isCell() && plugin.getCommentAtCell(highlight.row, highlight.col)) {
         return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_EDIT_COMMENT);
       }
       return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_ADD_COMMENT);
     },
     callback() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       plugin.setRange(range);
       plugin.show();
       plugin.focusEditor();
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range || range.highlight.isHeader() || this.selection.isEntireRowSelected() && this.selection.isEntireColumnSelected() || this.countRenderedRows() === 0 || this.countRenderedCols() === 0) {
         return true;
       }

package/plugins/comments/contextMenuItem/readOnlyComment.js

@@ -21,7 +21,7 @@ function readOnlyCommentItem(plugin) {
       return areReadOnly ? (0, _utils.markLabelAsSelected)(label) : label;
     },
     callback() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       range.forAll((row, column) => {
         if (row >= 0 && column >= 0) {
           const currentState = !!plugin.getCommentMeta(row, column, _comments.META_READONLY);
@@ -32,7 +32,7 @@ function readOnlyCommentItem(plugin) {
       });
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range || range.highlight.isHeader() || !plugin.getCommentAtCell(range.highlight.row, range.highlight.col) || this.selection.isEntireRowSelected() && this.selection.isEntireColumnSelected() || this.countRenderedRows() === 0 || this.countRenderedCols() === 0) {
         return true;
       }

package/plugins/comments/contextMenuItem/readOnlyComment.mjs

@@ -16,7 +16,7 @@ export default function readOnlyCommentItem(plugin) {
       return areReadOnly ? markLabelAsSelected(label) : label;
     },
     callback() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       range.forAll((row, column) => {
         if (row >= 0 && column >= 0) {
           const currentState = !!plugin.getCommentMeta(row, column, META_READONLY);
@@ -27,7 +27,7 @@ export default function readOnlyCommentItem(plugin) {
       });
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range || range.highlight.isHeader() || !plugin.getCommentAtCell(range.highlight.row, range.highlight.col) || this.selection.isEntireRowSelected() && this.selection.isEntireColumnSelected() || this.countRenderedRows() === 0 || this.countRenderedCols() === 0) {
         return true;
       }

package/plugins/comments/contextMenuItem/removeComment.js

@@ -15,7 +15,7 @@ function removeCommentItem(plugin) {
       return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_REMOVE_COMMENT);
     },
     callback() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       range.forAll((row, column) => {
         if (row >= 0 && column >= 0) {
           plugin.removeCommentAtCell(row, column, false);
@@ -24,7 +24,7 @@ function removeCommentItem(plugin) {
       this.render();
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range || range.highlight.isHeader() || this.selection.isEntireRowSelected() && this.selection.isEntireColumnSelected() || this.countRenderedRows() === 0 || this.countRenderedCols() === 0) {
         return true;
       }

package/plugins/comments/contextMenuItem/removeComment.mjs

@@ -10,7 +10,7 @@ export default function removeCommentItem(plugin) {
       return this.getTranslatedPhrase(C.CONTEXTMENU_ITEMS_REMOVE_COMMENT);
     },
     callback() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       range.forAll((row, column) => {
         if (row >= 0 && column >= 0) {
           plugin.removeCommentAtCell(row, column, false);
@@ -19,7 +19,7 @@ export default function removeCommentItem(plugin) {
       this.render();
     },
     disabled() {
-      const range = this.getSelectedRangeLast();
+      const range = this.getSelectedRangeActive();
       if (!range || range.highlight.isHeader() || this.selection.isEntireRowSelected() && this.selection.isEntireColumnSelected() || this.countRenderedRows() === 0 || this.countRenderedCols() === 0) {
         return true;
       }