merge: 合并 K86.14 评论输入紧凑弹窗修正

lib/pages/player/widgets/comment_composer_sheet.dart

@@ -147,13 +147,6 @@ class _CommentComposerSheetState extends State<CommentComposerSheet>
 
   @override
   Widget build(BuildContext context) {
-    final screenHeight = MediaQuery.sizeOf(context).height;
-    final halfHeight = (screenHeight * 0.5).roundToDouble();
-    final maxHeight = math.max(
-      0.0,
-      screenHeight - MediaQuery.paddingOf(context).top,
-    );
-    final sheetHeight = math.min(halfHeight, maxHeight);
     final keyboardHeight = _keyboardHeight(context);
     final l10n = AppLocalizations.of(context)!;
     final signedIn = context.watch<AuthController>().isSignedIn;
@@ -167,7 +160,7 @@ class _CommentComposerSheetState extends State<CommentComposerSheet>
       padding: EdgeInsets.only(bottom: keyboardHeight),
       child: SizedBox(
         key: const Key('comment-composer-sheet'),
-        height: sheetHeight,
+        width: double.infinity,
         child: Material(
           color: AppColors.card,
           clipBehavior: Clip.antiAlias,
@@ -177,9 +170,10 @@ class _CommentComposerSheetState extends State<CommentComposerSheet>
           child: SafeArea(
             top: false,
             child: Padding(
-              padding: const EdgeInsets.fromLTRB(16, 16, 16, 12),
+              padding: const EdgeInsets.fromLTRB(16, 12, 16, 12),
               child: TextFieldTapRegion(
                 child: Column(
+                  mainAxisSize: MainAxisSize.min,
                   crossAxisAlignment: CrossAxisAlignment.stretch,
                   children: [
                     if (widget.replyTo != null)
@@ -197,10 +191,7 @@ class _CommentComposerSheetState extends State<CommentComposerSheet>
                           ),
                         ),
                       ),
-                    Expanded(
+                    Container(
-                      child: Align(
-                        alignment: Alignment.topCenter,
-                        child: Container(
                       decoration: BoxDecoration(
                         color: AppColors.commentInput,
                         borderRadius: BorderRadius.circular(_inputRadius),
@@ -248,8 +239,6 @@ class _CommentComposerSheetState extends State<CommentComposerSheet>
                         },
                       ),
                     ),
-                      ),
-                    ),
                     const SizedBox(height: 12),
                     Align(
                       alignment: Alignment.centerRight,

test/comment/drama_comments_sheet_test.dart

@@ -106,7 +106,8 @@ void main() {
 
     final composer = find.byKey(const Key('comment-composer-sheet'));
     expect(composer, findsOneWidget);
-    expect(tester.getSize(composer).height, closeTo(844 / 2, 0.1));
+    final compactHeight = tester.getSize(composer).height;
+    expect(compactHeight, inInclusiveRange(100, 150));
     final input = find.byKey(const Key('comment-composer-input'));
     expect(input, findsOneWidget);
     expect(tester.widget<TextField>(input).focusNode?.hasFocus, isTrue);
@@ -117,6 +118,8 @@ void main() {
 
     await tester.enterText(input, 'First line\nSecond line');
     await tester.pump();
+    expect(tester.getSize(composer).height, greaterThan(compactHeight));
+    expect(tester.getSize(composer).height, lessThan(844 / 2));
     final multilineField = tester.widget<TextField>(input);
     expect(multilineField.textAlignVertical, TextAlignVertical.top);
     expect(multilineField.style?.height, 1.4);
@@ -313,7 +316,8 @@ void main() {
     final composer = find.byKey(const Key('comment-composer-sheet'));
     final composerInput = find.byKey(const Key('comment-composer-input'));
     expect(composer, findsOneWidget);
-    expect(tester.getSize(composer).height, closeTo(844 / 2, 0.1));
+    final compactHeight = tester.getSize(composer).height;
+    expect(compactHeight, inInclusiveRange(100, 150));
     expect(tester.widget<TextField>(composerInput).focusNode?.hasFocus, isTrue);
     final underlyingSheet = find.byKey(
       const Key('player-comments-sheet'),
@@ -333,7 +337,7 @@ void main() {
     tester.view.viewInsets = const FakeViewPadding(bottom: 180);
     await tester.pump();
     await tester.pump(const Duration(milliseconds: 200));
-    expect(tester.getSize(composer).height, closeTo(844 / 2, 0.1));
+    expect(tester.getSize(composer).height, closeTo(compactHeight, 0.1));
     expect(tester.getBottomLeft(composer).dy, closeTo(844 - 180, 0.1));
     expect(
       tester.getBottomLeft(composerInput).dy,