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
96a78c08
Unverified
Commit
96a78c08
authored
Nov 04, 2020
by
Aneesh Rao
Committed by
GitHub
Nov 04, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enable customization of TabBar's InkWell (#69457)
parent
53410c4b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
156 additions
and
0 deletions
+156
-0
tabs.dart
packages/flutter/lib/src/material/tabs.dart
+29
-0
tabs_test.dart
packages/flutter/test/material/tabs_test.dart
+127
-0
No files found.
packages/flutter/lib/src/material/tabs.dart
View file @
96a78c08
...
...
@@ -16,6 +16,7 @@ import 'debug.dart';
import
'ink_well.dart'
;
import
'material.dart'
;
import
'material_localizations.dart'
;
import
'material_state.dart'
;
import
'tab_bar_theme.dart'
;
import
'tab_controller.dart'
;
import
'tab_indicator.dart'
;
...
...
@@ -608,7 +609,9 @@ class TabBar extends StatefulWidget implements PreferredSizeWidget {
this
.
unselectedLabelColor
,
this
.
unselectedLabelStyle
,
this
.
dragStartBehavior
=
DragStartBehavior
.
start
,
this
.
overlayColor
,
this
.
mouseCursor
,
this
.
enableFeedback
,
this
.
onTap
,
this
.
physics
,
})
:
assert
(
tabs
!=
null
),
...
...
@@ -741,6 +744,22 @@ class TabBar extends StatefulWidget implements PreferredSizeWidget {
/// bodyText1 definition is used.
final
TextStyle
?
unselectedLabelStyle
;
/// Defines the ink response focus, hover, and splash colors.
///
/// If non-null, it is resolved against one of [MaterialState.focused],
/// [MaterialState.hovered], and [MaterialState.pressed].
///
/// [MaterialState.pressed] triggers a ripple (an ink splash), per
/// the current Material Design spec. The [overlayColor] doesn't map
/// a state to [InkResponse.highlightColor] because a separate highlight
/// is not used by the current design guidelines. See
/// https://material.io/design/interaction/states.html#pressed
///
/// If the overlay color is null or resolves to null, then the default values
/// for [InkResponse.focusColor], [InkResponse.hoverColor], [InkResponse.splashColor]
/// will be used instead.
final
MaterialStateProperty
<
Color
?>?
overlayColor
;
/// {@macro flutter.widgets.scrollable.dragStartBehavior}
final
DragStartBehavior
dragStartBehavior
;
...
...
@@ -750,6 +769,14 @@ class TabBar extends StatefulWidget implements PreferredSizeWidget {
/// If this property is null, [SystemMouseCursors.click] will be used.
final
MouseCursor
?
mouseCursor
;
/// Whether detected gestures should provide acoustic and/or haptic feedback.
///
/// For example, on Android a tap will produce a clicking sound and a long-press
/// will produce a short vibration, when feedback is enabled.
///
/// Defaults to true.
final
bool
?
enableFeedback
;
/// An optional callback that's called when the [TabBar] is tapped.
///
/// The callback is applied to the index of the tab where the tap occurred.
...
...
@@ -1096,6 +1123,8 @@ class _TabBarState extends State<TabBar> {
wrappedTabs
[
index
]
=
InkWell
(
mouseCursor:
widget
.
mouseCursor
??
SystemMouseCursors
.
click
,
onTap:
()
{
_handleTap
(
index
);
},
enableFeedback:
widget
.
enableFeedback
??
true
,
overlayColor:
widget
.
overlayColor
,
child:
Padding
(
padding:
EdgeInsets
.
only
(
bottom:
widget
.
indicatorWeight
),
child:
Stack
(
...
...
packages/flutter/test/material/tabs_test.dart
View file @
96a78c08
...
...
@@ -13,6 +13,7 @@ import '../flutter_test_alternative.dart' show Fake;
import
'../rendering/mock_canvas.dart'
;
import
'../rendering/recording_canvas.dart'
;
import
'../widgets/semantics_tester.dart'
;
import
'feedback_tester.dart'
;
Widget
boilerplate
(
{
Widget
?
child
,
TextDirection
textDirection
=
TextDirection
.
ltr
})
{
return
Localizations
(
...
...
@@ -2226,6 +2227,132 @@ void main() {
));
});
group
(
'Tab feedback'
,
()
{
late
FeedbackTester
feedback
;
setUp
(()
{
feedback
=
FeedbackTester
();
});
tearDown
(()
{
feedback
.
dispose
();
});
testWidgets
(
'Tab feedback is enabled (default)'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
boilerplate
(
child:
const
DefaultTabController
(
length:
1
,
child:
TabBar
(
tabs:
<
Tab
>[
Tab
(
text:
'A'
,)
],
)
)
)
);
await
tester
.
tap
(
find
.
byType
(
InkWell
),
pointer:
1
);
await
tester
.
pump
(
const
Duration
(
seconds:
1
));
expect
(
feedback
.
clickSoundCount
,
1
);
expect
(
feedback
.
hapticCount
,
0
);
await
tester
.
tap
(
find
.
byType
(
InkWell
),
pointer:
1
);
await
tester
.
pump
(
const
Duration
(
seconds:
1
));
expect
(
feedback
.
clickSoundCount
,
2
);
expect
(
feedback
.
hapticCount
,
0
);
});
testWidgets
(
'Tab feedback is disabled'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
boilerplate
(
child:
const
DefaultTabController
(
length:
1
,
child:
TabBar
(
tabs:
<
Tab
>[
Tab
(
text:
'A'
,)
],
enableFeedback:
false
,
),
),
),
);
await
tester
.
tap
(
find
.
byType
(
InkWell
),
pointer:
1
);
await
tester
.
pump
(
const
Duration
(
seconds:
1
));
expect
(
feedback
.
clickSoundCount
,
0
);
expect
(
feedback
.
hapticCount
,
0
);
await
tester
.
longPress
(
find
.
byType
(
InkWell
),
pointer:
1
);
await
tester
.
pump
(
const
Duration
(
seconds:
1
));
expect
(
feedback
.
clickSoundCount
,
0
);
expect
(
feedback
.
hapticCount
,
0
);
});
});
group
(
'Tab overlayColor affects ink response'
,
()
{
testWidgets
(
'Tab
\'
s ink well changes color on hover with Tab overlayColor'
,
(
WidgetTester
tester
)
async
{
await
tester
.
pumpWidget
(
boilerplate
(
child:
DefaultTabController
(
length:
1
,
child:
TabBar
(
tabs:
const
<
Tab
>[
Tab
(
text:
'A'
,)
],
overlayColor:
MaterialStateProperty
.
resolveWith
<
Color
>(
(
Set
<
MaterialState
>
states
)
{
if
(
states
.
contains
(
MaterialState
.
hovered
))
return
const
Color
(
0xff00ff00
);
if
(
states
.
contains
(
MaterialState
.
pressed
))
return
const
Color
(
0xf00fffff
);
return
const
Color
(
0xffbadbad
);
// Shouldn't happen.
}
),
)
)
)
);
final
TestGesture
gesture
=
await
tester
.
createGesture
(
kind:
PointerDeviceKind
.
mouse
);
await
gesture
.
addPointer
();
addTearDown
(
gesture
.
removePointer
);
await
gesture
.
moveTo
(
tester
.
getCenter
(
find
.
byType
(
Tab
)));
await
tester
.
pumpAndSettle
();
final
RenderObject
inkFeatures
=
tester
.
allRenderObjects
.
firstWhere
((
RenderObject
object
)
=>
object
.
runtimeType
.
toString
()
==
'_RenderInkFeatures'
);
expect
(
inkFeatures
,
paints
..
rect
(
rect:
const
Rect
.
fromLTRB
(
0.0
,
276.0
,
800.0
,
324.0
),
color:
const
Color
(
0xff00ff00
)));
});
testWidgets
(
'Tab
\'
s ink response splashColor matches resolved Tab overlayColor for MaterialState.pressed'
,
(
WidgetTester
tester
)
async
{
const
Color
splashColor
=
Color
(
0xf00fffff
);
await
tester
.
pumpWidget
(
boilerplate
(
child:
DefaultTabController
(
length:
1
,
child:
TabBar
(
tabs:
const
<
Tab
>[
Tab
(
text:
'A'
,)
],
overlayColor:
MaterialStateProperty
.
resolveWith
<
Color
>(
(
Set
<
MaterialState
>
states
)
{
if
(
states
.
contains
(
MaterialState
.
hovered
))
return
const
Color
(
0xff00ff00
);
if
(
states
.
contains
(
MaterialState
.
pressed
))
return
splashColor
;
return
const
Color
(
0xffbadbad
);
// Shouldn't happen.
}
),
)
)
)
);
await
tester
.
pumpAndSettle
();
final
TestGesture
gesture
=
await
tester
.
startGesture
(
tester
.
getRect
(
find
.
byType
(
InkWell
)).
center
);
await
tester
.
pump
(
const
Duration
(
milliseconds:
200
));
// unconfirmed splash is well underway
final
RenderObject
inkFeatures
=
tester
.
allRenderObjects
.
firstWhere
((
RenderObject
object
)
=>
object
.
runtimeType
.
toString
()
==
'_RenderInkFeatures'
);
expect
(
inkFeatures
,
paints
..
circle
(
x:
400
,
y:
24
,
color:
splashColor
));
await
gesture
.
up
();
});
});
testWidgets
(
'Skipping tabs with global key does not crash'
,
(
WidgetTester
tester
)
async
{
// Regression test for https://github.com/flutter/flutter/issues/24660
final
List
<
String
>
tabs
=
<
String
>[
...
...
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