From 0bee802ccc85ca372f62f566aa483a63de6c4c38 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Mon, 8 Apr 2024 14:02:36 +0200 Subject: [PATCH] FIX: do not autofocus input on edit in mobile (#26554) --- .../javascripts/discourse/services/chat-channel-composer.js | 6 +++++- .../javascripts/discourse/services/chat-thread-composer.js | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-channel-composer.js b/plugins/chat/assets/javascripts/discourse/services/chat-channel-composer.js index 89ff9389244..2f23ec2756a 100644 --- a/plugins/chat/assets/javascripts/discourse/services/chat-channel-composer.js +++ b/plugins/chat/assets/javascripts/discourse/services/chat-channel-composer.js @@ -13,6 +13,7 @@ export default class ChatChannelComposer extends Service { @service loadingSlider; @service capabilities; @service appEvents; + @service site; @tracked textarea; @tracked scrollable; @@ -48,7 +49,10 @@ export default class ChatChannelComposer extends Service { this.chat.activeMessage = null; message.editing = true; message.channel.draft = message; - this.focus({ refreshHeight: true, ensureAtEnd: true }); + + if (this.site.desktopView) { + this.focus({ refreshHeight: true, ensureAtEnd: true }); + } } @action diff --git a/plugins/chat/assets/javascripts/discourse/services/chat-thread-composer.js b/plugins/chat/assets/javascripts/discourse/services/chat-thread-composer.js index 7eff7352dea..c58b3ac4f17 100644 --- a/plugins/chat/assets/javascripts/discourse/services/chat-thread-composer.js +++ b/plugins/chat/assets/javascripts/discourse/services/chat-thread-composer.js @@ -8,6 +8,7 @@ export default class ChatThreadComposer extends Service { @service chat; @service capabilities; @service appEvents; + @service site; @tracked textarea; @tracked scrollable; @@ -43,7 +44,10 @@ export default class ChatThreadComposer extends Service { this.chat.activeMessage = null; message.editing = true; message.thread.draft = message; - this.focus({ refreshHeight: true, ensureAtEnd: true }); + + if (this.site.desktopView) { + this.focus({ refreshHeight: true, ensureAtEnd: true }); + } } @action