Skip to content

Commit

Permalink
feat: [MDS-1032] Add onTapAlwaysCalled and cursorErrorColor to Input …
Browse files Browse the repository at this point in the history 
…widgets props (#379)
  • Loading branch information
@Kypsis
Kypsis committed Mar 13, 2024
1 parent 3f17ea5 commit 82b0f13
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 28 deletions.
1 change: 1 addition & 0 deletions lib/src/widgets/text_area/text_area.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ class MoonTextArea extends StatelessWidget {
borderRadius: effectiveBorderRadius,
controller: controller,
cursorColor: effectiveTextColor,
cursorErrorColor: effectiveErrorColor,
enabled: enabled,
enableIMEPersonalizedLearning: enableIMEPersonalizedLearning,
enableInteractiveSelection: enableInteractiveSelection,
Expand Down
10 changes: 10 additions & 0 deletions lib/src/widgets/text_input/form_text_input.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ class MoonFormTextInput extends FormField<String> {
int? maxLength,
ValueChanged<String>? onChanged,
GestureTapCallback? onTap,
bool onTapAlwaysCalled = false,
TapRegionCallback? onTapOutside,
VoidCallback? onEditingComplete,
ValueChanged<String>? onSubmitted,
Expand All @@ -91,6 +92,7 @@ class MoonFormTextInput extends FormField<String> {
double? cursorHeight,
Radius? cursorRadius,
Color? cursorColor,
Color? cursorErrorColor,
Brightness? keyboardAppearance,
EdgeInsets scrollPadding = const EdgeInsets.all(20.0),
bool? enableInteractiveSelection,
Expand Down Expand Up @@ -145,6 +147,7 @@ class MoonFormTextInput extends FormField<String> {
contextMenuBuilder: contextMenuBuilder,
controller: controller,
cursorColor: cursorColor,
cursorErrorColor: cursorErrorColor,
cursorHeight: cursorHeight,
cursorOpacityAnimates: cursorOpacityAnimates,
cursorRadius: cursorRadius,
Expand Down Expand Up @@ -191,6 +194,7 @@ class MoonFormTextInput extends FormField<String> {
onSaved: onSaved,
onSubmitted: onSubmitted,
onTap: onTap,
onTapAlwaysCalled: onTapAlwaysCalled,
onTapOutside: onTapOutside,
padding: padding,
readOnly: readOnly,
Expand Down Expand Up @@ -253,6 +257,7 @@ class MoonFormTextInput extends FormField<String> {
contextMenuBuilder: contextMenuBuilder,
controller: state._effectiveController,
cursorColor: cursorColor,
cursorErrorColor: cursorErrorColor,
cursorHeight: cursorHeight,
cursorOpacityAnimates: cursorOpacityAnimates,
cursorRadius: cursorRadius,
Expand Down Expand Up @@ -297,6 +302,7 @@ class MoonFormTextInput extends FormField<String> {
onEditingComplete: onEditingComplete,
onSubmitted: onSubmitted,
onTap: onTap,
onTapAlwaysCalled: onTapAlwaysCalled,
onTapOutside: onTapOutside,
padding: padding,
readOnly: readOnly,
Expand Down Expand Up @@ -510,6 +516,7 @@ class MoonFormTextInputConfiguration {
final Radius? cursorRadius;
final bool? cursorOpacityAnimates;
final Color? cursorColor;
final Color? cursorErrorColor;
final ui.BoxHeightStyle selectionHeightStyle;
final ui.BoxWidthStyle selectionWidthStyle;
final Brightness? keyboardAppearance;
Expand All @@ -518,6 +525,7 @@ class MoonFormTextInputConfiguration {
final TextSelectionControls? selectionControls;
final DragStartBehavior dragStartBehavior;
final GestureTapCallback? onTap;
final bool onTapAlwaysCalled;
final TapRegionCallback? onTapOutside;
final MouseCursor? mouseCursor;
final ScrollPhysics? scrollPhysics;
Expand Down Expand Up @@ -604,6 +612,7 @@ class MoonFormTextInputConfiguration {
this.cursorRadius,
this.cursorOpacityAnimates,
this.cursorColor,
this.cursorErrorColor,
this.selectionHeightStyle = ui.BoxHeightStyle.tight,
this.selectionWidthStyle = ui.BoxWidthStyle.tight,
this.keyboardAppearance,
Expand All @@ -612,6 +621,7 @@ class MoonFormTextInputConfiguration {
bool? enableInteractiveSelection,
this.selectionControls,
this.onTap,
this.onTapAlwaysCalled = false,
this.onTapOutside,
this.mouseCursor,
this.scrollController,
Expand Down
64 changes: 36 additions & 28 deletions lib/src/widgets/text_input/text_input.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,10 +194,12 @@ class MoonTextInput extends StatefulWidget {
/// {@macro flutter.widgets.editableText.keyboardType}
final TextInputType keyboardType;

/// {@template flutter.widgets.TextField.textInputAction}
/// The type of action button to use for the keyboard.
///
/// Defaults to [TextInputAction.newline] if [keyboardType] is
/// [TextInputType.multiline] and [TextInputAction.done] otherwise.
/// {@endtemplate}
final TextInputAction? textInputAction;

/// {@macro flutter.widgets.editableText.textCapitalization}
Expand Down Expand Up @@ -353,14 +355,11 @@ class MoonTextInput extends StatefulWidget {
///
/// The cursor indicates the current location of text insertion point in
/// the field.
///
/// If this is null it will default to the ambient
/// [DefaultSelectionStyle.cursorColor]. If that is null, and the
/// [ThemeData.platform] is [TargetPlatform.iOS] or [TargetPlatform.macOS]
/// it will use [CupertinoThemeData.primaryColor]. Otherwise it will use
/// the value of [ColorScheme.primary] of [ThemeData.colorScheme].
final Color? cursorColor;

/// The color of the cursor when the [MoonTextInput] is showing an error.
final Color? cursorErrorColor;

/// Controls how tall the selection highlight boxes are computed to be.
///
/// See [ui.BoxHeightStyle] for details on available styles.
Expand Down Expand Up @@ -391,7 +390,7 @@ class MoonTextInput extends StatefulWidget {
final DragStartBehavior dragStartBehavior;

/// {@template flutter.material.textfield.onTap}
/// The callback that is called for each distinct tap except for every second tap of a double tap.
/// Called for the first tap in a series of taps.
///
/// The text field builds a [GestureDetector] to handle input events like tap,
/// to trigger focus requests, to move the caret, adjust the selection, etc.
Expand All @@ -410,8 +409,17 @@ class MoonTextInput extends StatefulWidget {
/// To listen to arbitrary pointer events without competing with the
/// text field's internal gesture detector, use a [Listener].
/// {@endtemplate}
///
/// If [onTapAlwaysCalled] is enabled, this will also be called for consecutive
/// taps.
final GestureTapCallback? onTap;

/// Whether [onTap] should be called for every tap.
///
/// Defaults to false, so [onTap] is only called for each distinct tap. When
/// enabled, [onTap] is called for every tap including consecutive taps.
final bool onTapAlwaysCalled;

/// {@macro flutter.widgets.editableText.onTapOutside}
///
/// {@tool dartpad}
Expand All @@ -432,21 +440,6 @@ class MoonTextInput extends StatefulWidget {

/// The cursor for a mouse pointer when it enters or is hovering over the
/// widget.
///
/// If [mouseCursor] is a [MaterialStateProperty<MouseCursor>],
/// [MaterialStateProperty.resolve] is used for the following [MaterialState]s:
///
/// * [MaterialState.error].
/// * [MaterialState.hovered].
/// * [MaterialState.focused].
/// * [MaterialState.disabled].
///
/// If this property is null, [MaterialStateMouseCursor.textable] will be used.
///
/// The [mouseCursor] is the only property of [MoonTextInput] that controls the
/// appearance of the mouse pointer. All other properties related to "cursor"
/// stand for the text cursor, which is usually a blinking vertical line at
/// the editing position.
final MouseCursor? mouseCursor;

/// {@macro flutter.widgets.editableText.scrollPhysics}
Expand Down Expand Up @@ -628,6 +621,7 @@ class MoonTextInput extends StatefulWidget {
this.cursorRadius,
this.cursorOpacityAnimates,
this.cursorColor,
this.cursorErrorColor,
this.selectionHeightStyle = ui.BoxHeightStyle.tight,
this.selectionWidthStyle = ui.BoxWidthStyle.tight,
this.keyboardAppearance,
Expand All @@ -636,6 +630,7 @@ class MoonTextInput extends StatefulWidget {
bool? enableInteractiveSelection,
this.selectionControls,
this.onTap,
this.onTapAlwaysCalled = false,
this.onTapOutside,
this.mouseCursor,
this.scrollController,
Expand Down Expand Up @@ -728,6 +723,7 @@ class MoonTextInput extends StatefulWidget {
properties.add(DiagnosticsProperty<Radius>('cursorRadius', cursorRadius, defaultValue: null));
properties.add(DiagnosticsProperty<bool>('cursorOpacityAnimates', cursorOpacityAnimates, defaultValue: null));
properties.add(ColorProperty('cursorColor', cursorColor, defaultValue: null));
properties.add(ColorProperty('cursorErrorColor', cursorErrorColor, defaultValue: null));
properties.add(DiagnosticsProperty<Brightness>('keyboardAppearance', keyboardAppearance, defaultValue: null));
properties.add(
DiagnosticsProperty<EdgeInsetsGeometry>('scrollPadding', scrollPadding, defaultValue: const EdgeInsets.all(20.0)),
Expand Down Expand Up @@ -805,7 +801,9 @@ class _MoonTextInputState extends State<MoonTextInput>
bool get _hasIntrinsicError =>
widget.maxLength != null &&
widget.maxLength! > 0 &&
_effectiveController.value.text.characters.length > widget.maxLength!;
(widget.controller == null
? !restorePending && _effectiveController.value.text.characters.length > widget.maxLength!
: _effectiveController.value.text.characters.length > widget.maxLength!);

MaxLengthEnforcement get _effectiveMaxLengthEnforcement =>
widget.maxLengthEnforcement ??
Expand Down Expand Up @@ -1036,6 +1034,9 @@ class _MoonTextInputState extends State<MoonTextInput>
final Color effectiveErrorColor =
widget.errorColor ?? context.moonTheme?.textInputTheme.colors.errorColor ?? MoonColors.light.chichi;

final Color effectiveCursorErrorColor =
widget.cursorErrorColor ?? context.moonTheme?.textInputTheme.colors.errorColor ?? MoonColors.light.chichi;

final Color effectiveHoverBorderColor =
widget.hoverBorderColor ?? context.moonTheme?.textInputTheme.colors.hoverBorderColor ?? MoonColors.light.beerus;

Expand Down Expand Up @@ -1170,7 +1171,7 @@ class _MoonTextInputState extends State<MoonTextInput>
forcePressEnabled = true;
paintCursorAboveText = true;
cursorOpacityAnimates ??= true;
cursorColor = _hasError ? effectiveErrorColor : widget.cursorColor ?? effectiveTextColor;
cursorColor = _hasError ? effectiveCursorErrorColor : widget.cursorColor ?? effectiveTextColor;
selectionColor = selectionStyle.selectionColor ?? cupertinoTheme.primaryColor.withOpacity(0.40);
cursorRadius ??= const Radius.circular(2.0);
cursorOffset = Offset(iOSHorizontalOffset / MediaQuery.devicePixelRatioOf(context), 0);
Expand All @@ -1181,7 +1182,7 @@ class _MoonTextInputState extends State<MoonTextInput>
forcePressEnabled = false;
paintCursorAboveText = true;
cursorOpacityAnimates ??= false;
cursorColor = _hasError ? effectiveErrorColor : widget.cursorColor ?? effectiveTextColor;
cursorColor = _hasError ? effectiveCursorErrorColor : widget.cursorColor ?? effectiveTextColor;
selectionColor = selectionStyle.selectionColor ?? cupertinoTheme.primaryColor.withOpacity(0.40);
cursorRadius ??= const Radius.circular(2.0);
cursorOffset = Offset(iOSHorizontalOffset / MediaQuery.devicePixelRatioOf(context), 0);
Expand All @@ -1197,21 +1198,21 @@ class _MoonTextInputState extends State<MoonTextInput>
forcePressEnabled = false;
paintCursorAboveText = false;
cursorOpacityAnimates ??= false;
cursorColor = _hasError ? effectiveErrorColor : widget.cursorColor ?? effectiveTextColor;
cursorColor = _hasError ? effectiveCursorErrorColor : widget.cursorColor ?? effectiveTextColor;
selectionColor = selectionStyle.selectionColor ?? theme.colorScheme.primary.withOpacity(0.40);

case TargetPlatform.linux:
forcePressEnabled = false;
paintCursorAboveText = false;
cursorOpacityAnimates ??= false;
cursorColor = _hasError ? effectiveErrorColor : widget.cursorColor ?? effectiveTextColor;
cursorColor = _hasError ? effectiveCursorErrorColor : widget.cursorColor ?? effectiveTextColor;
selectionColor = selectionStyle.selectionColor ?? theme.colorScheme.primary.withOpacity(0.40);

case TargetPlatform.windows:
forcePressEnabled = false;
paintCursorAboveText = false;
cursorOpacityAnimates ??= false;
cursorColor = _hasError ? effectiveErrorColor : widget.cursorColor ?? effectiveTextColor;
cursorColor = _hasError ? effectiveCursorErrorColor : widget.cursorColor ?? effectiveTextColor;
selectionColor = selectionStyle.selectionColor ?? theme.colorScheme.primary.withOpacity(0.40);
handleDidGainAccessibilityFocus = () {
// Automatically activates MoonTextInput on receiving accessibility focus.
Expand Down Expand Up @@ -1482,6 +1483,13 @@ class _MoonTextInputSelectionGestureDetectorBuilder extends TextSelectionGesture
void onSingleTapUp(TapDragUpDetails details) {
super.onSingleTapUp(details);
_state._requestKeyboard();
}

@override
bool get onUserTapAlwaysCalled => _state.widget.onTapAlwaysCalled;

@override
void onUserTap() {
_state.widget.onTap?.call();
}

Expand Down

0 comments on commit 82b0f13

Please sign in to comment.