mirror of
https://github.com/lingble/chatwoot.git
synced 2025-11-02 20:18:08 +00:00
# Pull Request Template ## Description This PR includes UI changes to dynamically add the `Shift` key to the key set `Alt+KeyP` and `Alt+KeyL` in the keyboard shortcut modal for the `QWERTZ` layout. **Context** Previously, the `Alt+L` shortcut for toggling the reply editor conflicted with the `@` symbol on the QWERTZ layout in macOS. The new `useDetectLayout` composable checks the active keyboard layout. If `QWERTZ` is detected, the shortcuts are modified to `Shift+Alt+KeyP` and `Shift+Alt+KeyL`. [PR with the functionality changes](https://github.com/chatwoot/chatwoot/pull/9831#event-13764407813) Fixes https://linear.app/chatwoot/issue/PR-1095/typing-a-in-private-note-switches-to-reply-tab-with-german-keyboard ## Type of change - [x] Breaking change (fix or feature that would cause existing functionality not to work as expected) ## How Has This Been Tested? **Loom video** https://www.loom.com/share/35b741c5afc64bc58bd4e7dc5dad012d?sid=f66ca0bf-b6a7-40fc-8972-ff0cd0196a16 ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [x] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules
142 lines
5.2 KiB
Vue
142 lines
5.2 KiB
Vue
<script setup>
|
|
import { ref, onMounted } from 'vue';
|
|
import { useI18n } from 'dashboard/composables/useI18n';
|
|
import { useDetectKeyboardLayout } from 'dashboard/composables/useDetectKeyboardLayout';
|
|
import { SHORTCUT_KEYS } from './constants';
|
|
import {
|
|
LAYOUT_QWERTZ,
|
|
keysToModifyInQWERTZ,
|
|
} from 'shared/helpers/KeyboardHelpers';
|
|
import Hotkey from 'dashboard/components/base/Hotkey.vue';
|
|
|
|
defineProps({
|
|
show: {
|
|
type: Boolean,
|
|
default: false,
|
|
},
|
|
});
|
|
|
|
const { t } = useI18n();
|
|
|
|
const shortcutKeys = SHORTCUT_KEYS;
|
|
const currentLayout = ref(null);
|
|
|
|
const title = item => t(`KEYBOARD_SHORTCUTS.TITLE.${item.label}`);
|
|
|
|
// Added this function to check if the keySet needs a shift key
|
|
// This is used to display the shift key in the modal
|
|
// If the current layout is QWERTZ and the keySet contains a key that needs a shift key
|
|
// If layout is QWERTZ then we add the Shift+keysToModify to fix an known issue
|
|
// https://github.com/chatwoot/chatwoot/issues/9492
|
|
const needsShiftKey = keySet => {
|
|
return (
|
|
currentLayout.value === LAYOUT_QWERTZ &&
|
|
keySet.some(key => keysToModifyInQWERTZ.has(key))
|
|
);
|
|
};
|
|
|
|
onMounted(async () => {
|
|
currentLayout.value = await useDetectKeyboardLayout();
|
|
});
|
|
</script>
|
|
|
|
<template>
|
|
<woot-modal :show="show" size="medium" :on-close="() => $emit('close')">
|
|
<div class="flex flex-col h-auto overflow-auto">
|
|
<woot-modal-header
|
|
:header-title="$t('SIDEBAR_ITEMS.KEYBOARD_SHORTCUTS')"
|
|
/>
|
|
<div class="grid grid-cols-2 px-8 pt-0 pb-4 mt-6 gap-x-5 gap-y-3">
|
|
<div class="flex justify-between items-center min-w-[25rem]">
|
|
<h5 class="text-sm text-slate-800 dark:text-slate-100">
|
|
{{ $t('KEYBOARD_SHORTCUTS.TOGGLE_MODAL') }}
|
|
</h5>
|
|
<div class="flex items-center gap-2 mb-1 ml-2">
|
|
<Hotkey custom-class="min-h-[28px] min-w-[60px] normal-case key">
|
|
{{ $t('KEYBOARD_SHORTCUTS.KEYS.WINDOWS_KEY_AND_COMMAND_KEY') }}
|
|
</Hotkey>
|
|
<Hotkey custom-class="min-h-[28px] min-w-[36px] key">
|
|
{{ $t('KEYBOARD_SHORTCUTS.KEYS.FORWARD_SLASH_KEY') }}
|
|
</Hotkey>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="grid grid-cols-2 px-8 pt-0 pb-8 gap-x-5 gap-y-3">
|
|
<div class="flex justify-between items-center min-w-[25rem]">
|
|
<h5 class="text-sm text-slate-800 dark:text-slate-100">
|
|
{{ $t('KEYBOARD_SHORTCUTS.TITLE.OPEN_CONVERSATION') }}
|
|
</h5>
|
|
<div class="flex items-center gap-2 mb-1 ml-2">
|
|
<div class="flex gap-2">
|
|
<Hotkey custom-class="min-h-[28px] min-w-[60px] normal-case key">
|
|
{{ $t('KEYBOARD_SHORTCUTS.KEYS.ALT_OR_OPTION_KEY') }}
|
|
</Hotkey>
|
|
<Hotkey custom-class="min-h-[28px] w-9 key"> {{ 'J' }} </Hotkey>
|
|
<span
|
|
class="flex items-center text-sm font-semibold text-slate-800 dark:text-slate-100"
|
|
>
|
|
{{ $t('KEYBOARD_SHORTCUTS.KEYS.FORWARD_SLASH_KEY') }}
|
|
</span>
|
|
</div>
|
|
<Hotkey custom-class="min-h-[28px] min-w-[60px] normal-case key">
|
|
{{ $t('KEYBOARD_SHORTCUTS.KEYS.ALT_OR_OPTION_KEY') }}
|
|
</Hotkey>
|
|
<Hotkey custom-class="w-9 key"> {{ 'K' }} </Hotkey>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="flex justify-between items-center min-w-[25rem]">
|
|
<h5 class="text-sm text-slate-800 dark:text-slate-100">
|
|
{{ $t('KEYBOARD_SHORTCUTS.TITLE.RESOLVE_AND_NEXT') }}
|
|
</h5>
|
|
<div class="flex items-center gap-2 mb-1 ml-2">
|
|
<Hotkey custom-class="min-h-[28px] min-w-[60px] normal-case key">
|
|
{{ $t('KEYBOARD_SHORTCUTS.KEYS.WINDOWS_KEY_AND_COMMAND_KEY') }}
|
|
</Hotkey>
|
|
<Hotkey custom-class="min-h-[28px] min-w-[60px] normal-case key">
|
|
{{ $t('KEYBOARD_SHORTCUTS.KEYS.ALT_OR_OPTION_KEY') }}
|
|
</Hotkey>
|
|
<Hotkey custom-class="w-9 key"> {{ 'E' }} </Hotkey>
|
|
</div>
|
|
</div>
|
|
<div
|
|
v-for="shortcutKey in shortcutKeys"
|
|
:key="shortcutKey.id"
|
|
class="flex justify-between items-center min-w-[25rem]"
|
|
>
|
|
<h5 class="text-sm text-slate-800 min-w-[36px] dark:text-slate-100">
|
|
{{ title(shortcutKey) }}
|
|
</h5>
|
|
<div class="flex items-center gap-2 mb-1 ml-2">
|
|
<Hotkey
|
|
v-if="needsShiftKey(shortcutKey.keySet)"
|
|
custom-class="min-h-[28px] min-w-[36px] key"
|
|
>
|
|
{{ 'Shift' }}
|
|
</Hotkey>
|
|
<Hotkey
|
|
:class="{ 'min-w-[60px]': shortcutKey.firstKey !== 'Up' }"
|
|
custom-class="min-h-[28px] normal-case key"
|
|
>
|
|
{{ shortcutKey.firstKey }}
|
|
</Hotkey>
|
|
<Hotkey
|
|
:class="{ 'normal-case': shortcutKey.secondKey === 'Down' }"
|
|
custom-class="min-h-[28px] min-w-[36px] key"
|
|
>
|
|
{{ shortcutKey.secondKey }}
|
|
</Hotkey>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</woot-modal>
|
|
</template>
|
|
|
|
<style scoped>
|
|
.key {
|
|
@apply py-2 px-2.5 font-semibold text-xs text-slate-700 dark:text-slate-100 bg-slate-75 dark:bg-slate-900 shadow border-b-2 rtl:border-l-2 ltr:border-r-2 border-slate-200 dark:border-slate-700;
|
|
}
|
|
</style>
|