Skip to content

Commit bc611f5

Browse files
Reverts "Fix TextField helper top padding on M3 (#145087)" (#145168)
Reverts: flutter/flutter#145087 Initiated by: Jasguerrero Reason for reverting: failing on accessibility checks b/329548765 Original PR Author: bleroux Reviewed By: {justinmc} This change reverts the following previous change: ## Description `InputDecorator` adds a 8.0 gap beetween the container and the helper text. From the Material 3 specification, this gap should be 4.0. See https://m3.material.io/components/text-fields/specs#0c5c8d6d-2169-4d42-960c-51f6ee42eb57. This PR sets the correct values for M3 without changing the value for M2. | Before | After | M3 Spec | |--------|--------|--------| | ![image](https://github.com/flutter/flutter/assets/840911/9947f334-d98f-4f7e-9da7-ca6d5c0770ac) | ![image](https://github.com/flutter/flutter/assets/840911/081dec4b-eb9f-4eee-a7dc-2538e7110ff0)| ![image](https://github.com/flutter/flutter/assets/840911/c8c8f045-3b79-43a5-a1a3-cc6d5460644f) | If this change is accepted, a future step will be to make this value configurable, probably by `InputDecorationTheme`. ## Related Issue Fixes flutter/flutter#144984 ## Tests Updates a value used by several existing tests.
1 parent 20889dd commit bc611f5

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

packages/flutter/lib/src/material/input_decorator.dart

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -726,9 +726,7 @@ class _RenderDecoration extends RenderBox with SlottedContainerRenderObjectMixin
726726
_expands = expands,
727727
_material3 = material3;
728728

729-
// TODO(bleroux): consider defining this value as a Material token and making it
730-
// configurable by InputDecorationTheme.
731-
double get subtextGap => material3 ? 4.0 : 8.0;
729+
static const double subtextGap = 8.0;
732730

733731
RenderBox? get icon => childForSlot(_DecorationSlot.icon);
734732
RenderBox? get input => childForSlot(_DecorationSlot.input);

packages/flutter/test/material/input_decorator_test.dart

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,20 +1504,23 @@ void main() {
15041504
});
15051505

15061506
group('Material3 - InputDecoration helper/counter/error', () {
1507-
// Overall height for InputDecorator (filled or outlined) is 76dp on mobile:
1507+
// Overall height for InputDecorator (filled or outlined) is 80dp on mobile:
15081508
// 8 - top padding
15091509
// 12 - floating label (font size = 16 * 0.75, line height is forced to 1.0)
15101510
// 4 - gap between label and input
15111511
// 24 - input text (font size = 16, line height = 1.5)
15121512
// 8 - bottom padding
1513-
// 4 - gap above helper/error/counter
1513+
// 8 - gap above supporting text
15141514
// 16 - helper/counter (font size = 12, line height is 1.5)
15151515
const double topPadding = 8.0;
15161516
const double floatingLabelHeight = 12.0;
15171517
const double labelInputGap = 4.0;
15181518
const double inputHeight = 24.0;
15191519
const double bottomPadding = 8.0;
1520-
const double helperGap = 4.0;
1520+
// TODO(bleroux): make the InputDecorator implementation compliant with M3 spec by changing
1521+
// the helperGap to 4.0 instead of 8.0.
1522+
// See https://github.com/flutter/flutter/issues/144984.
1523+
const double helperGap = 8.0;
15211524
const double helperHeight = 16.0;
15221525
const double containerHeight = topPadding + floatingLabelHeight + labelInputGap + inputHeight + bottomPadding; // 56.0
15231526
const double fullHeight = containerHeight + helperGap + helperHeight; // 80.0 (should be 76.0 based on M3 spec)

0 commit comments

Comments
 (0)