From 3ce06efd4076efa2efdb2f1de9c61f955168c23c Mon Sep 17 00:00:00 2001 From: Todd Volkert Date: Tue, 14 Jul 2020 22:36:02 -0700 Subject: [PATCH] Default textBaseline to alphabetic in Flex (#61425) --- packages/flutter/lib/src/widgets/basic.dart | 6 ++++-- packages/flutter/test/widgets/debug_test.dart | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/flutter/lib/src/widgets/basic.dart b/packages/flutter/lib/src/widgets/basic.dart index c0f41ecc0f..6f1521d5a3 100644 --- a/packages/flutter/lib/src/widgets/basic.dart +++ b/packages/flutter/lib/src/widgets/basic.dart @@ -3871,7 +3871,7 @@ class Flex extends MultiChildRenderObjectWidget { this.crossAxisAlignment = CrossAxisAlignment.center, this.textDirection, this.verticalDirection = VerticalDirection.down, - this.textBaseline, + this.textBaseline = TextBaseline.alphabetic, this.clipBehavior = Clip.hardEdge, List children = const [], }) : assert(direction != null), @@ -3963,6 +3963,8 @@ class Flex extends MultiChildRenderObjectWidget { final VerticalDirection verticalDirection; /// If aligning items according to their baseline, which baseline to use. + /// + /// Defaults to [TextBaseline.alphabetic]. final TextBaseline textBaseline; // TODO(liyuqian): defaults to [Clip.none] once Google references are updated. @@ -4219,7 +4221,7 @@ class Row extends Flex { CrossAxisAlignment crossAxisAlignment = CrossAxisAlignment.center, TextDirection textDirection, VerticalDirection verticalDirection = VerticalDirection.down, - TextBaseline textBaseline, + TextBaseline textBaseline = TextBaseline.alphabetic, List children = const [], }) : super( children: children, diff --git a/packages/flutter/test/widgets/debug_test.dart b/packages/flutter/test/widgets/debug_test.dart index d46b0b18b1..fc7144592c 100644 --- a/packages/flutter/test/widgets/debug_test.dart +++ b/packages/flutter/test/widgets/debug_test.dart @@ -34,8 +34,8 @@ void main() { ' If multiple keyed nodes exist as children of another node, they\n' ' must have unique keys.\n' ' Flex(direction: vertical, mainAxisAlignment: start,\n' - ' crossAxisAlignment: center) has multiple children with key\n' - " [<'key'>].\n", + ' crossAxisAlignment: center, textBaseline: alphabetic) has\n' + " multiple children with key [<'key'>].\n", ), ); }