diff --git a/src/components/AChat/AChatForm.vue b/src/components/AChat/AChatForm.vue index 36eb30a4d..964eae02b 100644 --- a/src/components/AChat/AChatForm.vue +++ b/src/components/AChat/AChatForm.vue @@ -18,13 +18,20 @@ density="compact" color="primary" v-on="listeners" + autofocus > + -
@@ -33,8 +40,10 @@ diff --git a/src/components/EmojiPicker.vue b/src/components/EmojiPicker.vue index d4a3b5b26..700290a83 100644 --- a/src/components/EmojiPicker.vue +++ b/src/components/EmojiPicker.vue @@ -14,6 +14,8 @@ import { useTheme } from '@/hooks/useTheme' import axios from 'axios' import { defineComponent, onMounted, ref } from 'vue' import { Picker } from 'emoji-mart' +import { isMobile } from '@/lib/display-mobile' + const className = 'emoji-picker' const classes = { root: className @@ -36,6 +38,7 @@ export default defineComponent({ picker.value = new Picker({ data, + autoFocus: !isMobile(), // disable autofocus on mobile devices dynamicWidth: true, navPosition: 'none', previewPosition: 'none', diff --git a/src/lib/display-mobile.ts b/src/lib/display-mobile.ts new file mode 100644 index 000000000..72683b7ba --- /dev/null +++ b/src/lib/display-mobile.ts @@ -0,0 +1,8 @@ +import { detect } from 'detect-browser' + +export function isMobile(): boolean { + const browser = detect() + const isMobileDevice = + browser && browser.os ? ['android', 'ios'].includes(browser.os.toLowerCase()) : false + return isMobileDevice || window.innerWidth < 450 +} diff --git a/src/locales/de.json b/src/locales/de.json index 1ffbd4ddc..85f49e6c6 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -17,8 +17,6 @@ "estimate_fee": "Voraussichtliche Gebühr", "incorrect_address": "Fehlerhafte Empfängeradresse", "message": "Gib deine Nachricht ein", - "message_mac_os": "Type a message. Cmd + Ctrl + Space for Emoji picker", - "message_windows_10": "Type a message. Win + . for Emoji picker", "new_chat": "Starte neuen Chat", "new_chat_tooltip": "Klicke hier um eine neue Konversation zu starten", "no_address": "Bitte gib die Empfängeradresse an", diff --git a/src/locales/en.json b/src/locales/en.json index 7ded3de6a..d01ce881f 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -18,8 +18,6 @@ "unable_to_retrieve_no_public_key": "`Unable to decrypt message: no partner's public key`", "me": "Me", "message": "Type a message", - "message_mac_os": "Type a message. Cmd + Ctrl + Space for Emoji picker", - "message_windows_10": "Type a message. Win + . for Emoji picker", "my_qr_code": "My QR code", "new_chat": "Start a new chat", "no_connection": "No Internet connection", diff --git a/src/locales/ru.json b/src/locales/ru.json index 6283e870e..afdcda095 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -18,8 +18,6 @@ "unable_to_retrieve_no_public_key": "`Не могу прочитать сообщение: нет публичного ключа собеседника`", "me": "Я", "message": "Введите сообщение", - "message_mac_os": "Введите сообщение. Cmd + Ctrl + Space для выбора смайлика", - "message_windows_10": "Введите сообщение. Win + . для выбора смайлика", "my_qr_code": "Мой QR-код", "new_chat": "Начать новый чат", "no_connection": "Нет подключения к Интернету", diff --git a/src/locales/zh.json b/src/locales/zh.json index 962752bd2..81a112dea 100644 --- a/src/locales/zh.json +++ b/src/locales/zh.json @@ -18,8 +18,6 @@ "unable_to_retrieve_no_public_key": "`无法解密消息:没有合作伙伴的公钥`", "me": "我", "message": "键入消息", - "message_mac_os": "键入消息。Cmd+Ctrl+Space for表情符号选取器", - "message_windows_10": "为表情符号选取器键入消息.Win+.", "my_qr_code": "我的二维码", "new_chat": "开始新的聊天", "no_connection": "没有Internet连接",