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

Fixed tab scrolling

Browse Source
This commit is contained in:
Hans Muller 2016-03-02 12:24:46 -08:00
parent 74ffda0f14
commit 4eae547c87
2 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -704,7 +704,8 @@ class _TabBarState<T> extends ScrollableState<TabBar<T>> implements TabBarSelect
void _updateScrollBehavior() { void _updateScrollBehavior() {
scrollTo(scrollBehavior.updateExtents( scrollTo(scrollBehavior.updateExtents(
containerExtent: config.scrollDirection == Axis.vertical ? _viewportSize.height : _viewportSize.width, containerExtent: config.scrollDirection == Axis.vertical ? _viewportSize.height : _viewportSize.width,
contentExtent: _tabWidths.reduce((double sum, double width) => sum + width) contentExtent: _tabWidths.reduce((double sum, double width) => sum + width),
scrollOffset: scrollOffset
)); ));
} }
@ -780,7 +781,7 @@ class _TabBarState<T> extends ScrollableState<TabBar<T>> implements TabBarSelect
); );
if (config.isScrollable) { if (config.isScrollable) {
child: new Viewport( return new Viewport(
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
paintOffset: scrollOffsetToPixelDelta(scrollOffset), paintOffset: scrollOffsetToPixelDelta(scrollOffset),
onPaintOffsetUpdateNeeded: _handlePaintOffsetUpdateNeeded, onPaintOffsetUpdateNeeded: _handlePaintOffsetUpdateNeeded,

47
packages/flutter/test/widget/tabs_test.dart
View File

@ -7,12 +7,13 @@ import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart'; import 'package:flutter/widgets.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
Widget buildFrame({ List<String> tabs, String value, bool isScrollable: false }) { Widget buildFrame({ List<String> tabs, String value, bool isScrollable: false, Key tabBarKey }) {
return new Material( return new Material(
child: new TabBarSelection<String>( child: new TabBarSelection<String>(
value: value, value: value,
values: tabs, values: tabs,
child: new TabBar<String>( child: new TabBar<String>(
key: tabBarKey,
labels: new Map<String, TabLabel>.fromIterable(tabs, value: (String tab) => new TabLabel(text: tab)), labels: new Map<String, TabLabel>.fromIterable(tabs, value: (String tab) => new TabLabel(text: tab)),
isScrollable: isScrollable isScrollable: isScrollable
) )
@ -98,4 +99,48 @@ void main() {
expect(selection.value, equals('A')); expect(selection.value, equals('A'));
}); });
}); });
test('Scrollable TabBar tap centers selected tab', () {
testWidgets((WidgetTester tester) {
List<String> tabs = <String>['AAAAAA', 'BBBBBB', 'CCCCCC', 'DDDDDD', 'EEEEEE', 'FFFFFF', 'GGGGGG', 'HHHHHH', 'IIIIII', 'JJJJJJ', 'KKKKKK', 'LLLLLL'];
Key tabBarKey = new Key('TabBar');
tester.pumpWidget(buildFrame(tabs: tabs, value: 'AAAAAA', isScrollable: true, tabBarKey: tabBarKey));
TabBarSelectionState<String> selection = TabBarSelection.of(tester.findText('AAAAAA'));
expect(selection, isNotNull);
expect(selection.value, equals('AAAAAA'));
expect(tester.getSize(tester.findElementByKey(tabBarKey)).width, equals(800.0));
// The center of the FFFFFF item is to the right of the TabBar's center
expect(tester.getCenter(tester.findText('FFFFFF')).x, greaterThan(401.0));
tester.tap(tester.findText('FFFFFF'));
tester.pump();
tester.pump(const Duration(seconds: 1)); // finish the scroll animation
expect(selection.value, equals('FFFFFF'));
// The center of the FFFFFF item is now at the TabBar's center
expect(tester.getCenter(tester.findText('FFFFFF')).x, closeTo(400.0, 1.0));
});
});
test('TabBar can be scrolled independent of the selection', () {
testWidgets((WidgetTester tester) {
List<String> tabs = <String>['AAAAAA', 'BBBBBB', 'CCCCCC', 'DDDDDD', 'EEEEEE', 'FFFFFF', 'GGGGGG', 'HHHHHH', 'IIIIII', 'JJJJJJ', 'KKKKKK', 'LLLLLL'];
Key tabBarKey = new Key('TabBar');
tester.pumpWidget(buildFrame(tabs: tabs, value: 'AAAAAA', isScrollable: true, tabBarKey: tabBarKey));
TabBarSelectionState<String> selection = TabBarSelection.of(tester.findText('AAAAAA'));
expect(selection, isNotNull);
expect(selection.value, equals('AAAAAA'));
// Fling-scroll the TabBar to the left
expect(tester.getCenter(tester.findText('HHHHHH')).x, lessThan(700.0));
tester.fling(tester.findElementByKey(tabBarKey), const Offset(-20.0, 0.0), 1000.0);
tester.pump();
tester.pump(const Duration(seconds: 1)); // finish the scroll animation
expect(tester.getCenter(tester.findText('HHHHHH')).x, lessThan(500.0));
// Scrolling the TabBar doesn't change the selection
expect(selection.value, equals('AAAAAA'));
});
});
} }