From 65022f7c9958ab09201822422a94c4a8c08819d6 Mon Sep 17 00:00:00 2001 From: d9k Date: Wed, 17 Jul 2024 15:52:27 +0500 Subject: [PATCH 1/2] hotkeys: add russian letters for components inspector support --- .../src/features/components/ComponentsInspector.vue | 4 ++-- .../src/features/components/SelectedComponentPane.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/app-frontend/src/features/components/ComponentsInspector.vue b/packages/app-frontend/src/features/components/ComponentsInspector.vue index 4b4076056..289d94828 100644 --- a/packages/app-frontend/src/features/components/ComponentsInspector.vue +++ b/packages/app-frontend/src/features/components/ComponentsInspector.vue @@ -43,11 +43,11 @@ export default defineComponent({ onKeyDown((event) => { // ƒ,ß,® - these are the result keys in Mac with altKey pressed - if ((event.key === 'f' || event.key === 'ƒ') && event.altKey) { + if (((['f', 'ƒ', 'а']).includes(event.key)) && event.altKey) { treeFilterInput.value.focus() return false } - else if ((event.key === 's' || event.key === 'ß') && event.altKey && !pickingComponent.value) { + else if ((['s', 'ß', 'ы']).includes(event.key) && event.altKey && !pickingComponent.value) { startPickingComponent() return false } diff --git a/packages/app-frontend/src/features/components/SelectedComponentPane.vue b/packages/app-frontend/src/features/components/SelectedComponentPane.vue index c1e6673d8..ec40bb2e4 100644 --- a/packages/app-frontend/src/features/components/SelectedComponentPane.vue +++ b/packages/app-frontend/src/features/components/SelectedComponentPane.vue @@ -34,7 +34,7 @@ export default defineComponent({ const stateFilterInput = ref() onKeyDown((event) => { // ∂ - the result key in Mac with altKey pressed - if ((event.key === 'd' || event.key === '∂') && event.altKey) { + if ((['d', '∂', 'в'].includes(event.key)) && event.altKey) { stateFilterInput.value.focus() return false } From f8e9f738a272fe36daafbe708a12d1edf3975912 Mon Sep 17 00:00:00 2001 From: d9k Date: Wed, 17 Jul 2024 16:19:41 +0500 Subject: [PATCH 2/2] #2175 hotkeys: alt-O to open selected component in editor --- .../src/features/components/SelectedComponentPane.vue | 10 +++++++++- packages/app-frontend/src/locales/en.js | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/app-frontend/src/features/components/SelectedComponentPane.vue b/packages/app-frontend/src/features/components/SelectedComponentPane.vue index ec40bb2e4..9b0124254 100644 --- a/packages/app-frontend/src/features/components/SelectedComponentPane.vue +++ b/packages/app-frontend/src/features/components/SelectedComponentPane.vue @@ -3,7 +3,7 @@ import StateInspector from '@front/features/inspector/StateInspector.vue' import EmptyPane from '@front/features/layout/EmptyPane.vue' import { computed, defineComponent, ref, watch } from 'vue' -import { SharedData, copyToClipboard, getComponentDisplayName } from '@vue-devtools/shared-utils' +import { SharedData, copyToClipboard, getComponentDisplayName, openInEditor } from '@vue-devtools/shared-utils' import { onKeyDown } from '@front/util/keyboard' import RenderCode from './RenderCode.vue' import { useSelectedComponent } from './composable' @@ -38,6 +38,14 @@ export default defineComponent({ stateFilterInput.value.focus() return false } + + if ((['o', 'o', 'щ']).includes(event.key) && event.altKey) { + const file = selectedComponent.data.value?.file + if (file) { + openInEditor(file) + } + return false + } }, true) const sameApp = computed(() => selectedComponent.data.value?.id.split(':')[0] === selectedComponentId.value?.split(':')[0]) diff --git a/packages/app-frontend/src/locales/en.js b/packages/app-frontend/src/locales/en.js index cff0ebef0..b7515f4e0 100644 --- a/packages/app-frontend/src/locales/en.js +++ b/packages/app-frontend/src/locales/en.js @@ -70,7 +70,7 @@ export default { }, ComponentInspector: { openInEditor: { - tooltip: 'Open <>{{file}} in editor', + tooltip: '[[{{keys.alt}}]] + [[O]] Open <>{{file}} in editor', }, }, EventsHistory: {