diff --git a/desktop/flipper-common/src/settings.tsx b/desktop/flipper-common/src/settings.tsx index 9568d7680..14d2ae646 100644 --- a/desktop/flipper-common/src/settings.tsx +++ b/desktop/flipper-common/src/settings.tsx @@ -29,13 +29,6 @@ export type Settings = { */ enablePrefetching: Tristate; idbPath: string; - reactNative: { - shortcuts: { - enabled: boolean; - reload: string; - openDevMenu: string; - }; - }; darkMode: 'dark' | 'light' | 'system'; showWelcomeAtStartup: boolean; suppressPluginErrors: boolean; diff --git a/desktop/flipper-server-core/src/utils/settings.tsx b/desktop/flipper-server-core/src/utils/settings.tsx index 5c4a9b3ba..996a5fe67 100644 --- a/desktop/flipper-server-core/src/utils/settings.tsx +++ b/desktop/flipper-server-core/src/utils/settings.tsx @@ -56,13 +56,6 @@ function getDefaultSettings(): Settings { enablePhysicalIOS: os.platform() === 'darwin', enablePrefetching: Tristate.Unset, idbPath: '/usr/local/bin/idb', - reactNative: { - shortcuts: { - enabled: false, - reload: 'Alt+Shift+R', - openDevMenu: 'Alt+Shift+D', - }, - }, darkMode: 'light', showWelcomeAtStartup: true, suppressPluginErrors: false, diff --git a/desktop/flipper-ui-core/src/chrome/SettingsSheet.tsx b/desktop/flipper-ui-core/src/chrome/SettingsSheet.tsx index 96cf0a942..373bf7fe5 100644 --- a/desktop/flipper-ui-core/src/chrome/SettingsSheet.tsx +++ b/desktop/flipper-ui-core/src/chrome/SettingsSheet.tsx @@ -23,7 +23,6 @@ import { ConfigText, URLConfigField, } from './settings/configFields'; -import KeyboardShortcutInput from './settings/KeyboardShortcutInput'; import {isEqual, isMatch, isEmpty} from 'lodash'; import LauncherSettingsPanel from '../fb-stubs/LauncherSettingsPanel'; import { @@ -124,7 +123,6 @@ class SettingsSheet extends Component { enablePhysicalIOS, enablePrefetching, idbPath, - reactNative, darkMode, suppressPluginErrors, persistDeviceData, @@ -294,60 +292,6 @@ class SettingsSheet extends Component { Use System Setting - { - this.setState((prevState) => ({ - updatedSettings: { - ...prevState.updatedSettings, - reactNative: { - ...prevState.updatedSettings.reactNative, - shortcuts: { - ...prevState.updatedSettings.reactNative.shortcuts, - enabled, - }, - }, - }, - })); - }}> - { - this.setState((prevState) => ({ - updatedSettings: { - ...prevState.updatedSettings, - reactNative: { - ...prevState.updatedSettings.reactNative, - shortcuts: { - ...prevState.updatedSettings.reactNative.shortcuts, - reload, - }, - }, - }, - })); - }} - /> - { - this.setState((prevState) => ({ - updatedSettings: { - ...prevState.updatedSettings, - reactNative: { - ...prevState.updatedSettings.reactNative, - shortcuts: { - ...prevState.updatedSettings.reactNative.shortcuts, - openDevMenu, - }, - }, - }, - })); - }} - /> - { - const settings = store.getState().settingsState.reactNative; - - if (!settings?.shortcuts.enabled) { - return; - } - - const shortcuts: ShortcutEventCommand[] = [ - settings.shortcuts.reload && { - shortcut: settings.shortcuts.reload, - command: 'reload', - }, - settings.shortcuts.openDevMenu && { - shortcut: settings.shortcuts.openDevMenu, - command: 'devMenu', - }, - ]; - - shortcuts.forEach( - (shortcut: ShortcutEventCommand) => - shortcut && - shortcut.shortcut && - registerShortcut(shortcut.shortcut, () => { - const devices = store - .getState() - .connections.devices.filter( - (device) => device.os === 'Metro' && !device.isArchived, - ); - - devices.forEach((device) => - device.flipperServer.exec( - 'metro-command', - device.serial, - shortcut.command, - ), - ); - }), - ); -}; diff --git a/desktop/scripts/jest-setup-after.tsx b/desktop/scripts/jest-setup-after.tsx index 57a3066e7..20e2eafc9 100644 --- a/desktop/scripts/jest-setup-after.tsx +++ b/desktop/scripts/jest-setup-after.tsx @@ -184,9 +184,6 @@ function createStubRenderHost(): RenderHost { enablePhysicalIOS: false, enablePrefetching: Tristate.False, idbPath: `/dev/null`, - reactNative: { - shortcuts: {enabled: false, openDevMenu: '', reload: ''}, - }, showWelcomeAtStartup: false, suppressPluginErrors: false, persistDeviceData: false,