From 589cd0bb678fd32ea406523083e34d21be81cf9f Mon Sep 17 00:00:00 2001
From: Hans Muller <hansmuller@chromium.org>
Date: Thu, 19 May 2016 12:44:16 -0700
Subject: [PATCH] correct Block scrollableKey plumbing (#4048)

---
 packages/flutter/lib/src/widgets/scrollable.dart |  2 +-
 packages/flutter/test/widget/block_test.dart     | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/flutter/lib/src/widgets/scrollable.dart b/packages/flutter/lib/src/widgets/scrollable.dart
index 80a7ae0a429..d4d4dd839b7 100644
--- a/packages/flutter/lib/src/widgets/scrollable.dart
+++ b/packages/flutter/lib/src/widgets/scrollable.dart
@@ -854,7 +854,7 @@ class Block extends StatelessWidget {
     if (padding != null)
       contents = new Padding(padding: padding, child: contents);
     return new ScrollableViewport(
-      key: scrollableKey,
+      scrollableKey: scrollableKey,
       initialScrollOffset: initialScrollOffset,
       scrollDirection: scrollDirection,
       scrollAnchor: scrollAnchor,
diff --git a/packages/flutter/test/widget/block_test.dart b/packages/flutter/test/widget/block_test.dart
index 2fbbf01a835..c7f075e7ab3 100644
--- a/packages/flutter/test/widget/block_test.dart
+++ b/packages/flutter/test/widget/block_test.dart
@@ -105,4 +105,18 @@ void main() {
     expect(first, equals(1));
     expect(second, equals(1));
   });
+
+  testWidgets('Block scrollableKey', (WidgetTester tester) async {
+    // Regression test for https://github.com/flutter/flutter/issues/4046
+    // The Block's scrollableKey needs to become its Scrollable descendant's key.
+    final GlobalKey<ScrollableState<Scrollable>> key = new GlobalKey<ScrollableState<Scrollable>>();
+    Widget buildBlock() {
+      return new Block(
+        scrollableKey: key,
+        children: <Widget>[new Text("A"), new Text("B"), new Text("C")]
+      );
+    }
+    await tester.pumpWidget(buildBlock());
+    expect(key.currentState.scrollOffset, 0.0);
+  });
 }