handsontable 16.0.1 → 16.1.0-next-91b8a0f-20250905

package/selection/transformation/focus.mjs

@@ -0,0 +1,73 @@
+import "core-js/modules/es.error.cause.js";
+import { BaseTransformation } from "./_base.mjs";
+/**
+ * The FocusTransformation class implements algorithms for transforming coordinates while the
+ * focus is being moved. The currently selection layer range defines the bounds for the focus movement.
+ *
+ * @class FocusTransformation
+ * @private
+ */
+export class FocusTransformation extends BaseTransformation {
+  /**
+   * Calculates offset coordinates for focus selection based on the current selection state.
+   * For header focus selection, calculates offset including headers.
+   * For cell focus selection, calculates offset only for selected cells.
+   *
+   * @returns {{x: number, y: number}}
+   */
+  calculateOffset() {
+    const range = this.getCurrentSelection();
+    const {
+      row,
+      col
+    } = range.getOuterTopStartCorner();
+    const columnsInRange = this.tableApi.countRenderableColumnsInRange(0, col - 1);
+    const rowsInRange = this.tableApi.countRenderableRowsInRange(0, row - 1);
+    const isHeaderSelection = range.highlight.isHeader();
+    const headerX = isHeaderSelection ? Math.abs(col) : 0;
+    const headerY = isHeaderSelection ? Math.abs(row) : 0;
+    return {
+      x: col < 0 ? headerX : -columnsInRange,
+      y: row < 0 ? headerY : -rowsInRange
+    };
+  }
+
+  /**
+   * Gets the count of renderable rows for focus transformation.
+   * Focus transformation operates on the current selection range.
+   *
+   * @returns {number}
+   */
+  countRenderableRows() {
+    const range = this.getCurrentSelection();
+    return this.tableApi.countRenderableRowsInRange(0, range.getOuterBottomEndCorner().row);
+  }
+
+  /**
+   * Gets the count of renderable columns for focus transformation.
+   * Focus transformation operates on the current selection range.
+   *
+   * @returns {number}
+   */
+  countRenderableColumns() {
+    const range = this.getCurrentSelection();
+    return this.tableApi.countRenderableColumnsInRange(0, range.getOuterBottomEndCorner().col);
+  }
+
+  /**
+   * Throws an error because focus transformation doesn't support `transformEnd`.
+   */
+  transformEnd() {
+    throw new Error('`transformEnd` is not valid for focus selection use `transformStart` instead');
+  }
+
+  /**
+   * Changes the behavior of the transformation logic by switching the selection layer
+   * when the selection is out of range.
+   *
+   * @returns {boolean}
+   */
+  shouldSwitchSelectionLayer() {
+    return true;
+  }
+}

package/selection/transformation/index.js

@@ -0,0 +1,7 @@
+"use strict";
+
+exports.__esModule = true;
+var _extender = require("./extender");
+exports.ExtenderTransformation = _extender.ExtenderTransformation;
+var _focus = require("./focus");
+exports.FocusTransformation = _focus.FocusTransformation;

package/selection/transformation/index.mjs

@@ -0,0 +1,2 @@
+export { ExtenderTransformation } from "./extender.mjs";
+export { FocusTransformation } from "./focus.mjs";

package/selection/utils.js

@@ -118,9 +118,10 @@ function normalizeSelectionFactory(type) {
       rowEnd = Math.max(origRowStart, origRowEnd);
       columnEnd = Math.max(origColumnStart, origColumnEnd);
     }
+    const highlight = isObjectType ? selection.highlight.clone() : createCellCoords(rowStart, columnStart);
     const from = createCellCoords(rowStart, columnStart);
     const to = createCellCoords(rowEnd, columnEnd);
-    return createCellRange(from, from, to);
+    return createCellRange(highlight, from, to);
   };
 }
 

package/selection/utils.mjs

@@ -111,9 +111,10 @@ export function normalizeSelectionFactory(type) {
       rowEnd = Math.max(origRowStart, origRowEnd);
       columnEnd = Math.max(origColumnStart, origColumnEnd);
     }
+    const highlight = isObjectType ? selection.highlight.clone() : createCellCoords(rowStart, columnStart);
     const from = createCellCoords(rowStart, columnStart);
     const to = createCellCoords(rowEnd, columnEnd);
-    return createCellRange(from, from, to);
+    return createCellRange(highlight, from, to);
   };
 }
 

package/settings.d.ts

@@ -37,9 +37,12 @@ import { Settings as MergeCellsSettings } from './plugins/mergeCells';
 import { Settings as MultiColumnSortingSettings } from './plugins/multiColumnSorting';
 import { Settings as NestedHeadersSettings } from './plugins/nestedHeaders';
 import { Settings as NestedRowsSettings } from './plugins/nestedRows';
+import { Settings as PaginationSettings } from './plugins/pagination';
 import { Settings as PersistentStateSettings } from './plugins/persistentState';
 import { Settings as SearchSettings } from './plugins/search';
 import { Settings as TrimRowsSettings } from './plugins/trimRows';
+import { Settings as DialogSettings } from './plugins/dialog';
+import { Settings as LoadingSettings } from './plugins/loading';
 import { Settings as UndoRedoSettings } from './plugins/undoRedo';
 import { EditorType, BaseEditor } from './editors';
 import { RendererType } from './renderers';
@@ -159,6 +162,7 @@ export interface GridSettings extends Events {
   height?: number | string | (() => number | string);
   hiddenColumns?: HiddenColumnsSettings;
   hiddenRows?: HiddenRowsSettings;
+  initialState?: Partial<GridSettings>;
   invalidCellClassName?: string;
   imeFastEdit?: boolean;
   isEmptyCol?: (this: Core, column: number) => boolean;
@@ -188,6 +192,7 @@ export interface GridSettings extends Events {
   numericFormat?: NumericFormatOptions;
   observeDOMVisibility?: boolean;
   outsideClickDeselects?: boolean | ((target: HTMLElement) => boolean);
+  pagination?: PaginationSettings;
   persistentState?: PersistentStateSettings;
   placeholder?: string;
   placeholderCellClassName?: string;
@@ -207,7 +212,7 @@ export interface GridSettings extends Events {
   skipColumnOnPaste?: boolean;
   skipRowOnPaste?: boolean;
   sortByRelevance?: boolean;
-  source?: string[] | number[] | ((this: CellProperties, query: string, callback: (items: string[]) => void) => void);
+  source?: string[] | number[] | { key: any, value: any }[] | ((this: CellProperties, query: string, callback: (items: string[]) => void) => void);
   startCols?: number;
   startRows?: number;
   stretchH?: 'none' | 'all' | 'last';
@@ -222,8 +227,12 @@ export interface GridSettings extends Events {
   trimWhitespace?: boolean;
   type?: CellType | string;
   uncheckedTemplate?: boolean | string | number;
+  dialog?: DialogSettings;
+  loading?: LoadingSettings;
   undo?: UndoRedoSettings;
   validator?: BaseValidator | RegExp | ValidatorType | string;
+  valueGetter?: (this: Core, value: CellValue, row: number, column: number, cellProperties: CellProperties) => CellValue;
+  valueSetter?: (this: Core, value: CellValue, row: number, column: number, cellProperties: CellProperties) => CellValue;
   viewportColumnRenderingOffset?: number | 'auto';
   viewportRowRenderingOffset?: number | 'auto';
   viewportColumnRenderingThreshold?: number | 'auto';

package/shortcutContexts/commands/editor/fastOpen.js

@@ -6,7 +6,7 @@ const command = exports.command = {
   callback(hot, event) {
     const {
       highlight
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     if (highlight.isHeader()) {
       return;
     }

package/shortcutContexts/commands/editor/fastOpen.mjs

@@ -3,7 +3,7 @@ export const command = {
   callback(hot, event) {
     const {
       highlight
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     if (highlight.isHeader()) {
       return;
     }

package/shortcutContexts/commands/editor/open.js

@@ -1,24 +1,30 @@
 "use strict";
 
 exports.__esModule = true;
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.some.js");
 var _event = require("../../../helpers/dom/event");
 const command = exports.command = {
   name: 'editorOpen',
   callback(hot, event, keys) {
+    const {
+      selection
+    } = hot;
     const editorManager = hot._getEditorManager();
-    const selectedRange = hot.getSelectedRangeLast();
+    const selectedRanges = hot.getSelectedRange();
+    const selectedRange = hot.getSelectedRangeActive();
     const {
       highlight
     } = selectedRange;
 
     // supports for navigating with enter key when multiple cells are selected
-    if (hot.selection.isMultiple() && !selectedRange.isHeader() && hot.countRenderedCols() > 0 && hot.countRenderedRows() > 0) {
+    if ((selectedRanges.some(range => selection.isMultiple(range)) || selectedRanges.length > 1) && !selectedRange.isHeader() && hot.countRenderedCols() > 0 && hot.countRenderedRows() > 0) {
       const settings = hot.getSettings();
       const enterMoves = typeof settings.enterMoves === 'function' ? settings.enterMoves(event) : settings.enterMoves;
       if (keys.includes('shift')) {
-        hot.selection.transformFocus(-enterMoves.row, -enterMoves.col);
+        selection.transformFocus(-enterMoves.row, -enterMoves.col);
       } else {
-        hot.selection.transformFocus(enterMoves.row, enterMoves.col);
+        selection.transformFocus(enterMoves.row, enterMoves.col);
       }
       return;
     }

package/shortcutContexts/commands/editor/open.mjs

@@ -1,21 +1,27 @@
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.some.js";
 import { stopImmediatePropagation } from "../../../helpers/dom/event.mjs";
 export const command = {
   name: 'editorOpen',
   callback(hot, event, keys) {
+    const {
+      selection
+    } = hot;
     const editorManager = hot._getEditorManager();
-    const selectedRange = hot.getSelectedRangeLast();
+    const selectedRanges = hot.getSelectedRange();
+    const selectedRange = hot.getSelectedRangeActive();
     const {
       highlight
     } = selectedRange;
 
     // supports for navigating with enter key when multiple cells are selected
-    if (hot.selection.isMultiple() && !selectedRange.isHeader() && hot.countRenderedCols() > 0 && hot.countRenderedRows() > 0) {
+    if ((selectedRanges.some(range => selection.isMultiple(range)) || selectedRanges.length > 1) && !selectedRange.isHeader() && hot.countRenderedCols() > 0 && hot.countRenderedRows() > 0) {
       const settings = hot.getSettings();
       const enterMoves = typeof settings.enterMoves === 'function' ? settings.enterMoves(event) : settings.enterMoves;
       if (keys.includes('shift')) {
-        hot.selection.transformFocus(-enterMoves.row, -enterMoves.col);
+        selection.transformFocus(-enterMoves.row, -enterMoves.col);
       } else {
-        hot.selection.transformFocus(enterMoves.row, enterMoves.col);
+        selection.transformFocus(enterMoves.row, enterMoves.col);
       }
       return;
     }

package/shortcutContexts/commands/extendCellsSelection/down.js

@@ -9,7 +9,7 @@ const command = exports.command = {
     } = hot;
     const {
       highlight
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     if (!selection.isSelectedByColumnHeader() && !selection.isSelectedByCorner() && (highlight.isCell() || highlight.isHeader() && selection.isSelectedByRowHeader())) {
       selection.markSource('keyboard');
       selection.transformEnd(1, 0);

package/shortcutContexts/commands/extendCellsSelection/down.mjs

@@ -6,7 +6,7 @@ export const command = {
     } = hot;
     const {
       highlight
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     if (!selection.isSelectedByColumnHeader() && !selection.isSelectedByCorner() && (highlight.isCell() || highlight.isHeader() && selection.isSelectedByRowHeader())) {
       selection.markSource('keyboard');
       selection.transformEnd(1, 0);

package/shortcutContexts/commands/extendCellsSelection/downByViewportHeight.js

@@ -10,7 +10,7 @@ const command = exports.command = {
     } = hot;
     const {
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     const nextRowIndexToSelect = Math.min(to.row + hot.countVisibleRows(), hot.countRows() - 1);
     const row = rowIndexMapper.getNearestNotHiddenIndex(nextRowIndexToSelect, -1);
     if (row !== null) {
@@ -18,7 +18,7 @@ const command = exports.command = {
       const scrollPadding = to.row - hot.getFirstFullyVisibleRow();
       const nextVerticalScroll = Math.min(coords.row - scrollPadding, hot.countRows() - 1);
       selection.markSource('keyboard');
-      selection.setRangeEnd(coords);
+      selection.setRangeEnd(coords, hot.getActiveSelectionLayerIndex());
       selection.markEndSource();
       hot.scrollViewportTo({
         row: nextVerticalScroll,

package/shortcutContexts/commands/extendCellsSelection/downByViewportHeight.mjs

@@ -7,7 +7,7 @@ export const command = {
     } = hot;
     const {
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     const nextRowIndexToSelect = Math.min(to.row + hot.countVisibleRows(), hot.countRows() - 1);
     const row = rowIndexMapper.getNearestNotHiddenIndex(nextRowIndexToSelect, -1);
     if (row !== null) {
@@ -15,7 +15,7 @@ export const command = {
       const scrollPadding = to.row - hot.getFirstFullyVisibleRow();
       const nextVerticalScroll = Math.min(coords.row - scrollPadding, hot.countRows() - 1);
       selection.markSource('keyboard');
-      selection.setRangeEnd(coords);
+      selection.setRangeEnd(coords, hot.getActiveSelectionLayerIndex());
       selection.markEndSource();
       hot.scrollViewportTo({
         row: nextVerticalScroll,

package/shortcutContexts/commands/extendCellsSelection/left.js

@@ -9,7 +9,7 @@ const command = exports.command = {
     } = hot;
     const {
       highlight
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     if (!selection.isSelectedByRowHeader() && !selection.isSelectedByCorner() && (highlight.isCell() || highlight.isHeader() && selection.isSelectedByColumnHeader())) {
       selection.markSource('keyboard');
       selection.transformEnd(0, -1 * hot.getDirectionFactor());

package/shortcutContexts/commands/extendCellsSelection/left.mjs

@@ -6,7 +6,7 @@ export const command = {
     } = hot;
     const {
       highlight
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     if (!selection.isSelectedByRowHeader() && !selection.isSelectedByCorner() && (highlight.isCell() || highlight.isHeader() && selection.isSelectedByColumnHeader())) {
       selection.markSource('keyboard');
       selection.transformEnd(0, -1 * hot.getDirectionFactor());

package/shortcutContexts/commands/extendCellsSelection/right.js

@@ -9,7 +9,7 @@ const command = exports.command = {
     } = hot;
     const {
       highlight
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     if (!selection.isSelectedByRowHeader() && !selection.isSelectedByCorner() && (highlight.isCell() || highlight.isHeader() && selection.isSelectedByColumnHeader())) {
       selection.markSource('keyboard');
       selection.transformEnd(0, hot.getDirectionFactor());

package/shortcutContexts/commands/extendCellsSelection/right.mjs

@@ -6,7 +6,7 @@ export const command = {
     } = hot;
     const {
       highlight
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     if (!selection.isSelectedByRowHeader() && !selection.isSelectedByCorner() && (highlight.isCell() || highlight.isHeader() && selection.isSelectedByColumnHeader())) {
       selection.markSource('keyboard');
       selection.transformEnd(0, hot.getDirectionFactor());

package/shortcutContexts/commands/extendCellsSelection/toColumns.js

@@ -11,7 +11,7 @@ const command = exports.command = {
       highlight,
       from,
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     selection.markSource('keyboard');
     if (selection.isSelectedByRowHeader()) {
       selection.selectAll(true, true);

package/shortcutContexts/commands/extendCellsSelection/toColumns.mjs

@@ -8,7 +8,7 @@ export const command = {
       highlight,
       from,
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     selection.markSource('keyboard');
     if (selection.isSelectedByRowHeader()) {
       selection.selectAll(true, true);

package/shortcutContexts/commands/extendCellsSelection/toMostBottom.js

@@ -12,7 +12,7 @@ const command = exports.command = {
       highlight,
       from,
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     const isFocusHighlightedByHeader = highlight.isHeader() && selection.isSelectedByRowHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const row = rowIndexMapper.getNearestNotHiddenIndex(hot.countRows() - 1, -1);

package/shortcutContexts/commands/extendCellsSelection/toMostBottom.mjs

@@ -9,7 +9,7 @@ export const command = {
       highlight,
       from,
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     const isFocusHighlightedByHeader = highlight.isHeader() && selection.isSelectedByRowHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const row = rowIndexMapper.getNearestNotHiddenIndex(hot.countRows() - 1, -1);

package/shortcutContexts/commands/extendCellsSelection/toMostInlineEnd.js

@@ -12,7 +12,7 @@ const command = exports.command = {
       highlight,
       from,
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     if (!selection.isSelectedByRowHeader() && !selection.isSelectedByCorner() && highlight.isCell()) {
       const column = columnIndexMapper.getNearestNotHiddenIndex(hot.countCols() - 1, -1);
       const newFrom = from.clone();

package/shortcutContexts/commands/extendCellsSelection/toMostInlineEnd.mjs

@@ -9,7 +9,7 @@ export const command = {
       highlight,
       from,
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     if (!selection.isSelectedByRowHeader() && !selection.isSelectedByCorner() && highlight.isCell()) {
       const column = columnIndexMapper.getNearestNotHiddenIndex(hot.countCols() - 1, -1);
       const newFrom = from.clone();

package/shortcutContexts/commands/extendCellsSelection/toMostInlineStart.js

@@ -12,7 +12,7 @@ const command = exports.command = {
       highlight,
       from,
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     if (!selection.isSelectedByRowHeader() && !selection.isSelectedByCorner() && highlight.isCell()) {
       const fixedColumns = parseInt(hot.getSettings().fixedColumnsStart, 10);
       const column = columnIndexMapper.getNearestNotHiddenIndex(fixedColumns, 1);

package/shortcutContexts/commands/extendCellsSelection/toMostInlineStart.mjs

@@ -9,7 +9,7 @@ export const command = {
       highlight,
       from,
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     if (!selection.isSelectedByRowHeader() && !selection.isSelectedByCorner() && highlight.isCell()) {
       const fixedColumns = parseInt(hot.getSettings().fixedColumnsStart, 10);
       const column = columnIndexMapper.getNearestNotHiddenIndex(fixedColumns, 1);

package/shortcutContexts/commands/extendCellsSelection/toMostLeft.js

@@ -12,7 +12,7 @@ const command = exports.command = {
       highlight,
       from,
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     const isFocusHighlightedByHeader = highlight.isHeader() && selection.isSelectedByColumnHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const column = columnIndexMapper.getNearestNotHiddenIndex(...(hot.isRtl() ? [hot.countCols() - 1, -1] : [0, 1]));

package/shortcutContexts/commands/extendCellsSelection/toMostLeft.mjs

@@ -9,7 +9,7 @@ export const command = {
       highlight,
       from,
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     const isFocusHighlightedByHeader = highlight.isHeader() && selection.isSelectedByColumnHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const column = columnIndexMapper.getNearestNotHiddenIndex(...(hot.isRtl() ? [hot.countCols() - 1, -1] : [0, 1]));

package/shortcutContexts/commands/extendCellsSelection/toMostRight.js

@@ -12,7 +12,7 @@ const command = exports.command = {
       highlight,
       from,
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     const isFocusHighlightedByHeader = highlight.isHeader() && selection.isSelectedByColumnHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const column = columnIndexMapper.getNearestNotHiddenIndex(...(hot.isRtl() ? [0, 1] : [hot.countCols() - 1, -1]));

package/shortcutContexts/commands/extendCellsSelection/toMostRight.mjs

@@ -9,7 +9,7 @@ export const command = {
       highlight,
       from,
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     const isFocusHighlightedByHeader = highlight.isHeader() && selection.isSelectedByColumnHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const column = columnIndexMapper.getNearestNotHiddenIndex(...(hot.isRtl() ? [0, 1] : [hot.countCols() - 1, -1]));

package/shortcutContexts/commands/extendCellsSelection/toMostTop.js

@@ -12,7 +12,7 @@ const command = exports.command = {
       highlight,
       from,
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     const isFocusHighlightedByHeader = highlight.isHeader() && selection.isSelectedByRowHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const row = rowIndexMapper.getNearestNotHiddenIndex(0, 1);

package/shortcutContexts/commands/extendCellsSelection/toMostTop.mjs

@@ -9,7 +9,7 @@ export const command = {
       highlight,
       from,
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     const isFocusHighlightedByHeader = highlight.isHeader() && selection.isSelectedByRowHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const row = rowIndexMapper.getNearestNotHiddenIndex(0, 1);

package/shortcutContexts/commands/extendCellsSelection/toRows.js

@@ -11,7 +11,7 @@ const command = exports.command = {
       highlight,
       from,
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     selection.markSource('keyboard');
     if (selection.isSelectedByColumnHeader()) {
       selection.selectAll(true, true);

package/shortcutContexts/commands/extendCellsSelection/toRows.mjs

@@ -8,7 +8,7 @@ export const command = {
       highlight,
       from,
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     selection.markSource('keyboard');
     if (selection.isSelectedByColumnHeader()) {
       selection.selectAll(true, true);

package/shortcutContexts/commands/extendCellsSelection/up.js

@@ -9,7 +9,7 @@ const command = exports.command = {
     } = hot;
     const {
       highlight
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     if (!selection.isSelectedByColumnHeader() && !selection.isSelectedByCorner() && (highlight.isCell() || highlight.isHeader() && selection.isSelectedByRowHeader())) {
       selection.markSource('keyboard');
       selection.transformEnd(-1, 0);

package/shortcutContexts/commands/extendCellsSelection/up.mjs

@@ -6,7 +6,7 @@ export const command = {
     } = hot;
     const {
       highlight
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     if (!selection.isSelectedByColumnHeader() && !selection.isSelectedByCorner() && (highlight.isCell() || highlight.isHeader() && selection.isSelectedByRowHeader())) {
       selection.markSource('keyboard');
       selection.transformEnd(-1, 0);

package/shortcutContexts/commands/extendCellsSelection/upByViewportHeight.js

@@ -10,7 +10,7 @@ const command = exports.command = {
     } = hot;
     const {
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     const nextRowIndexToSelect = Math.max(to.row - hot.countVisibleRows(), 0);
     const row = rowIndexMapper.getNearestNotHiddenIndex(nextRowIndexToSelect, 1);
     if (row !== null) {
@@ -18,7 +18,7 @@ const command = exports.command = {
       const scrollPadding = to.row - hot.getFirstFullyVisibleRow();
       const nextVerticalScroll = Math.max(coords.row - scrollPadding, 0);
       selection.markSource('keyboard');
-      selection.setRangeEnd(coords);
+      selection.setRangeEnd(coords, hot.getActiveSelectionLayerIndex());
       selection.markEndSource();
       hot.scrollViewportTo({
         row: nextVerticalScroll,

package/shortcutContexts/commands/extendCellsSelection/upByViewportHeight.mjs

@@ -7,7 +7,7 @@ export const command = {
     } = hot;
     const {
       to
-    } = hot.getSelectedRangeLast();
+    } = hot.getSelectedRangeActive();
     const nextRowIndexToSelect = Math.max(to.row - hot.countVisibleRows(), 0);
     const row = rowIndexMapper.getNearestNotHiddenIndex(nextRowIndexToSelect, 1);
     if (row !== null) {
@@ -15,7 +15,7 @@ export const command = {
       const scrollPadding = to.row - hot.getFirstFullyVisibleRow();
       const nextVerticalScroll = Math.max(coords.row - scrollPadding, 0);
       selection.markSource('keyboard');
-      selection.setRangeEnd(coords);
+      selection.setRangeEnd(coords, hot.getActiveSelectionLayerIndex());
       selection.markEndSource();
       hot.scrollViewportTo({
         row: nextVerticalScroll,

package/shortcutContexts/commands/moveCellSelection/downByViewportHeight.js

@@ -13,7 +13,7 @@ const command = exports.command = {
     const columnHeadersCount = navigableHeaders ? hot.countColHeaders() : 0;
     const {
       row
-    } = hot.getSelectedRangeLast().highlight;
+    } = hot.getSelectedRangeActive().highlight;
     let rowsStep = hot.countVisibleRows() + columnHeadersCount;
     rowsStep = rowsStep === 0 ? 1 : rowsStep;
 
@@ -29,7 +29,7 @@ const command = exports.command = {
     selection.markSource('keyboard');
     selection.transformStart(rowsStep, 0);
     selection.markEndSource();
-    if (hot.getSelectedRangeLast().highlight.row < 0) {
+    if (hot.getSelectedRangeActive().highlight.row < 0) {
       hot.scrollViewportTo({
         row: 0
       });

package/shortcutContexts/commands/moveCellSelection/downByViewportHeight.mjs

@@ -10,7 +10,7 @@ export const command = {
     const columnHeadersCount = navigableHeaders ? hot.countColHeaders() : 0;
     const {
       row
-    } = hot.getSelectedRangeLast().highlight;
+    } = hot.getSelectedRangeActive().highlight;
     let rowsStep = hot.countVisibleRows() + columnHeadersCount;
     rowsStep = rowsStep === 0 ? 1 : rowsStep;
 
@@ -26,7 +26,7 @@ export const command = {
     selection.markSource('keyboard');
     selection.transformStart(rowsStep, 0);
     selection.markEndSource();
-    if (hot.getSelectedRangeLast().highlight.row < 0) {
+    if (hot.getSelectedRangeActive().highlight.row < 0) {
       hot.scrollViewportTo({
         row: 0
       });

package/shortcutContexts/commands/moveCellSelection/inlineEnd.js

@@ -1,6 +1,8 @@
 "use strict";
 
 exports.__esModule = true;
+require("core-js/modules/esnext.iterator.constructor.js");
+require("core-js/modules/esnext.iterator.some.js");
 const command = exports.command = {
   name: 'moveCellSelectionInlineEnd',
   callback(hot, event) {
@@ -8,10 +10,11 @@ const command = exports.command = {
       selection
     } = hot;
     const settings = hot.getSettings();
-    const selectedRange = hot.getSelectedRangeLast();
+    const selectedRanges = hot.getSelectedRange();
+    const selectedRange = hot.getSelectedRangeActive();
     const tabMoves = typeof settings.tabMoves === 'function' ? settings.tabMoves(event) : settings.tabMoves;
     selection.markSource('keyboard');
-    if (selection.isMultiple() && !selectedRange.isHeader() && hot.countRenderedCols() > 0 && hot.countRenderedRows() > 0) {
+    if ((selectedRanges.some(range => selection.isMultiple(range)) || selectedRanges.length > 1) && !selectedRange.isHeader() && hot.countRenderedCols() > 0 && hot.countRenderedRows() > 0) {
       selection.transformFocus(-tabMoves.row, -tabMoves.col);
     } else {
       selection.transformStart(-tabMoves.row, -tabMoves.col);