fix: use isMobile function from lib/display-mobile.ts

Adamant-im · Feb 26, 2024 · abb6773 · abb6773
1 parent 895e583
commit abb6773
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/src/components/AChat/AChatForm.vue b/src/components/AChat/AChatForm.vue
@@ -18,7 +18,7 @@
       density="compact"
       color="primary"
       v-on="listeners"
-      autofocus
+      :autofocus="isDesktopDevice"
     >
       <template #prepend-inner>
         <chat-emojis
@@ -41,6 +41,7 @@
 <script>
 import { nextTick } from 'vue'
 import ChatEmojis from '@/components/Chat/ChatEmojis.vue'
+import { isMobile } from '@/lib/display-mobile'
 
 export default {
   components: { ChatEmojis },
@@ -83,6 +84,7 @@ export default {
     emojiPickerOpen: false
   }),
   computed: {
+    isDesktopDevice: () => !isMobile(),
     className: () => 'a-chat',
     classes() {
       return [
@@ -136,8 +138,6 @@ export default {
     if (this.messageText) {
       this.message = this.messageText
       this.focus()
-    } else if (!this.$isMobile) {
-      this.focus()
     }
     this.attachKeyCommandListener()
   },

diff --git a/src/main.ts b/src/main.ts
@@ -20,16 +20,6 @@ import 'dayjs/locale/ru'
 const app = createApp(App)
 
 app.config.globalProperties.appVersion = packageJSON.version
-const isTouchable =  'ontouchstart' in window || navigator.maxTouchPoints > 0;
-const isMobileUserAgent =  navigator.userAgent.match(/Android/i)
-  || navigator.userAgent.match(/webOS/i)
-  || navigator.userAgent.match(/iPhone/i)
-  || navigator.userAgent.match(/iPad/i)
-  || navigator.userAgent.match(/iPod/i)
-  || navigator.userAgent.match(/BlackBerry/i)
-  || navigator.userAgent.match(/Windows Phone/i)
-
-app.config.globalProperties.$isMobile = isTouchable && isMobileUserAgent
 
 app.use(router)
 app.use(store)