handsontable 0.0.0-next-5a535ed-20240403 → 0.0.0-next-c2810a1-20240403

package/shortcutContexts/commands/extendCellsSelection/toMostInlineEnd.mjs

@@ -6,10 +6,16 @@ export const command = {
       columnIndexMapper
     } = hot;
     const {
-      highlight
+      highlight,
+      from,
+      to
     } = hot.getSelectedRangeLast();
-    if (highlight.isCell()) {
-      selection.setRangeEnd(hot._createCellCoords(selection.selectedRange.current().from.row, columnIndexMapper.getNearestNotHiddenIndex(hot.countCols() - 1, -1)));
+    if (!hot.selection.isSelectedByRowHeader() && !hot.selection.isSelectedByCorner() && highlight.isCell()) {
+      const column = columnIndexMapper.getNearestNotHiddenIndex(hot.countCols() - 1, -1);
+      const newFrom = from.clone();
+      newFrom.col = highlight.col;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
+      selection.setRangeEnd(hot._createCellCoords(to.row, column));
     }
   }
 };

package/shortcutContexts/commands/extendCellsSelection/toMostInlineStart.js

@@ -9,10 +9,17 @@ const command = exports.command = {
       columnIndexMapper
     } = hot;
     const {
-      highlight
+      highlight,
+      from,
+      to
     } = hot.getSelectedRangeLast();
-    if (highlight.isCell()) {
-      selection.setRangeEnd(hot._createCellCoords(selection.selectedRange.current().from.row, columnIndexMapper.getNearestNotHiddenIndex(0, 1)));
+    if (!hot.selection.isSelectedByRowHeader() && !hot.selection.isSelectedByCorner() && highlight.isCell()) {
+      const fixedColumns = parseInt(hot.getSettings().fixedColumnsStart, 10);
+      const column = columnIndexMapper.getNearestNotHiddenIndex(fixedColumns, 1);
+      const newFrom = from.clone();
+      newFrom.col = highlight.col;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
+      selection.setRangeEnd(hot._createCellCoords(to.row, column));
     }
   }
 };

package/shortcutContexts/commands/extendCellsSelection/toMostInlineStart.mjs

@@ -6,10 +6,17 @@ export const command = {
       columnIndexMapper
     } = hot;
     const {
-      highlight
+      highlight,
+      from,
+      to
     } = hot.getSelectedRangeLast();
-    if (highlight.isCell()) {
-      selection.setRangeEnd(hot._createCellCoords(selection.selectedRange.current().from.row, columnIndexMapper.getNearestNotHiddenIndex(0, 1)));
+    if (!hot.selection.isSelectedByRowHeader() && !hot.selection.isSelectedByCorner() && highlight.isCell()) {
+      const fixedColumns = parseInt(hot.getSettings().fixedColumnsStart, 10);
+      const column = columnIndexMapper.getNearestNotHiddenIndex(fixedColumns, 1);
+      const newFrom = from.clone();
+      newFrom.col = highlight.col;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
+      selection.setRangeEnd(hot._createCellCoords(to.row, column));
     }
   }
 };

package/shortcutContexts/commands/extendCellsSelection/toMostLeft.js

@@ -16,7 +16,9 @@ const command = exports.command = {
     const isFocusHighlightedByHeader = highlight.isHeader() && hot.selection.isSelectedByColumnHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const column = columnIndexMapper.getNearestNotHiddenIndex(...(hot.isRtl() ? [hot.countCols() - 1, -1] : [0, 1]));
-      selection.setRangeStart(from.clone());
+      const newFrom = from.clone();
+      newFrom.col = highlight.col;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
 
       // Restore the column highlight by header flag after setting up a new selection.
       if (isFocusHighlightedByHeader) {

package/shortcutContexts/commands/extendCellsSelection/toMostLeft.mjs

@@ -13,7 +13,9 @@ export const command = {
     const isFocusHighlightedByHeader = highlight.isHeader() && hot.selection.isSelectedByColumnHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const column = columnIndexMapper.getNearestNotHiddenIndex(...(hot.isRtl() ? [hot.countCols() - 1, -1] : [0, 1]));
-      selection.setRangeStart(from.clone());
+      const newFrom = from.clone();
+      newFrom.col = highlight.col;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
 
       // Restore the column highlight by header flag after setting up a new selection.
       if (isFocusHighlightedByHeader) {

package/shortcutContexts/commands/extendCellsSelection/toMostRight.js

@@ -16,7 +16,9 @@ const command = exports.command = {
     const isFocusHighlightedByHeader = highlight.isHeader() && hot.selection.isSelectedByColumnHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const column = columnIndexMapper.getNearestNotHiddenIndex(...(hot.isRtl() ? [0, 1] : [hot.countCols() - 1, -1]));
-      selection.setRangeStart(from.clone());
+      const newFrom = from.clone();
+      newFrom.col = highlight.col;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
 
       // Restore the column highlight by header flag after setting up a new selection.
       if (isFocusHighlightedByHeader) {

package/shortcutContexts/commands/extendCellsSelection/toMostRight.mjs

@@ -13,7 +13,9 @@ export const command = {
     const isFocusHighlightedByHeader = highlight.isHeader() && hot.selection.isSelectedByColumnHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const column = columnIndexMapper.getNearestNotHiddenIndex(...(hot.isRtl() ? [0, 1] : [hot.countCols() - 1, -1]));
-      selection.setRangeStart(from.clone());
+      const newFrom = from.clone();
+      newFrom.col = highlight.col;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
 
       // Restore the column highlight by header flag after setting up a new selection.
       if (isFocusHighlightedByHeader) {

package/shortcutContexts/commands/extendCellsSelection/toMostTop.js

@@ -16,7 +16,9 @@ const command = exports.command = {
     const isFocusHighlightedByHeader = highlight.isHeader() && hot.selection.isSelectedByRowHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const row = rowIndexMapper.getNearestNotHiddenIndex(0, 1);
-      selection.setRangeStart(from.clone());
+      const newFrom = from.clone();
+      newFrom.row = highlight.row;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
 
       // Restore the row highlight by header flag after setting up a new selection.
       if (isFocusHighlightedByHeader) {

package/shortcutContexts/commands/extendCellsSelection/toMostTop.mjs

@@ -13,7 +13,9 @@ export const command = {
     const isFocusHighlightedByHeader = highlight.isHeader() && hot.selection.isSelectedByRowHeader();
     if (highlight.isCell() || isFocusHighlightedByHeader) {
       const row = rowIndexMapper.getNearestNotHiddenIndex(0, 1);
-      selection.setRangeStart(from.clone());
+      const newFrom = from.clone();
+      newFrom.row = highlight.row;
+      selection.setRangeStart(newFrom, undefined, false, highlight.clone());
 
       // Restore the row highlight by header flag after setting up a new selection.
       if (isFocusHighlightedByHeader) {

package/shortcutContexts/commands/extendCellsSelection/toRows.js

@@ -12,7 +12,7 @@ const command = exports.command = {
     if (hot.selection.isSelectedByColumnHeader()) {
       hot.selection.selectAll(true, true);
     } else {
-      hot.selectRows(from.row, to.row, highlight.col);
+      hot.selectRows(from.row, to.row, highlight);
     }
   }
 };

package/shortcutContexts/commands/extendCellsSelection/toRows.mjs

@@ -9,7 +9,7 @@ export const command = {
     if (hot.selection.isSelectedByColumnHeader()) {
       hot.selection.selectAll(true, true);
     } else {
-      hot.selectRows(from.row, to.row, highlight.col);
+      hot.selectRows(from.row, to.row, highlight);
     }
   }
 };

package/shortcutContexts/commands/extendCellsSelection/up.js

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

package/shortcutContexts/commands/extendCellsSelection/up.mjs

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

package/shortcutContexts/commands/moveCellSelection/inlineEnd.js

@@ -5,7 +5,12 @@ const command = exports.command = {
   name: 'moveCellSelectionInlineEnd',
   callback(hot, event) {
     const settings = hot.getSettings();
+    const selectedRange = hot.getSelectedRangeLast();
     const tabMoves = typeof settings.tabMoves === 'function' ? settings.tabMoves(event) : settings.tabMoves;
-    hot.selection.transformStart(-tabMoves.row, -tabMoves.col);
+    if (hot.selection.isMultiple() && !selectedRange.isHeader() && hot.countRenderedCols() > 0 && hot.countRenderedRows() > 0) {
+      hot.selection.transformFocus(-tabMoves.row, -tabMoves.col);
+    } else {
+      hot.selection.transformStart(-tabMoves.row, -tabMoves.col);
+    }
   }
 };

package/shortcutContexts/commands/moveCellSelection/inlineEnd.mjs

@@ -2,7 +2,12 @@ export const command = {
   name: 'moveCellSelectionInlineEnd',
   callback(hot, event) {
     const settings = hot.getSettings();
+    const selectedRange = hot.getSelectedRangeLast();
     const tabMoves = typeof settings.tabMoves === 'function' ? settings.tabMoves(event) : settings.tabMoves;
-    hot.selection.transformStart(-tabMoves.row, -tabMoves.col);
+    if (hot.selection.isMultiple() && !selectedRange.isHeader() && hot.countRenderedCols() > 0 && hot.countRenderedRows() > 0) {
+      hot.selection.transformFocus(-tabMoves.row, -tabMoves.col);
+    } else {
+      hot.selection.transformStart(-tabMoves.row, -tabMoves.col);
+    }
   }
 };

package/shortcutContexts/commands/moveCellSelection/inlineStart.js

@@ -5,7 +5,12 @@ const command = exports.command = {
   name: 'moveCellSelectionInlineStart',
   callback(hot, event) {
     const settings = hot.getSettings();
+    const selectedRange = hot.getSelectedRangeLast();
     const tabMoves = typeof settings.tabMoves === 'function' ? settings.tabMoves(event) : settings.tabMoves;
-    hot.selection.transformStart(tabMoves.row, tabMoves.col);
+    if (hot.selection.isMultiple() && !selectedRange.isHeader() && hot.countRenderedCols() > 0 && hot.countRenderedRows() > 0) {
+      hot.selection.transformFocus(tabMoves.row, tabMoves.col);
+    } else {
+      hot.selection.transformStart(tabMoves.row, tabMoves.col);
+    }
   }
 };

package/shortcutContexts/commands/moveCellSelection/inlineStart.mjs

@@ -2,7 +2,12 @@ export const command = {
   name: 'moveCellSelectionInlineStart',
   callback(hot, event) {
     const settings = hot.getSettings();
+    const selectedRange = hot.getSelectedRangeLast();
     const tabMoves = typeof settings.tabMoves === 'function' ? settings.tabMoves(event) : settings.tabMoves;
-    hot.selection.transformStart(tabMoves.row, tabMoves.col);
+    if (hot.selection.isMultiple() && !selectedRange.isHeader() && hot.countRenderedCols() > 0 && hot.countRenderedRows() > 0) {
+      hot.selection.transformFocus(tabMoves.row, tabMoves.col);
+    } else {
+      hot.selection.transformStart(tabMoves.row, tabMoves.col);
+    }
   }
 };

package/shortcutContexts/grid.js

@@ -37,7 +37,13 @@ function shortcutsGridContext(hot) {
   });
   context.addShortcuts([{
     keys: [['Control/Meta', 'A']],
-    callback: () => commandsPool.selectAllCells()
+    callback: () => commandsPool.selectAllCells(),
+    runOnlyIf: () => !hot.getSelectedRangeLast().highlight.isHeader()
+  }, {
+    keys: [['Control/Meta', 'A']],
+    callback: () => {},
+    runOnlyIf: () => hot.getSelectedRangeLast().highlight.isHeader(),
+    preventDefault: true
   }, {
     keys: [['Control/Meta', 'Shift', 'Space']],
     callback: () => commandsPool.selectAllCellsAndHeaders()
@@ -157,12 +163,12 @@ function shortcutsGridContext(hot) {
     keys: [['Tab']],
     // The property value is controlled by focusCatcher module (https://github.com/handsontable/handsontable/blob/master/handsontable/src/core/focusCatcher/index.js)
     preventDefault: false,
-    callback: () => commandsPool.moveCellSelectionInlineStart()
+    callback: event => commandsPool.moveCellSelectionInlineStart(event)
   }, {
     keys: [['Shift', 'Tab']],
     // The property value is controlled by focusCatcher module (https://github.com/handsontable/handsontable/blob/master/handsontable/src/core/focusCatcher/index.js)
     preventDefault: false,
-    callback: () => commandsPool.moveCellSelectionInlineEnd()
+    callback: event => commandsPool.moveCellSelectionInlineEnd(event)
   }, {
     keys: [['Control/Meta', 'Backspace']],
     callback: () => commandsPool.scrollToFocusedCell()

package/shortcutContexts/grid.mjs

@@ -33,7 +33,13 @@ export function shortcutsGridContext(hot) {
   });
   context.addShortcuts([{
     keys: [['Control/Meta', 'A']],
-    callback: () => commandsPool.selectAllCells()
+    callback: () => commandsPool.selectAllCells(),
+    runOnlyIf: () => !hot.getSelectedRangeLast().highlight.isHeader()
+  }, {
+    keys: [['Control/Meta', 'A']],
+    callback: () => {},
+    runOnlyIf: () => hot.getSelectedRangeLast().highlight.isHeader(),
+    preventDefault: true
   }, {
     keys: [['Control/Meta', 'Shift', 'Space']],
     callback: () => commandsPool.selectAllCellsAndHeaders()
@@ -153,12 +159,12 @@ export function shortcutsGridContext(hot) {
     keys: [['Tab']],
     // The property value is controlled by focusCatcher module (https://github.com/handsontable/handsontable/blob/master/handsontable/src/core/focusCatcher/index.js)
     preventDefault: false,
-    callback: () => commandsPool.moveCellSelectionInlineStart()
+    callback: event => commandsPool.moveCellSelectionInlineStart(event)
   }, {
     keys: [['Shift', 'Tab']],
     // The property value is controlled by focusCatcher module (https://github.com/handsontable/handsontable/blob/master/handsontable/src/core/focusCatcher/index.js)
     preventDefault: false,
-    callback: () => commandsPool.moveCellSelectionInlineEnd()
+    callback: event => commandsPool.moveCellSelectionInlineEnd(event)
   }, {
     keys: [['Control/Meta', 'Backspace']],
     callback: () => commandsPool.scrollToFocusedCell()

package/shortcuts/context.js

@@ -90,7 +90,8 @@ const createContext = name => {
       stopPropagation
     };
     if ((0, _mixed.isDefined)(relativeToGroup)) {
-      [newShortcut.relativeToGroup, newShortcut.position] = [relativeToGroup, position];
+      newShortcut.relativeToGroup = relativeToGroup;
+      newShortcut.position = position;
     }
     if (isContextObject(forwardToContext)) {
       newShortcut.forwardToContext = forwardToContext;

package/shortcuts/context.mjs

@@ -86,7 +86,8 @@ export const createContext = name => {
       stopPropagation
     };
     if (isDefined(relativeToGroup)) {
-      [newShortcut.relativeToGroup, newShortcut.position] = [relativeToGroup, position];
+      newShortcut.relativeToGroup = relativeToGroup;
+      newShortcut.position = position;
     }
     if (isContextObject(forwardToContext)) {
       newShortcut.forwardToContext = forwardToContext;