diff --git a/packages/bruno-app/src/components/CodeEditor/index.js b/packages/bruno-app/src/components/CodeEditor/index.js index 9a269c3146..1292600212 100644 --- a/packages/bruno-app/src/components/CodeEditor/index.js +++ b/packages/bruno-app/src/components/CodeEditor/index.js @@ -84,8 +84,8 @@ export default class CodeEditor extends React.Component { this.searchBarRef.current?.focus(); }); }, - 'Cmd-H': 'replace', - 'Ctrl-H': 'replace', + 'Cmd-H': this.props.readOnly ? false : 'replace', + 'Ctrl-H': this.props.readOnly ? false : 'replace', 'Tab': function (cm) { cm.getSelection().includes('\n') || editor.getLine(cm.getCursor().line) == cm.getSelection() ? cm.execCommand('indentMore') diff --git a/packages/bruno-app/src/components/Preferences/Keybindings/index.js b/packages/bruno-app/src/components/Preferences/Keybindings/index.js index e3863fb8ba..f922ec0141 100644 --- a/packages/bruno-app/src/components/Preferences/Keybindings/index.js +++ b/packages/bruno-app/src/components/Preferences/Keybindings/index.js @@ -218,23 +218,21 @@ const RESERVED_BY_OS = { comboSignature(['f12']) // Dashboard (older macOS) ]), windows: new Set([ + // System-level shortcuts (intercepted by Windows before reaching the app) comboSignature(['alt', 'tab']), + comboSignature(['alt', 'shift', 'tab']), comboSignature(['alt', 'f4']), - comboSignature(['f1']), // Windows Help + comboSignature(['alt', 'esc']), + comboSignature(['alt', 'space']), comboSignature(['ctrl', 'alt', 'delete']), - comboSignature(['command', 'l']), - comboSignature(['command', 'd']), - comboSignature(['command', 'e']), - comboSignature(['command', 'r']), - comboSignature(['command', 'i']), - comboSignature(['command', 's']), - comboSignature(['command', 'a']), - comboSignature(['command', 'x']), - comboSignature(['command', 'm']), - comboSignature(['command', 'tab']), comboSignature(['ctrl', 'shift', 'esc']), + // Function keys + comboSignature(['f1']), // Windows Help + comboSignature(['f11']), // Fullscreen toggle + comboSignature(['f12']), // DevTools // Undo/Redo - standard text editing shortcuts that browsers handle natively comboSignature(['ctrl', 'z']), + comboSignature(['ctrl', 'y']), comboSignature(['ctrl', 'shift', 'z']), // Toggle Developer Tools comboSignature(['ctrl', 'shift', 'i']) diff --git a/packages/bruno-app/src/components/RequestTabs/RequestTab/index.js b/packages/bruno-app/src/components/RequestTabs/RequestTab/index.js index 10a488875c..9d7b5b1705 100644 --- a/packages/bruno-app/src/components/RequestTabs/RequestTab/index.js +++ b/packages/bruno-app/src/components/RequestTabs/RequestTab/index.js @@ -225,7 +225,11 @@ const RequestTab = ({ tab, collection, tabIndex, collectionRequestTabs, folderUi if (tab.type === 'environment-settings') { if (collection?.environmentsDraft) { const { environmentUid, variables } = collection.environmentsDraft; - dispatch(saveEnvironment(variables, environmentUid, collection.uid)); + if (environmentUid?.startsWith('dotenv:')) { + window.dispatchEvent(new Event('dotenv-save')); + } else { + dispatch(saveEnvironment(variables, environmentUid, collection.uid)); + } } } else if (tab.type === 'global-environment-settings') { if (globalEnvironmentDraft) { diff --git a/packages/bruno-app/src/components/Sidebar/NewRequest/index.js b/packages/bruno-app/src/components/Sidebar/NewRequest/index.js index 4023d801db..f44ac7f1e5 100644 --- a/packages/bruno-app/src/components/Sidebar/NewRequest/index.js +++ b/packages/bruno-app/src/components/Sidebar/NewRequest/index.js @@ -316,18 +316,6 @@ const NewRequest = ({ collectionUid, item, isEphemeral, onClose }) => {
{ - if (e.key === 'Enter' && !e.defaultPrevented) { - const isTextInput - = ['input', 'textarea'].includes(e.target.tagName.toLowerCase()) - || e.target.isContentEditable; - - if (!isTextInput) { - e.preventDefault(); - formik.handleSubmit(); - } - } - }} >