Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: [MDS-665] Fix Input bugs and add border animations #248

Merged
merged 3 commits into from
Sep 8, 2023
Merged

fix: [MDS-665] Fix Input bugs and add border animations #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94d3361
PRogress commit
Kypsis Sep 8, 2023
6df363e
Finalize fixes
Kypsis Sep 8, 2023
94905b8
Remove comments
Kypsis Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 66 additions & 3 deletions example/lib/src/storybook/stories/text_input.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:moon_design/moon_design.dart';
import 'package:storybook_flutter/storybook_flutter.dart';

TextEditingController _textController = TextEditingController();
TextEditingController _dateController = TextEditingController();
TextEditingController _passwordController = TextEditingController();

bool _hidePassword = true;
Expand Down Expand Up @@ -82,6 +83,17 @@ class TextInputStory extends Story {

final inactiveBorderColor = colorTable(context)[inactiveBorderColorKnob ?? 40];

final hoverBorderColorKnob = context.knobs.nullable.options(
label: "hoverBorderColor",
description: "MoonColors variants for MoonTextInput hover border.",
enabled: false,
initial: 0,
// piccolo
options: colorOptions,
);

final hoverBorderColor = colorTable(context)[hoverBorderColorKnob ?? 40];

final errorColorKnob = context.knobs.nullable.options(
label: "errorColor",
description: "MoonColors variants for MoonTextInput error.",
Expand Down Expand Up @@ -141,6 +153,7 @@ class TextInputStory extends Story {
mainAxisAlignment: MainAxisAlignment.center,
children: [
MoonFormTextInput(
hoverBorderColor: hoverBorderColor,
controller: _textController,
enabled: enabledKnob,
textInputSize: textInputSizeKnob,
Expand All @@ -152,8 +165,8 @@ class TextInputStory extends Story {
inactiveBorderColor: inactiveBorderColor,
errorColor: errorColor,
borderRadius: borderRadius,
hintText: "Enter your text here (over 10 characters)",
validator: (String? value) => value?.length != null && value!.length < 10
hintText: "Enter text (over 10 characters)",
validator: (String? value) => value != null && value.length < 10
? "The text should be longer than 10 characters."
: null,
leading: showLeadingKnob
Expand Down Expand Up @@ -199,7 +212,7 @@ class TextInputStory extends Story {
validator: (String? value) => value != "123abc" ? "Wrong password." : null,
leading: showLeadingKnob
? const MoonIcon(
MoonIcons.search_24,
MoonIcons.password_24,
size: 24,
)
: null,
Expand Down Expand Up @@ -228,6 +241,56 @@ class TextInputStory extends Story {
);
},
),
const SizedBox(height: 16),
MoonFormTextInput(
readOnly: true,
hoverBorderColor: hoverBorderColor,
controller: _dateController,
enabled: enabledKnob,
textInputSize: textInputSizeKnob,
textColor: textColor,
hintTextColor: hintTextColor,
backgroundColor: backgroundColor,
activeBorderColor: activeBorderColor,
inactiveBorderColor: inactiveBorderColor,
errorColor: errorColor,
borderRadius: borderRadius,
hintText: "Pick a date",
validator: (String? value) => value != null && value.isEmpty ? "Pick a date." : null,
onTap: () async {
final DateTime? pickedDate = await showDatePicker(
context: context,
initialDate: DateTime.now(),
firstDate: DateTime.now(),
lastDate: DateTime(2050),
);

if (pickedDate != null) {
_dateController.text = "${pickedDate.toLocal()}".split(" ")[0];
}
},
leading: showLeadingKnob
? const MoonIcon(
MoonIcons.calendar_24,
size: 24,
)
: null,
trailing: showTrailingKnob
? MouseRegion(
cursor: SystemMouseCursors.click,
child: GestureDetector(
child: const MoonIcon(
MoonIcons.close_small_24,
size: 24,
),
onTap: () => _dateController.clear(),
),
)
: null,
helper: showHelperKnob ? const Text("Supporting text") : null,
errorBuilder: (BuildContext context, String? errorText) =>
StoryErrorWidget(errorText: errorText!),
),
const SizedBox(height: 32),
MoonFilledButton(
label: const Text("Submit"),
Expand Down
2 changes: 1 addition & 1 deletion example/lib/src/storybook/stories/text_input_group.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class TextInputGroupStory extends Story {
activeBorderColor: activeBorderColor,
errorColor: errorColor,
borderRadius: borderRadius,
hintText: "Enter your text here (over 10 characters)",
hintText: "Enter text (over 10 characters)",
validator: (String? value) => value?.length != null && value!.length < 10
? "The text should be longer than 10 characters."
: null,
Expand Down
4 changes: 2 additions & 2 deletions lib/src/theme/text_input/text_input_theme.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class MoonTextInputTheme extends ThemeExtension<MoonTextInputTheme> with Diagnos
inactiveBorderColor: tokens.colors.beerus,
errorColor: tokens.colors.chiChi100,
hoverBorderColor: tokens.colors.beerus,
textColor: tokens.colors.trunks,
helperTextColor: tokens.colors.trunks,
textColor: tokens.colors.textPrimary,
helperTextColor: tokens.colors.textSecondary,
),
properties = properties ??
MoonTextInputProperties(
Expand Down
Loading