firka/flutter
firka/flutter
4
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Update chip.dart to use set of MaterialState" (#128607)

Browse Source 
Reverts flutter/flutter#128507

This PR caused some internal failures (Google internal link b/286503764). Will need to investigate before we can re-land these changes.
This commit is contained in:
Hans Muller 2023-06-09 11:52:14 -07:00 committed by GitHub
parent e84fa2ce47
commit d5a8fa6271
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
packages/flutter/lib/src/material/chip.dart
View File

@ -19,6 +19,7 @@ import 'ink_well.dart';
import 'material.dart'; import 'material.dart';
import 'material_localizations.dart'; import 'material_localizations.dart';
import 'material_state.dart'; import 'material_state.dart';
import 'material_state_mixin.dart';
import 'text_theme.dart'; import 'text_theme.dart';
import 'theme.dart'; import 'theme.dart';
import 'theme_data.dart'; import 'theme_data.dart';
@ -841,7 +842,7 @@ class RawChip extends StatefulWidget
State<RawChip> createState() => _RawChipState(); State<RawChip> createState() => _RawChipState();
} }
class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip> { class _RawChipState extends State<RawChip> with MaterialStateMixin, TickerProviderStateMixin<RawChip> {
static const Duration pressedAnimationDuration = Duration(milliseconds: 75); static const Duration pressedAnimationDuration = Duration(milliseconds: 75);
late AnimationController selectController; late AnimationController selectController;
@ -853,7 +854,6 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
late Animation<double> deleteDrawerAnimation; late Animation<double> deleteDrawerAnimation;
late Animation<double> enableAnimation; late Animation<double> enableAnimation;
late Animation<double> selectionFade; late Animation<double> selectionFade;
late final Set<MaterialState> states;
bool get hasDeleteButton => widget.onDeleted != null; bool get hasDeleteButton => widget.onDeleted != null;
bool get hasAvatar => widget.avatar != null; bool get hasAvatar => widget.avatar != null;
@ -871,10 +871,8 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
void initState() { void initState() {
assert(widget.onSelected == null || widget.onPressed == null); assert(widget.onSelected == null || widget.onPressed == null);
super.initState(); super.initState();
states = <MaterialState>{ setMaterialState(MaterialState.disabled, !widget.isEnabled);
if (!widget.isEnabled) MaterialState.disabled, setMaterialState(MaterialState.selected, widget.selected);
if (widget.selected) MaterialState.selected,
};
selectController = AnimationController( selectController = AnimationController(
duration: _kSelectDuration, duration: _kSelectDuration,
value: widget.selected ? 1.0 : 0.0, value: widget.selected ? 1.0 : 0.0,
@ -949,7 +947,7 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
if (!canTap) { if (!canTap) {
return; return;
} }
states.add(MaterialState.pressed); setMaterialState(MaterialState.pressed, true);
setState(() { setState(() {
_isTapping = true; _isTapping = true;
}); });
@ -959,7 +957,7 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
if (!canTap) { if (!canTap) {
return; return;
} }
states.remove(MaterialState.pressed); setMaterialState(MaterialState.pressed, false);
setState(() { setState(() {
_isTapping = false; _isTapping = false;
}); });
@ -969,7 +967,7 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
if (!canTap) { if (!canTap) {
return; return;
} }
states.remove(MaterialState.pressed); setMaterialState(MaterialState.pressed, false);
setState(() { setState(() {
_isTapping = false; _isTapping = false;
}); });
@ -978,33 +976,13 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
widget.onPressed?.call(); widget.onPressed?.call();
} }
void _updateFocusState(bool focused) {
setState(() {
if (focused) {
states.add(MaterialState.focused);
} else {
states.remove(MaterialState.focused);
}
});
}
void _updateHoverState(bool hovered) {
setState(() {
if (hovered) {
states.add(MaterialState.hovered);
} else {
states.remove(MaterialState.hovered);
}
});
}
OutlinedBorder _getShape(ThemeData theme, ChipThemeData chipTheme, ChipThemeData chipDefaults) { OutlinedBorder _getShape(ThemeData theme, ChipThemeData chipTheme, ChipThemeData chipDefaults) {
final BorderSide? resolvedSide = MaterialStateProperty.resolveAs<BorderSide?>(widget.side, states) final BorderSide? resolvedSide = MaterialStateProperty.resolveAs<BorderSide?>(widget.side, materialStates)
?? MaterialStateProperty.resolveAs<BorderSide?>(chipTheme.side, states) ?? MaterialStateProperty.resolveAs<BorderSide?>(chipTheme.side, materialStates)
?? MaterialStateProperty.resolveAs<BorderSide?>(chipDefaults.side, states); ?? MaterialStateProperty.resolveAs<BorderSide?>(chipDefaults.side, materialStates);
final OutlinedBorder resolvedShape = MaterialStateProperty.resolveAs<OutlinedBorder?>(widget.shape, states) final OutlinedBorder resolvedShape = MaterialStateProperty.resolveAs<OutlinedBorder?>(widget.shape, materialStates)
?? MaterialStateProperty.resolveAs<OutlinedBorder?>(chipTheme.shape, states) ?? MaterialStateProperty.resolveAs<OutlinedBorder?>(chipTheme.shape, materialStates)
?? MaterialStateProperty.resolveAs<OutlinedBorder?>(chipDefaults.shape, states) ?? MaterialStateProperty.resolveAs<OutlinedBorder?>(chipDefaults.shape, materialStates)
?? const StadiumBorder(); ?? const StadiumBorder();
return resolvedShape.copyWith(side: resolvedSide); return resolvedShape.copyWith(side: resolvedSide);
} }
@ -1054,9 +1032,7 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
super.didUpdateWidget(oldWidget); super.didUpdateWidget(oldWidget);
if (oldWidget.isEnabled != widget.isEnabled) { if (oldWidget.isEnabled != widget.isEnabled) {
setState(() { setState(() {
if (!widget.isEnabled) { setMaterialState(MaterialState.disabled, !widget.isEnabled);
states.add(MaterialState.disabled);
}
if (widget.isEnabled) { if (widget.isEnabled) {
enableController.forward(); enableController.forward();
} else { } else {
@ -1075,9 +1051,7 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
} }
if (oldWidget.selected != widget.selected) { if (oldWidget.selected != widget.selected) {
setState(() { setState(() {
if (widget.selected) { setMaterialState(MaterialState.selected, widget.selected);
states.add(MaterialState.selected);
}
if (widget.selected) { if (widget.selected) {
selectController.forward(); selectController.forward();
} else { } else {
@ -1213,7 +1187,7 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
?? chipDefaults.iconTheme; ?? chipDefaults.iconTheme;
final TextStyle effectiveLabelStyle = labelStyle.merge(widget.labelStyle); final TextStyle effectiveLabelStyle = labelStyle.merge(widget.labelStyle);
final Color? resolvedLabelColor = MaterialStateProperty.resolveAs<Color?>(effectiveLabelStyle.color, states); final Color? resolvedLabelColor = MaterialStateProperty.resolveAs<Color?>(effectiveLabelStyle.color, materialStates);
final TextStyle resolvedLabelStyle = effectiveLabelStyle.copyWith(color: resolvedLabelColor); final TextStyle resolvedLabelStyle = effectiveLabelStyle.copyWith(color: resolvedLabelColor);
final Widget? avatar = iconTheme != null && hasAvatar final Widget? avatar = iconTheme != null && hasAvatar
? IconTheme(data: iconTheme, child: widget.avatar!) ? IconTheme(data: iconTheme, child: widget.avatar!)
@ -1227,14 +1201,14 @@ class _RawChipState extends State<RawChip> with TickerProviderStateMixin<RawChip
shape: resolvedShape, shape: resolvedShape,
clipBehavior: widget.clipBehavior, clipBehavior: widget.clipBehavior,
child: InkWell( child: InkWell(
onFocusChange: _updateFocusState, onFocusChange: updateMaterialState(MaterialState.focused),
focusNode: widget.focusNode, focusNode: widget.focusNode,
autofocus: widget.autofocus, autofocus: widget.autofocus,
canRequestFocus: widget.isEnabled, canRequestFocus: widget.isEnabled,
onTap: canTap ? _handleTap : null, onTap: canTap ? _handleTap : null,
onTapDown: canTap ? _handleTapDown : null, onTapDown: canTap ? _handleTapDown : null,
onTapCancel: canTap ? _handleTapCancel : null, onTapCancel: canTap ? _handleTapCancel : null,
onHover: canTap ? _updateHoverState : null, onHover: canTap ? updateMaterialState(MaterialState.hovered) : null,
customBorder: resolvedShape, customBorder: resolvedShape,
child: AnimatedBuilder( child: AnimatedBuilder(
animation: Listenable.merge(<Listenable>[selectController, enableController]), animation: Listenable.merge(<Listenable>[selectController, enableController]),