handsontable 0.0.0-next-8dc7078-20240322 → 0.0.0-next-28fc088-20240325

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of handsontable might be problematic. Click here for more details.

Files changed (98) hide show
  1. package/3rdparty/walkontable/src/cell/range.d.ts +2 -1
  2. package/3rdparty/walkontable/src/cell/range.js +22 -5
  3. package/3rdparty/walkontable/src/cell/range.mjs +22 -5
  4. package/base.js +2 -2
  5. package/base.mjs +2 -2
  6. package/core/viewportScroll/index.js +4 -1
  7. package/core/viewportScroll/index.mjs +4 -1
  8. package/core/viewportScroll/scrollStrategies/focusScroll.js +15 -0
  9. package/core/viewportScroll/scrollStrategies/focusScroll.mjs +11 -0
  10. package/core.d.ts +4 -3
  11. package/core.js +76 -21
  12. package/core.mjs +76 -21
  13. package/dist/handsontable.css +2 -2
  14. package/dist/handsontable.full.css +2 -2
  15. package/dist/handsontable.full.js +2649 -1389
  16. package/dist/handsontable.full.min.css +2 -2
  17. package/dist/handsontable.full.min.js +71 -71
  18. package/dist/handsontable.js +2653 -1393
  19. package/dist/handsontable.min.css +2 -2
  20. package/dist/handsontable.min.js +19 -19
  21. package/editorManager.js +12 -8
  22. package/editorManager.mjs +12 -8
  23. package/focusManager.js +7 -1
  24. package/focusManager.mjs +7 -1
  25. package/helpers/mixed.js +1 -1
  26. package/helpers/mixed.mjs +1 -1
  27. package/package.json +1 -1
  28. package/pluginHooks.d.ts +4 -0
  29. package/pluginHooks.js +98 -37
  30. package/pluginHooks.mjs +98 -37
  31. package/plugins/collapsibleColumns/collapsibleColumns.js +9 -3
  32. package/plugins/collapsibleColumns/collapsibleColumns.mjs +9 -3
  33. package/plugins/columnSorting/columnSorting.js +8 -2
  34. package/plugins/columnSorting/columnSorting.mjs +8 -2
  35. package/plugins/contextMenu/menu/defaultShortcutsList.js +26 -10
  36. package/plugins/contextMenu/menu/defaultShortcutsList.mjs +26 -10
  37. package/plugins/mergeCells/calculations/selection.js +1 -70
  38. package/plugins/mergeCells/calculations/selection.mjs +1 -70
  39. package/plugins/mergeCells/cellsCollection.js +116 -0
  40. package/plugins/mergeCells/cellsCollection.mjs +116 -0
  41. package/plugins/mergeCells/contextMenuItem/toggleMerge.js +11 -1
  42. package/plugins/mergeCells/contextMenuItem/toggleMerge.mjs +11 -1
  43. package/plugins/mergeCells/focusOrder.js +305 -0
  44. package/plugins/mergeCells/focusOrder.mjs +300 -0
  45. package/plugins/mergeCells/mergeCells.js +336 -192
  46. package/plugins/mergeCells/mergeCells.mjs +336 -192
  47. package/plugins/multiColumnSorting/multiColumnSorting.js +8 -2
  48. package/plugins/multiColumnSorting/multiColumnSorting.mjs +8 -2
  49. package/plugins/nestedHeaders/nestedHeaders.js +1 -0
  50. package/plugins/nestedHeaders/nestedHeaders.mjs +1 -0
  51. package/plugins/nestedRows/nestedRows.js +9 -3
  52. package/plugins/nestedRows/nestedRows.mjs +9 -3
  53. package/renderers/checkboxRenderer/checkboxRenderer.js +8 -5
  54. package/renderers/checkboxRenderer/checkboxRenderer.mjs +8 -5
  55. package/selection/highlight/visualSelection.js +2 -0
  56. package/selection/highlight/visualSelection.mjs +2 -0
  57. package/selection/selection.js +209 -40
  58. package/selection/selection.mjs +208 -39
  59. package/selection/transformation.js +83 -32
  60. package/selection/transformation.mjs +83 -32
  61. package/shortcutContexts/commands/editor/closeAndSave.js +2 -2
  62. package/shortcutContexts/commands/editor/closeAndSave.mjs +2 -2
  63. package/shortcutContexts/commands/editor/open.js +18 -3
  64. package/shortcutContexts/commands/editor/open.mjs +18 -3
  65. package/shortcutContexts/commands/extendCellsSelection/down.js +1 -1
  66. package/shortcutContexts/commands/extendCellsSelection/down.mjs +1 -1
  67. package/shortcutContexts/commands/extendCellsSelection/left.js +1 -1
  68. package/shortcutContexts/commands/extendCellsSelection/left.mjs +1 -1
  69. package/shortcutContexts/commands/extendCellsSelection/right.js +1 -1
  70. package/shortcutContexts/commands/extendCellsSelection/right.mjs +1 -1
  71. package/shortcutContexts/commands/extendCellsSelection/toColumns.js +1 -1
  72. package/shortcutContexts/commands/extendCellsSelection/toColumns.mjs +1 -1
  73. package/shortcutContexts/commands/extendCellsSelection/toMostBottom.js +3 -1
  74. package/shortcutContexts/commands/extendCellsSelection/toMostBottom.mjs +3 -1
  75. package/shortcutContexts/commands/extendCellsSelection/toMostInlineEnd.js +9 -3
  76. package/shortcutContexts/commands/extendCellsSelection/toMostInlineEnd.mjs +9 -3
  77. package/shortcutContexts/commands/extendCellsSelection/toMostInlineStart.js +10 -3
  78. package/shortcutContexts/commands/extendCellsSelection/toMostInlineStart.mjs +10 -3
  79. package/shortcutContexts/commands/extendCellsSelection/toMostLeft.js +3 -1
  80. package/shortcutContexts/commands/extendCellsSelection/toMostLeft.mjs +3 -1
  81. package/shortcutContexts/commands/extendCellsSelection/toMostRight.js +3 -1
  82. package/shortcutContexts/commands/extendCellsSelection/toMostRight.mjs +3 -1
  83. package/shortcutContexts/commands/extendCellsSelection/toMostTop.js +3 -1
  84. package/shortcutContexts/commands/extendCellsSelection/toMostTop.mjs +3 -1
  85. package/shortcutContexts/commands/extendCellsSelection/toRows.js +1 -1
  86. package/shortcutContexts/commands/extendCellsSelection/toRows.mjs +1 -1
  87. package/shortcutContexts/commands/extendCellsSelection/up.js +1 -1
  88. package/shortcutContexts/commands/extendCellsSelection/up.mjs +1 -1
  89. package/shortcutContexts/commands/moveCellSelection/inlineEnd.js +6 -1
  90. package/shortcutContexts/commands/moveCellSelection/inlineEnd.mjs +6 -1
  91. package/shortcutContexts/commands/moveCellSelection/inlineStart.js +6 -1
  92. package/shortcutContexts/commands/moveCellSelection/inlineStart.mjs +6 -1
  93. package/shortcutContexts/grid.js +2 -2
  94. package/shortcutContexts/grid.mjs +2 -2
  95. package/shortcuts/context.js +2 -1
  96. package/shortcuts/context.mjs +2 -1
  97. package/utils/dataStructures/linkedList.js +6 -1
  98. package/utils/dataStructures/linkedList.mjs +6 -1
@@ -20,6 +20,7 @@ export default class CellRange {
20
20
  }): boolean;
21
21
  isSingleCell(): boolean;
22
22
  isSingleHeader(): boolean;
23
+ isHeader(): boolean;
23
24
  containsHeaders(): boolean;
24
25
  getOuterHeight(): number;
25
26
  getOuterWidth(): number;
@@ -35,7 +36,7 @@ export default class CellRange {
35
36
  isOverlappingHorizontally(cellRange: CellRange): boolean;
36
37
  isOverlappingVertically(cellRange: CellRange): boolean;
37
38
  expand(cellCoords: CellCoords): boolean;
38
- expandByRange(expandingRange: CellRange): boolean;
39
+ expandByRange(expandingRange: CellRange, changeDirection: boolean): boolean;
39
40
  getDirection(): DirectionType;
40
41
  setDirection(direction: DirectionType): void;
41
42
  getVerticalDirection(): 'N-S' | 'S-N';
@@ -149,6 +149,18 @@ class CellRange {
149
149
  return (this.from.row < 0 || this.from.col < 0) && this.from.row === this.to.row && this.from.col === this.to.col;
150
150
  }
151
151
 
152
+ /**
153
+ * Checks if your range covers only headers range (negative coordinates, without any cells).
154
+ *
155
+ * @returns {boolean}
156
+ */
157
+ isHeader() {
158
+ if (this.from.isHeader() && this.to.isHeader()) {
159
+ return true;
160
+ }
161
+ return this.from.col < 0 && this.to.col < 0 || this.from.row < 0 && this.to.row < 0;
162
+ }
163
+
152
164
  /**
153
165
  * Checks if your range overlaps headers range (negative coordinates).
154
166
  *
@@ -333,9 +345,12 @@ class CellRange {
333
345
  * Expand your range with another range (`expandingRange`).
334
346
  *
335
347
  * @param {CellRange} expandingRange A new range.
348
+ * @param {boolean} [changeDirection=true] If `true`, the direction of your range is changed to the direction
349
+ * of the `expandingRange` range.
336
350
  * @returns {boolean}
337
351
  */
338
352
  expandByRange(expandingRange) {
353
+ let changeDirection = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
339
354
  if (this.includesRange(expandingRange) || !this.overlaps(expandingRange)) {
340
355
  return false;
341
356
  }
@@ -353,11 +368,13 @@ class CellRange {
353
368
  this.from = finalFrom;
354
369
  this.to = finalTo;
355
370
  this.setDirection(initialDirection);
356
- if (this.highlight.row === this.getOuterBottomRightCorner().row && this.getVerticalDirection() === 'N-S') {
357
- this.flipDirectionVertically();
358
- }
359
- if (this.highlight.col === this.getOuterTopRightCorner().col && this.getHorizontalDirection() === 'W-E') {
360
- this.flipDirectionHorizontally();
371
+ if (changeDirection) {
372
+ if (this.highlight.row === this.getOuterBottomRightCorner().row && this.getVerticalDirection() === 'N-S') {
373
+ this.flipDirectionVertically();
374
+ }
375
+ if (this.highlight.col === this.getOuterTopRightCorner().col && this.getHorizontalDirection() === 'W-E') {
376
+ this.flipDirectionHorizontally();
377
+ }
361
378
  }
362
379
  return true;
363
380
  }
@@ -145,6 +145,18 @@ class CellRange {
145
145
  return (this.from.row < 0 || this.from.col < 0) && this.from.row === this.to.row && this.from.col === this.to.col;
146
146
  }
147
147
 
148
+ /**
149
+ * Checks if your range covers only headers range (negative coordinates, without any cells).
150
+ *
151
+ * @returns {boolean}
152
+ */
153
+ isHeader() {
154
+ if (this.from.isHeader() && this.to.isHeader()) {
155
+ return true;
156
+ }
157
+ return this.from.col < 0 && this.to.col < 0 || this.from.row < 0 && this.to.row < 0;
158
+ }
159
+
148
160
  /**
149
161
  * Checks if your range overlaps headers range (negative coordinates).
150
162
  *
@@ -329,9 +341,12 @@ class CellRange {
329
341
  * Expand your range with another range (`expandingRange`).
330
342
  *
331
343
  * @param {CellRange} expandingRange A new range.
344
+ * @param {boolean} [changeDirection=true] If `true`, the direction of your range is changed to the direction
345
+ * of the `expandingRange` range.
332
346
  * @returns {boolean}
333
347
  */
334
348
  expandByRange(expandingRange) {
349
+ let changeDirection = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
335
350
  if (this.includesRange(expandingRange) || !this.overlaps(expandingRange)) {
336
351
  return false;
337
352
  }
@@ -349,11 +364,13 @@ class CellRange {
349
364
  this.from = finalFrom;
350
365
  this.to = finalTo;
351
366
  this.setDirection(initialDirection);
352
- if (this.highlight.row === this.getOuterBottomRightCorner().row && this.getVerticalDirection() === 'N-S') {
353
- this.flipDirectionVertically();
354
- }
355
- if (this.highlight.col === this.getOuterTopRightCorner().col && this.getHorizontalDirection() === 'W-E') {
356
- this.flipDirectionHorizontally();
367
+ if (changeDirection) {
368
+ if (this.highlight.row === this.getOuterBottomRightCorner().row && this.getVerticalDirection() === 'N-S') {
369
+ this.flipDirectionVertically();
370
+ }
371
+ if (this.highlight.col === this.getOuterTopRightCorner().col && this.getHorizontalDirection() === 'W-E') {
372
+ this.flipDirectionHorizontally();
373
+ }
357
374
  }
358
375
  return true;
359
376
  }
package/base.js CHANGED
@@ -45,8 +45,8 @@ Handsontable.hooks = _pluginHooks.default.getSingleton();
45
45
  Handsontable.CellCoords = _src.CellCoords;
46
46
  Handsontable.CellRange = _src.CellRange;
47
47
  Handsontable.packageName = 'handsontable';
48
- Handsontable.buildDate = "22/03/2024 12:25:58";
49
- Handsontable.version = "0.0.0-next-8dc7078-20240322";
48
+ Handsontable.buildDate = "25/03/2024 14:25:33";
49
+ Handsontable.version = "0.0.0-next-28fc088-20240325";
50
50
  Handsontable.languages = {
51
51
  dictionaryKeys: _registry.dictionaryKeys,
52
52
  getLanguageDictionary: _registry.getLanguageDictionary,
package/base.mjs CHANGED
@@ -35,8 +35,8 @@ Handsontable.hooks = Hooks.getSingleton();
35
35
  Handsontable.CellCoords = CellCoords;
36
36
  Handsontable.CellRange = CellRange;
37
37
  Handsontable.packageName = 'handsontable';
38
- Handsontable.buildDate = "22/03/2024 12:26:04";
39
- Handsontable.version = "0.0.0-next-8dc7078-20240322";
38
+ Handsontable.buildDate = "25/03/2024 14:25:38";
39
+ Handsontable.version = "0.0.0-next-28fc088-20240325";
40
40
  Handsontable.languages = {
41
41
  dictionaryKeys,
42
42
  getLanguageDictionary,
@@ -4,6 +4,7 @@ exports.__esModule = true;
4
4
  exports.createViewportScroller = createViewportScroller;
5
5
  var _columnHeaderScroll = require("./scrollStrategies/columnHeaderScroll");
6
6
  var _cornerHeaderScroll = require("./scrollStrategies/cornerHeaderScroll");
7
+ var _focusScroll = require("./scrollStrategies/focusScroll");
7
8
  var _multipleScroll = require("./scrollStrategies/multipleScroll");
8
9
  var _noncontiguousScroll = require("./scrollStrategies/noncontiguousScroll");
9
10
  var _rowHeaderScroll = require("./scrollStrategies/rowHeaderScroll");
@@ -46,7 +47,9 @@ function createViewportScroller(hot) {
46
47
  return;
47
48
  }
48
49
  let scrollStrategy;
49
- if (selection.isSelectedByCorner()) {
50
+ if (selection.isFocusSelectionChanged()) {
51
+ scrollStrategy = (0, _focusScroll.focusScrollStrategy)(hot);
52
+ } else if (selection.isSelectedByCorner()) {
50
53
  scrollStrategy = (0, _cornerHeaderScroll.cornerHeaderScrollStrategy)(hot);
51
54
  } else if (selection.isSelectedByRowHeader()) {
52
55
  scrollStrategy = (0, _rowHeaderScroll.rowHeaderScrollStrategy)(hot);
@@ -1,5 +1,6 @@
1
1
  import { columnHeaderScrollStrategy } from "./scrollStrategies/columnHeaderScroll.mjs";
2
2
  import { cornerHeaderScrollStrategy } from "./scrollStrategies/cornerHeaderScroll.mjs";
3
+ import { focusScrollStrategy } from "./scrollStrategies/focusScroll.mjs";
3
4
  import { multipleScrollStrategy } from "./scrollStrategies/multipleScroll.mjs";
4
5
  import { noncontiguousScrollStrategy } from "./scrollStrategies/noncontiguousScroll.mjs";
5
6
  import { rowHeaderScrollStrategy } from "./scrollStrategies/rowHeaderScroll.mjs";
@@ -42,7 +43,9 @@ export function createViewportScroller(hot) {
42
43
  return;
43
44
  }
44
45
  let scrollStrategy;
45
- if (selection.isSelectedByCorner()) {
46
+ if (selection.isFocusSelectionChanged()) {
47
+ scrollStrategy = focusScrollStrategy(hot);
48
+ } else if (selection.isSelectedByCorner()) {
46
49
  scrollStrategy = cornerHeaderScrollStrategy(hot);
47
50
  } else if (selection.isSelectedByRowHeader()) {
48
51
  scrollStrategy = rowHeaderScrollStrategy(hot);
@@ -0,0 +1,15 @@
1
+ "use strict";
2
+
3
+ exports.__esModule = true;
4
+ exports.focusScrollStrategy = focusScrollStrategy;
5
+ /**
6
+ * Scroll strategy for changed the focus position of the selection.
7
+ *
8
+ * @param {Core} hot Handsontable instance.
9
+ * @returns {function(): function(CellCoords): void}
10
+ */
11
+ function focusScrollStrategy(hot) {
12
+ return cellCoords => {
13
+ hot.scrollViewportTo(cellCoords.toObject());
14
+ };
15
+ }
@@ -0,0 +1,11 @@
1
+ /**
2
+ * Scroll strategy for changed the focus position of the selection.
3
+ *
4
+ * @param {Core} hot Handsontable instance.
5
+ * @returns {function(): function(CellCoords): void}
6
+ */
7
+ export function focusScrollStrategy(hot) {
8
+ return cellCoords => {
9
+ hot.scrollViewportTo(cellCoords.toObject());
10
+ };
11
+ }
package/core.d.ts CHANGED
@@ -3,6 +3,7 @@ import { Events } from './pluginHooks';
3
3
  import {
4
4
  CellValue,
5
5
  RowObject,
6
+ SimpleCellCoords,
6
7
  } from './common';
7
8
  import {
8
9
  GridSettings,
@@ -135,12 +136,12 @@ export default class Core {
135
136
  scrollViewportTo(options: { row?: number, col?: number, verticalSnap?: 'top' | 'bottom', horizontalSnap?: 'start' | 'end', considerHiddenIndexes?: boolean }): boolean;
136
137
  scrollViewportTo(row?: number, column?: number, snapToBottom?: boolean, snapToRight?: boolean, considerHiddenIndexes?: boolean): boolean;
137
138
  scrollToFocusedCell(callback?: () => void): void;
138
- selectAll(includeRowHeaders?: boolean, includeColumnHeaders?: boolean, options?: { focusPosition?: { row: number, col: number }, disableHeadersHighlight?: boolean }): void;
139
+ selectAll(includeRowHeaders?: boolean, includeColumnHeaders?: boolean, options?: { focusPosition?: SimpleCellCoords | CellCoords, disableHeadersHighlight?: boolean }): void;
139
140
  selectCell(row: number, column: number, endRow?: number, endColumn?: number, scrollToCell?: boolean, changeListener?: boolean): boolean;
140
141
  selectCellByProp(row: number, prop: string, endRow?: number, endProp?: string, scrollToCell?: boolean): boolean;
141
142
  selectCells(coords: Array<[number, number | string, number, number | string]> | CellRange[], scrollToCell?: boolean, changeListener?: boolean): boolean;
142
- selectColumns(startColumn: number | string, endColumn?: number | string, focusPosition?: number): boolean;
143
- selectRows(startRow: number, endRow?: number, focusPosition?: number): boolean;
143
+ selectColumns(startColumn: number | string, endColumn?: number | string, focusPosition?: number | SimpleCellCoords | CellCoords): boolean;
144
+ selectRows(startRow: number, endRow?: number, focusPosition?: number | SimpleCellCoords | CellCoords): boolean;
144
145
  setCellMeta(row: number, column: number, key: string, val: any): void;
145
146
  setCellMeta<K extends keyof CellMeta>(row: number, column: number, key: K, val: CellMeta[K]): void;
146
147
  setCellMetaObject(row: number, column: number, prop: CellMeta): void;
package/core.js CHANGED
@@ -273,6 +273,26 @@ function Core(rootElement, userSettings) {
273
273
  renderableRow >= 0 ? instance.rowIndexMapper.getVisualFromRenderableIndex(renderableRow) : renderableRow, renderableColumn >= 0 ? instance.columnIndexMapper.getVisualFromRenderableIndex(renderableColumn) : renderableColumn // eslint-disable-line max-len
274
274
  );
275
275
  };
276
+ const findFirstNonHiddenRenderableRow = (visualRowFrom, visualRowTo) => {
277
+ const dir = visualRowTo > visualRowFrom ? 1 : -1;
278
+ const minIndex = Math.min(visualRowFrom, visualRowTo);
279
+ const maxIndex = Math.max(visualRowFrom, visualRowTo);
280
+ const rowIndex = instance.rowIndexMapper.getNearestNotHiddenIndex(visualRowFrom, dir);
281
+ if (rowIndex === null || dir === 1 && rowIndex > maxIndex || dir === -1 && rowIndex < minIndex) {
282
+ return null;
283
+ }
284
+ return rowIndex >= 0 ? instance.rowIndexMapper.getRenderableFromVisualIndex(rowIndex) : rowIndex;
285
+ };
286
+ const findFirstNonHiddenRenderableColumn = (visualColumnFrom, visualColumnTo) => {
287
+ const dir = visualColumnTo > visualColumnFrom ? 1 : -1;
288
+ const minIndex = Math.min(visualColumnFrom, visualColumnTo);
289
+ const maxIndex = Math.max(visualColumnFrom, visualColumnTo);
290
+ const columnIndex = instance.columnIndexMapper.getNearestNotHiddenIndex(visualColumnFrom, dir);
291
+ if (columnIndex === null || dir === 1 && columnIndex > maxIndex || dir === -1 && columnIndex < minIndex) {
292
+ return null;
293
+ }
294
+ return columnIndex >= 0 ? instance.columnIndexMapper.getRenderableFromVisualIndex(columnIndex) : columnIndex;
295
+ };
276
296
  let selection = new _selection.Selection(tableMeta, {
277
297
  rowIndexMapper: instance.rowIndexMapper,
278
298
  columnIndexMapper: instance.columnIndexMapper,
@@ -284,11 +304,19 @@ function Core(rootElement, userSettings) {
284
304
  countRenderableRows: () => this.view.countRenderableRows(),
285
305
  countRowHeaders: () => this.countRowHeaders(),
286
306
  countColHeaders: () => this.countColHeaders(),
307
+ countRenderableRowsInRange: function () {
308
+ return _this.view.countRenderableRowsInRange(...arguments);
309
+ },
310
+ countRenderableColumnsInRange: function () {
311
+ return _this.view.countRenderableColumnsInRange(...arguments);
312
+ },
287
313
  getShortcutManager: () => instance.getShortcutManager(),
288
314
  createCellCoords: (row, column) => instance._createCellCoords(row, column),
289
315
  createCellRange: (highlight, from, to) => instance._createCellRange(highlight, from, to),
290
316
  visualToRenderableCoords,
291
317
  renderableToVisualCoords,
318
+ findFirstNonHiddenRenderableRow,
319
+ findFirstNonHiddenRenderableColumn,
292
320
  isDisabledCellSelection: (visualRow, visualColumn) => {
293
321
  if (visualRow < 0 || visualColumn < 0) {
294
322
  return instance.getSettings().disableVisualSelection;
@@ -339,6 +367,17 @@ function Core(rootElement, userSettings) {
339
367
  }
340
368
  this._refreshBorders(null);
341
369
  });
370
+ this.selection.addLocalHook('beforeSetFocus', cellCoords => {
371
+ this.runHooks('beforeSelectionFocusSet', cellCoords.row, cellCoords.col);
372
+ });
373
+ this.selection.addLocalHook('afterSetFocus', cellCoords => {
374
+ const preventScrolling = (0, _object.createObjectPropListener)(false);
375
+ this.runHooks('afterSelectionFocusSet', cellCoords.row, cellCoords.col, preventScrolling);
376
+ if (!preventScrolling.isTouched() || preventScrolling.isTouched() && !preventScrolling.value) {
377
+ viewportScroller.scrollTo(cellCoords);
378
+ }
379
+ this._refreshBorders(null);
380
+ });
342
381
  this.selection.addLocalHook('afterSelectionFinished', cellRanges => {
343
382
  const selectionLayerLevel = cellRanges.length - 1;
344
383
  const {
@@ -405,25 +444,35 @@ function Core(rootElement, userSettings) {
405
444
  args[_key9] = arguments[_key9];
406
445
  }
407
446
  return _this.runHooks('afterModifyTransformStart', ...args);
408
- }).addLocalHook('beforeModifyTransformEnd', function () {
447
+ }).addLocalHook('beforeModifyTransformFocus', function () {
409
448
  for (var _len10 = arguments.length, args = new Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
410
449
  args[_key10] = arguments[_key10];
411
450
  }
412
- return _this.runHooks('modifyTransformEnd', ...args);
413
- }).addLocalHook('afterModifyTransformEnd', function () {
451
+ return _this.runHooks('modifyTransformFocus', ...args);
452
+ }).addLocalHook('afterModifyTransformFocus', function () {
414
453
  for (var _len11 = arguments.length, args = new Array(_len11), _key11 = 0; _key11 < _len11; _key11++) {
415
454
  args[_key11] = arguments[_key11];
416
455
  }
417
- return _this.runHooks('afterModifyTransformEnd', ...args);
418
- }).addLocalHook('beforeRowWrap', function () {
456
+ return _this.runHooks('afterModifyTransformFocus', ...args);
457
+ }).addLocalHook('beforeModifyTransformEnd', function () {
419
458
  for (var _len12 = arguments.length, args = new Array(_len12), _key12 = 0; _key12 < _len12; _key12++) {
420
459
  args[_key12] = arguments[_key12];
421
460
  }
422
- return _this.runHooks('beforeRowWrap', ...args);
423
- }).addLocalHook('beforeColumnWrap', function () {
461
+ return _this.runHooks('modifyTransformEnd', ...args);
462
+ }).addLocalHook('afterModifyTransformEnd', function () {
424
463
  for (var _len13 = arguments.length, args = new Array(_len13), _key13 = 0; _key13 < _len13; _key13++) {
425
464
  args[_key13] = arguments[_key13];
426
465
  }
466
+ return _this.runHooks('afterModifyTransformEnd', ...args);
467
+ }).addLocalHook('beforeRowWrap', function () {
468
+ for (var _len14 = arguments.length, args = new Array(_len14), _key14 = 0; _key14 < _len14; _key14++) {
469
+ args[_key14] = arguments[_key14];
470
+ }
471
+ return _this.runHooks('beforeRowWrap', ...args);
472
+ }).addLocalHook('beforeColumnWrap', function () {
473
+ for (var _len15 = arguments.length, args = new Array(_len15), _key15 = 0; _key15 < _len15; _key15++) {
474
+ args[_key15] = arguments[_key15];
475
+ }
427
476
  return _this.runHooks('beforeColumnWrap', ...args);
428
477
  }).addLocalHook('insertRowRequire', totalRows => this.alter('insert_row_above', totalRows, 1, 'auto')).addLocalHook('insertColRequire', totalCols => this.alter('insert_col_start', totalCols, 1, 'auto'));
429
478
  grid = {
@@ -1561,8 +1610,8 @@ function Core(rootElement, userSettings) {
1561
1610
  * @returns {Array} Returns removed portion of columns.
1562
1611
  */
1563
1612
  this.spliceCol = function (column, index, amount) {
1564
- for (var _len14 = arguments.length, elements = new Array(_len14 > 3 ? _len14 - 3 : 0), _key14 = 3; _key14 < _len14; _key14++) {
1565
- elements[_key14 - 3] = arguments[_key14];
1613
+ for (var _len16 = arguments.length, elements = new Array(_len16 > 3 ? _len16 - 3 : 0), _key16 = 3; _key16 < _len16; _key16++) {
1614
+ elements[_key16 - 3] = arguments[_key16];
1566
1615
  }
1567
1616
  return datamap.spliceCol(column, index, amount, ...elements);
1568
1617
  };
@@ -1579,8 +1628,8 @@ function Core(rootElement, userSettings) {
1579
1628
  * @returns {Array} Returns removed portion of rows.
1580
1629
  */
1581
1630
  this.spliceRow = function (row, index, amount) {
1582
- for (var _len15 = arguments.length, elements = new Array(_len15 > 3 ? _len15 - 3 : 0), _key15 = 3; _key15 < _len15; _key15++) {
1583
- elements[_key15 - 3] = arguments[_key15];
1631
+ for (var _len17 = arguments.length, elements = new Array(_len17 > 3 ? _len17 - 3 : 0), _key17 = 3; _key17 < _len17; _key17++) {
1632
+ elements[_key17 - 3] = arguments[_key17];
1584
1633
  }
1585
1634
  return datamap.spliceRow(row, index, amount, ...elements);
1586
1635
  };
@@ -2977,8 +3026,8 @@ function Core(rootElement, userSettings) {
2977
3026
  */
2978
3027
  this.spliceCellsMeta = function (visualIndex) {
2979
3028
  let deleteAmount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
2980
- for (var _len16 = arguments.length, cellMetaRows = new Array(_len16 > 2 ? _len16 - 2 : 0), _key16 = 2; _key16 < _len16; _key16++) {
2981
- cellMetaRows[_key16 - 2] = arguments[_key16];
3029
+ for (var _len18 = arguments.length, cellMetaRows = new Array(_len18 > 2 ? _len18 - 2 : 0), _key18 = 2; _key18 < _len18; _key18++) {
3030
+ cellMetaRows[_key18 - 2] = arguments[_key18];
2982
3031
  }
2983
3032
  if (cellMetaRows.length > 0 && !Array.isArray(cellMetaRows[0])) {
2984
3033
  throw new Error('The 3rd argument (cellMetaRows) has to be passed as an array of cell meta objects array.');
@@ -3900,6 +3949,8 @@ function Core(rootElement, userSettings) {
3900
3949
  * hot.selectColumns(1, 2, -1);
3901
3950
  * // Select range of columns using visual indexes and mark the second cell as highlighted.
3902
3951
  * hot.selectColumns(2, 1, 1);
3952
+ * // Select range of columns using visual indexes and move the focus position somewhere in the middle of the range.
3953
+ * hot.selectColumns(2, 5, { row: 2, col: 3 });
3903
3954
  * // Select range of columns using column properties.
3904
3955
  * hot.selectColumns('id', 'last_name');
3905
3956
  * ```
@@ -3909,10 +3960,11 @@ function Core(rootElement, userSettings) {
3909
3960
  * @function selectColumns
3910
3961
  * @param {number} startColumn The visual column index from which the selection starts.
3911
3962
  * @param {number} [endColumn=startColumn] The visual column index to which the selection finishes. If `endColumn`
3912
- * is not defined the column defined by `startColumn` will be selected.
3913
- * @param {number} [focusPosition=0] The argument allows changing the cell/header focus position.
3914
- * The value can take visual row index from -N to N, where negative values
3915
- * point to the headers and positive values point to the cell range.
3963
+ * is not defined the column defined by `startColumn` will be selected.
3964
+ * @param {number | { row: number, col: number } | CellCoords} [focusPosition=0] The argument allows changing the cell/header focus
3965
+ * position. The value can take visual row index from -N to N, where negative values point to the headers and positive
3966
+ * values point to the cell range. An object with `row` and `col` properties also can be passed to change the focus
3967
+ * position horizontally.
3916
3968
  * @returns {boolean} `true` if selection was successful, `false` otherwise.
3917
3969
  */
3918
3970
  this.selectColumns = function (startColumn) {
@@ -3934,6 +3986,8 @@ function Core(rootElement, userSettings) {
3934
3986
  * hot.selectRows(1, 2, -1);
3935
3987
  * // Select range of rows using visual indexes and mark the second cell as highlighted.
3936
3988
  * hot.selectRows(2, 1, 1);
3989
+ * // Select range of rows using visual indexes and move the focus position somewhere in the middle of the range.
3990
+ * hot.selectRows(2, 5, { row: 2, col: 3 });
3937
3991
  * ```
3938
3992
  *
3939
3993
  * @memberof Core#
@@ -3941,10 +3995,11 @@ function Core(rootElement, userSettings) {
3941
3995
  * @function selectRows
3942
3996
  * @param {number} startRow The visual row index from which the selection starts.
3943
3997
  * @param {number} [endRow=startRow] The visual row index to which the selection finishes. If `endRow`
3944
- * is not defined the row defined by `startRow` will be selected.
3945
- * @param {number} [focusPosition=0] The argument allows changing the cell/header focus position.
3946
- * The value can take visual column index from -N to N, where negative values
3947
- * point to the headers and positive values point to the cell range.
3998
+ * is not defined the row defined by `startRow` will be selected.
3999
+ * @param {number | { row: number, col: number } | CellCoords} [focusPosition=0] The argument allows changing the cell/header focus
4000
+ * position. The value can take visual row index from -N to N, where negative values point to the headers and positive
4001
+ * values point to the cell range. An object with `row` and `col` properties also can be passed to change the focus
4002
+ * position vertically.
3948
4003
  * @returns {boolean} `true` if selection was successful, `false` otherwise.
3949
4004
  */
3950
4005
  this.selectRows = function (startRow) {
package/core.mjs CHANGED
@@ -268,6 +268,26 @@ export default function Core(rootElement, userSettings) {
268
268
  renderableRow >= 0 ? instance.rowIndexMapper.getVisualFromRenderableIndex(renderableRow) : renderableRow, renderableColumn >= 0 ? instance.columnIndexMapper.getVisualFromRenderableIndex(renderableColumn) : renderableColumn // eslint-disable-line max-len
269
269
  );
270
270
  };
271
+ const findFirstNonHiddenRenderableRow = (visualRowFrom, visualRowTo) => {
272
+ const dir = visualRowTo > visualRowFrom ? 1 : -1;
273
+ const minIndex = Math.min(visualRowFrom, visualRowTo);
274
+ const maxIndex = Math.max(visualRowFrom, visualRowTo);
275
+ const rowIndex = instance.rowIndexMapper.getNearestNotHiddenIndex(visualRowFrom, dir);
276
+ if (rowIndex === null || dir === 1 && rowIndex > maxIndex || dir === -1 && rowIndex < minIndex) {
277
+ return null;
278
+ }
279
+ return rowIndex >= 0 ? instance.rowIndexMapper.getRenderableFromVisualIndex(rowIndex) : rowIndex;
280
+ };
281
+ const findFirstNonHiddenRenderableColumn = (visualColumnFrom, visualColumnTo) => {
282
+ const dir = visualColumnTo > visualColumnFrom ? 1 : -1;
283
+ const minIndex = Math.min(visualColumnFrom, visualColumnTo);
284
+ const maxIndex = Math.max(visualColumnFrom, visualColumnTo);
285
+ const columnIndex = instance.columnIndexMapper.getNearestNotHiddenIndex(visualColumnFrom, dir);
286
+ if (columnIndex === null || dir === 1 && columnIndex > maxIndex || dir === -1 && columnIndex < minIndex) {
287
+ return null;
288
+ }
289
+ return columnIndex >= 0 ? instance.columnIndexMapper.getRenderableFromVisualIndex(columnIndex) : columnIndex;
290
+ };
271
291
  let selection = new Selection(tableMeta, {
272
292
  rowIndexMapper: instance.rowIndexMapper,
273
293
  columnIndexMapper: instance.columnIndexMapper,
@@ -279,11 +299,19 @@ export default function Core(rootElement, userSettings) {
279
299
  countRenderableRows: () => this.view.countRenderableRows(),
280
300
  countRowHeaders: () => this.countRowHeaders(),
281
301
  countColHeaders: () => this.countColHeaders(),
302
+ countRenderableRowsInRange: function () {
303
+ return _this.view.countRenderableRowsInRange(...arguments);
304
+ },
305
+ countRenderableColumnsInRange: function () {
306
+ return _this.view.countRenderableColumnsInRange(...arguments);
307
+ },
282
308
  getShortcutManager: () => instance.getShortcutManager(),
283
309
  createCellCoords: (row, column) => instance._createCellCoords(row, column),
284
310
  createCellRange: (highlight, from, to) => instance._createCellRange(highlight, from, to),
285
311
  visualToRenderableCoords,
286
312
  renderableToVisualCoords,
313
+ findFirstNonHiddenRenderableRow,
314
+ findFirstNonHiddenRenderableColumn,
287
315
  isDisabledCellSelection: (visualRow, visualColumn) => {
288
316
  if (visualRow < 0 || visualColumn < 0) {
289
317
  return instance.getSettings().disableVisualSelection;
@@ -334,6 +362,17 @@ export default function Core(rootElement, userSettings) {
334
362
  }
335
363
  this._refreshBorders(null);
336
364
  });
365
+ this.selection.addLocalHook('beforeSetFocus', cellCoords => {
366
+ this.runHooks('beforeSelectionFocusSet', cellCoords.row, cellCoords.col);
367
+ });
368
+ this.selection.addLocalHook('afterSetFocus', cellCoords => {
369
+ const preventScrolling = createObjectPropListener(false);
370
+ this.runHooks('afterSelectionFocusSet', cellCoords.row, cellCoords.col, preventScrolling);
371
+ if (!preventScrolling.isTouched() || preventScrolling.isTouched() && !preventScrolling.value) {
372
+ viewportScroller.scrollTo(cellCoords);
373
+ }
374
+ this._refreshBorders(null);
375
+ });
337
376
  this.selection.addLocalHook('afterSelectionFinished', cellRanges => {
338
377
  const selectionLayerLevel = cellRanges.length - 1;
339
378
  const {
@@ -400,25 +439,35 @@ export default function Core(rootElement, userSettings) {
400
439
  args[_key9] = arguments[_key9];
401
440
  }
402
441
  return _this.runHooks('afterModifyTransformStart', ...args);
403
- }).addLocalHook('beforeModifyTransformEnd', function () {
442
+ }).addLocalHook('beforeModifyTransformFocus', function () {
404
443
  for (var _len10 = arguments.length, args = new Array(_len10), _key10 = 0; _key10 < _len10; _key10++) {
405
444
  args[_key10] = arguments[_key10];
406
445
  }
407
- return _this.runHooks('modifyTransformEnd', ...args);
408
- }).addLocalHook('afterModifyTransformEnd', function () {
446
+ return _this.runHooks('modifyTransformFocus', ...args);
447
+ }).addLocalHook('afterModifyTransformFocus', function () {
409
448
  for (var _len11 = arguments.length, args = new Array(_len11), _key11 = 0; _key11 < _len11; _key11++) {
410
449
  args[_key11] = arguments[_key11];
411
450
  }
412
- return _this.runHooks('afterModifyTransformEnd', ...args);
413
- }).addLocalHook('beforeRowWrap', function () {
451
+ return _this.runHooks('afterModifyTransformFocus', ...args);
452
+ }).addLocalHook('beforeModifyTransformEnd', function () {
414
453
  for (var _len12 = arguments.length, args = new Array(_len12), _key12 = 0; _key12 < _len12; _key12++) {
415
454
  args[_key12] = arguments[_key12];
416
455
  }
417
- return _this.runHooks('beforeRowWrap', ...args);
418
- }).addLocalHook('beforeColumnWrap', function () {
456
+ return _this.runHooks('modifyTransformEnd', ...args);
457
+ }).addLocalHook('afterModifyTransformEnd', function () {
419
458
  for (var _len13 = arguments.length, args = new Array(_len13), _key13 = 0; _key13 < _len13; _key13++) {
420
459
  args[_key13] = arguments[_key13];
421
460
  }
461
+ return _this.runHooks('afterModifyTransformEnd', ...args);
462
+ }).addLocalHook('beforeRowWrap', function () {
463
+ for (var _len14 = arguments.length, args = new Array(_len14), _key14 = 0; _key14 < _len14; _key14++) {
464
+ args[_key14] = arguments[_key14];
465
+ }
466
+ return _this.runHooks('beforeRowWrap', ...args);
467
+ }).addLocalHook('beforeColumnWrap', function () {
468
+ for (var _len15 = arguments.length, args = new Array(_len15), _key15 = 0; _key15 < _len15; _key15++) {
469
+ args[_key15] = arguments[_key15];
470
+ }
422
471
  return _this.runHooks('beforeColumnWrap', ...args);
423
472
  }).addLocalHook('insertRowRequire', totalRows => this.alter('insert_row_above', totalRows, 1, 'auto')).addLocalHook('insertColRequire', totalCols => this.alter('insert_col_start', totalCols, 1, 'auto'));
424
473
  grid = {
@@ -1556,8 +1605,8 @@ export default function Core(rootElement, userSettings) {
1556
1605
  * @returns {Array} Returns removed portion of columns.
1557
1606
  */
1558
1607
  this.spliceCol = function (column, index, amount) {
1559
- for (var _len14 = arguments.length, elements = new Array(_len14 > 3 ? _len14 - 3 : 0), _key14 = 3; _key14 < _len14; _key14++) {
1560
- elements[_key14 - 3] = arguments[_key14];
1608
+ for (var _len16 = arguments.length, elements = new Array(_len16 > 3 ? _len16 - 3 : 0), _key16 = 3; _key16 < _len16; _key16++) {
1609
+ elements[_key16 - 3] = arguments[_key16];
1561
1610
  }
1562
1611
  return datamap.spliceCol(column, index, amount, ...elements);
1563
1612
  };
@@ -1574,8 +1623,8 @@ export default function Core(rootElement, userSettings) {
1574
1623
  * @returns {Array} Returns removed portion of rows.
1575
1624
  */
1576
1625
  this.spliceRow = function (row, index, amount) {
1577
- for (var _len15 = arguments.length, elements = new Array(_len15 > 3 ? _len15 - 3 : 0), _key15 = 3; _key15 < _len15; _key15++) {
1578
- elements[_key15 - 3] = arguments[_key15];
1626
+ for (var _len17 = arguments.length, elements = new Array(_len17 > 3 ? _len17 - 3 : 0), _key17 = 3; _key17 < _len17; _key17++) {
1627
+ elements[_key17 - 3] = arguments[_key17];
1579
1628
  }
1580
1629
  return datamap.spliceRow(row, index, amount, ...elements);
1581
1630
  };
@@ -2972,8 +3021,8 @@ export default function Core(rootElement, userSettings) {
2972
3021
  */
2973
3022
  this.spliceCellsMeta = function (visualIndex) {
2974
3023
  let deleteAmount = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
2975
- for (var _len16 = arguments.length, cellMetaRows = new Array(_len16 > 2 ? _len16 - 2 : 0), _key16 = 2; _key16 < _len16; _key16++) {
2976
- cellMetaRows[_key16 - 2] = arguments[_key16];
3024
+ for (var _len18 = arguments.length, cellMetaRows = new Array(_len18 > 2 ? _len18 - 2 : 0), _key18 = 2; _key18 < _len18; _key18++) {
3025
+ cellMetaRows[_key18 - 2] = arguments[_key18];
2977
3026
  }
2978
3027
  if (cellMetaRows.length > 0 && !Array.isArray(cellMetaRows[0])) {
2979
3028
  throw new Error('The 3rd argument (cellMetaRows) has to be passed as an array of cell meta objects array.');
@@ -3895,6 +3944,8 @@ export default function Core(rootElement, userSettings) {
3895
3944
  * hot.selectColumns(1, 2, -1);
3896
3945
  * // Select range of columns using visual indexes and mark the second cell as highlighted.
3897
3946
  * hot.selectColumns(2, 1, 1);
3947
+ * // Select range of columns using visual indexes and move the focus position somewhere in the middle of the range.
3948
+ * hot.selectColumns(2, 5, { row: 2, col: 3 });
3898
3949
  * // Select range of columns using column properties.
3899
3950
  * hot.selectColumns('id', 'last_name');
3900
3951
  * ```
@@ -3904,10 +3955,11 @@ export default function Core(rootElement, userSettings) {
3904
3955
  * @function selectColumns
3905
3956
  * @param {number} startColumn The visual column index from which the selection starts.
3906
3957
  * @param {number} [endColumn=startColumn] The visual column index to which the selection finishes. If `endColumn`
3907
- * is not defined the column defined by `startColumn` will be selected.
3908
- * @param {number} [focusPosition=0] The argument allows changing the cell/header focus position.
3909
- * The value can take visual row index from -N to N, where negative values
3910
- * point to the headers and positive values point to the cell range.
3958
+ * is not defined the column defined by `startColumn` will be selected.
3959
+ * @param {number | { row: number, col: number } | CellCoords} [focusPosition=0] The argument allows changing the cell/header focus
3960
+ * position. The value can take visual row index from -N to N, where negative values point to the headers and positive
3961
+ * values point to the cell range. An object with `row` and `col` properties also can be passed to change the focus
3962
+ * position horizontally.
3911
3963
  * @returns {boolean} `true` if selection was successful, `false` otherwise.
3912
3964
  */
3913
3965
  this.selectColumns = function (startColumn) {
@@ -3929,6 +3981,8 @@ export default function Core(rootElement, userSettings) {
3929
3981
  * hot.selectRows(1, 2, -1);
3930
3982
  * // Select range of rows using visual indexes and mark the second cell as highlighted.
3931
3983
  * hot.selectRows(2, 1, 1);
3984
+ * // Select range of rows using visual indexes and move the focus position somewhere in the middle of the range.
3985
+ * hot.selectRows(2, 5, { row: 2, col: 3 });
3932
3986
  * ```
3933
3987
  *
3934
3988
  * @memberof Core#
@@ -3936,10 +3990,11 @@ export default function Core(rootElement, userSettings) {
3936
3990
  * @function selectRows
3937
3991
  * @param {number} startRow The visual row index from which the selection starts.
3938
3992
  * @param {number} [endRow=startRow] The visual row index to which the selection finishes. If `endRow`
3939
- * is not defined the row defined by `startRow` will be selected.
3940
- * @param {number} [focusPosition=0] The argument allows changing the cell/header focus position.
3941
- * The value can take visual column index from -N to N, where negative values
3942
- * point to the headers and positive values point to the cell range.
3993
+ * is not defined the row defined by `startRow` will be selected.
3994
+ * @param {number | { row: number, col: number } | CellCoords} [focusPosition=0] The argument allows changing the cell/header focus
3995
+ * position. The value can take visual row index from -N to N, where negative values point to the headers and positive
3996
+ * values point to the cell range. An object with `row` and `col` properties also can be passed to change the focus
3997
+ * position vertically.
3943
3998
  * @returns {boolean} `true` if selection was successful, `false` otherwise.
3944
3999
  */
3945
4000
  this.selectRows = function (startRow) {
@@ -25,8 +25,8 @@
25
25
  * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER ARISING FROM
26
26
  * USE OR INABILITY TO USE THIS SOFTWARE.
27
27
  *
28
- * Version: 0.0.0-next-8dc7078-20240322
29
- * Release date: 06/03/2024 (built at 22/03/2024 12:26:09)
28
+ * Version: 0.0.0-next-28fc088-20240325
29
+ * Release date: 06/03/2024 (built at 25/03/2024 14:25:43)
30
30
  */
31
31
  /**
32
32
  * Fix for bootstrap styles
@@ -25,8 +25,8 @@
25
25
  * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER ARISING FROM
26
26
  * USE OR INABILITY TO USE THIS SOFTWARE.
27
27
  *
28
- * Version: 0.0.0-next-8dc7078-20240322
29
- * Release date: 06/03/2024 (built at 22/03/2024 12:26:09)
28
+ * Version: 0.0.0-next-28fc088-20240325
29
+ * Release date: 06/03/2024 (built at 25/03/2024 14:25:43)
30
30
  */
31
31
  /**
32
32
  * Fix for bootstrap styles