handsontable 0.0.0-next-c3d199b-20230626 → 0.0.0-next-208afb8-20230627

package/editorManager.js

@@ -255,13 +255,7 @@ var EditorManager = /*#__PURE__*/function () {
         return;
       }
       if (!this.activeEditor) {
-        var _this$instance$getSel2 = this.instance.getSelectedRangeLast().highlight,
-          row = _this$instance$getSel2.row,
-          col = _this$instance$getSel2.col;
-        var renderableRowIndex = this.instance.rowIndexMapper.getRenderableFromVisualIndex(row);
-        var 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) {
@@ -336,9 +330,9 @@ var EditorManager = /*#__PURE__*/function () {
     key: "isCellEditable",
     value: function isCellEditable() {
       var editorClass = this.instance.getCellEditor(this.cellProperties);
-      var _this$instance$getSel3 = this.instance.getSelectedRangeLast().highlight,
-        row = _this$instance$getSel3.row,
-        col = _this$instance$getSel3.col;
+      var _this$instance$getSel2 = this.instance.getSelectedRangeLast().highlight,
+        row = _this$instance$getSel2.row,
+        col = _this$instance$getSel2.col;
       var _this$instance = this.instance,
         rowIndexMapper = _this$instance.rowIndexMapper,
         columnIndexMapper = _this$instance.columnIndexMapper;

package/editorManager.mjs

@@ -249,13 +249,7 @@ var EditorManager = /*#__PURE__*/function () {
         return;
       }
       if (!this.activeEditor) {
-        var _this$instance$getSel2 = this.instance.getSelectedRangeLast().highlight,
-          row = _this$instance$getSel2.row,
-          col = _this$instance$getSel2.col;
-        var renderableRowIndex = this.instance.rowIndexMapper.getRenderableFromVisualIndex(row);
-        var 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) {
@@ -330,9 +324,9 @@ var EditorManager = /*#__PURE__*/function () {
     key: "isCellEditable",
     value: function isCellEditable() {
       var editorClass = this.instance.getCellEditor(this.cellProperties);
-      var _this$instance$getSel3 = this.instance.getSelectedRangeLast().highlight,
-        row = _this$instance$getSel3.row,
-        col = _this$instance$getSel3.col;
+      var _this$instance$getSel2 = this.instance.getSelectedRangeLast().highlight,
+        row = _this$instance$getSel2.row,
+        col = _this$instance$getSel2.col;
       var _this$instance = this.instance,
         rowIndexMapper = _this$instance.rowIndexMapper,
         columnIndexMapper = _this$instance.columnIndexMapper;

package/helpers/mixed.js

@@ -152,7 +152,7 @@ var domMessages = {
 function _injectProductInfo(key, element) {
   var hasValidType = !isEmpty(key);
   var isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  var hotVersion = "0.0.0-next-c3d199b-20230626";
+  var hotVersion = "0.0.0-next-208afb8-20230627";
   var keyValidityDate;
   var consoleMessageState = 'invalid';
   var domMessageState = 'invalid';

package/helpers/mixed.mjs

@@ -142,7 +142,7 @@ var domMessages = {
 export function _injectProductInfo(key, element) {
   var hasValidType = !isEmpty(key);
   var isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  var hotVersion = "0.0.0-next-c3d199b-20230626";
+  var hotVersion = "0.0.0-next-208afb8-20230627";
   var keyValidityDate;
   var consoleMessageState = 'invalid';
   var 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-c3d199b-20230626",
+  "version": "0.0.0-next-208afb8-20230627",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/pluginHooks.d.ts

@@ -128,6 +128,7 @@ export interface Events {
   afterRowSequenceChange?: (source: 'init' | 'move' | 'insert' | 'remove' | 'update') => void;
   afterScrollHorizontally?: () => void;
   afterScrollVertically?: () => void;
+  afterScroll?: () => void;
   afterSelectColumns?: (from: CellCoords, to: CellCoords, highlight: CellCoords) => void;
   afterSelection?: (row: number, column: number, row2: number, column2: number, preventScrolling: { value: boolean }, selectionLayerLevel: number) => void;
   afterSelectionByProp?: (row: number, prop: string, row2: number, prop2: string, preventScrolling: { value: boolean }, selectionLayerLevel: number) => void;

package/pluginHooks.js

@@ -577,6 +577,13 @@ var REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-sen
  * @event Hooks#afterScrollVertically
  */
 'afterScrollVertically',
+/**
+ * Fired after the vertical or horizontal scroll event.
+ *
+ * @since 14.0.0
+ * @event Hooks#afterScroll
+ */
+'afterScroll',
 /**
  * Fired after one or more cells are selected (e.g. During mouse move).
  *
@@ -683,7 +690,7 @@ var REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-sen
 /**
  * Fired before one or more columns are selected (e.g. During mouse header click or {@link Core#selectColumns} API call).
  *
- * @since 13.0.0
+ * @since 14.0.0
  * @event Hooks#beforeSelectColumns
  * @param {CellCoords} from Selection start coords object.
  * @param {CellCoords} to Selection end coords object.
@@ -717,7 +724,7 @@ var REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-sen
 /**
  * Fired after one or more columns are selected (e.g. During mouse header click or {@link Core#selectColumns} API call).
  *
- * @since 13.0.0
+ * @since 14.0.0
  * @event Hooks#afterSelectColumns
  * @param {CellCoords} from Selection start coords object.
  * @param {CellCoords} to Selection end coords object.
@@ -727,7 +734,7 @@ var REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-sen
 /**
  * Fired before one or more rows are selected (e.g. During mouse header click or {@link Core#selectRows} API call).
  *
- * @since 13.0.0
+ * @since 14.0.0
  * @event Hooks#beforeSelectRows
  * @param {CellCoords} from Selection start coords object.
  * @param {CellCoords} to Selection end coords object.
@@ -761,7 +768,7 @@ var REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-sen
 /**
  * Fired after one or more rows are selected (e.g. During mouse header click or {@link Core#selectRows} API call).
  *
- * @since 13.0.0
+ * @since 14.0.0
  * @event Hooks#afterSelectRows
  * @param {CellCoords} from Selection start coords object.
  * @param {CellCoords} to Selection end coords object.

package/pluginHooks.mjs

@@ -574,6 +574,13 @@ var REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-sen
  * @event Hooks#afterScrollVertically
  */
 'afterScrollVertically',
+/**
+ * Fired after the vertical or horizontal scroll event.
+ *
+ * @since 14.0.0
+ * @event Hooks#afterScroll
+ */
+'afterScroll',
 /**
  * Fired after one or more cells are selected (e.g. During mouse move).
  *
@@ -680,7 +687,7 @@ var REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-sen
 /**
  * Fired before one or more columns are selected (e.g. During mouse header click or {@link Core#selectColumns} API call).
  *
- * @since 13.0.0
+ * @since 14.0.0
  * @event Hooks#beforeSelectColumns
  * @param {CellCoords} from Selection start coords object.
  * @param {CellCoords} to Selection end coords object.
@@ -714,7 +721,7 @@ var REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-sen
 /**
  * Fired after one or more columns are selected (e.g. During mouse header click or {@link Core#selectColumns} API call).
  *
- * @since 13.0.0
+ * @since 14.0.0
  * @event Hooks#afterSelectColumns
  * @param {CellCoords} from Selection start coords object.
  * @param {CellCoords} to Selection end coords object.
@@ -724,7 +731,7 @@ var REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-sen
 /**
  * Fired before one or more rows are selected (e.g. During mouse header click or {@link Core#selectRows} API call).
  *
- * @since 13.0.0
+ * @since 14.0.0
  * @event Hooks#beforeSelectRows
  * @param {CellCoords} from Selection start coords object.
  * @param {CellCoords} to Selection end coords object.
@@ -758,7 +765,7 @@ var REGISTERED_HOOKS = [/* eslint-disable jsdoc/require-description-complete-sen
 /**
  * Fired after one or more rows are selected (e.g. During mouse header click or {@link Core#selectRows} API call).
  *
- * @since 13.0.0
+ * @since 14.0.0
  * @event Hooks#afterSelectRows
  * @param {CellCoords} from Selection start coords object.
  * @param {CellCoords} to Selection end coords object.

package/plugins/comments/comments.js

@@ -162,6 +162,7 @@ var SHORTCUTS_CONTEXT_NAME = "plugin:".concat(PLUGIN_KEY);
 var _editor = /*#__PURE__*/new WeakMap();
 var _displaySwitch = /*#__PURE__*/new WeakMap();
 var _preventEditorAutoSwitch = /*#__PURE__*/new WeakMap();
+var _preventEditorHiding = /*#__PURE__*/new WeakMap();
 var _tempEditorDimensions = /*#__PURE__*/new WeakMap();
 var _cellBelowCursor = /*#__PURE__*/new WeakMap();
 var _commentValueBeforeSave = /*#__PURE__*/new WeakMap();
@@ -218,6 +219,17 @@ var Comments = /*#__PURE__*/function (_BasePlugin) {
       writable: true,
       value: false
     });
+    /**
+     * 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(_assertThisInitialized(_this), _preventEditorHiding, {
+      writable: true,
+      value: false
+    });
     /**
      * The property for holding editor dimensions for further processing.
      *
@@ -288,11 +300,8 @@ var Comments = /*#__PURE__*/function (_BasePlugin) {
       this.addHook('afterRenderer', function (TD, row, col, prop, value, cellProperties) {
         return _this2.onAfterRenderer(TD, cellProperties);
       });
-      this.addHook('afterScrollHorizontally', function () {
-        return _this2.hide();
-      });
-      this.addHook('afterScrollVertically', function () {
-        return _this2.hide();
+      this.addHook('afterScroll', function () {
+        return _this2.onAfterScroll();
       });
       this.addHook('afterBeginEditing', function () {
         return _this2.hide();
@@ -350,10 +359,16 @@ var Comments = /*#__PURE__*/function (_BasePlugin) {
         keys: [['Control', 'Alt', 'M']],
         callback: function callback() {
           var range = _this3.hot.getSelectedRangeLast();
-          _this3.setRange(range);
-          _this3.show();
-          _this3.focusEditor();
-          manager.setActiveContextName(SHORTCUTS_CONTEXT_NAME);
+          _classPrivateFieldSet(_this3, _preventEditorHiding, true);
+          _this3.hot.scrollToFocusedCell(function () {
+            _this3.setRange(range);
+            _this3.show();
+            _this3.focusEditor();
+            manager.setActiveContextName(SHORTCUTS_CONTEXT_NAME);
+            _this3.hot._registerTimeout(function () {
+              _classPrivateFieldSet(_this3, _preventEditorHiding, false);
+            });
+          });
         },
         stopPropagation: true,
         runOnlyIf: function runOnlyIf() {
@@ -915,6 +930,17 @@ var Comments = /*#__PURE__*/function (_BasePlugin) {
       }
     }
 
+    /**
+     * Observes the changes in the scroll position if triggered it hides the comment editor.
+     */
+  }, {
+    key: "onAfterScroll",
+    value: function onAfterScroll() {
+      if (!_classPrivateFieldGet(this, _preventEditorHiding)) {
+        this.hide();
+      }
+    }
+
     /**
      * Add Comments plugin options to the Context Menu.
      *

package/plugins/comments/comments.mjs

@@ -151,6 +151,7 @@ var SHORTCUTS_CONTEXT_NAME = "plugin:".concat(PLUGIN_KEY);
 var _editor = /*#__PURE__*/new WeakMap();
 var _displaySwitch = /*#__PURE__*/new WeakMap();
 var _preventEditorAutoSwitch = /*#__PURE__*/new WeakMap();
+var _preventEditorHiding = /*#__PURE__*/new WeakMap();
 var _tempEditorDimensions = /*#__PURE__*/new WeakMap();
 var _cellBelowCursor = /*#__PURE__*/new WeakMap();
 var _commentValueBeforeSave = /*#__PURE__*/new WeakMap();
@@ -207,6 +208,17 @@ export var Comments = /*#__PURE__*/function (_BasePlugin) {
       writable: true,
       value: false
     });
+    /**
+     * 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(_assertThisInitialized(_this), _preventEditorHiding, {
+      writable: true,
+      value: false
+    });
     /**
      * The property for holding editor dimensions for further processing.
      *
@@ -277,11 +289,8 @@ export var Comments = /*#__PURE__*/function (_BasePlugin) {
       this.addHook('afterRenderer', function (TD, row, col, prop, value, cellProperties) {
         return _this2.onAfterRenderer(TD, cellProperties);
       });
-      this.addHook('afterScrollHorizontally', function () {
-        return _this2.hide();
-      });
-      this.addHook('afterScrollVertically', function () {
-        return _this2.hide();
+      this.addHook('afterScroll', function () {
+        return _this2.onAfterScroll();
       });
       this.addHook('afterBeginEditing', function () {
         return _this2.hide();
@@ -339,10 +348,16 @@ export var Comments = /*#__PURE__*/function (_BasePlugin) {
         keys: [['Control', 'Alt', 'M']],
         callback: function callback() {
           var range = _this3.hot.getSelectedRangeLast();
-          _this3.setRange(range);
-          _this3.show();
-          _this3.focusEditor();
-          manager.setActiveContextName(SHORTCUTS_CONTEXT_NAME);
+          _classPrivateFieldSet(_this3, _preventEditorHiding, true);
+          _this3.hot.scrollToFocusedCell(function () {
+            _this3.setRange(range);
+            _this3.show();
+            _this3.focusEditor();
+            manager.setActiveContextName(SHORTCUTS_CONTEXT_NAME);
+            _this3.hot._registerTimeout(function () {
+              _classPrivateFieldSet(_this3, _preventEditorHiding, false);
+            });
+          });
         },
         stopPropagation: true,
         runOnlyIf: function runOnlyIf() {
@@ -904,6 +919,17 @@ export var Comments = /*#__PURE__*/function (_BasePlugin) {
       }
     }
 
+    /**
+     * Observes the changes in the scroll position if triggered it hides the comment editor.
+     */
+  }, {
+    key: "onAfterScroll",
+    value: function onAfterScroll() {
+      if (!_classPrivateFieldGet(this, _preventEditorHiding)) {
+        this.hide();
+      }
+    }
+
     /**
      * Add Comments plugin options to the Context Menu.
      *

package/plugins/contextMenu/contextMenu.js

@@ -218,6 +218,7 @@ var ContextMenu = /*#__PURE__*/function (_BasePlugin) {
         callback: function callback() {
           var _this3$hot$getSelecte = _this3.hot.getSelectedRangeLast(),
             highlight = _this3$hot$getSelecte.highlight;
+          _this3.hot.scrollToFocusedCell();
           var rect = _this3.hot.getCell(highlight.row, highlight.col, true).getBoundingClientRect();
           var offset = (0, _utils.getDocumentOffsetByElement)(_this3.menu.container, _this3.hot.rootDocument);
           _this3.open({

package/plugins/contextMenu/contextMenu.mjs

@@ -211,6 +211,7 @@ export var ContextMenu = /*#__PURE__*/function (_BasePlugin) {
         callback: function callback() {
           var _this3$hot$getSelecte = _this3.hot.getSelectedRangeLast(),
             highlight = _this3$hot$getSelecte.highlight;
+          _this3.hot.scrollToFocusedCell();
           var rect = _this3.hot.getCell(highlight.row, highlight.col, true).getBoundingClientRect();
           var offset = getDocumentOffsetByElement(_this3.menu.container, _this3.hot.rootDocument);
           _this3.open({

package/tableView.js

@@ -915,10 +915,12 @@ var TableView = /*#__PURE__*/function () {
           return _this2.afterRender(force);
         },
         onScrollVertically: function onScrollVertically() {
-          return _this2.instance.runHooks('afterScrollVertically');
+          _this2.instance.runHooks('afterScrollVertically');
+          _this2.instance.runHooks('afterScroll');
         },
         onScrollHorizontally: function onScrollHorizontally() {
-          return _this2.instance.runHooks('afterScrollHorizontally');
+          _this2.instance.runHooks('afterScrollHorizontally');
+          _this2.instance.runHooks('afterScroll');
         },
         onBeforeRemoveCellClassNames: function onBeforeRemoveCellClassNames() {
           return _this2.instance.runHooks('beforeRemoveCellClassNames');

package/tableView.mjs

@@ -910,10 +910,12 @@ var TableView = /*#__PURE__*/function () {
           return _this2.afterRender(force);
         },
         onScrollVertically: function onScrollVertically() {
-          return _this2.instance.runHooks('afterScrollVertically');
+          _this2.instance.runHooks('afterScrollVertically');
+          _this2.instance.runHooks('afterScroll');
         },
         onScrollHorizontally: function onScrollHorizontally() {
-          return _this2.instance.runHooks('afterScrollHorizontally');
+          _this2.instance.runHooks('afterScrollHorizontally');
+          _this2.instance.runHooks('afterScroll');
         },
         onBeforeRemoveCellClassNames: function onBeforeRemoveCellClassNames() {
           return _this2.instance.runHooks('beforeRemoveCellClassNames');