handsontable 0.0.0-next-d82e84a-20240117 → 0.0.0-next-40cdda4-20240118

package/core.mjs

@@ -28,7 +28,7 @@ import { hasLanguageDictionary, getValidLanguageCode, getTranslatedPhrase } from
 import { warnUserAboutLanguageRegistration, normalizeLanguageCode } from "./i18n/utils.mjs";
 import { Selection } from "./selection/index.mjs";
 import { MetaManager, DynamicCellMetaMod, ExtendMetaPropertiesMod, replaceData } from "./dataMap/index.mjs";
-import { installFocusCatcher } from "./core/index.mjs";
+import { installFocusCatcher, createViewportScroller } from "./core/index.mjs";
 import { createUniqueMap } from "./utils/dataStructures/uniqueMap.mjs";
 import { createShortcutManager } from "./shortcuts/index.mjs";
 import { registerAllShortcutContexts } from "./shortcutContexts/index.mjs";
@@ -105,7 +105,6 @@ export default function Core(rootElement, userSettings) {
   var _userSettings$layoutD,
     _this = this;
   let rootInstanceSymbol = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  let preventScrollingToCell = false;
   let instance = this;
   const eventManager = new EventManager(instance);
   let datamap;
@@ -113,6 +112,7 @@ export default function Core(rootElement, userSettings) {
   let grid;
   let editorManager;
   let focusManager;
+  let viewportScroller;
   let firstRun = true;
   if (hasValidParameter(rootInstanceSymbol)) {
     registerAsRootInstance(this);
@@ -302,7 +302,7 @@ export default function Core(rootElement, userSettings) {
   };
   this.columnIndexMapper.addLocalHook('cacheUpdated', onIndexMapperCacheUpdate);
   this.rowIndexMapper.addLocalHook('cacheUpdated', onIndexMapperCacheUpdate);
-  this.selection.addLocalHook('afterSetRangeEnd', cellCoords => {
+  this.selection.addLocalHook('afterSetRangeEnd', (cellCoords, isLastSelectionLayer) => {
     const preventScrolling = createObjectPropListener(false);
     const selectionRange = this.selection.getSelectedRange();
     const {
@@ -311,53 +311,12 @@ export default function Core(rootElement, userSettings) {
     } = selectionRange.current();
     const selectionLayerLevel = selectionRange.size() - 1;
     this.runHooks('afterSelection', from.row, from.col, to.row, to.col, preventScrolling, selectionLayerLevel);
-    this.runHooks('afterSelectionByProp', from.row, instance.colToProp(from.col), to.row, instance.colToProp(to.col), preventScrolling, selectionLayerLevel); // eslint-disable-line max-len
-
-    let scrollToCell = true;
-    if (preventScrollingToCell) {
-      scrollToCell = false;
-    }
-    if (preventScrolling.isTouched()) {
-      scrollToCell = !preventScrolling.value;
-    }
-    const currentSelectedRange = this.selection.selectedRange.current();
-    const isSelectedByAnyHeader = this.selection.isSelectedByAnyHeader();
-    const isSelectedByRowHeader = this.selection.isSelectedByRowHeader();
-    const isSelectedByColumnHeader = this.selection.isSelectedByColumnHeader();
-    if (scrollToCell !== false) {
-      if (!isSelectedByAnyHeader) {
-        if (currentSelectedRange && !this.selection.isMultiple()) {
-          const {
-            row,
-            col
-          } = currentSelectedRange.from;
-          if (row < 0 && col >= 0) {
-            this.scrollViewportTo({
-              col
-            });
-          } else if (col < 0 && row >= 0) {
-            this.scrollViewportTo({
-              row
-            });
-          } else {
-            this.scrollViewportTo({
-              row,
-              col
-            });
-          }
-        } else {
-          this.scrollViewportTo(cellCoords.toObject());
-        }
-      } else if (isSelectedByRowHeader) {
-        this.scrollViewportTo({
-          row: cellCoords.row
-        });
-      } else if (isSelectedByColumnHeader) {
-        this.scrollViewportTo({
-          col: cellCoords.col
-        });
-      }
+    this.runHooks('afterSelectionByProp', from.row, instance.colToProp(from.col), to.row, instance.colToProp(to.col), preventScrolling, selectionLayerLevel);
+    if (isLastSelectionLayer && (!preventScrolling.isTouched() || preventScrolling.isTouched() && !preventScrolling.value)) {
+      viewportScroller.scrollTo(cellCoords);
     }
+    const isSelectedByRowHeader = selection.isSelectedByRowHeader();
+    const isSelectedByColumnHeader = selection.isSelectedByColumnHeader();
 
     // @TODO: These CSS classes are no longer needed anymore. They are used only as a indicator of the selected
     // rows/columns in the MergedCells plugin (via border.js#L520 in the walkontable module). After fixing
@@ -1093,6 +1052,7 @@ export default function Core(rootElement, userSettings) {
     this.updateSettings(tableMeta, true);
     this.view = new TableView(this);
     editorManager = EditorManager.getInstance(instance, tableMeta, selection);
+    viewportScroller = createViewportScroller(instance);
     focusManager = new FocusManager(instance);
     if (isRootInstance(this)) {
       installFocusCatcher(instance);
@@ -3910,13 +3870,13 @@ export default function Core(rootElement, userSettings) {
     let scrollToCell = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     let changeListener = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
     if (scrollToCell === false) {
-      preventScrollingToCell = true;
+      viewportScroller.suspend();
     }
     const wasSelected = selection.selectCells(coords);
     if (wasSelected && changeListener) {
       instance.listen();
     }
-    preventScrollingToCell = false;
+    viewportScroller.resume();
     return wasSelected;
   };
 
@@ -4048,9 +4008,8 @@ export default function Core(rootElement, userSettings) {
     let includeRowHeaders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
     let includeColumnHeaders = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : includeRowHeaders;
     let options = arguments.length > 2 ? arguments[2] : undefined;
-    preventScrollingToCell = true;
+    viewportScroller.skipNextScrollCycle();
     selection.selectAll(includeRowHeaders, includeColumnHeaders, options);
-    preventScrollingToCell = false;
   };
   const getIndexToScroll = (indexMapper, visualIndex) => {
     // Looking for a visual index on the right and then (when not found) on the left.

package/dist/handsontable.css

@@ -25,8 +25,8 @@
  * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER ARISING FROM
  * USE OR INABILITY TO USE THIS SOFTWARE.
  *
- * Version: 0.0.0-next-d82e84a-20240117
- * Release date: 16/01/2024 (built at 17/01/2024 13:49:44)
+ * Version: 0.0.0-next-40cdda4-20240118
+ * Release date: 16/01/2024 (built at 18/01/2024 13:04:39)
  */
 /**
  * Fix for bootstrap styles

package/dist/handsontable.full.css

@@ -25,8 +25,8 @@
  * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER ARISING FROM
  * USE OR INABILITY TO USE THIS SOFTWARE.
  *
- * Version: 0.0.0-next-d82e84a-20240117
- * Release date: 16/01/2024 (built at 17/01/2024 13:49:44)
+ * Version: 0.0.0-next-40cdda4-20240118
+ * Release date: 16/01/2024 (built at 18/01/2024 13:04:39)
  */
 /**
  * Fix for bootstrap styles