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

Update the AppBar scroll offset only if the body region is scrolled (#5343)

Browse Source 
Fixes https://github.com/flutter/flutter/issues/5131
This commit is contained in:
Jason Simmons 2016-08-11 16:51:46 -07:00 committed by GitHub
parent 803fbec51b
commit 529c25caa8
2 changed files with 73 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
packages/flutter/lib/src/material/scaffold.dart
View File

@ -681,7 +681,18 @@ class ScaffoldState extends State<Scaffold> {
}
final List<LayoutId> children = new List<LayoutId>();
_addIfNonNull(children, config.body, _ScaffoldSlot.body);
Widget body;
if (config.appBarBehavior != AppBarBehavior.anchor) {
body = new NotificationListener<ScrollNotification>(
onNotification: _handleScrollNotification,
child: config.body
);
} else {
body = config.body;
}
_addIfNonNull(children, body, _ScaffoldSlot.body);
if (config.appBarBehavior == AppBarBehavior.anchor) {
final double expandedHeight = (config.appBar?.expandedHeight ?? 0.0) + padding.top;
final Widget appBar = new ConstrainedBox(
@ -728,27 +739,15 @@ class ScaffoldState extends State<Scaffold> {
));
}
Widget application;
if (config.appBarBehavior != AppBarBehavior.anchor) {
application = new NotificationListener<ScrollNotification>(
onNotification: _handleScrollNotification,
child: new CustomMultiChildLayout(
children: children,
delegate: new _ScaffoldLayout(
padding: EdgeInsets.zero,
appBarBehavior: config.appBarBehavior
)
)
);
} else {
application = new CustomMultiChildLayout(
children: children,
delegate: new _ScaffoldLayout(
padding: padding
)
);
}
EdgeInsets appPadding = (config.appBarBehavior != AppBarBehavior.anchor) ?
EdgeInsets.zero : padding;
Widget application = new CustomMultiChildLayout(
children: children,
delegate: new _ScaffoldLayout(
padding: appPadding,
appBarBehavior: config.appBarBehavior
)
);
return new Material(child: application);
}

52
packages/flutter/test/material/scaffold_test.dart
View File

@ -76,4 +76,56 @@ void main() {
expect(tester.binding.transientCallbackCount, greaterThan(0));
});
testWidgets('Drawer scrolling', (WidgetTester tester) async {
GlobalKey<ScrollableState<Scrollable>> drawerKey =
new GlobalKey<ScrollableState<Scrollable>>(debugLabel: 'drawer');
Key appBarKey = new Key('appBar');
const double appBarHeight = 256.0;
await tester.pumpWidget(
new MaterialApp(
home: new Scaffold(
appBarBehavior: AppBarBehavior.under,
appBar: new AppBar(
key: appBarKey,
expandedHeight: appBarHeight,
title: new Text('Title'),
flexibleSpace: new FlexibleSpaceBar(title: new Text('Title')),
),
drawer: new Drawer(
child: new Block(
scrollableKey: drawerKey,
children: new List<Widget>.generate(10,
(int index) => new SizedBox(height: 100.0, child: new Text('D$index'))
)
)
),
body: new Block(
padding: const EdgeInsets.only(top: appBarHeight),
children: new List<Widget>.generate(10,
(int index) => new SizedBox(height: 100.0, child: new Text('B$index'))
),
),
)
)
);
ScaffoldState state = tester.firstState(find.byType(Scaffold));
state.openDrawer();
await tester.pump();
await tester.pump(const Duration(seconds: 1));
expect(drawerKey.currentState.scrollOffset, equals(0));
const double scrollDelta = 80.0;
await tester.scroll(find.byKey(drawerKey), const Offset(0.0, -scrollDelta));
await tester.pump();
expect(drawerKey.currentState.scrollOffset, equals(scrollDelta));
RenderBox renderBox = tester.renderObject(find.byKey(appBarKey));
expect(renderBox.size.height, equals(appBarHeight));
});
}