Skip to content

Commit 4e7a07a

Browse files
authored
Remove chip tooltip deprecations (flutter#134486)
Part of flutter#133171 These deprecations were introduced in flutter#96174 The replacement is to use `deleteButtonTooltipMessage`. This migration is supported by dart fix. â�
1 parent cba7daf commit 4e7a07a

File tree

3 files changed

+2
-75
lines changed

3 files changed

+2
-75
lines changed

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

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -279,16 +279,6 @@ abstract interface class DeletableChipAttributes {
279279
/// If null, the default [MaterialLocalizations.deleteButtonTooltip] will be
280280
/// used.
281281
String? get deleteButtonTooltipMessage;
282-
283-
/// Whether to use a tooltip on the chip's delete button showing the
284-
/// [deleteButtonTooltipMessage].
285-
///
286-
/// Defaults to true.
287-
@Deprecated(
288-
'Migrate to deleteButtonTooltipMessage. '
289-
'This feature was deprecated after v2.10.0-0.3.pre.'
290-
)
291-
bool get useDeleteButtonTooltip;
292282
}
293283

294284
/// An interface for Material Design chips that can have check marks.
@@ -597,11 +587,6 @@ class Chip extends StatelessWidget implements ChipAttributes, DeletableChipAttri
597587
this.shadowColor,
598588
this.surfaceTintColor,
599589
this.iconTheme,
600-
@Deprecated(
601-
'Migrate to deleteButtonTooltipMessage. '
602-
'This feature was deprecated after v2.10.0-0.3.pre.'
603-
)
604-
this.useDeleteButtonTooltip = true,
605590
}) : assert(elevation == null || elevation >= 0.0);
606591

607592
@override
@@ -648,12 +633,6 @@ class Chip extends StatelessWidget implements ChipAttributes, DeletableChipAttri
648633
final Color? surfaceTintColor;
649634
@override
650635
final IconThemeData? iconTheme;
651-
@override
652-
@Deprecated(
653-
'Migrate to deleteButtonTooltipMessage. '
654-
'This feature was deprecated after v2.10.0-0.3.pre.'
655-
)
656-
final bool useDeleteButtonTooltip;
657636

658637
@override
659638
Widget build(BuildContext context) {
@@ -666,7 +645,6 @@ class Chip extends StatelessWidget implements ChipAttributes, DeletableChipAttri
666645
deleteIcon: deleteIcon,
667646
onDeleted: onDeleted,
668647
deleteIconColor: deleteIconColor,
669-
useDeleteButtonTooltip: useDeleteButtonTooltip,
670648
deleteButtonTooltipMessage: deleteButtonTooltipMessage,
671649
tapEnabled: false,
672650
side: side,
@@ -771,11 +749,6 @@ class RawChip extends StatefulWidget
771749
this.showCheckmark,
772750
this.checkmarkColor,
773751
this.avatarBorder = const CircleBorder(),
774-
@Deprecated(
775-
'Migrate to deleteButtonTooltipMessage. '
776-
'This feature was deprecated after v2.10.0-0.3.pre.'
777-
)
778-
this.useDeleteButtonTooltip = true,
779752
}) : assert(pressElevation == null || pressElevation >= 0.0),
780753
assert(elevation == null || elevation >= 0.0),
781754
deleteIcon = deleteIcon ?? _kDefaultDeleteIcon;
@@ -855,12 +828,6 @@ class RawChip extends StatefulWidget
855828
final Color? checkmarkColor;
856829
@override
857830
final ShapeBorder avatarBorder;
858-
@override
859-
@Deprecated(
860-
'Migrate to deleteButtonTooltipMessage. '
861-
'This feature was deprecated after v2.10.0-0.3.pre.'
862-
)
863-
final bool useDeleteButtonTooltip;
864831

865832
/// If set, this indicates that the chip should be disabled if all of the
866833
/// tap callbacks ([onSelected], [onPressed]) are null.
@@ -1159,9 +1126,8 @@ class _RawChipState extends State<RawChip> with MaterialStateMixin, TickerProvid
11591126
container: true,
11601127
button: true,
11611128
child: _wrapWithTooltip(
1162-
tooltip: widget.useDeleteButtonTooltip
1163-
? widget.deleteButtonTooltipMessage ?? MaterialLocalizations.of(context).deleteButtonTooltip
1164-
: null,
1129+
tooltip: widget.deleteButtonTooltipMessage
1130+
?? MaterialLocalizations.of(context).deleteButtonTooltip,
11651131
enabled: widget.onDeleted != null,
11661132
child: InkWell(
11671133
// Radius should be slightly less than the full size of the chip.

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

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,6 @@ class InputChip extends StatelessWidget
123123
this.showCheckmark,
124124
this.checkmarkColor,
125125
this.avatarBorder = const CircleBorder(),
126-
@Deprecated(
127-
'Migrate to deleteButtonTooltipMessage. '
128-
'This feature was deprecated after v2.10.0-0.3.pre.'
129-
)
130-
this.useDeleteButtonTooltip = true,
131126
}) : assert(pressElevation == null || pressElevation >= 0.0),
132127
assert(elevation == null || elevation >= 0.0);
133128

@@ -199,12 +194,6 @@ class InputChip extends StatelessWidget
199194
final ShapeBorder avatarBorder;
200195
@override
201196
final IconThemeData? iconTheme;
202-
@override
203-
@Deprecated(
204-
'Migrate to deleteButtonTooltipMessage. '
205-
'This feature was deprecated after v2.10.0-0.3.pre.'
206-
)
207-
final bool useDeleteButtonTooltip;
208197

209198
@override
210199
Widget build(BuildContext context) {
@@ -223,7 +212,6 @@ class InputChip extends StatelessWidget
223212
deleteIcon: resolvedDeleteIcon,
224213
onDeleted: onDeleted,
225214
deleteIconColor: deleteIconColor,
226-
useDeleteButtonTooltip: useDeleteButtonTooltip,
227215
deleteButtonTooltipMessage: deleteButtonTooltipMessage,
228216
onSelected: onSelected,
229217
onPressed: onPressed,

packages/flutter/test/material/chip_test.dart

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ Widget chipWithOptionalDeleteButton({
138138
Key? labelKey,
139139
required bool deletable,
140140
TextDirection textDirection = TextDirection.ltr,
141-
bool useDeleteButtonTooltip = true,
142141
String? chipTooltip,
143142
String? deleteButtonTooltipMessage,
144143
VoidCallback? onPressed = doNothing,
@@ -154,7 +153,6 @@ Widget chipWithOptionalDeleteButton({
154153
onPressed: onPressed,
155154
onDeleted: deletable ? doNothing : null,
156155
deleteIcon: Icon(Icons.close, key: deleteButtonKey),
157-
useDeleteButtonTooltip: useDeleteButtonTooltip,
158156
deleteButtonTooltipMessage: deleteButtonTooltipMessage,
159157
label: Text(
160158
deletable
@@ -3204,31 +3202,6 @@ void main() {
32043202
expect(box.size, equals(const Size(128, 24.0 + 16.0)));
32053203
});
32063204

3207-
testWidgetsWithLeakTracking('Chip delete button tooltip can be disabled using useDeleteButtonTooltip', (WidgetTester tester) async {
3208-
await tester.pumpWidget(
3209-
chipWithOptionalDeleteButton(
3210-
deletable: true,
3211-
useDeleteButtonTooltip: false,
3212-
),
3213-
);
3214-
3215-
// Tap at the delete icon of the chip, which is at the right side of the
3216-
// chip
3217-
final Offset topRightOfInkwell = tester.getTopLeft(find.byType(InkWell).first);
3218-
final Offset tapLocationOfDeleteButton = topRightOfInkwell + const Offset(8, 8);
3219-
final TestGesture tapGesture = await tester.startGesture(tapLocationOfDeleteButton);
3220-
3221-
await tester.pump();
3222-
3223-
// Wait for some more time while pressing and holding the delete button
3224-
await tester.pumpAndSettle();
3225-
3226-
// There should be no delete button tooltip
3227-
expect(findTooltipContainer('Delete'), findsNothing);
3228-
3229-
await tapGesture.up();
3230-
});
3231-
32323205
testWidgetsWithLeakTracking('Chip delete button tooltip is disabled if deleteButtonTooltipMessage is empty', (WidgetTester tester) async {
32333206
final UniqueKey deleteButtonKey = UniqueKey();
32343207
await tester.pumpWidget(

0 commit comments

Comments
 (0)