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

Allow tapping on TabBar indicator to switch tabs (#11525)

Browse Source 
* Allow tapping on TabBar indicator to switch tabs

* fix semantics

* review comments
This commit is contained in:
Michael Goderbauer 2017-08-08 10:14:35 -07:00 committed by GitHub
parent 8f57c67d9b
commit 7edec88632
2 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/flutter/lib/src/material/tabs.dart
View File

@ -737,7 +737,10 @@ class _TabBarState extends State<TabBar> {
children: <Widget>[
new InkWell(
onTap: () { _handleTap(index); },
child: wrappedTabs[index],
child: new Padding(
padding: new EdgeInsets.only(bottom: widget.indicatorWeight),
child: wrappedTabs[index],
),
),
new Semantics(
selected: index == _currentIndex,
@ -753,9 +756,7 @@ class _TabBarState extends State<TabBar> {
Widget tabBar = new CustomPaint(
painter: _indicatorPainter,
child: new Padding(
padding: new EdgeInsets.only(bottom: widget.indicatorWeight),
child: new _TabStyle(
child: new _TabStyle(
animation: kAlwaysDismissedAnimation,
selected: false,
labelColor: widget.labelColor,
@ -767,7 +768,6 @@ class _TabBarState extends State<TabBar> {
children: wrappedTabs,
),
),
),
);
if (widget.isScrollable) {

41
packages/flutter/test/material/tabs_test.dart
View File

@ -7,6 +7,7 @@ import 'dart:ui' show SemanticsFlags, SemanticsAction;
import 'package:flutter_test/flutter_test.dart';
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/physics.dart';
import '../rendering/mock_canvas.dart';
@ -1007,14 +1008,14 @@ void main() {
actions: SemanticsAction.tap.index,
flags: SemanticsFlags.isSelected.index,
label: 'TAB #0\nTab 1 of 2',
rect: new Rect.fromLTRB(0.0, 0.0, 108.0, 46.0),
rect: new Rect.fromLTRB(0.0, 0.0, 108.0, kTextTabBarHeight),
transform: new Matrix4.translationValues(0.0, 276.0, 0.0),
),
new TestSemantics(
id: 5,
actions: SemanticsAction.tap.index,
label: 'TAB #1\nTab 2 of 2',
rect: new Rect.fromLTRB(0.0, 0.0, 108.0, 46.0),
rect: new Rect.fromLTRB(0.0, 0.0, 108.0, kTextTabBarHeight),
transform: new Matrix4.translationValues(108.0, 276.0, 0.0),
),
]),
@ -1120,4 +1121,40 @@ void main() {
expect(find.text('PAGE'), findsOneWidget);
});
testWidgets('can tap on indicator at very bottom of TabBar to switch tabs', (WidgetTester tester) async {
final TabController controller = new TabController(
vsync: const TestVSync(),
length: 2,
initialIndex: 0,
);
await tester.pumpWidget(
new Material(
child: new Column(
children: <Widget>[
new TabBar(
controller: controller,
indicatorWeight: 30.0,
tabs: const <Widget>[const Tab(text: 'TAB1'), const Tab(text: 'TAB2')],
),
new Flexible(
child: new TabBarView(
controller: controller,
children: const <Widget>[const Text('PAGE1'), const Text('PAGE2')],
),
),
],
),
),
);
expect(controller.index, 0);
final Offset bottomRight = tester.getBottomRight(find.byType(TabBar)) - const Offset(1.0, 1.0);
final TestGesture gesture = await tester.startGesture(bottomRight);
await gesture.up();
await tester.pumpAndSettle();
expect(controller.index, 1);
});
}