Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
4b91b220
Unverified
Commit
4b91b220
authored
Sep 02, 2022
by
Qun Cheng
Committed by
GitHub
Sep 02, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Tooltip Issue on Switch (#110830)
parent
57e42f02
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
165 additions
and
4 deletions
+165
-4
toggleable.dart
packages/flutter/lib/src/material/toggleable.dart
+4
-4
checkbox_test.dart
packages/flutter/test/material/checkbox_test.dart
+52
-0
radio_test.dart
packages/flutter/test/material/radio_test.dart
+52
-0
switch_test.dart
packages/flutter/test/material/switch_test.dart
+57
-0
No files found.
packages/flutter/lib/src/material/toggleable.dart
View file @
4b91b220
...
...
@@ -320,10 +320,10 @@ mixin ToggleableStateMixin<S extends StatefulWidget> on TickerProviderStateMixin
mouseCursor:
mouseCursor
.
resolve
(
states
),
child:
GestureDetector
(
excludeFromSemantics:
!
isInteractive
,
onTapDown:
_handleTapDown
,
onTap:
_handleTap
,
onTapUp:
_handleTapEnd
,
onTapCancel:
_handleTapEnd
,
onTapDown:
isInteractive
?
_handleTapDown
:
null
,
onTap:
isInteractive
?
_handleTap
:
null
,
onTapUp:
isInteractive
?
_handleTapEnd
:
null
,
onTapCancel:
isInteractive
?
_handleTapEnd
:
null
,
child:
Semantics
(
enabled:
isInteractive
,
child:
CustomPaint
(
...
...
packages/flutter/test/material/checkbox_test.dart
View file @
4b91b220
...
...
@@ -8,6 +8,7 @@ import 'package:flutter/foundation.dart';
import
'package:flutter/material.dart'
;
import
'package:flutter/rendering.dart'
;
import
'package:flutter/services.dart'
;
import
'package:flutter/src/gestures/constants.dart'
;
import
'package:flutter_test/flutter_test.dart'
;
import
'../rendering/mock_canvas.dart'
;
...
...
@@ -1446,6 +1447,57 @@ void main() {
await
tester
.
pumpAndSettle
();
expectBorder
();
});
testWidgets
(
'disabled checkbox shows tooltip'
,
(
WidgetTester
tester
)
async
{
const
String
longPressTooltip
=
'long press tooltip'
;
const
String
tapTooltip
=
'tap tooltip'
;
await
tester
.
pumpWidget
(
const
MaterialApp
(
home:
Material
(
child:
Tooltip
(
message:
longPressTooltip
,
child:
Checkbox
(
value:
true
,
onChanged:
null
),
),
),
)
);
// Default tooltip shows up after long pressed.
final
Finder
tooltip0
=
find
.
byType
(
Tooltip
);
expect
(
find
.
text
(
longPressTooltip
),
findsNothing
);
await
tester
.
tap
(
tooltip0
);
await
tester
.
pump
(
const
Duration
(
milliseconds:
10
));
expect
(
find
.
text
(
longPressTooltip
),
findsNothing
);
final
TestGesture
gestureLongPress
=
await
tester
.
startGesture
(
tester
.
getCenter
(
tooltip0
));
await
tester
.
pump
();
await
tester
.
pump
(
kLongPressTimeout
);
await
gestureLongPress
.
up
();
await
tester
.
pump
();
expect
(
find
.
text
(
longPressTooltip
),
findsOneWidget
);
// Tooltip shows up after tapping when set triggerMode to TooltipTriggerMode.tap.
await
tester
.
pumpWidget
(
const
MaterialApp
(
home:
Material
(
child:
Tooltip
(
triggerMode:
TooltipTriggerMode
.
tap
,
message:
tapTooltip
,
child:
Checkbox
(
value:
true
,
onChanged:
null
),
),
),
)
);
final
Finder
tooltip1
=
find
.
byType
(
Tooltip
);
expect
(
find
.
text
(
tapTooltip
),
findsNothing
);
await
tester
.
tap
(
tooltip1
);
await
tester
.
pump
(
const
Duration
(
milliseconds:
10
));
expect
(
find
.
text
(
tapTooltip
),
findsOneWidget
);
});
}
class
_SelectedGrabMouseCursor
extends
MaterialStateMouseCursor
{
...
...
packages/flutter/test/material/radio_test.dart
View file @
4b91b220
...
...
@@ -12,6 +12,7 @@ import 'package:flutter/foundation.dart';
import
'package:flutter/material.dart'
;
import
'package:flutter/rendering.dart'
;
import
'package:flutter/services.dart'
;
import
'package:flutter/src/gestures/constants.dart'
;
import
'package:flutter_test/flutter_test.dart'
;
import
'../rendering/mock_canvas.dart'
;
...
...
@@ -1115,4 +1116,55 @@ void main() {
// Release pointer after widget disappeared.
await
gesture
.
up
();
});
testWidgets
(
'disabled radio shows tooltip'
,
(
WidgetTester
tester
)
async
{
const
String
longPressTooltip
=
'long press tooltip'
;
const
String
tapTooltip
=
'tap tooltip'
;
await
tester
.
pumpWidget
(
const
MaterialApp
(
home:
Material
(
child:
Tooltip
(
message:
longPressTooltip
,
child:
Radio
<
bool
>(
value:
true
,
groupValue:
false
,
onChanged:
null
),
),
),
)
);
// Default tooltip shows up after long pressed.
final
Finder
tooltip0
=
find
.
byType
(
Tooltip
);
expect
(
find
.
text
(
longPressTooltip
),
findsNothing
);
await
tester
.
tap
(
tooltip0
);
await
tester
.
pump
(
const
Duration
(
milliseconds:
10
));
expect
(
find
.
text
(
longPressTooltip
),
findsNothing
);
final
TestGesture
gestureLongPress
=
await
tester
.
startGesture
(
tester
.
getCenter
(
tooltip0
));
await
tester
.
pump
();
await
tester
.
pump
(
kLongPressTimeout
);
await
gestureLongPress
.
up
();
await
tester
.
pump
();
expect
(
find
.
text
(
longPressTooltip
),
findsOneWidget
);
// Tooltip shows up after tapping when set triggerMode to TooltipTriggerMode.tap.
await
tester
.
pumpWidget
(
const
MaterialApp
(
home:
Material
(
child:
Tooltip
(
triggerMode:
TooltipTriggerMode
.
tap
,
message:
tapTooltip
,
child:
Radio
<
bool
>(
value:
true
,
groupValue:
false
,
onChanged:
null
),
),
),
)
);
final
Finder
tooltip1
=
find
.
byType
(
Tooltip
);
expect
(
find
.
text
(
tapTooltip
),
findsNothing
);
await
tester
.
tap
(
tooltip1
);
await
tester
.
pump
(
const
Duration
(
milliseconds:
10
));
expect
(
find
.
text
(
tapTooltip
),
findsOneWidget
);
});
}
packages/flutter/test/material/switch_test.dart
View file @
4b91b220
...
...
@@ -1721,6 +1721,63 @@ void main() {
await
gesture
.
up
();
});
testWidgets
(
'disabled switch shows tooltip'
,
(
WidgetTester
tester
)
async
{
const
String
longPressTooltip
=
'long press tooltip'
;
const
String
tapTooltip
=
'tap tooltip'
;
await
tester
.
pumpWidget
(
const
MaterialApp
(
home:
Material
(
child:
Tooltip
(
message:
longPressTooltip
,
child:
Switch
(
onChanged:
null
,
value:
true
,
),
),
),
)
);
// Default tooltip shows up after long pressed.
final
Finder
tooltip0
=
find
.
byType
(
Tooltip
);
expect
(
find
.
text
(
longPressTooltip
),
findsNothing
);
await
tester
.
tap
(
tooltip0
);
await
tester
.
pump
(
const
Duration
(
milliseconds:
10
));
expect
(
find
.
text
(
longPressTooltip
),
findsNothing
);
final
TestGesture
gestureLongPress
=
await
tester
.
startGesture
(
tester
.
getCenter
(
tooltip0
));
await
tester
.
pump
();
await
tester
.
pump
(
kLongPressTimeout
);
await
gestureLongPress
.
up
();
await
tester
.
pump
();
expect
(
find
.
text
(
longPressTooltip
),
findsOneWidget
);
// Tooltip shows up after tapping when set triggerMode to TooltipTriggerMode.tap.
await
tester
.
pumpWidget
(
const
MaterialApp
(
home:
Material
(
child:
Tooltip
(
triggerMode:
TooltipTriggerMode
.
tap
,
message:
tapTooltip
,
child:
Switch
(
onChanged:
null
,
value:
true
,
),
),
),
)
);
final
Finder
tooltip1
=
find
.
byType
(
Tooltip
);
expect
(
find
.
text
(
tapTooltip
),
findsNothing
);
await
tester
.
tap
(
tooltip1
);
await
tester
.
pump
(
const
Duration
(
milliseconds:
10
));
expect
(
find
.
text
(
tapTooltip
),
findsOneWidget
);
});
group
(
'with image'
,
()
{
late
ui
.
Image
image
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment