github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Primary scroll view support for SingleChildScrollView (#8437)

Browse Source
This commit is contained in:
Chris Bracken 2017-02-27 16:10:57 -08:00 committed by GitHub
parent f60410fa9d
commit c8c37fcc85
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/flutter/lib/src/widgets/single_child_scroll_view.dart
View File

@ -8,6 +8,7 @@ import 'package:flutter/rendering.dart';
import 'basic.dart'; import 'basic.dart';
import 'framework.dart'; import 'framework.dart';
import 'primary_scroll_controller.dart';
import 'scroll_controller.dart'; import 'scroll_controller.dart';
import 'scroll_physics.dart'; import 'scroll_physics.dart';
import 'scrollable.dart'; import 'scrollable.dart';
@ -42,11 +43,17 @@ class SingleChildScrollView extends StatelessWidget {
this.scrollDirection: Axis.vertical, this.scrollDirection: Axis.vertical,
this.reverse: false, this.reverse: false,
this.padding, this.padding,
this.primary: false,
this.physics, this.physics,
this.controller, this.controller,
this.child, this.child,
}) : super(key: key) { }) : super(key: key) {
assert(scrollDirection != null); assert(scrollDirection != null);
assert(primary != null);
assert(controller == null || !primary,
'Primary ScrollViews obtain their ScrollController via inheritance from a PrimaryScrollController widget. '
'You cannot both set primary to true and pass an explicit controller.'
);
} }
final Axis scrollDirection; final Axis scrollDirection;
@ -57,6 +64,8 @@ class SingleChildScrollView extends StatelessWidget {
final ScrollController controller; final ScrollController controller;
final bool primary;
final ScrollPhysics physics; final ScrollPhysics physics;
final Widget child; final Widget child;
@ -80,7 +89,7 @@ class SingleChildScrollView extends StatelessWidget {
contents = new Padding(padding: padding, child: contents); contents = new Padding(padding: padding, child: contents);
return new Scrollable( return new Scrollable(
axisDirection: axisDirection, axisDirection: axisDirection,
controller: controller, controller: controller ?? (primary ? PrimaryScrollController.of(context) : null),
physics: physics, physics: physics,
viewportBuilder: (BuildContext context, ViewportOffset offset) { viewportBuilder: (BuildContext context, ViewportOffset offset) {
return new _SingleChildViewport( return new _SingleChildViewport(

20
packages/flutter/test/widgets/single_child_scroll_view_test.dart
View File

@ -76,6 +76,26 @@ void main() {
expect(scrollable.position, const isInstanceOf<TestScrollPosition>()); expect(scrollable.position, const isInstanceOf<TestScrollPosition>());
}); });
testWidgets('Sets PrimaryScrollController when primary', (WidgetTester tester) async {
ScrollController primaryScrollController = new ScrollController();
await tester.pumpWidget(new PrimaryScrollController(
controller: primaryScrollController,
child: new SingleChildScrollView(
primary: true,
child: new Container(
height: 2000.0,
decoration: const BoxDecoration(
backgroundColor: const Color(0xFF00FF00),
),
),
),
));
Scrollable scrollable = tester.widget(find.byType(Scrollable));
expect(scrollable.controller, primaryScrollController);
});
testWidgets('Changing scroll controller inside dirty layout builder does not assert', (WidgetTester tester) async { testWidgets('Changing scroll controller inside dirty layout builder does not assert', (WidgetTester tester) async {
ScrollController controller = new ScrollController(); ScrollController controller = new ScrollController();