[CB] Shortcuts for the Data Editor

webapp/packages/core-view/src/View/CaptureView.tsx

@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import styles from './CaptureView.module.css';
 import { CaptureViewContext } from './CaptureViewContext.js';
 import type { IView } from './IView.js';
-import { parseHotkey } from './parseHotkey.js';
+import { mapShortcut, parseHotkey } from './parseHotkey.js';
 import { useActiveView } from './useActiveView.js';
 import { useViewContext } from './useViewContext.js';
 
@@ -40,7 +40,10 @@
     .filter(action => action?.binding && !action.isDisabled())
     .filter(Boolean) as IActionItem[];
 
-  const keys = actionItems.map(item => getCommonAndOSSpecificKeys(item.binding?.binding)).flat();
+  const keys = actionItems
+    .map(item => getCommonAndOSSpecificKeys(item.binding?.binding))
+    .flat()
+    .map(item => mapShortcut(item));
 
   useHotkeys(
     keys,
@@ -58,6 +61,8 @@
         });
       });
 
+      console.log(action);
+
       action?.activate(true);
     },
     {

webapp/packages/core-view/src/View/parseHotkey.ts

@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,10 @@ export function mapKey(key: string): string {
     .replace(/key|digit|numpad|arrow/, '');
 }
 
+export function mapShortcut(shortcut: string, combinationKey = '+'): string {
+  return shortcut.split(combinationKey).map(mapKey).join(combinationKey);
+}
+
 export function isHotkeyModifier(key: string): boolean {
   return reservedModifierKeywords.includes(key);
 }

webapp/packages/plugin-data-viewer/src/DATA_VIEWER_KEY_BINDINGS.ts

@@ -1,6 +1,6 @@
 /*
  * CloudBeaver - Cloud Database Manager
- * Copyright (C) 2020-2025 DBeaver Corp and others
+ * Copyright (C) 2020-2026 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0.
  * you may not use this file except in compliance with the License.
@@ -34,5 +34,5 @@ export const KEY_BINDING_SAVE: IKeyBinding = {
 
 export const KEY_BINDING_CANCEL: IKeyBinding = {
   id: 'data-viewer-cancel',
-  keys: ['Alt+Escape'],
+  keys: ['mod+.'],
 };