From 096b057f816870a8b844538a924620457bcf0af5 Mon Sep 17 00:00:00 2001
From: bggRGjQaUbCoE <githubaccount56556@proton.me>
Date: Fri, 17 Oct 2025 10:11:40 +0800
Subject: [PATCH] fix #1598

Signed-off-by: bggRGjQaUbCoE <githubaccount56556@proton.me>
---
 lib/pages/common/publish/common_publish_page.dart | 2 +-
 lib/pages/live_room/controller.dart               | 1 +
 lib/pages/live_room/send_danmaku/view.dart        | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/pages/common/publish/common_publish_page.dart b/lib/pages/common/publish/common_publish_page.dart
index ca364d959..c6ca1f086 100644
--- a/lib/pages/common/publish/common_publish_page.dart
+++ b/lib/pages/common/publish/common_publish_page.dart
@@ -30,7 +30,7 @@ abstract class CommonPublishPageState<T extends CommonPublishPage>
   late final controller = ChatBottomPanelContainerController<PanelType>();
   TextEditingController get editController;
 
-  Rx<PanelType> panelType = PanelType.none.obs;
+  final Rx<PanelType> panelType = PanelType.none.obs;
   late final RxBool readOnly = false.obs;
   late final RxBool enablePublish = false.obs;
 
diff --git a/lib/pages/live_room/controller.dart b/lib/pages/live_room/controller.dart
index f57a319d0..7e0d996fb 100644
--- a/lib/pages/live_room/controller.dart
+++ b/lib/pages/live_room/controller.dart
@@ -462,6 +462,7 @@ class LiveRoomController extends GetxController {
           fromEmote: fromEmote,
           liveRoomController: this,
           items: savedDanmaku,
+          autofocus: !fromEmote,
           onSave: (msg) {
             if (msg.isEmpty) {
               savedDanmaku?.clear();
diff --git a/lib/pages/live_room/send_danmaku/view.dart b/lib/pages/live_room/send_danmaku/view.dart
index a99cc8724..24fafdd57 100644
--- a/lib/pages/live_room/send_danmaku/view.dart
+++ b/lib/pages/live_room/send_danmaku/view.dart
@@ -20,6 +20,7 @@ class LiveSendDmPanel extends CommonRichTextPubPage {
     super.key,
     super.items,
     super.onSave,
+    super.autofocus = true,
     this.fromEmote = false,
     required this.liveRoomController,
   });