handsontable 14.0.0-next-c648fa4-20231128 → 14.0.0-next-b112557-20231129

package/helpers/mixed.js

@@ -134,7 +134,7 @@ const domMessages = {
 function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "14.0.0-next-c648fa4-20231128";
+  const hotVersion = "14.0.0-next-b112557-20231129";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/helpers/mixed.mjs

@@ -124,7 +124,7 @@ const domMessages = {
 export function _injectProductInfo(key, element) {
   const hasValidType = !isEmpty(key);
   const isNonCommercial = typeof key === 'string' && key.toLowerCase() === 'non-commercial-and-evaluation';
-  const hotVersion = "14.0.0-next-c648fa4-20231128";
+  const hotVersion = "14.0.0-next-b112557-20231129";
   let keyValidityDate;
   let consoleMessageState = 'invalid';
   let domMessageState = 'invalid';

package/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/handsontable/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "14.0.0-next-c648fa4-20231128",
+  "version": "14.0.0-next-b112557-20231129",
   "main": "index",
   "module": "index.mjs",
   "jsnext:main": "index.mjs",

package/shortcutContexts/commands/editor/closeAndSave.js

@@ -5,7 +5,7 @@ const command = exports.command = {
   name: 'editorCloseAndSave',
   callback(hot, event, keys) {
     const editorManager = hot._getEditorManager();
-    editorManager.closeEditorAndSaveChanges(hot.getShortcutManager().isCtrlPressed());
+    editorManager.closeEditorAndSaveChanges(event.ctrlKey || event.metaKey);
     editorManager.moveSelectionAfterEnter(keys.includes('shift'));
   }
 };

package/shortcutContexts/commands/editor/closeAndSave.mjs

@@ -2,7 +2,7 @@ export const command = {
   name: 'editorCloseAndSave',
   callback(hot, event, keys) {
     const editorManager = hot._getEditorManager();
-    editorManager.closeEditorAndSaveChanges(hot.getShortcutManager().isCtrlPressed());
+    editorManager.closeEditorAndSaveChanges(event.ctrlKey || event.metaKey);
     editorManager.moveSelectionAfterEnter(keys.includes('shift'));
   }
 };

package/shortcutContexts/commands/index.js

@@ -7,9 +7,10 @@ var _extendCellsSelection = require("./extendCellsSelection");
 var _moveCellSelection = require("./moveCellSelection");
 var _emptySelectedCells = require("./emptySelectedCells");
 var _scrollToFocusedCell = require("./scrollToFocusedCell");
-var _selectAll = require("./selectAll");
+var _selectAllCells = require("./selectAllCells");
+var _selectAllCellsAndHeaders = require("./selectAllCellsAndHeaders");
 var _populateSelectedCellsData = require("./populateSelectedCellsData");
-const allCommands = [...(0, _editor.getAllCommands)(), ...(0, _extendCellsSelection.getAllCommands)(), ...(0, _moveCellSelection.getAllCommands)(), _emptySelectedCells.command, _scrollToFocusedCell.command, _selectAll.command, _populateSelectedCellsData.command];
+const allCommands = [...(0, _editor.getAllCommands)(), ...(0, _extendCellsSelection.getAllCommands)(), ...(0, _moveCellSelection.getAllCommands)(), _emptySelectedCells.command, _scrollToFocusedCell.command, _selectAllCells.command, _selectAllCellsAndHeaders.command, _populateSelectedCellsData.command];
 
 /**
  * Prepares and creates an object with all available commands to trigger.

package/shortcutContexts/commands/index.mjs

@@ -3,9 +3,10 @@ import { getAllCommands as getAllSelectionExtendCommands } from "./extendCellsSe
 import { getAllCommands as getAllSelectionMoveCommands } from "./moveCellSelection/index.mjs";
 import { command as emptySelectedCells } from "./emptySelectedCells.mjs";
 import { command as scrollToFocusedCell } from "./scrollToFocusedCell.mjs";
-import { command as selectAll } from "./selectAll.mjs";
+import { command as selectAllCells } from "./selectAllCells.mjs";
+import { command as selectAllCellsAndHeaders } from "./selectAllCellsAndHeaders.mjs";
 import { command as populateSelectedCellsData } from "./populateSelectedCellsData.mjs";
-const allCommands = [...getAllEditorCommands(), ...getAllSelectionExtendCommands(), ...getAllSelectionMoveCommands(), emptySelectedCells, scrollToFocusedCell, selectAll, populateSelectedCellsData];
+const allCommands = [...getAllEditorCommands(), ...getAllSelectionExtendCommands(), ...getAllSelectionMoveCommands(), emptySelectedCells, scrollToFocusedCell, selectAllCells, selectAllCellsAndHeaders, populateSelectedCellsData];
 
 /**
  * Prepares and creates an object with all available commands to trigger.

package/shortcutContexts/commands/{selectAll.js → selectAllCells.js}

@@ -2,7 +2,7 @@
 
 exports.__esModule = true;
 const command = exports.command = {
-  name: 'selectAll',
+  name: 'selectAllCells',
   callback(hot) {
     hot.selection.selectAll(true, true, {
       disableHeadersHighlight: true

package/shortcutContexts/commands/{selectAll.mjs → selectAllCells.mjs}

@@ -1,5 +1,5 @@
 export const command = {
-  name: 'selectAll',
+  name: 'selectAllCells',
   callback(hot) {
     hot.selection.selectAll(true, true, {
       disableHeadersHighlight: true

package/shortcutContexts/commands/selectAllCellsAndHeaders.js

@@ -0,0 +1,11 @@
+"use strict";
+
+exports.__esModule = true;
+const command = exports.command = {
+  name: 'selectAllCellsAndHeaders',
+  callback(hot) {
+    hot.selection.selectAll(true, true, {
+      disableHeadersHighlight: false
+    });
+  }
+};

package/shortcutContexts/commands/selectAllCellsAndHeaders.mjs

@@ -0,0 +1,8 @@
+export const command = {
+  name: 'selectAllCellsAndHeaders',
+  callback(hot) {
+    hot.selection.selectAll(true, true, {
+      disableHeadersHighlight: false
+    });
+  }
+};

package/shortcutContexts/editor.js

@@ -16,7 +16,11 @@ function shortcutsEditorContext(hot) {
     group: _constants.EDITOR_EDIT_GROUP
   };
   context.addShortcuts([{
-    keys: [['Enter'], ['Enter', 'Shift'], ['Enter', 'Control/Meta'], ['Enter', 'Control/Meta', 'Shift']],
+    keys: [['Enter'], ['Enter', 'Shift']],
+    callback: (event, keys) => commandsPool.editorCloseAndSave(event, keys)
+  }, {
+    keys: [['Enter', 'Control/Meta'], ['Enter', 'Control/Meta', 'Shift']],
+    captureCtrl: true,
     callback: (event, keys) => commandsPool.editorCloseAndSave(event, keys)
   }, {
     keys: [['Escape'], ['Escape', 'Control/Meta']],

package/shortcutContexts/editor.mjs

@@ -12,7 +12,11 @@ export function shortcutsEditorContext(hot) {
     group: EDITOR_EDIT_GROUP
   };
   context.addShortcuts([{
-    keys: [['Enter'], ['Enter', 'Shift'], ['Enter', 'Control/Meta'], ['Enter', 'Control/Meta', 'Shift']],
+    keys: [['Enter'], ['Enter', 'Shift']],
+    callback: (event, keys) => commandsPool.editorCloseAndSave(event, keys)
+  }, {
+    keys: [['Enter', 'Control/Meta'], ['Enter', 'Control/Meta', 'Shift']],
+    captureCtrl: true,
     callback: (event, keys) => commandsPool.editorCloseAndSave(event, keys)
   }, {
     keys: [['Escape'], ['Escape', 'Control/Meta']],

package/shortcutContexts/grid.js

@@ -36,8 +36,11 @@ function shortcutsGridContext(hot) {
     runOnlyIf: () => (0, _mixed.isDefined)(hot.getSelected())
   });
   context.addShortcuts([{
-    keys: [['Control/Meta', 'A'], ['Control/Meta', 'Shift', 'Space']],
-    callback: () => commandsPool.selectAll()
+    keys: [['Control/Meta', 'A']],
+    callback: () => commandsPool.selectAllCells()
+  }, {
+    keys: [['Control/Meta', 'Shift', 'Space']],
+    callback: () => commandsPool.selectAllCellsAndHeaders()
   }, {
     keys: [['Control/Meta', 'Enter']],
     callback: () => commandsPool.populateSelectedCellsData(),

package/shortcutContexts/grid.mjs

@@ -32,8 +32,11 @@ export function shortcutsGridContext(hot) {
     runOnlyIf: () => isDefined(hot.getSelected())
   });
   context.addShortcuts([{
-    keys: [['Control/Meta', 'A'], ['Control/Meta', 'Shift', 'Space']],
-    callback: () => commandsPool.selectAll()
+    keys: [['Control/Meta', 'A']],
+    callback: () => commandsPool.selectAllCells()
+  }, {
+    keys: [['Control/Meta', 'Shift', 'Space']],
+    callback: () => commandsPool.selectAllCellsAndHeaders()
   }, {
     keys: [['Control/Meta', 'Enter']],
     callback: () => commandsPool.populateSelectedCellsData(),