Skip to content

Commit ec7e98d

Browse files
authored
fix: Textfield helper Text (#531)
* textfield * Update textfield.dart
1 parent 250b288 commit ec7e98d

File tree

5 files changed

+41
-41
lines changed

5 files changed

+41
-41
lines changed

packages/remix/lib/src/components/textfield/textfield.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ class TextFieldSpec extends Spec<TextFieldSpec>
5252

5353
final Brightness keyboardAppearance;
5454
final Color? autocorrectionTextRectColor;
55-
56-
final FlexBoxSpec textFieldContainer;
55+
final FlexBoxSpec outerContainer;
5756
final FlexBoxSpec container;
5857
final TextStyle? hintTextStyle;
5958
final TextSpec helperText;
@@ -89,7 +88,7 @@ class TextFieldSpec extends Spec<TextFieldSpec>
8988
Brightness? keyboardAppearance,
9089
this.autocorrectionTextRectColor,
9190
bool? cursorOpacityAnimates,
92-
FlexBoxSpec? textFieldContainer,
91+
FlexBoxSpec? outerContainer,
9392
FlexBoxSpec? container,
9493
this.hintTextStyle,
9594
TextSpec? helperText,
@@ -114,7 +113,7 @@ class TextFieldSpec extends Spec<TextFieldSpec>
114113
scrollPadding = scrollPadding ?? const EdgeInsets.all(20.0),
115114
clipBehavior = clipBehavior ?? Clip.hardEdge,
116115
keyboardAppearance = keyboardAppearance ?? Brightness.light,
117-
textFieldContainer = textFieldContainer ?? const FlexBoxSpec(),
116+
outerContainer = outerContainer ?? const FlexBoxSpec(),
118117
helperText = helperText ?? const TextSpec(),
119118
container = container ?? const FlexBoxSpec(),
120119
icon = icon ?? const IconSpec(),

packages/remix/lib/src/components/textfield/textfield.g.dart

Lines changed: 18 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/remix/lib/src/components/textfield/textfield_style.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ class TextFieldStyle extends SpecStyle<TextFieldSpecUtility> {
7979

8080
final $ = spec.utilities;
8181

82-
final textFieldContainerStyle = $.textFieldContainer.chain
82+
final containerStyle = $.container.chain
8383
..color.white()
84-
..padding.horizontal(12)
84+
..padding.horizontal(10)
8585
..padding.vertical(8)
8686
..borderRadius(6)
8787
..border.all.color.grey.shade300()
@@ -95,7 +95,7 @@ class TextFieldStyle extends SpecStyle<TextFieldSpecUtility> {
9595
..flex.crossAxisAlignment.center()
9696
..flex.gap(8);
9797

98-
final containerStyle = $.container.flex.chain
98+
final outerContainerStyle = $.outerContainer.flex.chain
9999
..direction.vertical()
100100
..mainAxisSize.min()
101101
..mainAxisAlignment.start()
@@ -120,11 +120,11 @@ class TextFieldStyle extends SpecStyle<TextFieldSpecUtility> {
120120
..style.fontSize(12)
121121
..wrap.padding.left(12);
122122

123-
final focus = spec.on.focus($.textFieldContainer.border.all.color.black());
123+
final focus = spec.on.focus($.container.border.all.color.black());
124124

125125
return Style.create([
126126
platformSettings(spec).call(),
127-
textFieldContainerStyle,
127+
outerContainerStyle,
128128
$.floatingLabel.off(),
129129
$.selectionColor.black12(),
130130
containerStyle,
@@ -145,7 +145,7 @@ class TextFieldDarkStyle extends TextFieldStyle {
145145
final $ = spec.utilities;
146146
final cursor = $.cursorColor.grey.shade100();
147147

148-
final textFieldContainerStyle = $.textFieldContainer.chain
148+
final containerStyle = $.container.chain
149149
..color.black()
150150
..border.all.color.grey.shade800()
151151
..shadow.spreadRadius(0)
@@ -163,12 +163,12 @@ class TextFieldDarkStyle extends TextFieldStyle {
163163
final helperStyle = $.helperText.style.color.grey.shade400();
164164
final icon = $.icon.color.grey.shade300();
165165

166-
final focus = spec.on.focus($.textFieldContainer.border.all.color.white());
166+
final focus = spec.on.focus($.container.border.all.color.white());
167167

168168
return Style.create([
169169
super.makeStyle(spec).call(),
170170
cursor,
171-
textFieldContainerStyle,
171+
containerStyle,
172172
focus,
173173
textStyle,
174174
helperStyle,

packages/remix/lib/src/components/textfield/textfield_theme.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class FortalezaTextFieldStyle extends TextFieldStyle {
77
Style makeStyle(SpecConfiguration<TextFieldSpecUtility> spec) {
88
final $ = spec.utilities;
99

10-
final textFieldContainerStyle = $.textFieldContainer.chain
10+
final containerStyle = $.container.chain
1111
..color.$neutral(1)
1212
..padding.horizontal.$space(3)
1313
..padding.vertical.$space(2)
@@ -19,7 +19,7 @@ class FortalezaTextFieldStyle extends TextFieldStyle {
1919

2020
final textStyle = [$.style.$text(2), $.style.color.$neutral(12)];
2121

22-
final containerStyle = $.container.flex.gap.$space(2);
22+
final outerContainerStyle = $.outerContainer.flex.gap.$space(2);
2323

2424
final hintStyle = [
2525
$.hintTextStyle.color.$neutral(9),
@@ -38,7 +38,7 @@ class FortalezaTextFieldStyle extends TextFieldStyle {
3838
final icon = $.icon.color.$accent();
3939

4040
final focus = spec.on.focus(
41-
$.textFieldContainer.chain
41+
$.container.chain
4242
..border.all.color.$accent()
4343
..border.all.width(2),
4444
);
@@ -47,8 +47,8 @@ class FortalezaTextFieldStyle extends TextFieldStyle {
4747
super.makeStyle(spec).call(),
4848
$.floatingLabel.on(),
4949
$.cursorColor.$neutral(12),
50-
textFieldContainerStyle,
5150
containerStyle,
51+
outerContainerStyle,
5252
...textStyle,
5353
...hintStyle,
5454
...floatingHintStyle,

packages/remix/lib/src/components/textfield/textfield_widget.dart

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,10 @@ class _TextFieldState extends State<TextField>
507507
// }
508508

509509
final style = widget.style ?? context.remix.components.textField;
510-
final configuration =
511-
TextFieldSpecConfiguration(context, TextFieldSpecUtility.self);
510+
final configuration = TextFieldSpecConfiguration(
511+
context,
512+
TextFieldSpecUtility.self,
513+
);
512514

513515
final child = SpecBuilder(
514516
controller: _statesController,
@@ -519,10 +521,10 @@ class _TextFieldState extends State<TextField>
519521
(_effectiveFocusNode.hasFocus ||
520522
_effectiveController.value.text.isNotEmpty);
521523

522-
return spec.container(
524+
return spec.outerContainer(
523525
direction: Axis.vertical,
524526
children: [
525-
spec.textFieldContainer(
527+
spec.container(
526528
direction: Axis.horizontal,
527529
children: [
528530
if (widget.prefixBuilder != null)
@@ -618,7 +620,8 @@ class _TextFieldState extends State<TextField>
618620
if (widget.suffix != null) widget.suffix!,
619621
],
620622
),
621-
spec.helperText(widget.helperText ?? ''),
623+
if (widget.helperText != null)
624+
spec.helperText(widget.helperText ?? ''),
622625
],
623626
);
624627
},

0 commit comments

Comments
 (0)