Skip to content

🎥 Make videos programmatically with React

`@remotion/studio`: Omit default shortcut overrides

JonnyBurger9735712a388d
diff --git a/packages/example/e2e/studio.test.mts b/packages/example/e2e/studio.test.mts
index a39642004d..32227c47cd 100644
--- a/packages/example/e2e/studio.test.mts
+++ b/packages/example/e2e/studio.test.mts
@@ -1862,7 +1862,12 @@ test.describe('visual mode', () => {
.toContain('Config.setKeyboardShortcuts({');
await expect(playPauseShortcut).toContainText('Q');
await playPauseActions.click();
- await page.getByText('Reset to default', {exact: true}).click();
+ await expect(
+ page.getByText('Reset to default', {exact: true}),
+ ).toBeVisible();
+ await page.getByText('Remap shortcut', {exact: true}).click();
+ await expect(playPauseShortcut).toContainText('Press shortcut');
+ await page.keyboard.press('Space');
await expect
.poll(() => fs.readFileSync(configFile, 'utf8'))
.not.toContain("'playPause'");
diff --git a/packages/studio/src/components/KeyboardShortcutsSettings.tsx b/packages/studio/src/components/KeyboardShortcutsSettings.tsx
index 35b4f8c9be..b23473bca5 100644
--- a/packages/studio/src/components/KeyboardShortcutsSettings.tsx
+++ b/packages/studio/src/components/KeyboardShortcutsSettings.tsx
@@ -21,6 +21,7 @@ import {InlineDropdown} from './InlineDropdown';
import {sectionHeader} from './InspectorPanel/styles';
import {
askAIKeyboardShortcutGroup,
+ defaultKeyboardShortcuts,
formatKeyboardShortcut,
getKeyboardShortcutsForAction,
keyboardShortcutGroups,
@@ -418,10 +419,24 @@ export const KeyboardShortcutsSettings: React.FC = () => {
return;
}
- setConfiguredShortcuts((current) => ({
- ...current,
- [shortcut.actionId!]: value,
- }));
+ setConfiguredShortcuts((current) => {
+ if (
+ defaultKeyboardShortcuts[
+ shortcut.actionId!
+ ].some((defaultShortcut) =>
+ isSameShortcut(defaultShortcut, value),
+ )
+ ) {
+ const next = {...current};
+ delete next[shortcut.actionId!];
+ return next;
+ }
+
+ return {
+ ...current,
+ [shortcut.actionId!]: value,
+ };
+ });
setShortcutsEdited(true);
setRecording(null);
}}